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

12 files changed, 224 insertions, 249 deletions

diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
index d95eb666ffcf..48ccb1e50db2 100644
--- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
+++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
@@ -57,9 +57,6 @@ using namespace com::sun::star::registry;
 using namespace com::sun::star::java;
 using namespace com::sun::star::task;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
 
 #define INTERACTION_HANDLER_NAME "java-vm.interaction-handler"
 
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index 97418fa1df42..ece8cb16fee5 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -42,9 +42,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::java;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
 
 
 sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
diff --git a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
index 4e03b5aaf68b..c3ffaf1ee73d 100644
--- a/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
+++ b/stoc/test/registry_tdprovider/testregistrytdprovider.cxx
@@ -61,12 +61,12 @@ namespace {
 class Service: public cppu::WeakImplHelper1< css::lang::XMain > {
 public:
     virtual sal_Int32 SAL_CALL
-    run(css::uno::Sequence< rtl::OUString > const & arguments)
+    run(css::uno::Sequence< OUString > const & arguments)
         throw (css::uno::RuntimeException);
 
-    static rtl::OUString getImplementationName();
+    static OUString getImplementationName();
 
-    static css::uno::Sequence< rtl::OUString > getSupportedServiceNames();
+    static css::uno::Sequence< OUString > getSupportedServiceNames();
 
     static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
         css::uno::Reference< css::uno::XComponentContext > const & context)
@@ -85,8 +85,8 @@ private:
 
 namespace {
 
-std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) {
-    return out << rtl::OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr();
+std::ostream & operator <<(std::ostream & out, OUString const & value) {
+    return out << OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr();
 }
 
 void assertTrue(bool argument) {
@@ -116,7 +116,7 @@ template< typename T > void assertEqual(T const & value, T const & argument) {
 
 }
 
-sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
+sal_Int32 Service::run(css::uno::Sequence< OUString > const &)
     throw (css::uno::RuntimeException)
 {
     css::uno::Reference< css::lang::XMultiComponentFactory > factory(
@@ -125,10 +125,10 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     css::uno::Sequence< css::uno::Any > args(1);
     args[0] = css::uno::Reference< css::beans::XPropertySet >(
         factory, css::uno::UNO_QUERY_THROW)->getPropertyValue(
-            rtl::OUString("Registry"));
+            OUString("Registry"));
     css::uno::Reference< css::container::XHierarchicalNameAccess > provider(
         factory->createInstanceWithArgumentsAndContext(
-            rtl::OUString( "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"),
+            OUString( "com.sun.star.comp.stoc.RegistryTypeDescriptionProvider"),
             args, m_context),
         css::uno::UNO_QUERY_THROW);
 
@@ -141,65 +141,65 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     assertEqual< bool >(
         false,
         provider->hasByHierarchicalName(
-            rtl::OUString( "[][]boolean")));
+            OUString( "[][]boolean")));
     assertEqual< bool >(
         false,
         provider->hasByHierarchicalName(
-            rtl::OUString( "test.registrytdprovider.Struct3<boolean,boolean>")));
+            OUString( "test.registrytdprovider.Struct3<boolean,boolean>")));
     assertEqual< bool >(
         false,
         provider->hasByHierarchicalName(
-            rtl::OUString( "com.sun.star.uno.XComponentContext::getValueByName")));
+            OUString( "com.sun.star.uno.XComponentContext::getValueByName")));
 
     css::uno::Reference< css::reflection::XCompoundTypeDescription > exception;
     exception
         = css::uno::Reference< css::reflection::XCompoundTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "com.sun.star.uno.Exception")),
+                OUString( "com.sun.star.uno.Exception")),
             css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_EXCEPTION, exception->getTypeClass());
-    assertEqual( rtl::OUString( "com.sun.star.uno.Exception"),
+    assertEqual( OUString( "com.sun.star.uno.Exception"),
         exception->getName());
     assertFalse(exception->getBaseType().is());
     exception
         = css::uno::Reference< css::reflection::XCompoundTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "com.sun.star.uno.RuntimeException")),
+                OUString( "com.sun.star.uno.RuntimeException")),
             css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_EXCEPTION, exception->getTypeClass());
-    assertEqual( rtl::OUString( "com.sun.star.uno.RuntimeException"),
+    assertEqual( OUString( "com.sun.star.uno.RuntimeException"),
         exception->getName());
-    assertEqual( rtl::OUString( "com.sun.star.uno.Exception"),
+    assertEqual( OUString( "com.sun.star.uno.Exception"),
         exception->getBaseType()->getName());
 
     css::uno::Reference< css::reflection::XStructTypeDescription > structure;
 
     structure = css::uno::Reference< css::reflection::XStructTypeDescription >(
         provider->getByHierarchicalName(
-            rtl::OUString( "test.registrytdprovider.Struct2")),
+            OUString( "test.registrytdprovider.Struct2")),
         css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass());
-    assertEqual( rtl::OUString( "test.registrytdprovider.Struct2"),
+    assertEqual( OUString( "test.registrytdprovider.Struct2"),
         structure->getName());
     assertFalse(structure->getBaseType().is());
     assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.Struct1"),
+        OUString( "test.registrytdprovider.Struct1"),
         structure->getMemberTypes()[0]->getName());
     assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength());
     assertEqual(
-        rtl::OUString("s1"),
+        OUString("s1"),
         structure->getMemberNames()[0]);
     assertEqual< sal_Int32 >(0, structure->getTypeParameters().getLength());
     assertEqual< sal_Int32 >(0, structure->getTypeArguments().getLength());
 
     structure = css::uno::Reference< css::reflection::XStructTypeDescription >(
         provider->getByHierarchicalName(
-            rtl::OUString( "test.registrytdprovider.Struct3")),
+            OUString( "test.registrytdprovider.Struct3")),
         css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.Struct3"),
+        OUString( "test.registrytdprovider.Struct3"),
         structure->getName());
     assertFalse(structure->getBaseType().is());
     assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength());
@@ -207,41 +207,41 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
         css::uno::TypeClass_UNKNOWN,
         structure->getMemberTypes()[0]->getTypeClass());
     assertEqual(
-        rtl::OUString("U"),
+        OUString("U"),
         structure->getMemberTypes()[0]->getName());
     assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength());
     assertEqual(
-        rtl::OUString("s2"),
+        OUString("s2"),
         structure->getMemberNames()[0]);
     assertEqual< sal_Int32 >(2, structure->getTypeParameters().getLength());
     assertEqual(
-        rtl::OUString("T"),
+        OUString("T"),
         structure->getTypeParameters()[0]);
     assertEqual(
-        rtl::OUString("U"),
+        OUString("U"),
         structure->getTypeParameters()[1]);
     assertEqual< sal_Int32 >(0, structure->getTypeArguments().getLength());
 
     structure = css::uno::Reference< css::reflection::XStructTypeDescription >(
         provider->getByHierarchicalName(
-            rtl::OUString( "test.registrytdprovider.Struct4")),
+            OUString( "test.registrytdprovider.Struct4")),
         css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.Struct4"),
+        OUString( "test.registrytdprovider.Struct4"),
         structure->getName());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.Struct2"),
+        OUString( "test.registrytdprovider.Struct2"),
         structure->getBaseType()->getName());
     assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.Struct3<"
+        OUString( "test.registrytdprovider.Struct3<"
                 "test.registrytdprovider.Struct2,"
                 "test.registrytdprovider.Struct3<boolean,any>>"),
         structure->getMemberTypes()[0]->getName());
     assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength());
     assertEqual(
-        rtl::OUString("s2"),
+        OUString("s2"),
         structure->getMemberNames()[0]);
     assertEqual< sal_Int32 >(0, structure->getTypeParameters().getLength());
     assertEqual< sal_Int32 >(0, structure->getTypeArguments().getLength());
