diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
| commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
| tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /codemaker/source/commoncpp | |
| parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) | |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'codemaker/source/commoncpp')
| -rw-r--r-- | codemaker/source/commoncpp/commoncpp.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 5db10d481c75..6f530409f745 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -56,7 +56,7 @@ OString scopedCppName(OString const & type, bool ns_alias) tmpBuf.append("::" + type.getToken(0, c, nPos)); } while( nPos != -1 ); - rtl::OString s(tmpBuf.makeStringAndClear()); + OString s(tmpBuf.makeStringAndClear()); if (ns_alias && s.indexOf("::com::sun::star::") == 0) { return s.replaceAt(0, 18, "css::"); // nicer shorthand @@ -70,10 +70,10 @@ OString translateUnoToCppType( codemaker::UnoType::Sort sort, RTTypeClass typeClass, OString const & nucleus, bool shortname) { - rtl::OStringBuffer buf; + OStringBuffer buf; if (sort == codemaker::UnoType::SORT_COMPLEX) { if (typeClass == RT_TYPE_INTERFACE - && nucleus == rtl::OString("com/sun/star/uno/XInterface")) + && nucleus == OString("com/sun/star/uno/XInterface")) { buf.append("::com::sun::star::uno::XInterface"); } else { @@ -84,13 +84,13 @@ OString translateUnoToCppType( static char const * const cppTypes[codemaker::UnoType::SORT_ANY + 1] = { "void", "::sal_Bool", "::sal_Int8", "::sal_Int16", "::sal_uInt16", "::sal_Int32", "::sal_uInt32", "::sal_Int64", "::sal_uInt64", - "float", "double", "::sal_Unicode", "::rtl::OUString", + "float", "double", "::sal_Unicode", "rtl::OUString", "::com::sun::star::uno::Type", "::com::sun::star::uno::Any" }; buf.append(cppTypes[sort]); } if (shortname) { - rtl::OString s(buf.makeStringAndClear()); + OString s(buf.makeStringAndClear()); if (s.indexOf("::com::sun::star") == 0) return s.replaceAt(0, 16, "css"); else @@ -100,9 +100,9 @@ OString translateUnoToCppType( return buf.makeStringAndClear(); } -rtl::OString translateUnoToCppIdentifier( - rtl::OString const & unoIdentifier, rtl::OString const & prefix, - IdentifierTranslationMode transmode, rtl::OString const * forbidden) +OString translateUnoToCppIdentifier( + OString const & unoIdentifier, OString const & prefix, + IdentifierTranslationMode transmode, OString const * forbidden) { if (// Keywords: unoIdentifier == "asm" |