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

9 files changed, 87 insertions, 97 deletions

diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index 4f268434d321..0ba8b42ac793 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -59,9 +59,6 @@ using namespace com::sun::star::registry;
 using namespace com::sun::star::bridge;
 using namespace test::testtools::bridgetest;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
 
 #define SERVICENAME     "com.sun.star.test.bridge.BridgeTest"
 #define IMPLNAME        "com.sun.star.comp.bridge.BridgeTest"
@@ -89,12 +86,12 @@ static bool check( bool b , char const * message )
 
 namespace {
 
-bool checkEmpty(rtl::OUString const & string, char const * message) {
+bool checkEmpty(OUString const & string, char const * message) {
     bool ok = string.isEmpty();
     if (!ok) {
         fprintf(
             stderr, "%s failed: %s\n", message,
-            rtl::OUStringToOString(string, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(string, RTL_TEXTENCODING_UTF8).getStr());
     }
     return ok;
 }
@@ -190,7 +187,7 @@ static void assign( TestElement & rData,
                     sal_Int32 nLong, sal_uInt32 nULong,
                     sal_Int64 nHyper, sal_uInt64 nUHyper,
                     float fFloat, double fDouble,
-                    TestEnum eEnum, const ::rtl::OUString& rStr,
+                    TestEnum eEnum, const OUString& rStr,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
                     const ::com::sun::star::uno::Any& rAny )
 {
@@ -570,7 +567,7 @@ static sal_Bool performTest(
                 bRet &= check(tps1.member == 12345, "transportPolyHyper");
                 Sequence< Any > seq(2);
                 seq[0] <<= static_cast< sal_uInt32 >(33);
-                seq[1] <<= rtl::OUString("ABC");
+                seq[1] <<= OUString("ABC");
                 TestPolyStruct< Sequence< Any > > tps2(seq);
                 TestPolyStruct< Sequence< Any > > tps3;
                 xLBT->transportPolySequence(tps2, tps3);
@@ -580,7 +577,7 @@ static sal_Bool performTest(
                 sal_uInt32 v0 = sal_uInt32();
                 tps3.member[0] >>= v0;
                 bRet &= check(v0 == 33, "transportPolySequence, element 0");
-                rtl::OUString v1;
+                OUString v1;
                 tps3.member[1] >>= v1;
                 bRet &= check( v1 == "ABC", "transportPolySequence, element 1" );
                 bRet &= check(
@@ -594,7 +591,7 @@ static sal_Bool performTest(
                 Any nullAny(xLBT->getNullPolyAny().member);
                 bRet &= check(
                     (((nullAny.getValueTypeName() ==
-                       rtl::OUString(
+                       OUString(
                                "com.sun.star.uno.XInterface")) &&
                       !static_cast< Reference< XInterface > const * >(
                           nullAny.getValue())->is())
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 8627e2932a6e..c1d72d3e2720 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -78,7 +78,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
     ::sal_uInt64 arg7 = sal_uInt64();
     float arg8 = float();
     double arg9 = double();
-    ::rtl::OUString arg11;
+    OUString arg11;
     css::uno::Type arg12;
     ::sal_Bool arg13 = sal_Bool();
     css::uno::Sequence< ::sal_Bool > arg14;
@@ -91,7 +91,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
     css::uno::Sequence< ::sal_uInt64 > arg21;
     css::uno::Sequence< float > arg22;
     css::uno::Sequence< double > arg23;
-    css::uno::Sequence< ::rtl::OUString > arg25;
+    css::uno::Sequence< OUString > arg25;
     css::uno::Sequence< css::uno::Type > arg26;
     css::uno::Sequence< css::uno::Any > arg27;
     ::sal_Bool arg27b = sal_Bool();
@@ -221,7 +221,7 @@ private:
         throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Int32 SAL_CALL fn11( ::sal_Int32 arg )
         throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL fn12( const ::rtl::OUString& arg )
+    virtual OUString SAL_CALL fn12( const OUString& arg )
         throw (::com::sun::star::uno::RuntimeException);
 
 
@@ -240,7 +240,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
     ttb::TestPolyStruct< ::sal_Int32 > arg5;
     ttb::TestPolyStruct< ::sal_Int64 > arg6;
     ttb::TestPolyStruct< ::sal_Unicode > arg7;
-    ttb::TestPolyStruct< ::rtl::OUString > arg8;
+    ttb::TestPolyStruct< OUString > arg8;
     ttb::TestPolyStruct< float > arg9;
     ttb::TestPolyStruct< double > arg10;
     ttb::TestPolyStruct<css::uno::Reference<css::uno::XInterface> > arg11;
@@ -250,8 +250,8 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
           ttb::TestPolyStruct2<sal_Unicode, css::uno::Any> > arg14;
     ttb::TestPolyStruct< ttb::TestPolyStruct2 <
         ttb::TestPolyStruct2< sal_Unicode, css::uno::Any >,
-        ::rtl::OUString > > arg15;
-    ttb::TestPolyStruct2< ::rtl::OUString,ttb::TestPolyStruct2 <
+        OUString > > arg15;
+    ttb::TestPolyStruct2< OUString,ttb::TestPolyStruct2 <
         ::sal_Unicode, ttb::TestPolyStruct < css::uno::Any > > > arg16;
     ttb::TestPolyStruct2< ttb::TestPolyStruct2<sal_Unicode, css::uno::Any >,
         ttb::TestPolyStruct<sal_Unicode> > arg17;
@@ -263,7 +263,7 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
     ttb::TestPolyStruct<css::uno::Sequence< ::sal_Int32 > > arg23;
     ttb::TestPolyStruct<css::uno::Sequence< ::sal_Int64 > > arg24;
 //    ttb::TestPolyStruct<css::uno::Sequence<::sal_Unicode> > arg25;
-    ttb::TestPolyStruct<css::uno::Sequence< ::rtl::OUString > > arg26;
+    ttb::TestPolyStruct<css::uno::Sequence< OUString > > arg26;
     ttb::TestPolyStruct<css::uno::Sequence<float> > arg27;
     ttb::TestPolyStruct<css::uno::Sequence<double> > arg28;
     ttb::TestPolyStruct<css::uno::Sequence<css::uno::Reference<css::uno::XInterface> > > arg29;
@@ -278,17 +278,17 @@ void Impl2::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
     css::uno::Sequence<ttb::TestPolyStruct< ::sal_Int32> > arg35;
     css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any> > > arg36;
     css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2<
-        ttb::TestPolyStruct2< ::sal_Unicode,css::uno::Any >, ::rtl::OUString> > > arg37;
-    css::uno::Sequence<ttb::TestPolyStruct2< ::rtl::OUString, ttb::TestPolyStruct2<
+        ttb::TestPolyStruct2< ::sal_Unicode,css::uno::Any >, OUString> > > arg37;
+    css::uno::Sequence<ttb::TestPolyStruct2< OUString, ttb::TestPolyStruct2<
         ::sal_Unicode, ttb::TestPolyStruct<css::uno::Any> > > > arg38;
     css::uno::Sequence<ttb::TestPolyStruct2<ttb::TestPolyStruct2<
         ::sal_Unicode, css::uno::Any>, ttb::TestPolyStruct< ::sal_Unicode> > > arg39;
     css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct< ::sal_Unicode> > > arg40;
     css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct<ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any> > > >arg41;
     css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct<
-        ttb::TestPolyStruct2<ttb::TestPolyStruct2<sal_Unicode, css::uno::Any>, ::rtl::OUString> > > > arg42;
+        ttb::TestPolyStruct2<ttb::TestPolyStruct2<sal_Unicode, css::uno::Any>, OUString> > > > arg42;
     css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct2<
-        ::rtl::OUString, ttb::TestPolyStruct2< ::sal_Unicode, ttb::TestPolyStruct<css::uno::Any> > > > > arg43;
+        OUString, ttb::TestPolyStruct2< ::sal_Unicode, ttb::TestPolyStruct<css::uno::Any> > > > > arg43;
     css::uno::Sequence<css::uno::Sequence<ttb::TestPolyStruct2<
         ttb::TestPolyStruct2< ::sal_Unicode, css::uno::Any>, ttb::TestPolyStruct<
         ::sal_Unicode> > > > arg44;
@@ -431,10 +431,10 @@ void Impl2::setatt1( double _att1 )throw (::com::sun::star::uno::RuntimeExceptio
     return 11 * arg;
 }
 
-::rtl::OUString Impl2::fn12( const ::rtl::OUString& arg )
+OUString Impl2::fn12( const OUString& arg )
         throw (::com::sun::star::uno::RuntimeException)
 {
-    return ::rtl::OUString("12") + arg;
+    return OUString("12") + arg;
 }
 
 css::uno::Reference< css::uno::XInterface > SAL_CALL create(
@@ -445,8 +445,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create(
     return static_cast< ::cppu::OWeakObject * >(new Impl);
 }
 
-::rtl::OUString SAL_CALL getImplementationName() {
-    return ::rtl::OUString(
+OUString SAL_CALL getImplementationName() {
+    return OUString(
             "comp.test.testtools.bridgetest.Constructors");
 }
 
@@ -464,8 +464,8 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL create2(
     return static_cast< ::cppu::OWeakObject * >(new Impl2);
 }
 
-::rtl::OUString SAL_CALL getImplementationName2() {
-    return ::rtl::OUString(
+OUString SAL_CALL getImplementationName2() {
+    return OUString(
             "comp.test.testtools.bridgetest.Constructors2");
 }
 
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index 9a0c0d7a6bfc..9d6d2517ceed 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -53,8 +53,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace test::testtools::bridgetest;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
 
 #define SERVICENAME     "com.sun.star.test.bridge.CppTestObject"
 #define IMPLNAME        "com.sun.star.comp.bridge.CppTestObject"
@@ -76,7 +74,7 @@ static void assign( TestElement & rData,
                     sal_Int32 nLong, sal_uInt32 nULong,
                     sal_Int64 nHyper, sal_uInt64 nUHyper,
                     float fFloat, double fDouble,
-                    TestEnum eEnum, const ::rtl::OUString& rStr,
+                    TestEnum eEnum, const OUString& rStr,
                     const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xTest,
                     const ::com::sun::star::uno::Any& rAny )
 {
@@ -103,7 +101,7 @@ static void assign( TestData & rData,
                     sal_Int32 nLong, sal_uInt32 nULong,
                     sal_Int64 nHyper, sal_uInt64 nUHyper,
                     float fFloat, double fDouble,
-                    TestEnum eEnum, const ::rtl::OUString& rStr,
+                    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< TestElement >& rSequence )
@@ -174,7 +172,7 @@ public:
                                      sal_Int32 nLong, sal_uInt32 nULong,
                                      sal_Int64 nHyper, sal_uInt64 nUHyper,
                                      float fFloat, double fDouble,
-                                     TestEnum eEnum, const ::rtl::OUString& rStr,
+                                     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<TestElement >& rSequence,
@@ -186,7 +184,7 @@ public:
                                                 sal_Int32& nLong, sal_uInt32& nULong,
                                                 sal_Int64& nHyper, sal_uInt64& nUHyper,
                                                 float& fFloat, double& fDouble,
-                                                TestEnum& eEnum, rtl::OUString& rStr,
+                                                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<TestElement >& rSequence,
@@ -198,7 +196,7 @@ public:
                                                sal_Int32& nLong, sal_uInt32& nULong,
                                                sal_Int64& nHyper, sal_uInt64& nUHyper,
                                                float& fFloat, double& fDouble,
-                                               TestEnum& eEnum, rtl::OUString& rStr,
+                                               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< TestElement >& rSequence,
@@ -247,7 +245,7 @@ public:
         { return _aData.Double; }
     virtual 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; }
@@ -282,7 +280,7 @@ public:
         { _aData.Double = _double; }
     virtual void SAL_CALL setEnum( 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; }
@@ -320,9 +318,9 @@ public:
         throw (RuntimeException)
     { return TestPolyStruct< sal_Int32 >(0); /* work around MS compiler bug */ }
 
-    virtual TestPolyStruct< rtl::OUString > SAL_CALL getNullPolyString()
+    virtual TestPolyStruct< OUString > SAL_CALL getNullPolyString()
         throw (RuntimeException)
-    { return TestPolyStruct< rtl::OUString >(); }
+    { return TestPolyStruct< OUString >(); }
 
     virtual TestPolyStruct< Type > SAL_CALL getNullPolyType()
         throw (RuntimeException)
@@ -372,7 +370,7 @@ public:
 
     virtual Reference< XMulti > SAL_CALL getMulti() throw (RuntimeException);
 
-    virtual rtl::OUString SAL_CALL testMulti(Reference< XMulti > const & multi)
+    virtual OUString SAL_CALL testMulti(Reference< XMulti > const & multi)
         throw (RuntimeException);
 
 public: // XBridgeTest
@@ -380,7 +378,7 @@ public: // XBridgeTest
         throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     virtual void SAL_CALL raiseRuntimeExceptionOneway(
-        const ::rtl::OUString& Message, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context )
+        const OUString& Message, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Context )
         throw(::com::sun::star::uno::RuntimeException);
 
     virtual sal_Int32 SAL_CALL getRuntimeException() throw(::com::sun::star::uno::RuntimeException);
@@ -559,7 +557,7 @@ Reference< XMulti > Test_Impl::getMulti() throw (RuntimeException) {
     return new testtools::bridgetest::Multi;
 }
 
-rtl::OUString Test_Impl::testMulti(Reference< XMulti > const & multi)
+OUString Test_Impl::testMulti(Reference< XMulti > const & multi)
     throw (RuntimeException)
 {
     return testtools::bridgetest::testMulti(multi);
@@ -571,7 +569,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,
-                           TestEnum eEnum, const ::rtl::OUString& rStr,
+                           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<TestElement >& rSequence,
@@ -589,7 +587,7 @@ TestData Test_Impl::setValues2( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& n
                                 sal_Int32& nLong, sal_uInt32& nULong,
                                 sal_Int64& nHyper, sal_uInt64& nUHyper,
                                 float& fFloat, double& fDouble,
-                                TestEnum& eEnum, rtl::OUString& rStr,
+                                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<TestElement >& rSequence,
@@ -613,7 +611,7 @@ TestData Test_Impl::getValues( sal_Bool& bBool, sal_Unicode& cChar, sal_Int8& nB
                                sal_Int32& nLong, sal_uInt32& nULong,
                                sal_Int64& nHyper, sal_uInt64& nUHyper,
                                float& fFloat, double& fDouble,
-                               TestEnum& eEnum, rtl::OUString& rStr,
+                               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<TestElement >& rSequence,
diff --git a/testtools/source/bridgetest/currentcontextchecker.cxx b/testtools/source/bridgetest/currentcontextchecker.cxx
index e86b4a731341..2f3c77b34411 100644
--- a/testtools/source/bridgetest/currentcontextchecker.cxx
+++ b/testtools/source/bridgetest/currentcontextchecker.cxx
@@ -50,7 +50,7 @@ public:
 
     virtual ~CurrentContext();
 
-    virtual css::uno::Any SAL_CALL getValueByName(::rtl::OUString const & Name)
+    virtual css::uno::Any SAL_CALL getValueByName(OUString const & Name)
         throw (css::uno::RuntimeException);
 
 private:
@@ -62,11 +62,11 @@ CurrentContext::CurrentContext() {}
 
 CurrentContext::~CurrentContext() {}
 
-css::uno::Any CurrentContext::getValueByName(::rtl::OUString const & Name)
+css::uno::Any CurrentContext::getValueByName(OUString const & Name)
     throw (css::uno::RuntimeException)
 {
     return Name == KEY
-        ? css::uno::makeAny(::rtl::OUString::createFromAscii(VALUE))
+        ? css::uno::makeAny(OUString::createFromAscii(VALUE))
         : css::uno::Any();
 }
 
@@ -103,11 +103,11 @@ bool testtools::bridgetest::CurrentContextChecker::performCheck(
             return false;
         }
         css::uno::Any a(
-            context->getValueByName(::rtl::OUString::createFromAscii(KEY)));
-        if (a.getValueType() != ::cppu::UnoType< ::rtl::OUString >::get()) {
+            context->getValueByName(OUString::createFromAscii(KEY)));
+        if (a.getValueType() != ::cppu::UnoType< OUString >::get()) {
             return false;
         }
-        ::rtl::OUString s;
+        OUString s;
         OSL_VERIFY(a >>= s);
         return s == VALUE;
     } else {
diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx
index 39a4f7354c40..0c20128345a0 100644
--- a/testtools/source/bridgetest/multi.cxx
+++ b/testtools/source/bridgetest/multi.cxx
@@ -31,15 +31,15 @@
 namespace {
 
 struct CheckFailed {
-    explicit CheckFailed(rtl::OUString const & theMessage): message(theMessage)
+    explicit CheckFailed(OUString const & theMessage): message(theMessage)
     {}
 
-    rtl::OUString message;
+    OUString message;
 };
 
-::std::ostream& operator<< (::std::ostream& os, const ::rtl::OUString& str)
+::std::ostream& operator<< (::std::ostream& os, const OUString& str)
 {
-    return os << ::rtl::OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr();
+    return os << OUStringToOString(str, RTL_TEXTENCODING_UTF8).getStr();
 }
 
 template< typename T > void checkEqual(T const & value, T const & argument) {
@@ -47,8 +47,8 @@ template< typename T > void checkEqual(T const & value, T const & argument) {
         std::ostringstream s;
         s << value << " != " << argument;
         throw CheckFailed(
-            rtl::OStringToOUString(
-                rtl::OString(s.str().c_str()), RTL_TEXTENCODING_UTF8));
+            OStringToOUString(
+                OString(s.str().c_str()), RTL_TEXTENCODING_UTF8));
     }
 }
 
@@ -56,7 +56,7 @@ template< typename T > void checkEqual(T const & value, T const & argument) {
 
 namespace testtools { namespace bridgetest {
 
-rtl::OUString testMulti(
+OUString testMulti(
     com::sun::star::uno::Reference< test::testtools::bridgetest::XMulti >
     const & multi)
 {
@@ -124,32 +124,32 @@ rtl::OUString testMulti(
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn11(5));
         checkEqual(
-            rtl::OUString("12" "abc"),
+            OUString("12" "abc"),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase1 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn12(
-                    rtl::OUString("abc")));
+                    OUString("abc")));
         checkEqual(
-            rtl::OUString("12" "abc-2"),
+            OUString("12" "abc-2"),
             static_cast< test::testtools::bridgetest::XMultiBase2 * >(
-                multi.get())->fn12(rtl::OUString("abc-2")));
+                multi.get())->fn12(OUString("abc-2")));
         checkEqual(
-            rtl::OUString("12" "abc-2"),
+            OUString("12" "abc-2"),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase2 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn12(
-                    rtl::OUString("abc-2")));
+                    OUString("abc-2")));
         checkEqual(
-            rtl::OUString("12" "abc-5"),
+            OUString("12" "abc-5"),
             static_cast< test::testtools::bridgetest::XMultiBase5 * >(
-                multi.get())->fn12(rtl::OUString("abc-5")));
+                multi.get())->fn12(OUString("abc-5")));
         checkEqual(
-            rtl::OUString("12" "abc-5"),
+            OUString("12" "abc-5"),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn12(
-                    rtl::OUString("abc-5")));
+                    OUString("abc-5")));
         checkEqual< sal_Int32 >(21 * 2, multi->fn21(2));
         checkEqual(
-            rtl::OUString("22" "de"),
-            multi->fn22(rtl::OUString("de")));
+            OUString("22" "de"),
+            multi->fn22(OUString("de")));
         checkEqual< sal_Int32 >(
             31 * 3,
             css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -189,19 +189,19 @@ rtl::OUString testMulti(
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->getatt3());
         checkEqual(
-            rtl::OUString("32" "f"),
+            OUString("32" "f"),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn32(
-                    rtl::OUString("f")));
+                    OUString("f")));
         checkEqual(
-            rtl::OUString("32" "f-5"),
+            OUString("32" "f-5"),
             static_cast< test::testtools::bridgetest::XMultiBase5 * >(
-                multi.get())->fn32(rtl::OUString("f-5")));
+                multi.get())->fn32(OUString("f-5")));
         checkEqual(
-            rtl::OUString("32" "f-5"),
+            OUString("32" "f-5"),
             css::uno::Reference< test::testtools::bridgetest::XMultiBase5 >(
                 multi, css::uno::UNO_QUERY_THROW)->fn32(
-                    rtl::OUString("f-5")));
+                    OUString("f-5")));
         checkEqual< sal_Int32 >(
             33,
             css::uno::Reference< test::testtools::bridgetest::XMultiBase3 >(
@@ -217,17 +217,17 @@ rtl::OUString testMulti(
         checkEqual< sal_Int32 >(41 * 4, multi->fn41(4));
         checkEqual< sal_Int32 >(61 * 6, multi->fn61(6));
         checkEqual(
-            rtl::OUString("62" ""),
-            multi->fn62(rtl::OUString()));
+            OUString("62" ""),
+            multi->fn62(OUString()));
         checkEqual< sal_Int32 >(71 * 7, multi->fn71(7));
         checkEqual(
-            rtl::OUString("72" "g"),
-            multi->fn72(rtl::OUString("g")));
+            OUString("72" "g"),
+            multi->fn72(OUString("g")));
         checkEqual< sal_Int32 >(73, multi->fn73());
     } catch (CheckFailed const & f) {
         return f.message;
     }
-    return rtl::OUString();
+    return OUString();
 }
 
 } }
diff --git a/testtools/source/bridgetest/multi.hxx b/testtools/source/bridgetest/multi.hxx
index 81f82af25fd5..eee17fdb4825 100644
--- a/testtools/source/bridgetest/multi.hxx
+++ b/testtools/source/bridgetest/multi.hxx
@@ -48,17 +48,17 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return 11 * arg; }
 
-    virtual rtl::OUString SAL_CALL fn12(rtl::OUString const & arg)
+    virtual OUString SAL_CALL fn12(OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString("12") + arg; }
+    { return OUString("12") + arg; }
 
     virtual sal_Int32 SAL_CALL fn21(sal_Int32 arg)
         throw (com::sun::star::uno::RuntimeException)
     { return 21 * arg; }
 
-    virtual rtl::OUString SAL_CALL fn22(rtl::OUString const & arg)
+    virtual OUString SAL_CALL fn22(OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString("22") + arg; }
+    { return OUString("22") + arg; }
 
     virtual double SAL_CALL getatt3()
         throw (com::sun::star::uno::RuntimeException)
@@ -72,9 +72,9 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return 31 * arg; }
 
-    virtual rtl::OUString SAL_CALL fn32(rtl::OUString const & arg)
+    virtual OUString SAL_CALL fn32(OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString("32") + arg; }
+    { return OUString("32") + arg; }
 
     virtual sal_Int32 SAL_CALL fn33()
         throw (com::sun::star::uno::RuntimeException)
@@ -88,17 +88,17 @@ public:
         throw (com::sun::star::uno::RuntimeException)
     { return 61 * arg; }
 
-    virtual rtl::OUString SAL_CALL fn62(rtl::OUString const & arg)
+    virtual OUString SAL_CALL fn62(OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString("62") + arg; }
+    { return OUString("62") + arg; }
 
     virtual sal_Int32 SAL_CALL fn71(sal_Int32 arg)
         throw (com::sun::star::uno::RuntimeException)
     { return 71 * arg; }
 
-    virtual rtl::OUString SAL_CALL fn72(rtl::OUString const & arg)
+    virtual OUString SAL_CALL fn72(OUString const & arg)
         throw (com::sun::star::uno::RuntimeException)
-    { return rtl::OUString("72") + arg; }
+    { return OUString("72") + arg; }
 
     virtual sal_Int32 SAL_CALL fn73()
         throw (com::sun::star::uno::RuntimeException)
@@ -109,7 +109,7 @@ private:
     double m_attribute3;
 };
 
-rtl::OUString testMulti(
+OUString testMulti(
     com::sun::star::uno::Reference< test::testtools::bridgetest::XMulti >
     const & multi);
 
diff --git a/testtools/source/performance/pseudo.cxx b/testtools/source/performance/pseudo.cxx
index c107f2aa7b44..3c5d35ccbf67 100644
--- a/testtools/source/performance/pseudo.cxx
+++ b/testtools/source/performance/pseudo.cxx
@@ -26,7 +26,6 @@
 #include <uno/mapping.h>
 #include <uno/lbnames.h>
 
-using ::rtl::OUString;
 
 namespace pseudo_uno
 {
diff --git a/testtools/source/performance/ubobject.cxx b/testtools/source/performance/ubobject.cxx
index 67ae10181137..6e904ccf2939 100644
--- a/testtools/source/performance/ubobject.cxx
+++ b/testtools/source/performance/ubobject.cxx
@@ -36,7 +36,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::test::performance;
 
-using ::rtl::OUString;
 
 #define SERVICENAME     "com.sun.star.test.performance.PerformanceTestObject"
 #define IMPLNAME        "com.sun.star.comp.performance.PerformanceTestObject"
@@ -123,7 +122,7 @@ public:
         {}
     virtual OUString SAL_CALL getString_attr() throw(::com::sun::star::uno::RuntimeException)
         { return _aDummyString; }
-    virtual void SAL_CALL setString_attr( const ::rtl::OUString& _attributestring ) throw(::com::sun::star::uno::RuntimeException)
+    virtual void SAL_CALL setString_attr( const OUString& _attributestring ) throw(::com::sun::star::uno::RuntimeException)
         {}
     virtual Reference< XInterface > SAL_CALL getInterface_attr() throw(::com::sun::star::uno::RuntimeException)
         { return Reference< XInterface >(); }
@@ -161,7 +160,7 @@ public:
         {}
     virtual OUString SAL_CALL getString() throw(::com::sun::star::uno::RuntimeException)
         { return _aDummyString; }
-    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)
         {}
     virtual Reference< XInterface > SAL_CALL getInterface() throw(::com::sun::star::uno::RuntimeException)
         { return Reference< XInterface >(); }
diff --git a/testtools/source/performance/ubtest.cxx b/testtools/source/performance/ubtest.cxx
index 5d02eeee0d60..9c1413f5bdb9 100644
--- a/testtools/source/performance/ubtest.cxx
+++ b/testtools/source/performance/ubtest.cxx
@@ -71,9 +71,6 @@ using namespace com::sun::star::bridge;
 using namespace com::sun::star::container;
 using namespace com::sun::star::test::performance;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OUStringToOString;
 
 #define SERVICENAME     "com.sun.star.test.performance.PerformanceTest"
 #define IMPLNAME        "com.sun.star.comp.performance.PerformanceTest"