@@ -252,25 +252,25 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     interface
         = css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.XTest1")),
+                OUString( "test.registrytdprovider.XTest1")),
             css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_INTERFACE, interface->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.XTest1"),
+        OUString( "test.registrytdprovider.XTest1"),
         interface->getName());
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > > bases(
             interface->getBaseTypes());
     assertEqual< sal_Int32 >(1, bases.getLength());
     assertEqual(
-        rtl::OUString( "com.sun.star.uno.XInterface"),
+        OUString( "com.sun.star.uno.XInterface"),
         bases[0]->getName());
     css::uno::Sequence<
         css::uno::Reference< css::reflection::XTypeDescription > >
             optionalBases(interface->getOptionalBaseTypes());
     assertEqual< sal_Int32 >(1, optionalBases.getLength());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.XBase"),
         optionalBases[0]->getName());
     css::uno::Sequence<
@@ -296,15 +296,15 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     assertEqual(
         css::uno::TypeClass_INTERFACE_ATTRIBUTE, attribute->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.XTest1::a1"),
+        OUString( "test.registrytdprovider.XTest1::a1"),
         attribute->getName());
     assertEqual(
-        rtl::OUString("a1"),
+        OUString("a1"),
         attribute->getMemberName());
     assertEqual< sal_Int32 >(3, attribute->getPosition());
     assertEqual< bool >(false, attribute->isReadOnly());
     assertEqual(
-        rtl::OUString("short"),
+        OUString("short"),
         attribute->getType()->getName());
     assertEqual< bool >(true, attribute->isBound());
     getExceptions = attribute->getGetExceptions();
@@ -318,32 +318,32 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     assertEqual(
         css::uno::TypeClass_INTERFACE_ATTRIBUTE, attribute->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.XTest1::a2"),
+        OUString( "test.registrytdprovider.XTest1::a2"),
         attribute->getName());
     assertEqual(
-        rtl::OUString("a2"),
+        OUString("a2"),
         attribute->getMemberName());
     assertEqual< sal_Int32 >(4, attribute->getPosition());
     assertEqual< bool >(false, attribute->isReadOnly());
     assertEqual(
-        rtl::OUString("long"),
+        OUString("long"),
         attribute->getType()->getName());
     assertEqual< bool >(false, attribute->isBound());
     getExceptions = attribute->getGetExceptions();
     assertEqual< sal_Int32 >(2, getExceptions.getLength());
     assertEqual(
-        rtl::OUString( "com.sun.star.lang.WrappedTargetException"),
+        OUString( "com.sun.star.lang.WrappedTargetException"),
         getExceptions[0]->getName());
     assertEqual(
-        rtl::OUString( "com.sun.star.uno.RuntimeException"),
+        OUString( "com.sun.star.uno.RuntimeException"),
         getExceptions[1]->getName());
     setExceptions = attribute->getSetExceptions();
     assertEqual< sal_Int32 >(2, setExceptions.getLength());
     assertEqual(
-        rtl::OUString( "com.sun.star.uno.Exception"),
+        OUString( "com.sun.star.uno.Exception"),
         setExceptions[0]->getName());
     assertEqual(
-        rtl::OUString( "com.sun.star.lang.WrappedTargetException"),
+        OUString( "com.sun.star.lang.WrappedTargetException"),
         setExceptions[1]->getName());
 
     attribute = css::uno::Reference<
@@ -352,22 +352,22 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     assertEqual(
         css::uno::TypeClass_INTERFACE_ATTRIBUTE, attribute->getTypeClass());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.XTest1::a3"),
         attribute->getName());
     assertEqual(
-        rtl::OUString("a3"),
+        OUString("a3"),
         attribute->getMemberName());
     assertEqual< sal_Int32 >(5, attribute->getPosition());
     assertEqual< bool >(true, attribute->isReadOnly());
     assertEqual(
-        rtl::OUString("hyper"),
+        OUString("hyper"),
         attribute->getType()->getName());
     assertEqual< bool >(true, attribute->isBound());
     getExceptions = attribute->getGetExceptions();
     assertEqual< sal_Int32 >(1, getExceptions.getLength());
     assertEqual(
-        rtl::OUString( "com.sun.star.lang.WrappedTargetException"),
+        OUString( "com.sun.star.lang.WrappedTargetException"),
         getExceptions[0]->getName());
     setExceptions = attribute->getSetExceptions();
     assertEqual< sal_Int32 >(0, setExceptions.getLength());
@@ -377,26 +377,26 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
             members[3], css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_INTERFACE_METHOD, method->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.XTest1::f1"),
+        OUString( "test.registrytdprovider.XTest1::f1"),
         method->getName());
     assertEqual(
-        rtl::OUString("f1"),
+        OUString("f1"),
         method->getMemberName());
     assertEqual< sal_Int32 >(6, method->getPosition());
     assertEqual< bool >(false, method->isOneway());
     assertEqual< sal_Int32 >(1, method->getParameters().getLength());
     assertEqual(
-        rtl::OUString("p"),
+        OUString("p"),
         method->getParameters()[0]->getName());
     assertEqual(
-        rtl::OUString("any"),
+        OUString("any"),
         method->getParameters()[0]->getType()->getName());
     assertEqual< bool >(false, method->getParameters()[0]->isIn());
     assertEqual< bool >(true, method->getParameters()[0]->isOut());
     assertEqual< sal_Int32 >(0, method->getParameters()[0]->getPosition());
     assertEqual< sal_Int32 >(1, method->getExceptions().getLength());
     assertEqual(
-        rtl::OUString( "com.sun.star.uno.RuntimeException"),
+        OUString( "com.sun.star.uno.RuntimeException"),
         method->getExceptions()[0]->getName());
 
     method = css::uno::Reference<
@@ -404,10 +404,10 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
             members[4], css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_INTERFACE_METHOD, method->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.XTest1::f2"),
+        OUString( "test.registrytdprovider.XTest1::f2"),
         method->getName());
     assertEqual(
-        rtl::OUString("f2"),
+        OUString("f2"),
         method->getMemberName());
     assertEqual< sal_Int32 >(7, method->getPosition());
     assertEqual< bool >(true, method->isOneway());
@@ -417,15 +417,15 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     interface
         = css::uno::Reference< css::reflection::XInterfaceTypeDescription2 >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.XTest2")),
+                OUString( "test.registrytdprovider.XTest2")),
             css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_INTERFACE, interface->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.XTest2"),
+        OUString( "test.registrytdprovider.XTest2"),
         interface->getName());
     assertEqual< sal_Int32 >(1, interface->getBaseTypes().getLength());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.Typedef2"),
+        OUString( "test.registrytdprovider.Typedef2"),
         interface->getBaseTypes()[0]->getName());
     assertEqual< sal_Int32 >(0, interface->getOptionalBaseTypes().getLength());
     assertEqual< sal_Int32 >(0, interface->getMembers().getLength());
@@ -434,11 +434,11 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
 
     service = css::uno::Reference< css::reflection::XServiceTypeDescription2 >(
         provider->getByHierarchicalName(
-            rtl::OUString( "test.registrytdprovider.Service1")),
+            OUString( "test.registrytdprovider.Service1")),
         css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_SERVICE, service->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.Service1"),
+        OUString( "test.registrytdprovider.Service1"),
         service->getName());
     assertEqual< sal_Int32 >(0, service->getMandatoryServices().getLength());
     assertEqual< sal_Int32 >(0, service->getOptionalServices().getLength());
