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

16 files changed, 96 insertions, 96 deletions

diff --git a/unotest/inc/unotest/bootstrapfixturebase.hxx b/unotest/inc/unotest/bootstrapfixturebase.hxx
index 740799937907..a1986131c5b5 100644
--- a/unotest/inc/unotest/bootstrapfixturebase.hxx
+++ b/unotest/inc/unotest/bootstrapfixturebase.hxx
@@ -53,12 +53,12 @@ namespace test {
 class OOO_DLLPUBLIC_UNOTEST BootstrapFixtureBase : public CppUnit::TestFixture
 {
 protected:
-  ::rtl::OUString m_aSrcRootURL;
-  ::rtl::OUString m_aSrcRootPath;
-  ::rtl::OUString m_aSolverRootURL;
-  ::rtl::OUString m_aSolverRootPath;
-  ::rtl::OUString m_aWorkdirRootURL;
-  ::rtl::OUString m_aWorkdirRootPath;
+  OUString m_aSrcRootURL;
+  OUString m_aSrcRootPath;
+  OUString m_aSolverRootURL;
+  OUString m_aSolverRootPath;
+  OUString m_aWorkdirRootURL;
+  OUString m_aWorkdirRootPath;
 
   com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> m_xContext;
   com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> m_xSFactory;
@@ -73,21 +73,21 @@ public:
   com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>
 	          getMultiServiceFactory() { return m_xSFactory; }
 
-  ::rtl::OUString getSrcRootURL()       { return m_aSrcRootURL; }
-  ::rtl::OUString getSrcRootPath()      { return m_aSrcRootPath; }
+  OUString getSrcRootURL()       { return m_aSrcRootURL; }
+  OUString getSrcRootPath()      { return m_aSrcRootPath; }
 
   // return a URL to a given c-str path from the source directory
-  ::rtl::OUString getURLFromSrc( const char *pPath );
+  OUString getURLFromSrc( const char *pPath );
 
   // return a Path to a given c-str path from the source directory
-  ::rtl::OUString getPathFromSrc( const char *pPath );
+  OUString getPathFromSrc( const char *pPath );
 
 
   // return a URL to a given c-str path from the workdir directory
-  ::rtl::OUString getURLFromWorkdir( const char *pPath );
+  OUString getURLFromWorkdir( const char *pPath );
 
   // return a Path to a given c-str path from the workdir directory
-  ::rtl::OUString getPathFromWorkdir( const char *pPath );
+  OUString getPathFromWorkdir( const char *pPath );
   virtual void setUp();
   virtual void tearDown();
 
diff --git a/unotest/inc/unotest/filters-test.hxx b/unotest/inc/unotest/filters-test.hxx
index 390ad05230a3..0825253400ea 100644
--- a/unotest/inc/unotest/filters-test.hxx
+++ b/unotest/inc/unotest/filters-test.hxx
@@ -53,11 +53,11 @@ class OOO_DLLPUBLIC_UNOTEST FiltersTest
 public:
     void testDir(
         //filter name
-        const rtl::OUString &rFilter,
+        const OUString &rFilter,
         //root dir of test files, must contain pass, fail, indeterminate
-        const rtl::OUString &rURL,
+        const OUString &rURL,
         //additional filter data for SfxFilter
-        const rtl::OUString &rUserData = rtl::OUString(),
+        const OUString &rUserData = OUString(),
         //SfxFilterFlags for SfxFilter
         unsigned int nFilterFlags = SFX_FILTER_IMPORT,
         //Clipboard id for SfxFilter
@@ -66,9 +66,9 @@ public:
         unsigned int nFilterVersion = 0);
 
     virtual bool load(
-        const rtl::OUString &rFilter,
-        const rtl::OUString &rURL,
-        const rtl::OUString &rUserData,
+        const OUString &rFilter,
+        const OUString &rURL,
+        const OUString &rUserData,
         unsigned int nFilterFlags,
         unsigned int nClipboardID,
         unsigned int nFilterVersion) = 0;
@@ -78,9 +78,9 @@ protected:
 
     void recursiveScan(
         filterStatus nExpected,
-        const rtl::OUString &rFilter,
-        const rtl::OUString &rURL,
-        const rtl::OUString &rUserData,
+        const OUString &rFilter,
+        const OUString &rURL,
+        const OUString &rUserData,
         unsigned int nFilterFlags,
         unsigned int nClipboardID,
         unsigned int nFilterVersion);
diff --git a/unotest/inc/unotest/gettestargument.hxx b/unotest/inc/unotest/gettestargument.hxx
index 02cf032ea767..ae4a7e36595a 100644
--- a/unotest/inc/unotest/gettestargument.hxx
+++ b/unotest/inc/unotest/gettestargument.hxx
@@ -31,7 +31,7 @@ namespace test {
 // Obtain the value of a test argument (tunneled in via an "arg-testarg.<name>"
 // bootstrap variable):
 OOO_DLLPUBLIC_UNOTEST bool getTestArgument(
-    rtl::OUString const & name, rtl::OUString * value);
+    OUString const & name, OUString * value);
 
 }
 
diff --git a/unotest/inc/unotest/macros_test.hxx b/unotest/inc/unotest/macros_test.hxx
index c3eb7ff5629c..d2c129102bdb 100644
--- a/unotest/inc/unotest/macros_test.hxx
+++ b/unotest/inc/unotest/macros_test.hxx
@@ -37,8 +37,8 @@
 
 struct TestMacroInfo
 {
-    rtl::OUString sFileBaseName;
-    rtl::OUString sMacroUrl;
+    OUString sFileBaseName;
+    OUString sMacroUrl;
 };
 
 namespace unotest {
diff --git a/unotest/inc/unotest/toabsolutefileurl.hxx b/unotest/inc/unotest/toabsolutefileurl.hxx
index ec3d3c18ec31..4e224d4cab0b 100644
--- a/unotest/inc/unotest/toabsolutefileurl.hxx
+++ b/unotest/inc/unotest/toabsolutefileurl.hxx
@@ -30,8 +30,8 @@ namespace test {
 
 // Convert a pathname in system notation, potentially relative to the process's
 // current working directory, to an absolute file URL:
-OOO_DLLPUBLIC_UNOTEST rtl::OUString toAbsoluteFileUrl(
-    rtl::OUString const & relativePathname);
+OOO_DLLPUBLIC_UNOTEST OUString toAbsoluteFileUrl(
+    OUString const & relativePathname);
 
 }
 
diff --git a/unotest/inc/unotest/uniquepipename.hxx b/unotest/inc/unotest/uniquepipename.hxx
index 6326fcf2c5b5..bbd90f69b4f2 100644
--- a/unotest/inc/unotest/uniquepipename.hxx
+++ b/unotest/inc/unotest/uniquepipename.hxx
@@ -29,7 +29,7 @@ namespace rtl { class OUString; }
 namespace test {
 
 // Create a system-wide unique name (for use with osl::Pipe):
-OOO_DLLPUBLIC_UNOTEST rtl::OUString uniquePipeName(rtl::OUString const & name);
+OOO_DLLPUBLIC_UNOTEST OUString uniquePipeName(OUString const & name);
 
 }
 
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx
index 90b3c1fb1e01..7f3fb84f33e9 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -55,15 +55,15 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
 #ifdef WNT
     if (pSrcRoot[1] == ':')
     {
-        m_aSrcRootURL += rtl::OUString::createFromAscii( "/" );
+        m_aSrcRootURL += OUString::createFromAscii( "/" );
     }
     if (pSolverRoot[1] == ':')
     {
-        m_aSolverRootURL += rtl::OUString::createFromAscii( "/" );
+        m_aSolverRootURL += OUString::createFromAscii( "/" );
     }
     if (pWorkdirRoot[1] == ':')
     {
-        m_aWorkdirRootURL += rtl::OUString::createFromAscii( "/" );
+        m_aWorkdirRootURL += OUString::createFromAscii( "/" );
     }
 #endif
 #else
@@ -71,13 +71,13 @@ test::BootstrapFixtureBase::BootstrapFixtureBase()
     const char* pSolverRoot = "/assets";
     const char* pWorkdirRoot = "/assets";
 #endif
-    m_aSrcRootPath = rtl::OUString::createFromAscii( pSrcRoot );
+    m_aSrcRootPath = OUString::createFromAscii( pSrcRoot );
     m_aSrcRootURL += m_aSrcRootPath;
 
-    m_aSolverRootPath = rtl::OUString::createFromAscii( pSolverRoot );
+    m_aSolverRootPath = OUString::createFromAscii( pSolverRoot );
     m_aSolverRootURL += m_aSolverRootPath;
 
-    m_aWorkdirRootPath = rtl::OUString::createFromAscii( pWorkdirRoot );
+    m_aWorkdirRootPath = OUString::createFromAscii( pWorkdirRoot );
     m_aWorkdirRootURL += m_aWorkdirRootPath;
 
 }
@@ -86,25 +86,25 @@ test::BootstrapFixtureBase::~BootstrapFixtureBase()
 {
 }
 
-::rtl::OUString test::BootstrapFixtureBase::getURLFromSrc( const char *pPath )
+OUString test::BootstrapFixtureBase::getURLFromSrc( const char *pPath )
 {
-    return m_aSrcRootURL + rtl::OUString::createFromAscii( pPath );
+    return m_aSrcRootURL + OUString::createFromAscii( pPath );
 }
 
-::rtl::OUString test::BootstrapFixtureBase::getPathFromSrc( const char *pPath )
+OUString test::BootstrapFixtureBase::getPathFromSrc( const char *pPath )
 {
-    return m_aSrcRootPath + rtl::OUString::createFromAscii( pPath );
+    return m_aSrcRootPath + OUString::createFromAscii( pPath );
 }
 
 
-::rtl::OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath )
+OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath )
 {
-    return m_aWorkdirRootURL + rtl::OUString::createFromAscii( pPath );
+    return m_aWorkdirRootURL + OUString::createFromAscii( pPath );
 }
 
