wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

Some more cppumaker "css" clean-up

Browse Source 
...hopefully, all generated headers that use css (indirectly) include sal/types.h

Change-Id: Iaa40fa014d54b57b395eafda8b4f35ca395d55b0
This commit is contained in:
Stephan Bergmann
2013-10-20 12:33:00 +02:00
parent 44b96b1d76
commit eb37196aa7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
codemaker/source/commoncpp/commoncpp.cxx
View File

@ -55,9 +55,9 @@ OString scopedCppName(OString const & type, bool ns_alias)
} while( nPos != -1 );
OString s(tmpBuf.makeStringAndClear());
if (ns_alias && s.indexOf("::com::sun::star::") == 0)
if (ns_alias && s.startsWith("::com::sun::star::", &s))
{
return s.replaceAt(0, 18, "css::"); // nicer shorthand
s = "::css::" + s; // nicer shorthand
}
return s;
@ -73,7 +73,7 @@ OString translateUnoToCppType(
"void", "::sal_Bool", "::sal_Int8", "::sal_Int16", "::sal_uInt16",
"::sal_Int32", "::sal_uInt32", "::sal_Int64", "::sal_uInt64",
"float", "double", "::sal_Unicode", "rtl::OUString",
"::com::sun::star::uno::Type", "::com::sun::star::uno::Any" };
"::css::uno::Type", "::css::uno::Any" };
buf.append(cppTypes[sort]);
} else {
if (sort == codemaker::UnoType::SORT_INTERFACE_TYPE