@@ -446,27 +446,27 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     assertEqual< sal_Int32 >(0, service->getOptionalInterfaces().getLength());
     assertEqual< bool >(true, service->isSingleInterfaceBased());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.XTest1"),
         service->getInterface()->getName());
     assertEqual< sal_Int32 >(2, service->getConstructors().getLength());
     assertEqual(
-        rtl::OUString("c1"),
+        OUString("c1"),
         service->getConstructors()[0]->getName());
     assertEqual< sal_Int32 >(
         0, service->getConstructors()[0]->getParameters().getLength());
     assertEqual< sal_Int32 >(
         0, service->getConstructors()[0]->getExceptions().getLength());
     assertEqual(
-        rtl::OUString("c2"),
+        OUString("c2"),
         service->getConstructors()[1]->getName());
     assertEqual< sal_Int32 >(
         1, service->getConstructors()[1]->getParameters().getLength());
     assertEqual(
-        rtl::OUString("p"),
+        OUString("p"),
         service->getConstructors()[1]->getParameters()[0]->getName());
     assertEqual(
-        rtl::OUString("any"),
+        OUString("any"),
         (service->getConstructors()[1]->getParameters()[0]->getType()->
          getName()));
     assertEqual< bool >(
@@ -481,26 +481,26 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     assertEqual< sal_Int32 >(
         1, service->getConstructors()[1]->getExceptions().getLength());
     assertEqual(
-        rtl::OUString( "com.sun.star.uno.RuntimeException"),
+        OUString( "com.sun.star.uno.RuntimeException"),
         service->getConstructors()[1]->getExceptions()[0]->getName());
 
     service = css::uno::Reference< css::reflection::XServiceTypeDescription2 >(
         provider->getByHierarchicalName(
-            rtl::OUString( "test.registrytdprovider.Service2")),
+            OUString( "test.registrytdprovider.Service2")),
         css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_SERVICE, service->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.Service2"),
+        OUString( "test.registrytdprovider.Service2"),
         service->getName());
     assertEqual< sal_Int32 >(0, service->getMandatoryServices().getLength());
     assertEqual< sal_Int32 >(0, service->getOptionalServices().getLength());
     assertEqual< sal_Int32 >(1, service->getMandatoryInterfaces().getLength());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.XTest1"),
+        OUString( "test.registrytdprovider.XTest1"),
         service->getMandatoryInterfaces()[0]->getName());
     assertEqual< sal_Int32 >(1, service->getOptionalInterfaces().getLength());
     assertEqual(
-        rtl::OUString( "test.registrytdprovider.XBase"),
+        OUString( "test.registrytdprovider.XBase"),
         service->getOptionalInterfaces()[0]->getName());
     assertEqual< bool >(false, service->isSingleInterfaceBased());
     assertFalse(service->getInterface().is());
@@ -508,11 +508,11 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
 
     service = css::uno::Reference< css::reflection::XServiceTypeDescription2 >(
         provider->getByHierarchicalName(
-            rtl::OUString( "test.registrytdprovider.Service3")),
+            OUString( "test.registrytdprovider.Service3")),
         css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_SERVICE, service->getTypeClass());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.Service3"),
         service->getName());
     assertEqual< sal_Int32 >(0, service->getMandatoryServices().getLength());
@@ -521,7 +521,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     assertEqual< sal_Int32 >(0, service->getOptionalInterfaces().getLength());
     assertEqual< bool >(true, service->isSingleInterfaceBased());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.Typedef2"),
         service->getInterface()->getName());
     assertEqual< sal_Int32 >(0, service->getConstructors().getLength());
@@ -532,32 +532,32 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     singleton = css::uno::Reference<
         css::reflection::XSingletonTypeDescription2 >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Singleton1")),
+                OUString( "test.registrytdprovider.Singleton1")),
             css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_SINGLETON, singleton->getTypeClass());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.Singleton1"),
         singleton->getName());
     assertFalse(singleton->getService().is());
     assertEqual< bool >(true, singleton->isInterfaceBased());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.XTest1"),
         singleton->getInterface()->getName());
 
     singleton = css::uno::Reference<
         css::reflection::XSingletonTypeDescription2 >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Singleton2")),
+                OUString( "test.registrytdprovider.Singleton2")),
             css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_SINGLETON, singleton->getTypeClass());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.Singleton2"),
         singleton->getName());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.Service1"),
         singleton->getService()->getName());
     assertEqual< bool >(false, singleton->isInterfaceBased());
@@ -566,17 +566,17 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     singleton = css::uno::Reference<
         css::reflection::XSingletonTypeDescription2 >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Singleton3")),
+                OUString( "test.registrytdprovider.Singleton3")),
             css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_SINGLETON, singleton->getTypeClass());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.Singleton3"),
         singleton->getName());
     assertFalse(singleton->getService().is());
     assertEqual< bool >(true, singleton->isInterfaceBased());
     assertEqual(
-        rtl::OUString(
+        OUString(
             "test.registrytdprovider.Typedef2"),
         singleton->getInterface()->getName());
 
@@ -584,7 +584,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Enum1")),
+                OUString( "test.registrytdprovider.Enum1")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -592,7 +592,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Enum2")),
+                OUString( "test.registrytdprovider.Enum2")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -600,7 +600,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Struct1")),
+                OUString( "test.registrytdprovider.Struct1")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -608,7 +608,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Struct2")),
+                OUString( "test.registrytdprovider.Struct2")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -616,7 +616,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Struct3")),
+                OUString( "test.registrytdprovider.Struct3")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -624,14 +624,14 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XStructTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Struct3")),
+                OUString( "test.registrytdprovider.Struct3")),
             css::uno::UNO_QUERY_THROW)->getMemberTypes()[0],
         css::uno::UNO_QUERY);
     assertFalse(published.is());
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Struct3a")),
+                OUString( "test.registrytdprovider.Struct3a")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -639,7 +639,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Exception1")),
+                OUString( "test.registrytdprovider.Exception1")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -647,7 +647,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Exception2")),
+                OUString( "test.registrytdprovider.Exception2")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -655,7 +655,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.XTest1")),
+                OUString( "test.registrytdprovider.XTest1")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -663,7 +663,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.XTest2")),
+                OUString( "test.registrytdprovider.XTest2")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -671,7 +671,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Typedef1")),
+                OUString( "test.registrytdprovider.Typedef1")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -679,7 +679,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Typedef2")),
+                OUString( "test.registrytdprovider.Typedef2")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -691,7 +691,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Consts1")),
+                OUString( "test.registrytdprovider.Consts1")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -699,7 +699,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Consts2")),
+                OUString( "test.registrytdprovider.Consts2")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -707,14 +707,14 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider")),
+                OUString( "test.registrytdprovider")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertFalse(published.is());
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Service1")),
+                OUString( "test.registrytdprovider.Service1")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -722,7 +722,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Service2")),
+                OUString( "test.registrytdprovider.Service2")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -730,7 +730,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Singleton2")),
+                OUString( "test.registrytdprovider.Singleton2")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -738,7 +738,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     published = css::uno::Reference< css::reflection::XPublished >(
         css::uno::Reference< css::reflection::XTypeDescription >(
             provider->getByHierarchicalName(
-                rtl::OUString( "test.registrytdprovider.Singleton1")),
+                OUString( "test.registrytdprovider.Singleton1")),
             css::uno::UNO_QUERY_THROW),
         css::uno::UNO_QUERY);
     assertTrue(published.is());
@@ -747,12 +747,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const &)
     return 0;
 }
 
