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

8 files changed, 134 insertions, 138 deletions

diff --git a/unodevtools/inc/unodevtools/options.hxx b/unodevtools/inc/unodevtools/options.hxx
index 7c1a9c1d5236..e1347829be7d 100644
--- a/unodevtools/inc/unodevtools/options.hxx
+++ b/unodevtools/inc/unodevtools/options.hxx
@@ -28,13 +28,13 @@
 namespace unodevtools {
 
 //-------------------------------------------------------------------------------
-sal_Bool readOption( rtl::OUString * pValue, const sal_Char * pOpt,
-                     sal_uInt32 * pnIndex, const rtl::OUString & aArg)
+sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
+                     sal_uInt32 * pnIndex, const OUString & aArg)
     throw (com::sun::star::uno::RuntimeException);
 
 //-------------------------------------------------------------------------------
 sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
-                     sal_uInt32 * pnIndex, const rtl::OUString & aArg);
+                     sal_uInt32 * pnIndex, const OUString & aArg);
 
 } // end of namespace unodevtools
 
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 5604962bce0a..309f3c76ddad 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -120,8 +120,8 @@ OString generateCompHelperDeclaration(std::ostream & o,
 
     // generate component/service helper functions
     o << "// component and service helper functions:\n"
-        "::rtl::OUString SAL_CALL _getImplementationName();\n"
-        "css::uno::Sequence< ::rtl::OUString > SAL_CALL "
+        "OUString SAL_CALL _getImplementationName();\n"
+        "css::uno::Sequence< OUString > SAL_CALL "
         "_getSupportedServiceNames();\n"
         "css::uno::Reference< css::uno::XInterface > SAL_CALL _create("
         " css::uno::Reference< css::uno::XComponentContext > const & "
@@ -143,19 +143,19 @@ void generateCompHelperDefinition(std::ostream & o,
     OString nm;
     short nbrackets = generateNamespace(o, implname, true, nm);
 
-    o << "::rtl::OUString SAL_CALL _getImplementationName() {\n"
-      << "    return ::rtl::OUString(\n"
+    o << "OUString SAL_CALL _getImplementationName() {\n"
+      << "    return OUString(\n"
       << "        \"" << implname << "\");\n}\n\n";
 
-    o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL "
+    o << "css::uno::Sequence< OUString > SAL_CALL "
         "_getSupportedServiceNames()\n{\n    css::uno::Sequence< "
-      << "::rtl::OUString >" << " s(" << services.size() << ");\n";
+      << "OUString >" << " s(" << services.size() << ");\n";
 
     boost::unordered_set< OString, OStringHash >::const_iterator iter = services.begin();
     short i=0;
     while (iter != services.end())
     {
-        o << "    s[" << i++ << "] = ::rtl::OUString(\""
+        o << "    s[" << i++ << "] = OUString(\""
           << (*iter).replace('/','.') << "\");\n";
         ++iter;
     }
@@ -206,7 +206,7 @@ void generateXPropertySetBodies(std::ostream& o,
       << propertyhelper
       << " >::getPropertySetInfo();\n}\n\n";
 
-    o << "void SAL_CALL " << classname << "setPropertyValue(const ::rtl::OUString"
+    o << "void SAL_CALL " << classname << "setPropertyValue(const OUString"
         " & aPropertyName, const css::uno::Any & aValue) throw ("
         "css::uno::RuntimeException, css::beans::UnknownPropertyException, "
         "css::beans::PropertyVetoException, css::lang::IllegalArgumentException, "
@@ -215,13 +215,13 @@ void generateXPropertySetBodies(std::ostream& o,
 
 
     o << "css::uno::Any SAL_CALL " << classname << "getPropertyValue(const "
-        "::rtl::OUString & aPropertyName) throw (css::uno::RuntimeException, "
+        "OUString & aPropertyName) throw (css::uno::RuntimeException, "
         "css::beans::UnknownPropertyException, css::lang::WrappedTargetException)"
         "\n{\n    return ::cppu::PropertySetMixin< "
       << propertyhelper << " >::getPropertyValue(aPropertyName);\n}\n\n";
 
     o << "void SAL_CALL " << classname << "addPropertyChangeListener(const "
-        "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+        "OUString & aPropertyName, const css::uno::Reference< "
         "css::beans::XPropertyChangeListener > & xListener) throw ("
         "css::uno::RuntimeException, css::beans::UnknownPropertyException, "
         "css::lang::WrappedTargetException)\n{\n    ::cppu::PropertySetMixin< "
@@ -229,7 +229,7 @@ void generateXPropertySetBodies(std::ostream& o,
       << " >::addPropertyChangeListener(aPropertyName, xListener);\n}\n\n";
 
     o << "void SAL_CALL " << classname << "removePropertyChangeListener(const "
-        "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+        "OUString & aPropertyName, const css::uno::Reference< "
         "css::beans::XPropertyChangeListener > & xListener) throw ("
         "css::uno::RuntimeException, css::beans::UnknownPropertyException, "
         "css::lang::WrappedTargetException)\n{\n    ::cppu::PropertySetMixin< "
@@ -237,7 +237,7 @@ void generateXPropertySetBodies(std::ostream& o,
       << " >::removePropertyChangeListener(aPropertyName, xListener);\n}\n\n";
 
     o << "void SAL_CALL " << classname << "addVetoableChangeListener(const "
-        "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+        "OUString & aPropertyName, const css::uno::Reference< "
         "css::beans::XVetoableChangeListener > & xListener) throw ("
         "css::uno::RuntimeException, css::beans::UnknownPropertyException, "
         "css::lang::WrappedTargetException)\n{\n    ::cppu::PropertySetMixin< "
@@ -245,7 +245,7 @@ void generateXPropertySetBodies(std::ostream& o,
       << " >::addVetoableChangeListener(aPropertyName, xListener);\n}\n\n";
 
     o << "void SAL_CALL " << classname << "removeVetoableChangeListener(const "
-        "::rtl::OUString & aPropertyName, const css::uno::Reference< "
+        "OUString & aPropertyName, const css::uno::Reference< "
         "css::beans::XVetoableChangeListener > & xListener) throw ("
         "css::uno::RuntimeException, css::beans::UnknownPropertyException, "
         "css::lang::WrappedTargetException)\n{\n    ::cppu::PropertySetMixin< "
@@ -309,54 +309,54 @@ void generateXAddInBodies(std::ostream& o, const OString & classname)
 {
     o << "// css::sheet::XAddIn:\n";
 
-    o << "::rtl::OUString SAL_CALL " << classname << "getProgrammaticFuntionName("
-        "const ::rtl::OUString & aDisplayName) throw (css::uno::RuntimeException)"
-        "\n{\n    ::rtl::OUString ret;\n    try {\n        css::uno::Reference< "
+    o << "OUString SAL_CALL " << classname << "getProgrammaticFuntionName("
+        "const OUString & aDisplayName) throw (css::uno::RuntimeException)"
+        "\n{\n    OUString ret;\n    try {\n        css::uno::Reference< "
         "css::container::XNameAccess > xNAccess(m_xHAccess, css::uno::UNO_QUERY);\n"
-        "        css::uno::Sequence< ::rtl::OUString > functions = "
+        "        css::uno::Sequence< OUString > functions = "
         "xNAccess->getElementNames();\n        sal_Int32 len = functions."
-        "getLength();\n        ::rtl::OUString sDisplayName;\n"
+        "getLength();\n        OUString sDisplayName;\n"
         "        for (sal_Int32 i=0; i < len; ++i) {\n"
         "            sDisplayName = getAddinProperty(functions[i], "
-        "::rtl::OUString(),\n                                           "
+        "OUString(),\n                                           "
         "sDISPLAYNAME);\n            if (sDisplayName.equals(aDisplayName))\n"
         "                return functions[i];\n        }\n    }\n"
         "     catch ( const css::uno::RuntimeException & e ) {\n        throw e;\n    }\n"
         "     catch ( css::uno::Exception & ) {\n    }\n    return ret;\n}\n\n";
 
-    o << "::rtl::OUString SAL_CALL " << classname << "getDisplayFunctionName(const "
-        "::rtl::OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
-        "{\n    return getAddinProperty(aProgrammaticName, ::rtl::OUString(), "
+    o << "OUString SAL_CALL " << classname << "getDisplayFunctionName(const "
+        "OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
+        "{\n    return getAddinProperty(aProgrammaticName, OUString(), "
         "sDISPLAYNAME);\n}\n\n";
 
-    o << "::rtl::OUString SAL_CALL " << classname << "getFunctionDescription(const "
-        "::rtl::OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
-        "{\n    return getAddinProperty(aProgrammaticName, ::rtl::OUString(), "
+    o << "OUString SAL_CALL " << classname << "getFunctionDescription(const "
+        "OUString & aProgrammaticName) throw (css::uno::RuntimeException)\n"
+        "{\n    return getAddinProperty(aProgrammaticName, OUString(), "
         "sDESCRIPTION);\n}\n\n";
 
-    o << "::rtl::OUString SAL_CALL " << classname << "getDisplayArgumentName(const "
-        "::rtl::OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
+    o << "OUString SAL_CALL " << classname << "getDisplayArgumentName(const "
+        "OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
         "(css::uno::RuntimeException)\n{\n    return getAddinProperty("
         "aProgrammaticFunctionName,\n                            m_functionMap["
         "aProgrammaticFunctionName][nArgument],\n"
         "                            sDISPLAYNAME);\n}\n\n";
 
-    o << "::rtl::OUString SAL_CALL " << classname << "getArgumentDescription(const "
-        "::rtl::OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
+    o << "OUString SAL_CALL " << classname << "getArgumentDescription(const "
+        "OUString & aProgrammaticFunctionName, ::sal_Int32 nArgument) throw "
         "(css::uno::RuntimeException)\n{\n    return getAddinProperty("
         "aProgrammaticFunctionName,\n                            "
         "m_functionMap[aProgrammaticFunctionName][nArgument],\n"
         "                            sDESCRIPTION);\n}\n\n";
 
-    o << "::rtl::OUString SAL_CALL " << classname << "getProgrammaticCategoryName("
-        "const ::rtl::OUString & aProgrammaticFunctionName) throw ("
+    o << "OUString SAL_CALL " << classname << "getProgrammaticCategoryName("
+        "const OUString & aProgrammaticFunctionName) throw ("
         "css::uno::RuntimeException)\n{\n    return getAddinProperty("
-        "aProgrammaticFunctionName, ::rtl::OUString(), sCATEGORY);\n}\n\n";
+        "aProgrammaticFunctionName, OUString(), sCATEGORY);\n}\n\n";
 
-    o << "::rtl::OUString SAL_CALL " << classname << "getDisplayCategoryName(const "
-        "::rtl::OUString & aProgrammaticFunctionName) throw ("
+    o << "OUString SAL_CALL " << classname << "getDisplayCategoryName(const "
+        "OUString & aProgrammaticFunctionName) throw ("
         "css::uno::RuntimeException)\n{\n    return getAddinProperty("
-        "aProgrammaticFunctionName, ::rtl::OUString(), "
+        "aProgrammaticFunctionName, OUString(), "
         "sCATEGORYDISPLAYNAME);\n}\n\n";
 }
 
@@ -364,26 +364,26 @@ void generateXCompatibilityNamesBodies(std::ostream& o, const OString & classnam
 {
     o << "// css::sheet::XCompatibilityNames:\n"
         "css::uno::Sequence< css::sheet::LocalizedName > SAL_CALL " << classname
-      << "getCompatibilityNames(const ::rtl::OUString & aProgrammaticName) throw "
+      << "getCompatibilityNames(const OUString & aProgrammaticName) throw "
         "(css::uno::RuntimeException)\n{\n    css::uno::Sequence< "
         "css::sheet::LocalizedName > seqLocalizedNames;\n    try {\n        "
-        "::rtl::OUStringBuffer buf("
+        "OUStringBuffer buf("
         "aProgrammaticName);\n        buf.appendAscii(\"/CompatibilityName\");\n"
-        "        ::rtl::OUString hname(buf.makeStringAndClear());\n\n        "
+        "        OUString hname(buf.makeStringAndClear());\n\n        "
         "if ( m_xCompAccess->hasByHierarchicalName(hname) ) {\n"
         "            css::uno::Reference< css::container::XNameAccess > "
         "xNameAccess(\n"
         "                m_xCompAccess->getByHierarchicalName(hname), "
-        "css::uno::UNO_QUERY);\n\n            css::uno::Sequence< ::rtl::OUString"
+        "css::uno::UNO_QUERY);\n\n            css::uno::Sequence< OUString"
         " > elems = \n            xNameAccess->getElementNames();"
         "\n            ::sal_Int32 len = elems.getLength();\n\n            "
-        "seqLocalizedNames.realloc(len);\n\n            ::rtl::OUString "
+        "seqLocalizedNames.realloc(len);\n\n            OUString "
         "sCompatibilityName;\n            for (::sal_Int32 i=0; i < len; ++i) {\n"
-        "                ::rtl::OUString sLocale(elems[i]);\n                "
+        "                OUString sLocale(elems[i]);\n                "
         "xNameAccess->getByName(sLocale) >>= sCompatibilityName;\n\n"
         "                css::lang::Locale aLocale;\n                "
         "::sal_Int32 nIndex = 0, nToken = 0;\n                "
-        "do {\n                    ::rtl::OUString aToken = sLocale.getToken(0, '-', "
+        "do {\n                    OUString aToken = sLocale.getToken(0, '-', "
         "nIndex);\n                    switch (nToken++) {\n                    "
         "case 0:\n                        aLocale.Language = aToken;\n"
         "                        break;\n                    case 1:\n"
@@ -461,7 +461,7 @@ void generateXDispatchProvider(std::ostream& o,
     o << "// css::frame::XDispatchProvider:\n"
         "css::uno::Reference< css::frame::XDispatch > SAL_CALL " << classname
       << "queryDispatch( const css::util::URL& aURL,"
-        " const ::rtl::OUString& sTargetFrameName, sal_Int32 nSearchFlags ) "
+        " const OUString& sTargetFrameName, sal_Int32 nSearchFlags ) "
         "throw(css::uno::RuntimeException)\n{\n    css::uno::Reference< "
         "css::frame::XDispatch > xRet;\n"
         "    if ( !m_xFrame.is() )\n        return 0;\n\n";
@@ -513,20 +513,20 @@ void generateAddinConstructorAndHelper(std::ostream& o,
 
         o << "        css::uno::Reference< css::lang::XMultiServiceFactory > xProvider"
             "(\n             m_xContext->getServiceManager()->createInstanceWithContext"
-            "(\n                 ::rtl::OUString(\n    "
+            "(\n                 OUString(\n    "
             "                 \"com.sun.star.configuration.ConfigurationProvider\"),"
             "\n                 m_xContext ), css::uno::UNO_QUERY );\n\n";
 
-        o << "        ::rtl::OUString sReadOnlyView(\n"
+        o << "        OUString sReadOnlyView(\n"
             "                \"com.sun.star.configuration.ConfigurationAccess\");\n\n";
 
-        o << "        ::rtl::OUStringBuffer sPath(::rtl::OUString(\n"
+        o << "        OUStringBuffer sPath(OUString(\n"
             "             \"/org.openoffice.Office.CalcAddIns/AddInInfo/\"));\n"
             "        sPath.appendAscii(sADDIN_SERVICENAME);\n"
             "        sPath.appendAscii(\"/AddInFunctions\");\n\n"
             "        // create arguments: nodepath\n"
             "        css::beans::PropertyValue aArgument;\n"
-            "        aArgument.Name = ::rtl::OUString(\"nodepath\");\n"
+            "        aArgument.Name = OUString(\"nodepath\");\n"
             "        aArgument.Value <<= sPath.makeStringAndClear();\n\n"
             "        css::uno::Sequence< css::uno::Any > aArguments(1);\n"
             "        aArguments[0] <<= aArgument;\n\n";
@@ -541,8 +541,8 @@ void generateAddinConstructorAndHelper(std::ostream& o,
 
         o << "        // extend arguments to create a view for all locales to get "
             "simple\n        // access to the compatibilityname property\n"
-            "        aArgument.Name = ::rtl::OUString(\"locale\");\n"
-            "        aArgument.Value <<= ::rtl::OUString(\"*\");\n"
+            "        aArgument.Name = OUString(\"locale\");\n"
+            "        aArgument.Value <<= OUString(\"*\");\n"
             "        aArguments.realloc(2);\n"
             "        aArguments[1] <<= aArgument;\n\n"
             "        // create view for all locales\n"
@@ -553,12 +553,12 @@ void generateAddinConstructorAndHelper(std::ostream& o,
 
         o << "    }\n    catch ( css::uno::Exception & ) {\n    }\n}\n\n";
 
-        o << "// addin configuration property helper function:\n::rtl::OUString "
-            "SAL_CALL " << classname << "::getAddinProperty(const ::rtl::OUString &"
-            " funcName, const ::rtl::OUString & paramName, const char * propName) "
+        o << "// addin configuration property helper function:\nOUString "
+            "SAL_CALL " << classname << "::getAddinProperty(const OUString &"
+            " funcName, const OUString & paramName, const char * propName) "
             "throw (css::uno::RuntimeException)\n{\n"
-            "    ::rtl::OUString ret;\n    try {\n        "
-            "::rtl::OUStringBuffer buf(funcName);\n"
+            "    OUString ret;\n    try {\n        "
+            "OUStringBuffer buf(funcName);\n"
             "        if (!paramName.isEmpty()) {\n"
             "            buf.appendAscii(\"/Parameters/\");\n"
             "            buf.append(paramName);\n        }\n\n"
@@ -566,7 +566,7 @@ void generateAddinConstructorAndHelper(std::ostream& o,
             "            m_xHAccess->getByHierarchicalName(\n"
             "                buf.makeStringAndClear()), css::uno::UNO_QUERY);\n"
             "        xPropSet->getPropertyValue(\n            "
-            "::rtl::OUString(propName)) >>= ret;\n    }\n"
+            "OUString(propName)) >>= ret;\n    }\n"
             "     catch ( const css::uno::RuntimeException & e ) {\n        throw e;\n    }\n"
             "     catch ( css::uno::Exception & ) {\n    }\n    return ret;\n";
     }
@@ -665,8 +665,8 @@ OString generateClassDefinition(std::ostream& o,
 
     // generate component/service helper functions
 //     o << "    // component and service helper functions:\n"
-//       << "    static ::rtl::OUString SAL_CALL _getImplementationName();\n"
-//       << "    static css::uno::Sequence< ::rtl::OUString > SAL_CALL "
+//       << "    static OUString SAL_CALL _getImplementationName();\n"
+//       << "    static css::uno::Sequence< OUString > SAL_CALL "
 //       << "_getSupportedServiceNames();\n"
 //       << "    static css::uno::Reference< css::uno::XInterface > SAL_CALL _create("
 //       << "\n        css::uno::Reference< css::uno::XComponentContext > const & "
@@ -717,12 +717,12 @@ OString generateClassDefinition(std::ostream& o,
       << "    virtual ~" << classname << "() {}\n\n";
 
     if (options.componenttype == 2) {
-        o << "    typedef boost::unordered_map< ::sal_Int32, rtl::OUString, "
+        o << "    typedef boost::unordered_map< ::sal_Int32, OUString, "
             "boost::hash<::sal_Int32> > ParamMap;\n"
-            "    typedef boost::unordered_map< rtl::OUString, ParamMap, "
-            "rtl::OUStringHash > FunctionMap;\n\n"
-            "    ::rtl::OUString SAL_CALL getAddinProperty(const ::rtl::OUString & "
-            "funcName, const ::rtl::OUString & paramName, const char * propName) "
+            "    typedef boost::unordered_map< OUString, ParamMap, "
+            "OUStringHash > FunctionMap;\n\n"
+            "    OUString SAL_CALL getAddinProperty(const OUString & "
+            "funcName, const OUString & paramName, const char * propName) "
             "throw (css::uno::RuntimeException);\n\n";
     }
 
@@ -829,7 +829,7 @@ OString generateClassDefinition(std::ostream& o,
                     buffer.append("IMPLEMENTS_PROPERTY_ACCESS");
             }
             o << buffer.makeStringAndClear()
-              << "), css::uno::Sequence< ::rtl::OUString >()),\n";
+              << "), css::uno::Sequence< OUString >()),\n";
         }
         o << "    m_xContext(context)";
 
@@ -858,20 +858,20 @@ void generateXServiceInfoBodies(std::ostream& o,
                                 OString const & comphelpernamespace)
 {
     o << "// com.sun.star.uno.XServiceInfo:\n"
-      << "::rtl::OUString SAL_CALL " << classname << "getImplementationName() "
+      << "OUString SAL_CALL " << classname << "getImplementationName() "
       << "throw (css::uno::RuntimeException)\n{\n    "
       << "return " << comphelpernamespace << "::_getImplementationName();\n}\n\n";
 
     o << "::sal_Bool SAL_CALL " << classname
-      << "supportsService(::rtl::OUString const & "
+      << "supportsService(OUString const & "
       << "serviceName) throw (css::uno::RuntimeException)\n{\n    "
-      << "css::uno::Sequence< ::rtl::OUString > serviceNames = "
+      << "css::uno::Sequence< OUString > serviceNames = "
       << comphelpernamespace << "::_getSupportedServiceNames();\n    "
       << "for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {\n    "
       << "    if (serviceNames[i] == serviceName)\n            return sal_True;\n"
       << "    }\n    return sal_False;\n}\n\n";
 
-    o << "css::uno::Sequence< ::rtl::OUString > SAL_CALL " << classname
+    o << "css::uno::Sequence< OUString > SAL_CALL " << classname
       << "getSupportedServiceNames() throw (css::uno::RuntimeException)\n{\n    "
       << "return " << comphelpernamespace
       << "::_getSupportedServiceNames();\n}\n\n";
diff --git a/unodevtools/source/skeletonmaker/cpptypemaker.cxx b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
index 640d0545464d..2a99b842fe87 100644
--- a/unodevtools/source/skeletonmaker/cpptypemaker.cxx
+++ b/unodevtools/source/skeletonmaker/cpptypemaker.cxx
@@ -318,10 +318,10 @@ void printSetPropertyMixinBody(std::ostream & o,
             o << "    v <<= " << buffer2.makeStringAndClear() << ";\n\n";
         }
 
-        o << "    prepareSet(\n        rtl::OUString(\""
+        o << "    prepareSet(\n        OUString(\""
           << fieldname << "\"),\n        css::uno::Any(), v, ";
     } else {
-        o << "    prepareSet(\n        rtl::OUString(\""
+        o << "    prepareSet(\n        OUString(\""
           << fieldname << "\"),\n        css::uno::Any(), css::uno::Any(), ";
     }
 
@@ -409,9 +409,9 @@ void printMethods(std::ostream & o,
     if (body && options.componenttype == 2) {
         if (type.equals("com/sun/star/lang/XServiceName")) {
             o << "// ::com::sun::star::lang::XServiceName:\n"
-                "::rtl::OUString SAL_CALL " << classname << "getServiceName() "
+                "OUString SAL_CALL " << classname << "getServiceName() "
                 "throw (css::uno::RuntimeException)\n{\n    "
-                "return ::rtl::OUString("
+                "return OUString("
                 "sADDIN_SERVICENAME);\n}\n";
             generated.add(type);
             return;
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
index 1b63edaccdab..27703c7e3f40 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx
@@ -32,7 +32,7 @@ using namespace ::codemaker::cpp;
 
 namespace skeletonmaker {
 
-void printLicenseHeader(std::ostream& o, rtl::OString const & filename)
+void printLicenseHeader(std::ostream& o, OString const & filename)
 {
     sal_Int32 index = -1;
 #ifdef SAL_UNX
@@ -639,7 +639,7 @@ void generateFunctionParamterMap(std::ostream& o,
         for ( sal_uInt16 p = 0; p < reader.getMethodParameterCount(m); ++p ) {
             if ( options.language == 2 ) {
                 o << "        fpm[" << p
-                  << "] = ::rtl::OUString(\""
+                  << "] = OUString(\""
                   << codemaker::convertString(reader.getMethodParameterName(m, p))
                   << "\");\n";
             }
@@ -658,7 +658,7 @@ void generateFunctionParamterMap(std::ostream& o,
         }
 
         if ( options.language == 2 ) {
-            o << "        m_functionMap[::rtl::OUString(\""
+            o << "        m_functionMap[OUString(\""
               << sMethod << "\")] = fpm;\n\n";
         }
         else {
diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.hxx b/unodevtools/source/skeletonmaker/skeletoncommon.hxx
index 8fc3951c39d6..24206fe21812 100644
--- a/unodevtools/source/skeletonmaker/skeletoncommon.hxx
+++ b/unodevtools/source/skeletonmaker/skeletoncommon.hxx
@@ -33,11 +33,11 @@
 
 namespace skeletonmaker {
 
-typedef ::std::map< ::rtl::OString, ::std::vector< ::rtl::OString >,
-                    ::std::less< ::rtl::OString > > ProtocolCmdMap;
+typedef ::std::map< OString, ::std::vector< OString >,
+                    ::std::less< OString > > ProtocolCmdMap;
 
-typedef ::std::vector< ::std::pair< rtl::OString,
-                     ::std::pair< rtl::OString, sal_Int16 > > > AttributeInfo;
+typedef ::std::vector< ::std::pair< OString,
+                     ::std::pair< OString, sal_Int16 > > > AttributeInfo;
 
 
 struct ProgramOptions {
@@ -61,8 +61,8 @@ struct ProgramOptions {
     // 2 = calc add-in
     // 3 = add-on
     short componenttype;
-    rtl::OString outputpath;
-    rtl::OString implname;
+    OString outputpath;
+    OString implname;
     ProtocolCmdMap protocolCmdMap;
 };
 
@@ -73,7 +73,7 @@ struct ProgramOptions {
    @param o specifies the output stream
    @param filename specifies the source file name
 */
-void printLicenseHeader(std::ostream& o, rtl::OString const & filename);
+void printLicenseHeader(std::ostream& o, OString const & filename);
 
 /**
    create dependent on the output path, the implementation name and the
@@ -92,34 +92,34 @@ void printLicenseHeader(std::ostream& o, rtl::OString const & filename);
    @return true if output is generated to standard out or else false
 */
 bool getOutputStream(ProgramOptions const & options,
-                     rtl::OString const & extension,
+                     OString const & extension,
                      std::ostream** ppOutputStream,
-                     rtl::OString & targetSourceFileName,
-                     rtl::OString & tmpSourceFileName);
+                     OString & targetSourceFileName,
+                     OString & tmpSourceFileName);
 
 codemaker::UnoType::Sort decomposeResolveAndCheck(
-    rtl::Reference< TypeManager > const & manager, rtl::OString const & type,
+    rtl::Reference< TypeManager > const & manager, OString const & type,
     bool resolveTypedefs, bool allowVoid, bool allowExtraEntities,
-    RTTypeClass * typeClass, rtl::OString * name, sal_Int32 * rank,
-    std::vector< rtl::OString > * arguments);
+    RTTypeClass * typeClass, OString * name, sal_Int32 * rank,
+    std::vector< OString > * arguments);
 
 void checkType(rtl::Reference< TypeManager > const & manager,
-               rtl::OString const & type,
-               boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaceTypes,
-               boost::unordered_set< rtl::OString, rtl::OStringHash >& serviceTypes,
+               OString const & type,
+               boost::unordered_set< OString, OStringHash >& interfaceTypes,
+               boost::unordered_set< OString, OStringHash >& serviceTypes,
                AttributeInfo& properties);
 
 void checkDefaultInterfaces(
-    boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces,
-    const boost::unordered_set< rtl::OString, rtl::OStringHash >& services,
-    const rtl::OString & propertyhelper);
+    boost::unordered_set< OString, OStringHash >& interfaces,
+    const boost::unordered_set< OString, OStringHash >& services,
+    const OString & propertyhelper);
 
-rtl::OString checkPropertyHelper(
+OString checkPropertyHelper(
     ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
-    const boost::unordered_set< rtl::OString, rtl::OStringHash >& services,
-    const boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces,
+    const boost::unordered_set< OString, OStringHash >& services,
+    const boost::unordered_set< OString, OStringHash >& interfaces,
     AttributeInfo& attributes,
-    boost::unordered_set< rtl::OString, rtl::OStringHash >& propinterfaces);
+    boost::unordered_set< OString, OStringHash >& propinterfaces);
 
 /**
    checks whether the return and parameters types are valid and allowed
@@ -145,7 +145,7 @@ void checkAddInTypes(rtl::Reference< TypeManager > const & manager,
    @return true if XComponent have to be supported
 */
 bool checkXComponentSupport(rtl::Reference< TypeManager > const & manager,
-         boost::unordered_set< rtl::OString, rtl::OStringHash >& interfaces);
+         boost::unordered_set< OString, OStringHash >& interfaces);
 
 
 sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader,
@@ -155,7 +155,7 @@ sal_uInt16 checkAdditionalPropertyFlags(typereg::Reader const & reader,
 void generateFunctionParameterMap(std::ostream& o,
          ProgramOptions const & options,
          rtl::Reference< TypeManager > const & manager,
-         const boost::unordered_set< ::rtl::OString, ::rtl::OStringHash >& interfaces);
+         const boost::unordered_set< OString, OStringHash >& interfaces);
 
 }
 
diff --git a/unodevtools/source/skeletonmaker/skeletoncpp.hxx b/unodevtools/source/skeletonmaker/skeletoncpp.hxx
index 3ce20d13ab64..6c7aed726b27 100644
--- a/unodevtools/source/skeletonmaker/skeletoncpp.hxx
+++ b/unodevtools/source/skeletonmaker/skeletoncpp.hxx
@@ -36,13 +36,13 @@ namespace skeletonmaker { namespace cpp {
 void printType(std::ostream & o,
                ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
                codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-               rtl::OString const & name, sal_Int32 rank,
-               std::vector< rtl::OString > const & arguments,
+               OString const & name, sal_Int32 rank,
+               std::vector< OString > const & arguments,
                short referenceType, bool defaultvalue=false);
 
 void printType(std::ostream & o,
                ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
-               rtl::OString const & type, short referenceType,
+               OString const & type, short referenceType,
                bool defaultvalue=false);
 
 
@@ -51,14 +51,14 @@ bool printConstructorParameters(std::ostream & o,
                                 rtl::Reference< TypeManager > const & manager,
                                 typereg::Reader const & reader,
                                 typereg::Reader const & outerReader,
-                                std::vector< rtl::OString > const & arguments);
+                                std::vector< OString > const & arguments);
 
 
 void printConstructor(std::ostream & o,
                       ProgramOptions const & options,
                       rtl::Reference< TypeManager > const & manager,
                       typereg::Reader const & reader,
-                      std::vector< rtl::OString > const & arguments);
+                      std::vector< OString > const & arguments);
 
 
 void printMethodParameters(std::ostream & o,
@@ -80,11 +80,11 @@ void printMethods(std::ostream & o,
                   ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
                   typereg::Reader const & reader,
                   codemaker::GeneratedTypeSet & generated,
-                  rtl::OString const & delegate,
-                  rtl::OString const & classname=rtl::OString(),
-                  rtl::OString const & indentation=rtl::OString(),
+                  OString const & delegate,
+                  OString const & classname=OString(),
+                  OString const & indentation=OString(),
                   bool defaultvalue=false,
-                  rtl::OString const & propertyhelper=rtl::OString());
+                  OString const & propertyhelper=OString());
 
 
 void printConstructionMethods(std::ostream & o,
@@ -97,8 +97,8 @@ void printServiceMembers(std::ostream & o,
                          ProgramOptions const & options,
                          rtl::Reference< TypeManager > const & manager,
                          typereg::Reader const & reader,
-                         rtl::OString const & type,
-                         rtl::OString const & delegate);
+                         OString const & type,
+                         OString const & delegate);
 
 
 void printMapsToCppType(std::ostream & o,
@@ -106,26 +106,26 @@ void printMapsToCppType(std::ostream & o,
                         rtl::Reference< TypeManager > const & manager,
                         codemaker::UnoType::Sort sort,
                         RTTypeClass typeClass,
-                        rtl::OString const & name,
+                        OString const & name,
                         sal_Int32 rank,
-                        std::vector< rtl::OString > const & arguments,
+                        std::vector< OString > const & arguments,
                         const char * cppTypeSort);
 
 
 void generateDocumentation(std::ostream & o,
                            ProgramOptions const & options,
                            rtl::Reference< TypeManager > const & manager,
-                           rtl::OString const & type,
-                           rtl::OString const & delegate);
+                           OString const & type,
+                           OString const & delegate);
 
 
 void generateSkeleton(ProgramOptions const & options,
                       rtl::Reference< TypeManager > const & manager,
-                      std::vector< rtl::OString > const & types);
+                      std::vector< OString > const & types);
 
 void generateCalcAddin(ProgramOptions const & options,
                        rtl::Reference< TypeManager > const & manager,
-                       std::vector< rtl::OString > const & types);
+                       std::vector< OString > const & types);
 
 } }
 
diff --git a/unodevtools/source/skeletonmaker/skeletonjava.hxx b/unodevtools/source/skeletonmaker/skeletonjava.hxx
index 41da0e06223c..4ff907f4088b 100644
--- a/unodevtools/source/skeletonmaker/skeletonjava.hxx
+++ b/unodevtools/source/skeletonmaker/skeletonjava.hxx
@@ -29,13 +29,13 @@ namespace skeletonmaker { namespace java {
 void printType(std::ostream & o,
                ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
                codemaker::UnoType::Sort sort, RTTypeClass typeClass,
-               rtl::OString const & name, sal_Int32 rank,
-               std::vector< rtl::OString > const & arguments,
+               OString const & name, sal_Int32 rank,
+               std::vector< OString > const & arguments,
                bool referenceType, bool defaultvalue=false);
 
 void printType(std::ostream & o,
                ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
-               rtl::OString const & type, bool referenceType,
+               OString const & type, bool referenceType,
                bool defaultvalue=false);
 
 bool printConstructorParameters(std::ostream & o,
@@ -43,12 +43,12 @@ bool printConstructorParameters(std::ostream & o,
                                 rtl::Reference< TypeManager > const & manager,
                                 typereg::Reader const & reader,
                                 typereg::Reader const & outerReader,
-                                std::vector< rtl::OString > const & arguments);
+                                std::vector< OString > const & arguments);
 
 void printConstructor(std::ostream & o,
                       ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
                       typereg::Reader const & reader,
-                      std::vector< rtl::OString > const & arguments);
+                      std::vector< OString > const & arguments);
 
 void printMethodParameters(std::ostream & o,
                            ProgramOptions const & options,
@@ -67,8 +67,8 @@ void printMethods(std::ostream & o,
                   ProgramOptions const & options, rtl::Reference< TypeManager > const & manager,
                   typereg::Reader const & reader,
                   codemaker::GeneratedTypeSet & generated,
-                  rtl::OString const & delegate,
-                  rtl::OString const & indentation=rtl::OString(),
+                  OString const & delegate,
+                  OString const & indentation=OString(),
                   bool defaultvalue=false,
                   bool usepropertymixin=false);
 
@@ -81,25 +81,25 @@ void printServiceMembers(std::ostream & o,
                          ProgramOptions const & options,
                          rtl::Reference< TypeManager > const & manager,
                          typereg::Reader const & reader,
-                         rtl::OString const & type,
-                         rtl::OString const & delegate);
+                         OString const & type,
+                         OString const & delegate);
 
 void printMapsToJavaType(std::ostream & o,
                          ProgramOptions const & options,
                          rtl::Reference< TypeManager > const & manager,
                          codemaker::UnoType::Sort sort,
                          RTTypeClass typeClass,
-                         rtl::OString const & name, sal_Int32 rank,
-                         std::vector< rtl::OString > const & arguments,
+                         OString const & name, sal_Int32 rank,
+                         std::vector< OString > const & arguments,
                          const char * javaTypeSort);
 
 void generateDocumentation(std::ostream & o,
                            ProgramOptions const & options,
                            rtl::Reference< TypeManager > const & manager,
-                           rtl::OString const & type,
-                           rtl::OString const & delegate);
+                           OString const & type,
+                           OString const & delegate);
 
-void generateSkeleton(ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, std::vector< rtl::OString > const & types);
+void generateSkeleton(ProgramOptions const & options, rtl::Reference< TypeManager > const & manager, std::vector< OString > const & types);
 
 } }
 
diff --git a/unodevtools/source/unodevtools/typeblob.cxx b/unodevtools/source/unodevtools/typeblob.cxx
index e65fdf69074b..7f2a6fdfe784 100644
--- a/unodevtools/source/unodevtools/typeblob.cxx
+++ b/unodevtools/source/unodevtools/typeblob.cxx
@@ -47,10 +47,6 @@ using namespace com::sun::star::container;
 using namespace com::sun::star::reflection;
 using namespace codemaker;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringToOUString;
-using ::rtl::OUStringToOString;
 
 namespace unodevtools {
 
@@ -224,7 +220,7 @@ void writeAttributeMethodData(
     if (seqExcp.getLength() > 0) {
         rWriter.setMethodData(methodindex, OUString(), methodmode,
                               xAttr->getMemberName(),
-                              rtl::OUString("void"),
+                              OUString("void"),
                               0, (sal_uInt16)seqExcp.getLength());
 
         for (sal_Int32 i=0; i < seqExcp.getLength(); i++) {