-::rtl::OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath )
+OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath )
 {
-    return m_aWorkdirRootPath + rtl::OUString::createFromAscii( pPath );
+    return m_aWorkdirRootPath + OUString::createFromAscii( pPath );
 
 }
 
@@ -112,8 +112,8 @@ void test::BootstrapFixtureBase::setUp()
 {
     // set UserInstallation to user profile dir in test/user-template
     rtl::Bootstrap aDefaultVars;
-    rtl::OUString sUserInstallURL = m_aSolverRootURL + rtl::OUString("/unittest");
-    aDefaultVars.set(rtl::OUString("UserInstallation"), sUserInstallURL);
+    OUString sUserInstallURL = m_aSolverRootURL + OUString("/unittest");
+    aDefaultVars.set(OUString("UserInstallation"), sUserInstallURL);
 
     m_xContext = comphelper::getProcessComponentContext();
     m_xFactory = m_xContext->getServiceManager();
diff --git a/unotest/source/cpp/filters-test.cxx b/unotest/source/cpp/filters-test.cxx
index 376118f35af5..87b4967fdf4c 100644
--- a/unotest/source/cpp/filters-test.cxx
+++ b/unotest/source/cpp/filters-test.cxx
@@ -36,7 +36,7 @@
 
 namespace test {
 
-void decode(const rtl::OUString& rIn, const rtl::OUString &rOut)
+void decode(const OUString& rIn, const OUString &rOut)
 {
     rtlCipher cipher = rtl_cipher_create(rtl_Cipher_AlgorithmARCFOUR, rtl_Cipher_ModeStream);
     CPPUNIT_ASSERT_MESSAGE("cipher creation failed", cipher != 0);
@@ -71,8 +71,8 @@ void decode(const rtl::OUString& rIn, const rtl::OUString &rOut)
 }
 
 void FiltersTest::recursiveScan(filterStatus nExpected,
-    const rtl::OUString &rFilter, const rtl::OUString &rURL,
-    const rtl::OUString &rUserData, unsigned int nFilterFlags,
+    const OUString &rFilter, const OUString &rURL,
+    const OUString &rUserData, unsigned int nFilterFlags,
     unsigned int nClipboardID, unsigned int nFilterVersion)
 {
     osl::Directory aDir(rURL);
@@ -83,7 +83,7 @@ void FiltersTest::recursiveScan(filterStatus nExpected,
     while (aDir.getNextItem(aItem) == osl::FileBase::E_None)
     {
         aItem.getFileStatus(aFileStatus);
-        rtl::OUString sURL = aFileStatus.getFileURL();
+        OUString sURL = aFileStatus.getFileURL();
         if (aFileStatus.getFileType() == osl::FileStatus::Directory)
         {
             recursiveScan(nExpected, rFilter, sURL, rUserData,
@@ -91,7 +91,7 @@ void FiltersTest::recursiveScan(filterStatus nExpected,
         }
         else
         {
-            rtl::OUString sTmpFile;
+            OUString sTmpFile;
             bool bEncrypted = false;
 
             sal_Int32 nLastSlash = sURL.lastIndexOf('/');
@@ -112,7 +112,7 @@ void FiltersTest::recursiveScan(filterStatus nExpected,
                 }
             }
 
-            rtl::OString aRes(rtl::OUStringToOString(sURL,
+            OString aRes(OUStringToOString(sURL,
                 osl_getThreadTextEncoding()));
 
             if (bEncrypted)
@@ -143,20 +143,20 @@ void FiltersTest::recursiveScan(filterStatus nExpected,
     CPPUNIT_ASSERT(osl::FileBase::E_None == aDir.close());
 }
 
-void FiltersTest::testDir(const rtl::OUString &rFilter,
-    const rtl::OUString &rURL, const rtl::OUString &rUserData,
+void FiltersTest::testDir(const OUString &rFilter,
+    const OUString &rURL, const OUString &rUserData,
     unsigned int nFilterFlags, unsigned int nClipboardID,
     unsigned int nFilterVersion)
 {
     fprintf(stderr, "File tested,Test Result,Execution Time (ms)\n");
     recursiveScan(test::pass, rFilter,
-        rURL + rtl::OUString("pass"),
+        rURL + OUString("pass"),
         rUserData, nFilterFlags, nClipboardID, nFilterVersion);
     recursiveScan(test::fail, rFilter,
-        rURL + rtl::OUString("fail"),
+        rURL + OUString("fail"),
         rUserData, nFilterFlags, nClipboardID, nFilterVersion);
     recursiveScan(test::indeterminate, rFilter,
-        rURL + rtl::OUString("indeterminate"),
+        rURL + OUString("indeterminate"),
         rUserData, nFilterFlags, nClipboardID, nFilterVersion);
 }
 
diff --git a/unotest/source/cpp/getargument.cxx b/unotest/source/cpp/getargument.cxx
index 83a4a02d2856..00206497f432 100644
--- a/unotest/source/cpp/getargument.cxx
+++ b/unotest/source/cpp/getargument.cxx
@@ -30,10 +30,10 @@ namespace test {
 
 namespace detail {
 
-bool getArgument(rtl::OUString const & name, rtl::OUString * value) {
+bool getArgument(OUString const & name, OUString * value) {
     OSL_ASSERT(value != 0);
     return rtl::Bootstrap::get(
-        rtl::OUString("arg-") + name, *value);
+        OUString("arg-") + name, *value);
 }
 
 }
diff --git a/unotest/source/cpp/getargument.hxx b/unotest/source/cpp/getargument.hxx
index 74fb44824dd1..3686cdef9602 100644
--- a/unotest/source/cpp/getargument.hxx
+++ b/unotest/source/cpp/getargument.hxx
@@ -29,7 +29,7 @@ namespace detail {
 // Obtain the value of an argument tunneled in via an "arg-<name>" bootstrap
 // variable:
 bool getArgument(
-    rtl::OUString const & name, rtl::OUString * value);
+    OUString const & name, OUString * value);
 
 }
 
diff --git a/unotest/source/cpp/gettestargument.cxx b/unotest/source/cpp/gettestargument.cxx
index ed27b44ae5b0..86ca32b254aa 100644
--- a/unotest/source/cpp/gettestargument.cxx
+++ b/unotest/source/cpp/gettestargument.cxx
@@ -27,9 +27,9 @@
 
 namespace test {
 
-bool getTestArgument(rtl::OUString const & name, rtl::OUString * value) {
+bool getTestArgument(OUString const & name, OUString * value) {
     return detail::getArgument(
-        rtl::OUString("testarg.") + name, value);
+        OUString("testarg.") + name, value);
 }
 
 }
diff --git a/unotest/source/cpp/macros_test.cxx b/unotest/source/cpp/macros_test.cxx
index b33492fdd694..9ba5fb00ac1f 100644
--- a/unotest/source/cpp/macros_test.cxx
+++ b/unotest/source/cpp/macros_test.cxx
@@ -57,9 +57,9 @@ uno::Reference< com::sun::star::lang::XComponent > MacrosTest::loadFromDesktop(c
         args[1].State = com::sun::star::beans::PropertyState_DIRECT_VALUE;
     }
 
-    uno::Reference< com::sun::star::lang::XComponent> xComponent= xLoader->loadComponentFromURL(rURL, rtl::OUString("_default"), 0, args);
-    rtl::OUString sMessage = rtl::OUString( "loading failed: " ) + rURL;
-    CPPUNIT_ASSERT_MESSAGE(rtl::OUStringToOString( sMessage, RTL_TEXTENCODING_UTF8 ).getStr( ), xComponent.is());
+    uno::Reference< com::sun::star::lang::XComponent> xComponent= xLoader->loadComponentFromURL(rURL, OUString("_default"), 0, args);
+    OUString sMessage = OUString( "loading failed: " ) + rURL;
+    CPPUNIT_ASSERT_MESSAGE(OUStringToOString( sMessage, RTL_TEXTENCODING_UTF8 ).getStr( ), xComponent.is());
     return xComponent;
 }
 
diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx
index e4b71eab2534..ea5a91036572 100644
--- a/unotest/source/cpp/officeconnection.cxx
+++ b/unotest/source/cpp/officeconnection.cxx
@@ -46,38 +46,38 @@ void OfficeConnection::setUp() {
     css::uno::Reference< css::bridge::XUnoUrlResolver > resolver(
         css::bridge::UnoUrlResolver::create(
             cppu::defaultBootstrap_InitialComponentContext()));
-    rtl::OUString desc;
-    rtl::OUString argSoffice;
+    OUString desc;
+    OUString argSoffice;
     CPPUNIT_ASSERT(
         detail::getArgument(
-            rtl::OUString("soffice"),
+            OUString("soffice"),
             &argSoffice));
     if (argSoffice.match("path:")) {
-        desc = "pipe,name=" + uniquePipeName(rtl::OUString("oootest"));
-        rtl::OUString noquickArg("--quickstart=no");
-        rtl::OUString nofirstArg("--nofirststartwizard");
-        rtl::OUString norestoreArg("--norestore");
-        rtl::OUString nologoArg("--nologo");
+        desc = "pipe,name=" + uniquePipeName(OUString("oootest"));
+        OUString noquickArg("--quickstart=no");
+        OUString nofirstArg("--nofirststartwizard");
+        OUString norestoreArg("--norestore");
+        OUString nologoArg("--nologo");
             // disable use of the unix standalone splash screen app for the
             // tests (probably not needed in combination with --headless?)
-        rtl::OUString headlessArg("--headless");
-        rtl::OUString acceptArg("--accept=" + desc + ";urp");
-        rtl::OUString argUser;
+        OUString headlessArg("--headless");
+        OUString acceptArg("--accept=" + desc + ";urp");
+        OUString argUser;
         CPPUNIT_ASSERT(
-            detail::getArgument(rtl::OUString("user"), &argUser));
-        rtl::OUString userArg(
-            rtl::OUString("-env:UserInstallation=") +
+            detail::getArgument(OUString("user"), &argUser));
+        OUString userArg(
+            OUString("-env:UserInstallation=") +
             toAbsoluteFileUrl(argUser));
-        rtl::OUString jreArg(
+        OUString jreArg(
             "-env:UNO_JAVA_JFW_ENV_JREHOME=true");
-        rtl::OUString classpathArg("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true");
+        OUString classpathArg("-env:UNO_JAVA_JFW_ENV_CLASSPATH=true");
         rtl_uString * args[] = {
             noquickArg.pData, nofirstArg.pData, norestoreArg.pData,
             nologoArg.pData, headlessArg.pData, acceptArg.pData, userArg.pData,
             jreArg.pData, classpathArg.pData };
         rtl_uString ** envs = 0;
-        rtl::OUString argEnv;
-        if (detail::getArgument(rtl::OUString("env"), &argEnv))
+        OUString argEnv;
+        if (detail::getArgument(OUString("env"), &argEnv))
         {
             envs = &argEnv.pData;
         }
@@ -100,9 +100,9 @@ void OfficeConnection::setUp() {
             context_ =
                 css::uno::Reference< css::uno::XComponentContext >(
                     resolver->resolve(
-                        rtl::OUString("uno:") +
+                        OUString("uno:") +
                         desc +
-                        rtl::OUString(";urp;StarOffice.ComponentContext")),
+                        OUString(";urp;StarOffice.ComponentContext")),
                     css::uno::UNO_QUERY_THROW);
             break;
         } catch (css::connection::NoConnectException &) {}
diff --git a/unotest/source/cpp/toabsolutefileurl.cxx b/unotest/source/cpp/toabsolutefileurl.cxx
index 67c415e93a09..6193c9814f70 100644
--- a/unotest/source/cpp/toabsolutefileurl.cxx
+++ b/unotest/source/cpp/toabsolutefileurl.cxx
@@ -29,33 +29,33 @@
 
 namespace test {
 
-rtl::OUString toAbsoluteFileUrl(rtl::OUString const & relativePathname) {
-    rtl::OUString cwd;
+OUString toAbsoluteFileUrl(OUString const & relativePathname) {
+    OUString cwd;
     oslProcessError e1 = osl_getProcessWorkingDir(&cwd.pData);
     if (e1 != osl_Process_E_None) {
         throw css::uno::RuntimeException(
-            (rtl::OUString("osl_getProcessWorkingDir failed with ") +
+            (OUString("osl_getProcessWorkingDir failed with ") +
              OUString::number(e1)),
             css::uno::Reference< css::uno::XInterface >());
     }
-    rtl::OUString url;
+    OUString url;
     osl::FileBase::RC e2 = osl::FileBase::getFileURLFromSystemPath(
         relativePathname, url);
     if (e2 != osl::FileBase::E_None) {
         throw css::uno::RuntimeException(
-            (rtl::OUString("osl::FileBase::getFileURLFromSystemPath(") +
+            (OUString("osl::FileBase::getFileURLFromSystemPath(") +
              relativePathname +
-             rtl::OUString(") failed with ") +
+             OUString(") failed with ") +
              OUString::number(e2)),
             css::uno::Reference< css::uno::XInterface >());
     }
-    rtl::OUString absUrl;
+    OUString absUrl;
     e2 = osl::FileBase::getAbsoluteFileURL(cwd, url, absUrl);
     if (e2 != osl::FileBase::E_None) {
         throw css::uno::RuntimeException(
-            (rtl::OUString("osl::FileBase::getAbsoluteFileURL(") +
-             cwd + rtl::OUString(", ") + url +
-             rtl::OUString(") failed with ") +
+            (OUString("osl::FileBase::getAbsoluteFileURL(") +
+             cwd + OUString(", ") + url +
+             OUString(") failed with ") +
              OUString::number(e2)),
             css::uno::Reference< css::uno::XInterface >());
     }
diff --git a/unotest/source/cpp/uniquepipename.cxx b/unotest/source/cpp/uniquepipename.cxx
index 667bc33ac1da..e75138076ff9 100644
--- a/unotest/source/cpp/uniquepipename.cxx
+++ b/unotest/source/cpp/uniquepipename.cxx
@@ -26,7 +26,7 @@
 
 namespace test {
 
-rtl::OUString uniquePipeName(rtl::OUString const & name) {
+OUString uniquePipeName(OUString const & name) {
     oslProcessInfo info;
     info.Size = sizeof info;
     CPPUNIT_ASSERT_EQUAL(
diff --git a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
index 3265f8801e1e..f05e59d3839d 100644
--- a/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
+++ b/unotest/source/cpp/unoexceptionprotector/unoexceptionprotector.cxx
@@ -37,8 +37,8 @@
 namespace {
 
 // Best effort conversion:
-std::string convert(rtl::OUString const & s16) {
-    rtl::OString s8(rtl::OUStringToOString(s16, osl_getThreadTextEncoding()));
+std::string convert(OUString const & s16) {
+    OString s8(OUStringToOString(s16, osl_getThreadTextEncoding()));
     BOOST_STATIC_ASSERT(sizeof (sal_Int32) <= sizeof (std::string::size_type));
         // ensure following cast is legitimate
     return std::string(
@@ -68,7 +68,7 @@ bool Prot::protect(
             context,
             CppUnit::Message(
                 convert(
-                    rtl::OUString("An uncaught exception of type ")
+                    OUString("An uncaught exception of type ")
                     + a.getValueTypeName()),
                 convert(e.Message)));
     }