-rtl::OUString Service::getImplementationName() {
-    return rtl::OUString("test.registrytdprovider.impl");
+OUString Service::getImplementationName() {
+    return OUString("test.registrytdprovider.impl");
 }
 
-css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() {
-    return css::uno::Sequence< rtl::OUString >();
+css::uno::Sequence< OUString > Service::getSupportedServiceNames() {
+    return css::uno::Sequence< OUString >();
 }
 
 css::uno::Reference< css::uno::XInterface > Service::createInstance(
@@ -782,11 +782,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const
 
 namespace {
 
-bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
-               css::uno::Sequence< rtl::OUString > const & serviceNames) {
-    rtl::OUString keyName("/");
+bool writeInfo(void * registryKey, OUString const & implementationName,
+               css::uno::Sequence< OUString > const & serviceNames) {
+    OUString keyName("/");
     keyName += implementationName;
-    keyName += rtl::OUString("/UNO/SERVICES");
+    keyName += OUString("/UNO/SERVICES");
     css::uno::Reference< css::registry::XRegistryKey > key;
     try {
         key = static_cast< css::registry::XRegistryKey * >(registryKey)->
diff --git a/stoc/test/tdmanager/testtdmanager.cxx b/stoc/test/tdmanager/testtdmanager.cxx
index 9e45fb3ff27c..31bf83c95bc7 100644
--- a/stoc/test/tdmanager/testtdmanager.cxx
+++ b/stoc/test/tdmanager/testtdmanager.cxx
@@ -59,12 +59,12 @@ namespace {
 class Service: public cppu::WeakImplHelper1< css::lang::XMain > {
 public:
     virtual sal_Int32 SAL_CALL
-    run(css::uno::Sequence< rtl::OUString > const & arguments)
+    run(css::uno::Sequence< OUString > const & arguments)
         throw (css::uno::RuntimeException);
 
-    static rtl::OUString getImplementationName();
+    static OUString getImplementationName();
 
-    static css::uno::Sequence< rtl::OUString > getSupportedServiceNames();
+    static css::uno::Sequence< OUString > getSupportedServiceNames();
 
     static css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance(
         css::uno::Reference< css::uno::XComponentContext > const & context)
@@ -83,8 +83,8 @@ private:
 
 namespace {
 
-std::ostream & operator <<(std::ostream & out, rtl::OUString const & value) {
-    return out << rtl::OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr();
+std::ostream & operator <<(std::ostream & out, OUString const & value) {
+    return out << OUStringToOString(value, RTL_TEXTENCODING_UTF8).getStr();
 }
 
 void assertTrue(bool argument) {
@@ -114,7 +114,7 @@ template< typename T > void assertEqual(T const & value, T const & argument) {
 
 }
 
-sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
+sal_Int32 Service::run(css::uno::Sequence< OUString > const & arguments)
     throw (css::uno::RuntimeException)
 {
     css::uno::Reference< css::lang::XMultiComponentFactory > factory(
@@ -122,7 +122,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
     assertTrue(factory.is());
     css::uno::Reference< css::container::XHierarchicalNameAccess > manager(
         m_context->getValueByName(
-            rtl::OUString(
+            OUString(
                     "/singletons/"
                     "com.sun.star.reflection.theTypeDescriptionManager")),
         css::uno::UNO_QUERY_THROW);
@@ -135,7 +135,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
     css::uno::Reference<css::container::XSet> xSet(
         manager, css::uno::UNO_QUERY_THROW );
     for ( sal_Int32 argPos = 0; argPos < arguments.getLength(); ++argPos ) {
-        rtl::OUString url;
+        OUString url;
         OSL_VERIFY( osl_File_E_None == osl_getFileURLFromSystemPath(
                         arguments[argPos].pData, &url.pData ) );
         bool supposedToBeCompatible = ! url.endsWithIgnoreAsciiCaseAsciiL(
@@ -143,14 +143,14 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
 
         css::uno::Reference<css::registry::XSimpleRegistry> xReg(
             m_context->getServiceManager()->createInstanceWithContext(
-                rtl::OUString( "com.sun.star.registry.SimpleRegistry" ),
+                OUString( "com.sun.star.registry.SimpleRegistry" ),
                 m_context ), css::uno::UNO_QUERY_THROW );
         xReg->open( url, true /* read-only */, false /* ! create */ );
         css::uno::Any arg( css::uno::makeAny(xReg) );
         css::uno::Reference<css::container::XHierarchicalNameAccess> xTDprov(
             m_context->getServiceManager()->
             createInstanceWithArgumentsAndContext(
-                rtl::OUString( "com.sun.star.comp.stoc."
+                OUString( "com.sun.star.comp.stoc."
                                    "RegistryTypeDescriptionProvider" ),
                 css::uno::Sequence<css::uno::Any>( &arg, 1 ), m_context ),
             css::uno::UNO_QUERY_THROW );
@@ -158,7 +158,7 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
             xSet->insert( css::uno::makeAny(xTDprov) );
             if (! supposedToBeCompatible)
                 std::cerr << "current rdb file: " <<
-                    rtl::OUStringToOString(
+                    OUStringToOString(
                         url, osl_getThreadTextEncoding()).getStr() << std::endl;
             assertTrue(supposedToBeCompatible);
         } catch (css::lang::IllegalArgumentException &) {
@@ -172,67 +172,67 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
 
     css::uno::Reference< css::reflection::XIndirectTypeDescription > sequence(
         manager->getByHierarchicalName(
-            rtl::OUString("[][]boolean")),
+            OUString("[][]boolean")),
         css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_SEQUENCE, sequence->getTypeClass());
     assertEqual(
-        rtl::OUString("[][]boolean"),
+        OUString("[][]boolean"),
         sequence->getName());
     assertEqual(
-        rtl::OUString("[]boolean"),
+        OUString("[]boolean"),
         sequence->getReferencedType()->getName());
 
     css::uno::Reference< css::reflection::XStructTypeDescription > structure(
         manager->getByHierarchicalName(
-            rtl::OUString( "test.tdmanager.Struct<boolean,test.tdmanager.Struct<"
+            OUString( "test.tdmanager.Struct<boolean,test.tdmanager.Struct<"
                     "any,com.sun.star.uno.XInterface>>")),
         css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_STRUCT, structure->getTypeClass());
     assertEqual(
-        rtl::OUString( "test.tdmanager.Struct<boolean,test.tdmanager.Struct<"
+        OUString( "test.tdmanager.Struct<boolean,test.tdmanager.Struct<"
                 "any,com.sun.star.uno.XInterface>>"),
         structure->getName());
     assertEqual< bool >(false, structure->getBaseType().is());
     assertEqual< sal_Int32 >(1, structure->getMemberTypes().getLength());
     assertEqual(
-        rtl::OUString( "test.tdmanager.Struct<any,com.sun.star.uno.XInterface>"),
+        OUString( "test.tdmanager.Struct<any,com.sun.star.uno.XInterface>"),
         structure->getMemberTypes()[0]->getName());
     assertEqual< sal_Int32 >(1, structure->getMemberNames().getLength());
     assertEqual(
-        rtl::OUString("s"),
+        OUString("s"),
         structure->getMemberNames()[0]);
     assertEqual< sal_Int32 >(0, structure->getTypeParameters().getLength());
     assertEqual< sal_Int32 >(2, structure->getTypeArguments().getLength());
     assertEqual(
-        rtl::OUString("boolean"),
+        OUString("boolean"),
         structure->getTypeArguments()[0]->getName());
     assertEqual(
-        rtl::OUString( "test.tdmanager.Struct<any,com.sun.star.uno.XInterface>"),
+        OUString( "test.tdmanager.Struct<any,com.sun.star.uno.XInterface>"),
         structure->getTypeArguments()[1]->getName());
 
     css::uno::Reference< css::reflection::XInterfaceMethodTypeDescription >
         method(
             manager->getByHierarchicalName(
-                rtl::OUString( "com.sun.star.uno.XComponentContext::getValueByName")),
+                OUString( "com.sun.star.uno.XComponentContext::getValueByName")),
             css::uno::UNO_QUERY_THROW);
     assertEqual(css::uno::TypeClass_INTERFACE_METHOD, method->getTypeClass());
     assertEqual(
-        rtl::OUString( "com.sun.star.uno.XComponentContext::getValueByName"),
+        OUString( "com.sun.star.uno.XComponentContext::getValueByName"),
         method->getName());
     assertEqual(
-        rtl::OUString("getValueByName"),
+        OUString("getValueByName"),
         method->getMemberName());
     assertEqual< sal_Int32 >(3, method->getPosition());
     assertEqual(
-        rtl::OUString("any"),
+        OUString("any"),
         method->getReturnType()->getName());
     assertEqual< bool >(false, method->isOneway());
     assertEqual< sal_Int32 >(1, method->getParameters().getLength());
     assertEqual(
-        rtl::OUString("Name"),
+        OUString("Name"),
         method->getParameters()[0]->getName());
     assertEqual(
-        rtl::OUString("string"),
+        OUString("string"),
         method->getParameters()[0]->getType()->getName());
     assertEqual< bool >(true, method->getParameters()[0]->isIn());
     assertEqual< bool >(false, method->getParameters()[0]->isOut());
@@ -243,21 +243,21 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
         css::uno::Reference< css::reflection::XPublished >(
             css::uno::Reference< css::reflection::XTypeDescription >(
                 manager->getByHierarchicalName(
-                    rtl::OUString("[]boolean")),
+                    OUString("[]boolean")),
                 css::uno::UNO_QUERY_THROW),
             css::uno::UNO_QUERY).is());
     assertFalse(
         css::uno::Reference< css::reflection::XPublished >(
             css::uno::Reference< css::reflection::XTypeDescription >(
                 manager->getByHierarchicalName(
-                    rtl::OUString( "com.sun.star.beans.XIntroTest::ObjectName")),
+                    OUString( "com.sun.star.beans.XIntroTest::ObjectName")),
                 css::uno::UNO_QUERY_THROW),
             css::uno::UNO_QUERY).is());
     assertFalse(
         css::uno::Reference< css::reflection::XPublished >(
             css::uno::Reference< css::reflection::XTypeDescription >(
                 manager->getByHierarchicalName(
-                    rtl::OUString( "com.sun.star.beans.XIntroTest::writeln")),
+                    OUString( "com.sun.star.beans.XIntroTest::writeln")),
                 css::uno::UNO_QUERY_THROW),
             css::uno::UNO_QUERY).is());
     //TODO: check that the reflection of a property of an accumulation-based
@@ -266,12 +266,12 @@ sal_Int32 Service::run(css::uno::Sequence< rtl::OUString > const & arguments)
     return 0;
 }
 
-rtl::OUString Service::getImplementationName() {
-    return rtl::OUString("test.tdmanager.impl");
+OUString Service::getImplementationName() {
+    return OUString("test.tdmanager.impl");
 }
 
-css::uno::Sequence< rtl::OUString > Service::getSupportedServiceNames() {
-    return css::uno::Sequence< rtl::OUString >();
+css::uno::Sequence< OUString > Service::getSupportedServiceNames() {
+    return css::uno::Sequence< OUString >();
 }
 
 css::uno::Reference< css::uno::XInterface > Service::createInstance(
@@ -301,11 +301,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(char const
 
 namespace {
 
-bool writeInfo(void * registryKey, rtl::OUString const & implementationName,
-               css::uno::Sequence< rtl::OUString > const & serviceNames) {
-    rtl::OUString keyName("/");
+bool writeInfo(void * registryKey, OUString const & implementationName,
+               css::uno::Sequence< OUString > const & serviceNames) {
+    OUString keyName("/");
     keyName += implementationName;
-    keyName += rtl::OUString("/UNO/SERVICES");
+    keyName += OUString("/UNO/SERVICES");
     css::uno::Reference< css::registry::XRegistryKey > key;
     try {
         key = static_cast< css::registry::XRegistryKey * >(registryKey)->
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index 8708e826c096..21fc5a37baa9 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -41,8 +41,6 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::registry;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
 
 const double MIN_DOUBLE     = -DBL_MAX;
 const double MAX_DOUBLE     = DBL_MAX;
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 213989abb6ae..f8a89ab85d9e 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -55,9 +55,6 @@ using namespace com::sun::star::registry;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::container;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
 
 //==================================================================================================
 class OInterfaceA : public WeakImplHelper1< XInterfaceA >
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 1bcce146518b..e48bb44f59d6 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -48,9 +48,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::registry;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
 
 
 //==================================================================================================
@@ -119,7 +116,7 @@ void assign( test::TestElement & rData,
              sal_Int32 nLong, sal_uInt32 nULong,
              sal_Int64 nHyper, sal_uInt64 nUHyper,
              float fFloat, double fDouble,
-             test::TestEnum eEnum, const ::rtl::OUString& rStr,
+             test::TestEnum eEnum, const OUString& rStr,
              const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
              const ::com::sun::star::uno::Any& rAny )
 {
@@ -146,7 +143,7 @@ void assign( test::TestData & rData,
              sal_Int32 nLong, sal_uInt32 nULong,
              sal_Int64 nHyper, sal_uInt64 nUHyper,
              float fFloat, double fDouble,
-             test::TestEnum eEnum, const ::rtl::OUString& rStr,
+             test::TestEnum eEnum, const OUString& rStr,
              const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
              const ::com::sun::star::uno::Any& rAny,
              const com::sun::star::uno::Sequence< test::TestElement >& rSequence )
@@ -172,7 +169,7 @@ public:
                                      sal_Int32 nLong, sal_uInt32 nULong,
                                      sal_Int64 nHyper, sal_uInt64 nUHyper,
                                      float fFloat, double fDouble,
-                                     test::TestEnum eEnum, const ::rtl::OUString& rStr,
+                                     test::TestEnum eEnum, const OUString& rStr,
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
                                      const ::com::sun::star::uno::Any& rAny,
                                      const ::com::sun::star::uno::Sequence<test::TestElement >& rSequence,
@@ -184,7 +181,7 @@ public:
                                                 sal_Int32& nLong, sal_uInt32& nULong,
                                                 sal_Int64& nHyper, sal_uInt64& nUHyper,
                                                 float& fFloat, double& fDouble,
-                                                test::TestEnum& eEnum, rtl::OUString& rStr,
+                                                test::TestEnum& eEnum, OUString& rStr,
                                                 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
                                                 ::com::sun::star::uno::Any& rAny,
                                                 ::com::sun::star::uno::Sequence<test::TestElement >& rSequence,
@@ -196,7 +193,7 @@ public:
                                                sal_Int32& nLong, sal_uInt32& nULong,
                                                sal_Int64& nHyper, sal_uInt64& nUHyper,
                                                float& fFloat, double& fDouble,
-                                               test::TestEnum& eEnum, rtl::OUString& rStr,
+                                               test::TestEnum& eEnum, OUString& rStr,
                                                ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
                                                ::com::sun::star::uno::Any& rAny,
                                                ::com::sun::star::uno::Sequence< test::TestElement >& rSequence,
@@ -227,7 +224,7 @@ public:
         { return _aData.Double; }
     virtual test::TestEnum SAL_CALL getEnum() throw(com::sun::star::uno::RuntimeException)
         { return _aData.Enum; }
-    virtual rtl::OUString SAL_CALL getString() throw(com::sun::star::uno::RuntimeException)
+    virtual OUString SAL_CALL getString() throw(com::sun::star::uno::RuntimeException)
         { return _aData.String; }
     virtual com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getInterface(  ) throw(com::sun::star::uno::RuntimeException)
         { return _aData.Interface; }
@@ -262,7 +259,7 @@ public:
         { _aData.Double = _double; }
     virtual void SAL_CALL setEnum( test::TestEnum _enum ) throw(::com::sun::star::uno::RuntimeException)
         { _aData.Enum = _enum; }
-    virtual void SAL_CALL setString( const ::rtl::OUString& _string ) throw(::com::sun::star::uno::RuntimeException)
+    virtual void SAL_CALL setString( const OUString& _string ) throw(::com::sun::star::uno::RuntimeException)
         { _aData.String = _string; }
     virtual void SAL_CALL setInterface( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _interface ) throw(::com::sun::star::uno::RuntimeException)
         { _aData.Interface = _interface; }
@@ -274,7 +271,7 @@ public:
         { _aStructData = _struct; }
 
     // XLanguageBindingTest
-    virtual test::TestData SAL_CALL raiseException( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, test::TestEnum& eEnum, ::rtl::OUString& aString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInterface, ::com::sun::star::uno::Any& aAny, ::com::sun::star::uno::Sequence<test::TestElement >& aSequence,test::TestData& aStruct )
+    virtual test::TestData SAL_CALL raiseException( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nByte, sal_Int16& nShort, sal_uInt16& nUShort, sal_Int32& nLong, sal_uInt32& nULong, sal_Int64& nHyper, sal_uInt64& nUHyper, float& fFloat, double& fDouble, test::TestEnum& eEnum, OUString& aString, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xInterface, ::com::sun::star::uno::Any& aAny, ::com::sun::star::uno::Sequence<test::TestElement >& aSequence,test::TestData& aStruct )
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException);
@@ -676,7 +673,7 @@ void Test_Impl::setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
                            sal_Int32 nLong, sal_uInt32 nULong,
                            sal_Int64 nHyper, sal_uInt64 nUHyper,
                            float fFloat, double fDouble,
-                           test::TestEnum eEnum, const ::rtl::OUString& rStr,
+                           test::TestEnum eEnum, const OUString& rStr,
                            const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
                            const ::com::sun::star::uno::Any& rAny,
                            const ::com::sun::star::uno::Sequence<test::TestElement >& rSequence,
@@ -694,7 +691,7 @@ test::TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_I
                                       sal_Int32& nLong, sal_uInt32& nULong,
                                       sal_Int64& nHyper, sal_uInt64& nUHyper,
                                       float& fFloat, double& fDouble,
-                                      test::TestEnum& eEnum, rtl::OUString& rStr,
+                                      test::TestEnum& eEnum, OUString& rStr,
                                       ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
                                       ::com::sun::star::uno::Any& rAny,
                                       ::com::sun::star::uno::Sequence<test::TestElement >& rSequence,
@@ -713,7 +710,7 @@ test::TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_In
                                      sal_Int32& nLong, sal_uInt32& nULong,
                                      sal_Int64& nHyper, sal_uInt64& nUHyper,
                                      float& fFloat, double& fDouble,
-                                     test::TestEnum& eEnum, rtl::OUString& rStr,
+                                     test::TestEnum& eEnum, OUString& rStr,
                                      ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
                                      ::com::sun::star::uno::Any& rAny,
                                      ::com::sun::star::uno::Sequence<test::TestElement >& rSequence,
@@ -853,7 +850,7 @@ sal_Bool performTest( const Reference<XLanguageBindingTest > & xLBT )
 }
 
 //__________________________________________________________________________________________________
-test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cChar*/, sal_Int8& /*nByte*/, sal_Int16& /*nShort*/, sal_uInt16& /*nUShort*/, sal_Int32& /*nLong*/, sal_uInt32& /*nULong*/, sal_Int64& /*nHyper*/, sal_uInt64& /*nUHyper*/, float& /*fFloat*/, double& /*fDouble*/, test::TestEnum& /*eEnum*/, ::rtl::OUString& /*aString*/, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& /*xInterface*/, ::com::sun::star::uno::Any& /*aAny*/, ::com::sun::star::uno::Sequence< test::TestElement >& /*aSequence*/, test::TestData& /*aStruct*/ )
+test::TestData Test_Impl::raiseException( sal_Bool& /*bBool*/, sal_Unicode& /*cChar*/, sal_Int8& /*nByte*/, sal_Int16& /*nShort*/, sal_uInt16& /*nUShort*/, sal_Int32& /*nLong*/, sal_uInt32& /*nULong*/, sal_Int64& /*nHyper*/, sal_uInt64& /*nUHyper*/, float& /*fFloat*/, double& /*fDouble*/, test::TestEnum& /*eEnum*/, OUString& /*aString*/, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& /*xInterface*/, ::com::sun::star::uno::Any& /*aAny*/, ::com::sun::star::uno::Sequence< test::TestElement >& /*aSequence*/, test::TestData& /*aStruct*/ )
     throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     IllegalArgumentException aExc;
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index b583ebc6169d..bcec385465bb 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -52,10 +52,6 @@ using namespace com::sun::star::reflection;
 using namespace com::sun::star::container;
 using namespace com::sun::star::beans::PropertyAttribute;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
-using ::rtl::OStringToOUString;
 
 
 typedef WeakImplHelper4< XIntroTest, XPropertySet, XNameAccess, XIndexAccess > ImplIntroTestHelper;
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index 44af57bf4cae..edb4a281a3ff 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -43,7 +43,6 @@ using namespace com::sun::star::lang;
 using namespace osl;
 using namespace cppu;
 
-using ::rtl::OUString;
 
 class EmptyComponentContext : public WeakImplHelper1< XComponentContext >
 {
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index c118cbdfa976..9d23f95ca8b1 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -51,9 +51,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace osl;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
 
 namespace stoc_impreg
 {
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index 7f6ece41f2a0..b8e100f18952 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -58,9 +58,6 @@ using namespace com::sun::star::container;
 using namespace osl;
 using namespace cppu;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
 
 
 Reference<XMultiServiceFactory> getProcessServiceManager()
diff --git a/stoc/test/uriproc/test_uriproc.cxx b/stoc/test/uriproc/test_uriproc.cxx
index 34a3b2d9c0c1..a82875a13e08 100644
--- a/stoc/test/uriproc/test_uriproc.cxx
+++ b/stoc/test/uriproc/test_uriproc.cxx
@@ -58,32 +58,32 @@ namespace {
         (actual) == (expected))
 
 template< typename T > void append(
-    rtl::OUStringBuffer & buffer, T const & value)
+    OUStringBuffer & buffer, T const & value)
 {
     buffer.append(value);
 }
 
-template<> void append(rtl::OUStringBuffer & buffer, bool const & value) {
+template<> void append(OUStringBuffer & buffer, bool const & value) {
     buffer.append(static_cast< sal_Bool >(value));
 }
 
-template<> void append(rtl::OUStringBuffer & buffer, std::size_t const & value)
+template<> void append(OUStringBuffer & buffer, std::size_t const & value)
 {
     buffer.append(static_cast< sal_Int32 >(value));
 }
 
-template<> void append(rtl::OUStringBuffer & buffer, char const * const & value)
+template<> void append(OUStringBuffer & buffer, char const * const & value)
 {
     buffer.appendAscii(value);
 }
 
 template< typename T1, typename T2, typename T3, typename T4 >
-rtl::OString createTestAssertEqualMessage(
+OString createTestAssertEqualMessage(
     char const * token1, T1 const & token2, T2 const & token3,
     char const * expectedExpr, char const * actualExpr, T3 const & expected,
     T4 const & actual)
 {
-    rtl::OUStringBuffer buf;
+    OUStringBuffer buf;
     buf.appendAscii(token1);
     buf.append(static_cast< sal_Unicode >('|'));
     append(buf, token2);
@@ -98,7 +98,7 @@ rtl::OString createTestAssertEqualMessage(
     buf.appendAscii(RTL_CONSTASCII_STRINGPARAM("> != <"));
     append(buf, actual);
     buf.append(static_cast< sal_Unicode >('>'));
-    return rtl::OUStringToOString(
+    return OUStringToOString(
         buf.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
 }
 
@@ -196,24 +196,24 @@ void Test::testParse() {
     for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > uriRef(
             m_uriFactory->parse(
-                rtl::OUString::createFromAscii(data[i].uriReference)));
+                OUString::createFromAscii(data[i].uriReference)));
         CPPUNIT_ASSERT(uriRef.is() == (data[i].schemeSpecificPart != 0));
         if (uriRef.is()) {
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].uriReference),
+                OUString::createFromAscii(data[i].uriReference),
                 uriRef->getUriReference());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
                 data[i].scheme != 0, uriRef->isAbsolute());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(
+                OUString::createFromAscii(
                     data[i].scheme == 0 ? "" : data[i].scheme),
                 uriRef->getScheme());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].schemeSpecificPart),
+                OUString::createFromAscii(data[i].schemeSpecificPart),
                 uriRef->getSchemeSpecificPart());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
@@ -224,12 +224,12 @@ void Test::testParse() {
                 data[i].authority != 0, uriRef->hasAuthority());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(
+                OUString::createFromAscii(
                     data[i].authority == 0 ? "" : data[i].authority),
                 uriRef->getAuthority());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].path),
+                OUString::createFromAscii(data[i].path),
                 uriRef->getPath());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
@@ -240,36 +240,36 @@ void Test::testParse() {
                 data[i].pathSegmentCount, uriRef->getPathSegmentCount());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString(""), uriRef->getPathSegment(-1));
+                OUString(""), uriRef->getPathSegment(-1));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].pathSegment0),
+                OUString::createFromAscii(data[i].pathSegment0),
                 uriRef->getPathSegment(0));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].pathSegment1),
+                OUString::createFromAscii(data[i].pathSegment1),
                 uriRef->getPathSegment(1));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].pathSegment2),
+                OUString::createFromAscii(data[i].pathSegment2),
                 uriRef->getPathSegment(2));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].pathSegment3),
+                OUString::createFromAscii(data[i].pathSegment3),
                 uriRef->getPathSegment(3));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].pathSegment4),
