diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-20 12:33:00 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-20 16:10:53 +0200 |
commit | eb37196aa773369555a36318e7aeaa2ed437d423 (patch) | |
tree | cb8563fd18c372c77826f8a24e99fbe9ace04e62 /codemaker | |
parent | 44b96b1d76bb1c7b6d78344ee54e31ffee54e342 (diff) |
Some more cppumaker "css" clean-up
...hopefully, all generated headers that use css (indirectly) include sal/types.h
Change-Id: Iaa40fa014d54b57b395eafda8b4f35ca395d55b0
Diffstat (limited to 'codemaker')
-rw-r--r-- | codemaker/source/commoncpp/commoncpp.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 98f4b73ccc88..b03520033620 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -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 |