+                OUString::createFromAscii(data[i].pathSegment4),
                 uriRef->getPathSegment(4));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString(), uriRef->getPathSegment(5));
+                OUString(), uriRef->getPathSegment(5));
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
                 data[i].query != 0, uriRef->hasQuery());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(
+                OUString::createFromAscii(
                     data[i].query == 0 ? "" : data[i].query),
                 uriRef->getQuery());
             TEST_ASSERT_EQUAL(
@@ -277,7 +277,7 @@ void Test::testParse() {
                 data[i].fragment != 0, uriRef->hasFragment());
             TEST_ASSERT_EQUAL(
                 "testParse", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(
+                OUString::createFromAscii(
                     data[i].fragment == 0 ? "" : data[i].fragment),
                 uriRef->getFragment());
         }
@@ -586,11 +586,11 @@ void Test::testMakeAbsolute() {
     for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > baseUriRef(
             m_uriFactory->parse(
-                rtl::OUString::createFromAscii(data[i].baseUriReference)));
+                OUString::createFromAscii(data[i].baseUriReference)));
         CPPUNIT_ASSERT(baseUriRef.is());
         css::uno::Reference< css::uri::XUriReference > uriRef(
             m_uriFactory->parse(
-                rtl::OUString::createFromAscii(data[i].uriReference)));
+                OUString::createFromAscii(data[i].uriReference)));
         CPPUNIT_ASSERT(uriRef.is());
         css::uno::Reference< css::uri::XUriReference > absolute(
             m_uriFactory->makeAbsolute(
@@ -602,7 +602,7 @@ void Test::testMakeAbsolute() {
         if (absolute.is()) {
             TEST_ASSERT_EQUAL(
                 "testMakeAbsolute", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].absolute),
+                OUString::createFromAscii(data[i].absolute),
                 absolute->getUriReference());
         }
     }
@@ -691,11 +691,11 @@ void Test::testMakeRelative() {
     for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > baseUriRef(
             m_uriFactory->parse(
-                rtl::OUString::createFromAscii(data[i].baseUriReference)));
+                OUString::createFromAscii(data[i].baseUriReference)));
         CPPUNIT_ASSERT(baseUriRef.is());
         css::uno::Reference< css::uri::XUriReference > uriRef(
             m_uriFactory->parse(
-                rtl::OUString::createFromAscii(data[i].uriReference)));
+                OUString::createFromAscii(data[i].uriReference)));
         CPPUNIT_ASSERT(uriRef.is());
         css::uno::Reference< css::uri::XUriReference > relative(
             m_uriFactory->makeRelative(
@@ -708,7 +708,7 @@ void Test::testMakeRelative() {
         if (relative.is()) {
             TEST_ASSERT_EQUAL(
                 "testMakeRelative", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].relative),
+                OUString::createFromAscii(data[i].relative),
                 relative->getUriReference());
             css::uno::Reference< css::uri::XUriReference > absolute(
                 m_uriFactory->makeAbsolute(
@@ -717,7 +717,7 @@ void Test::testMakeRelative() {
             CPPUNIT_ASSERT(absolute.is());
             TEST_ASSERT_EQUAL(
                 "testMakeRelative", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(
+                OUString::createFromAscii(
                     data[i].absolute == 0
                     ? data[i].uriReference : data[i].absolute),
                 absolute->getUriReference());
@@ -737,12 +737,12 @@ void Test::testVndSunStarExpand() {
         { "vnd.sun.star.expand:%5C$%5C%24%5C%5C", "$$\\" } };
     css::uno::Reference< css::util::XMacroExpander > expander(
         m_context->getValueByName(
-              rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander")),
+              OUString( "/singletons/com.sun.star.util.theMacroExpander")),
         css::uno::UNO_QUERY_THROW);
     for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > uriRef(
             m_uriFactory->parse(
-                rtl::OUString::createFromAscii(data[i].uriReference)));
+                OUString::createFromAscii(data[i].uriReference)));
         TEST_ASSERT_EQUAL(
             "testVndSunStarExpand", i, data[i].uriReference,
             data[i].expanded != 0, uriRef.is());
@@ -751,7 +751,7 @@ void Test::testVndSunStarExpand() {
                 expandUrl(uriRef, css::uno::UNO_QUERY_THROW);
             TEST_ASSERT_EQUAL(
                 "testVndSunStarExpand", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].expanded),
+                OUString::createFromAscii(data[i].expanded),
                 expandUrl->expand(expander));
         }
     }
@@ -782,7 +782,7 @@ void Test::testVndSunStarScript() {
     for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
         css::uno::Reference< css::uri::XUriReference > uriRef(
             m_uriFactory->parse(
-                rtl::OUString::createFromAscii(data[i].uriReference)));
+                OUString::createFromAscii(data[i].uriReference)));
         TEST_ASSERT_EQUAL(
             "testVndSunStarScript", i, data[i].uriReference, data[i].name != 0,
             uriRef.is());
@@ -791,13 +791,13 @@ void Test::testVndSunStarScript() {
                 scriptUrl(uriRef, css::uno::UNO_QUERY_THROW);
             TEST_ASSERT_EQUAL(
                 "testVndSunStarScript", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].uriReference),
+                OUString::createFromAscii(data[i].uriReference),
                 scriptUrl->getUriReference());
             TEST_ASSERT_EQUAL(
                 "testVndSunStarScript", i, data[i].uriReference,
-                rtl::OUString::createFromAscii(data[i].name),
+                OUString::createFromAscii(data[i].name),
                 scriptUrl->getName());
-            rtl::OUString originalReference(uriRef->getUriReference());
+            OUString originalReference(uriRef->getUriReference());
             for (std::size_t j = 0; j < parameterCount; ++j) {
                 if (data[i].parameters[j].key != 0) {
                     TEST_ASSERT_EQUAL(
@@ -807,35 +807,35 @@ void Test::testVndSunStarScript() {
                         data[i].uriReference,
                         data[i].parameters[j].value != 0,
                         scriptUrl->hasParameter(
-                            rtl::OUString::createFromAscii(
+                            OUString::createFromAscii(
                                 data[i].parameters[j].key)));
                     TEST_ASSERT_EQUAL(
                         "testVndSunStarScript",
                         static_cast< double >(i)
                         + static_cast< double >(j) / 10.0,
                         data[i].uriReference,
-                        rtl::OUString::createFromAscii(
+                        OUString::createFromAscii(
                             data[i].parameters[j].value),
                         scriptUrl->getParameter(
-                            rtl::OUString::createFromAscii(
+                            OUString::createFromAscii(
                                 data[i].parameters[j].key)));
 
                     // setting the parameter to its original value should not change
                     // the overall uri reference (provided it was normalized before)
                     if ( data[i].normalized ) {
-                        if ( scriptUrl->hasParameter(rtl::OUString::createFromAscii(
+                        if ( scriptUrl->hasParameter(OUString::createFromAscii(
                             data[i].parameters[j].key)) ) {
                             scriptUrl->setParameter(
-                                rtl::OUString::createFromAscii(
+                                OUString::createFromAscii(
                                     data[i].parameters[j].key),
                                 scriptUrl->getParameter(
-                                    rtl::OUString::createFromAscii(
+                                    OUString::createFromAscii(
                                         data[i].parameters[j].key)));
                             TEST_ASSERT_EQUAL(
                                 "testVndSunStarScript",
                                 static_cast< double >(i)
                                 + static_cast< double >(j) / 10.0,
-                                ::rtl::OUString("setParameter"),
+                                OUString("setParameter"),
                                 originalReference,
                                 uriRef->getUriReference());
                         }
@@ -847,7 +847,7 @@ void Test::testVndSunStarScript() {
                 TEST_ASSERT_EQUAL(
                     "testVndSunStarScript",
                     i,
-                    ::rtl::OUString("setName"),
+                    OUString("setName"),
                     originalReference,
                     uriRef->getUriReference());
             }
@@ -856,55 +856,55 @@ void Test::testVndSunStarScript() {
 
     css::uno::Reference< css::uri::XUriReference > uriRef(
         m_uriFactory->parse(
-            rtl::OUString( "vnd.sun.star.script:Hello?location=Library.Module")),
+            OUString( "vnd.sun.star.script:Hello?location=Library.Module")),
         css::uno::UNO_SET_THROW);
     css::uno::Reference< css::uri::XVndSunStarScriptUrlReference >
         scriptUrl(uriRef, css::uno::UNO_QUERY_THROW);
 
     scriptUrl->setParameter(
-        ::rtl::OUString("location"),
-        ::rtl::OUString("foo"));
+        OUString("location"),
+        OUString("foo"));
     TEST_ASSERT_EQUAL(
         "testVndSunStarScript", (sal_Int32)10, (sal_Int32)1,
         uriRef->getUriReference(),
-        ::rtl::OUString("vnd.sun.star.script:Hello?location=foo"));
+        OUString("vnd.sun.star.script:Hello?location=foo"));
 
     scriptUrl->setParameter(
-        ::rtl::OUString("language"),
-        ::rtl::OUString("StarBasic"));
+        OUString("language"),
+        OUString("StarBasic"));
     TEST_ASSERT_EQUAL(
         "testVndSunStarScript", (sal_Int32)10, (sal_Int32)2,
         uriRef->getUriReference(),
-        ::rtl::OUString("vnd.sun.star.script:Hello?location=foo&language=StarBasic"));
+        OUString("vnd.sun.star.script:Hello?location=foo&language=StarBasic"));
 
 
     bool caughtExpected = false;
     try {
-        scriptUrl->setName(::rtl::OUString());
+        scriptUrl->setName(OUString());
     }
     catch( const css::lang::IllegalArgumentException& ) {
         caughtExpected = true;
     }
     TEST_ASSERT_EQUAL(
         "testVndSunStarScript",
-        ::rtl::OUString("illegal arguments"),
-        ::rtl::OUString("name"),
+        OUString("illegal arguments"),
+        OUString("name"),
         caughtExpected,
         true);
 
     caughtExpected = false;
     try {
         scriptUrl->setParameter(
-            ::rtl::OUString(),
-            ::rtl::OUString("non-empty"));
+            OUString(),
+            OUString("non-empty"));
     }
     catch( const css::lang::IllegalArgumentException& ) {
         caughtExpected = true;
     }
     TEST_ASSERT_EQUAL(
         "testVndSunStarScript",
-        ::rtl::OUString("illegal arguments"),
-        ::rtl::OUString("parameter"),
+        OUString("illegal arguments"),
+        OUString("parameter"),
         caughtExpected,
         true);
 }
@@ -939,17 +939,17 @@ void Test::testTranslator() {
             TEST_ASSERT_EQUAL(
                 "testTranslator, translateToInternal", i,
                 data[i].externalUriReference,
-                rtl::OUString::createFromAscii(data[i].internalUriReference),
+                OUString::createFromAscii(data[i].internalUriReference),
                 translator->translateToInternal(
-                    rtl::OUString::createFromAscii(
+                    OUString::createFromAscii(
                         data[i].externalUriReference)));
         }
         TEST_ASSERT_EQUAL(
             "testTranslator, translateToExternal", i,
             data[i].internalUriReference,
-            rtl::OUString::createFromAscii(data[i].externalUriReference),
+            OUString::createFromAscii(data[i].externalUriReference),
             translator->translateToExternal(
-                rtl::OUString::createFromAscii(data[i].internalUriReference)));
+                OUString::createFromAscii(data[i].internalUriReference)));
     }
 }
 
@@ -969,14 +969,14 @@ void Test::testPkgUrlFactory() {
         css::uno::Reference< css::uri::XUriReference > url(
             factory->createVndSunStarPkgUrlReference(
                 m_uriFactory->parse(
-                    rtl::OUString::createFromAscii(data[i].authority))));
+                    OUString::createFromAscii(data[i].authority))));
         TEST_ASSERT_EQUAL(
             "testVndSunStarPkgFactory", i, data[i].authority,
             data[i].result != 0, static_cast< bool >(url.is()));
         if (data[i].result != 0) {
             TEST_ASSERT_EQUAL(
                 "testVndSunStarPkgFactory", i, data[i].authority,
-                rtl::OUString::createFromAscii(data[i].result),
+                OUString::createFromAscii(data[i].result),
                 url->getUriReference());
         }
     }