remove more rtl::OUString and OString prefixes

which seem to have snuck back in since the great rounds of removals.

Change-Id: I85f7f5f4801c0b48dae8b50f51f83595b286d6a1
Reviewed-on: https://gerrit.libreoffice.org/62229
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

10 files changed, 68 insertions, 77 deletions

diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx b/writerperfect/qa/unit/DrawingImportTest.cxx
index 5e71bf3e9b4f..4e1300d496c3 100644
--- a/writerperfect/qa/unit/DrawingImportTest.cxx
+++ b/writerperfect/qa/unit/DrawingImportTest.cxx
@@ -38,13 +38,12 @@ public:
     }
 
     // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() override;
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
-    virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
-    virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
-                                rtl::OUString& rTypeName) override;
+    virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
     virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
                                   OdgGenerator& rGenerator,
                                   utl::MediaDescriptor& rDescriptor) override;
@@ -59,24 +58,24 @@ bool DrawingImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputS
     return true;
 }
 
-bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName)
+bool DrawingImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
 {
     rTypeName = "WpftDummyDrawing";
     return true;
 }
 
 // XServiceInfo
-rtl::OUString SAL_CALL DrawingImportFilter::getImplementationName()
+OUString SAL_CALL DrawingImportFilter::getImplementationName()
 {
     return OUString("org.libreoffice.comp.Wpft.QA.DrawingImportFilter");
 }
 
-sal_Bool SAL_CALL DrawingImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL DrawingImportFilter::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL DrawingImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL DrawingImportFilter::getSupportedServiceNames()
 {
     return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
 }
@@ -146,10 +145,9 @@ void DrawingImportTest::test()
     uno::Reference<drawing::XShapeDescriptor> xShapeDesc;
     CPPUNIT_ASSERT(aShape >>= xShapeDesc);
     CPPUNIT_ASSERT(xShapeDesc.is());
-    CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"),
-                         xShapeDesc->getShapeType());
+    CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"), xShapeDesc->getShapeType());
     uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString());
+    CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xText->getString());
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(DrawingImportTest);
diff --git a/writerperfect/qa/unit/ImportTest.cxx b/writerperfect/qa/unit/ImportTest.cxx
index 3168ac6aade3..3a7b9c2293f0 100644
--- a/writerperfect/qa/unit/ImportTest.cxx
+++ b/writerperfect/qa/unit/ImportTest.cxx
@@ -47,11 +47,11 @@ public:
     CPPUNIT_TEST_SUITE_END();
 
 private:
-    WpftLoader createCalcLoader(const rtl::OUString& rFile) const;
+    WpftLoader createCalcLoader(const OUString& rFile) const;
 
-    WpftLoader createLoader(const rtl::OUString& rUrl, const rtl::OUString& rFactoryUrl) const;
+    WpftLoader createLoader(const OUString& rUrl, const OUString& rFactoryUrl) const;
 
-    rtl::OUString makeUrl(const rtl::OUString& rFile) const;
+    OUString makeUrl(const OUString& rFile) const;
 
 private:
     uno::Reference<lang::XMultiServiceFactory> m_xFilterFactory;
@@ -83,13 +83,12 @@ void ImportTest::testWK3WithFM3()
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0x0000ff), nCharColor); // blue text
 }
 
-WpftLoader ImportTest::createCalcLoader(const rtl::OUString& rFile) const
+WpftLoader ImportTest::createCalcLoader(const OUString& rFile) const
 {
     return createLoader(makeUrl(rFile), "private:factory/scalc");
 }
 
-WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
-                                    const rtl::OUString& rFactoryUrl) const
+WpftLoader ImportTest::createLoader(const OUString& rUrl, const OUString& rFactoryUrl) const
 {
     utl::MediaDescriptor aDesc;
     aDesc[utl::MediaDescriptor::PROP_URL()] <<= rUrl;
@@ -97,7 +96,7 @@ WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
     uno::Sequence<beans::PropertyValue> lDesc(aDesc.getAsConstPropertyValueList());
     m_xTypeDetection->queryTypeByDescriptor(lDesc, true);
     aDesc = lDesc;
-    rtl::OUString sFilter;
+    OUString sFilter;
     aDesc[utl::MediaDescriptor::PROP_FILTERNAME()] >>= sFilter;
     CPPUNIT_ASSERT(!sFilter.isEmpty());
     const uno::Reference<document::XFilter> xFilter(m_xFilterFactory->createInstance(sFilter),
@@ -106,7 +105,7 @@ WpftLoader ImportTest::createLoader(const rtl::OUString& rUrl,
     return WpftLoader(rUrl, xFilter, rFactoryUrl, m_xDesktop, m_xTypeMap, m_xContext);
 }
 
-rtl::OUString ImportTest::makeUrl(const rtl::OUString& rFile) const
+OUString ImportTest::makeUrl(const OUString& rFile) const
 {
     return const_cast<ImportTest*>(this)->m_directories.getURLFromSrc("/" TEST_DIR "/" + rFile);
 }
diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx b/writerperfect/qa/unit/PresentationImportTest.cxx
index 8fc5a65d3141..4b2a65296545 100644
--- a/writerperfect/qa/unit/PresentationImportTest.cxx
+++ b/writerperfect/qa/unit/PresentationImportTest.cxx
@@ -38,13 +38,12 @@ public:
     }
 
     // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() override;
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
-    virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
-    virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
-                                rtl::OUString& rTypeName) override;
+    virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
     virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
                                   OdpGenerator& rGenerator,
                                   utl::MediaDescriptor& rDescriptor) override;
@@ -59,25 +58,24 @@ bool PresentationImportFilter::doImportDocument(weld::Window*, librevenge::RVNGI
     return true;
 }
 
-bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream&,
-                                              rtl::OUString& rTypeName)
+bool PresentationImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
 {
     rTypeName = "WpftDummyPresentation";
     return true;
 }
 
 // XServiceInfo
-rtl::OUString SAL_CALL PresentationImportFilter::getImplementationName()
+OUString SAL_CALL PresentationImportFilter::getImplementationName()
 {
     return OUString("org.libreoffice.comp.Wpft.QA.PresentationImportFilter");
 }
 
-sal_Bool SAL_CALL PresentationImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL PresentationImportFilter::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL PresentationImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL PresentationImportFilter::getSupportedServiceNames()
 {
     return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
 }
@@ -147,10 +145,9 @@ void PresentationImportTest::test()
     uno::Reference<drawing::XShapeDescriptor> xShapeDesc;
     CPPUNIT_ASSERT(aShape >>= xShapeDesc);
     CPPUNIT_ASSERT(xShapeDesc.is());
-    CPPUNIT_ASSERT_EQUAL(rtl::OUString("com.sun.star.drawing.TextShape"),
-                         xShapeDesc->getShapeType());
+    CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"), xShapeDesc->getShapeType());
     uno::Reference<text::XText> xText(xShapeDesc, uno::UNO_QUERY);
-    CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xText->getString());
+    CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xText->getString());
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(PresentationImportTest);
diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
index 66b1623b39f4..e5ad7a3fcc1e 100644
--- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx
+++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx
@@ -37,13 +37,12 @@ public:
     }
 
     // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() override;
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
-    virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
-    virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
-                                rtl::OUString& rTypeName) override;
+    virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
     virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
                                   OdsGenerator& rGenerator,
                                   utl::MediaDescriptor& rDescriptor) override;
@@ -58,24 +57,24 @@ bool SpreadsheetImportFilter::doImportDocument(weld::Window*, librevenge::RVNGIn
     return true;
 }
 
-bool SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName)
+bool SpreadsheetImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
 {
     rTypeName = "WpftDummySpreadsheet";
     return true;
 }
 
 // XServiceInfo
-rtl::OUString SAL_CALL SpreadsheetImportFilter::getImplementationName()
+OUString SAL_CALL SpreadsheetImportFilter::getImplementationName()
 {
     return OUString("org.libreoffice.comp.Wpft.QA.SpreadsheetImportFilter");
 }
 
-sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL SpreadsheetImportFilter::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SpreadsheetImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL SpreadsheetImportFilter::getSupportedServiceNames()
 {
     return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
 }
@@ -131,7 +130,7 @@ void SpreadsheetImportTest::test()
     uno::Reference<table::XCell> xCell = xSheet->getCellByPosition(0, 0);
     CPPUNIT_ASSERT(xCell.is());
     CPPUNIT_ASSERT_EQUAL(table::CellContentType_TEXT, xCell->getType());
-    CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xCell->getFormula());
+    CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xCell->getFormula());
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(SpreadsheetImportTest);
diff --git a/writerperfect/qa/unit/TextImportTest.cxx b/writerperfect/qa/unit/TextImportTest.cxx
index de085a2f33b0..b9a3953fc8d2 100644
--- a/writerperfect/qa/unit/TextImportTest.cxx
+++ b/writerperfect/qa/unit/TextImportTest.cxx
@@ -36,13 +36,12 @@ public:
     }
 
     // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName() override;
-    virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) override;
-    virtual uno::Sequence<rtl::OUString> SAL_CALL getSupportedServiceNames() override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override;
+    virtual uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
 
 private:
-    virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput,
-                                rtl::OUString& rTypeName) override;
+    virtual bool doDetectFormat(librevenge::RVNGInputStream& rInput, OUString& rTypeName) override;
     virtual bool doImportDocument(weld::Window* pWindow, librevenge::RVNGInputStream& rInput,
                                   OdtGenerator& rGenerator,
                                   utl::MediaDescriptor& rDescriptor) override;
@@ -57,24 +56,24 @@ bool TextImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStre
     return true;
 }
 
-bool TextImportFilter::doDetectFormat(librevenge::RVNGInputStream&, rtl::OUString& rTypeName)
+bool TextImportFilter::doDetectFormat(librevenge::RVNGInputStream&, OUString& rTypeName)
 {
     rTypeName = "WpftDummyText";
     return true;
 }
 
 // XServiceInfo
-rtl::OUString SAL_CALL TextImportFilter::getImplementationName()
+OUString SAL_CALL TextImportFilter::getImplementationName()
 {
     return OUString("org.libreoffice.comp.Wpft.QA.TextImportFilter");
 }
 
-sal_Bool SAL_CALL TextImportFilter::supportsService(const rtl::OUString& rServiceName)
+sal_Bool SAL_CALL TextImportFilter::supportsService(const OUString& rServiceName)
 {
     return cppu::supportsService(this, rServiceName);
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL TextImportFilter::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL TextImportFilter::getSupportedServiceNames()
 {
     return { "com.sun.star.document.ImportFilter", "com.sun.star.document.ExtendedTypeDetection" };
 }
@@ -130,12 +129,12 @@ void TextImportTest::test()
     CPPUNIT_ASSERT(xPortions->hasMoreElements());
     uno::Reference<beans::XPropertySet> xPortionProps(xPortions->nextElement(), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xPortionProps.is());
-    rtl::OUString aPortionType;
+    OUString aPortionType;
     CPPUNIT_ASSERT(xPortionProps->getPropertyValue("TextPortionType") >>= aPortionType);
-    CPPUNIT_ASSERT_EQUAL(rtl::OUString("Text"), aPortionType);
+    CPPUNIT_ASSERT_EQUAL(OUString("Text"), aPortionType);
     uno::Reference<text::XTextRange> xPortion(xPortionProps, uno::UNO_QUERY);
     CPPUNIT_ASSERT(xPortion.is());
-    CPPUNIT_ASSERT_EQUAL(rtl::OUString("My hovercraft is full of eels."), xPortion->getString());
+    CPPUNIT_ASSERT_EQUAL(OUString("My hovercraft is full of eels."), xPortion->getString());
     CPPUNIT_ASSERT(!xPortions->hasMoreElements());
     CPPUNIT_ASSERT(!xParas->hasMoreElements());
 }
diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx
index 773458179145..d7c42ee7d3b0 100644
--- a/writerperfect/qa/unit/WPXSvStreamTest.cxx
+++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx
@@ -83,7 +83,7 @@ shared_ptr<RVNGInputStream> lcl_createStream()
     return pInputStream;
 }
 
-const shared_ptr<RVNGInputStream> lcl_createStreamForURL(const rtl::OUString& rURL)
+const shared_ptr<RVNGInputStream> lcl_createStreamForURL(const OUString& rURL)
 {
     using uno::Reference;
     using uno::UNO_QUERY_THROW;
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.cxx b/writerperfect/qa/unit/WpftFilterTestBase.cxx
index 301d9a1348ab..ea6ad5a89612 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.cxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.cxx
@@ -21,7 +21,7 @@ namespace writerperfect
 {
 namespace test
 {
-WpftFilterTestBase::WpftFilterTestBase(const rtl::OUString& rFactoryURL)
+WpftFilterTestBase::WpftFilterTestBase(const OUString& rFactoryURL)
     : ::test::FiltersTest()
     , WpftFilterFixture()
     , m_aFactoryURL(rFactoryURL)
@@ -45,13 +45,13 @@ bool WpftFilterTestBase::load(const OUString&, const OUString& rURL, const OUStr
     return aLoader.getDocument().is();
 }
 
-void WpftFilterTestBase::doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath)
+void WpftFilterTestBase::doTest(const OUString& rFilter, const OUString& rPath)
 {
     m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW);
     testDir(OUString(), m_directories.getURLFromSrc(rPath));
 }
 
-void WpftFilterTestBase::doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath,
+void WpftFilterTestBase::doTest(const OUString& rFilter, const OUString& rPath,
                                 const WpftOptionalMap_t& rOptionalMap)
 {
     m_xFilter.set(m_xFactory->createInstanceWithContext(rFilter, m_xContext), uno::UNO_QUERY_THROW);
diff --git a/writerperfect/qa/unit/WpftFilterTestBase.hxx b/writerperfect/qa/unit/WpftFilterTestBase.hxx
index 481d169d1663..509ebcb6d9f1 100644
--- a/writerperfect/qa/unit/WpftFilterTestBase.hxx
+++ b/writerperfect/qa/unit/WpftFilterTestBase.hxx
@@ -40,17 +40,17 @@ namespace writerperfect
 {
 namespace test
 {
-typedef std::unordered_map<rtl::OUString, bool> WpftOptionalMap_t;
+typedef std::unordered_map<OUString, bool> WpftOptionalMap_t;
 
 class WPFTQAHELPER_DLLPUBLIC WpftFilterTestBase : public ::test::FiltersTest,
                                                   public WpftFilterFixture
 {
 public:
-    explicit WpftFilterTestBase(const rtl::OUString& rFactoryURL);
+    explicit WpftFilterTestBase(const OUString& rFactoryURL);
 
 protected:
-    void doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath);
-    void doTest(const rtl::OUString& rFilter, const rtl::OUString& rPath,
+    void doTest(const OUString& rFilter, const OUString& rPath);
+    void doTest(const OUString& rFilter, const OUString& rPath,
                 const WpftOptionalMap_t& rOptionalMap);
 
 private:
@@ -58,7 +58,7 @@ private:
                       SotClipboardFormatId, unsigned int) override;
 
 private:
-    const rtl::OUString m_aFactoryURL;
+    const OUString m_aFactoryURL;
     css::uno::Reference<css::document::XFilter> m_xFilter;
     const WpftOptionalMap_t* m_pOptionalMap;
 };
diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx
index b89353d5c568..bae64e0aa651 100644
--- a/writerperfect/qa/unit/WpftLoader.cxx
+++ b/writerperfect/qa/unit/WpftLoader.cxx
@@ -42,9 +42,9 @@ namespace writerperfect
 {
 namespace test
 {
-WpftLoader::WpftLoader(const rtl::OUString& rURL,
+WpftLoader::WpftLoader(const OUString& rURL,
                        const css::uno::Reference<css::document::XFilter>& rxFilter,
-                       const rtl::OUString& rFactoryURL,
+                       const OUString& rFactoryURL,
                        const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
                        const css::uno::Reference<css::container::XNameAccess>& rxTypeMap,
                        const css::uno::Reference<css::uno::XComponentContext>& rxContext)
@@ -61,7 +61,7 @@ WpftLoader::WpftLoader(const rtl::OUString& rURL,
 
 WpftLoader::WpftLoader(const css::uno::Reference<css::io::XInputStream>& rxInputStream,
                        const css::uno::Reference<css::document::XFilter>& rxFilter,
-                       const rtl::OUString& rFactoryURL,
+                       const OUString& rFactoryURL,
                        const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
                        const css::uno::Reference<css::uno::XComponentContext>& rxContext)
     : m_xInputStream(rxInputStream)
@@ -146,7 +146,7 @@ bool WpftLoader::impl_load()
         const uno::Reference<document::XExtendedFilterDetection> xDetector(m_xFilter,
                                                                            uno::UNO_QUERY_THROW);
 
-        const rtl::OUString aTypeName(xDetector->detect(aDescriptor));
+        const OUString aTypeName(xDetector->detect(aDescriptor));
         if (aTypeName.isEmpty())
             throw lang::IllegalArgumentException();
 
@@ -179,7 +179,7 @@ void WpftLoader::impl_dispose()
 }
 
 void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDescriptor,
-                                       const rtl::OUString& rTypeName)
+                                       const OUString& rTypeName)
 {
     const sal_Int32 nDescriptorLen = rDescriptor.getLength();
 
@@ -194,7 +194,7 @@ void WpftLoader::impl_detectFilterName(uno::Sequence<beans::PropertyValue>& rDes
     {
         for (sal_Int32 n = 0; aTypes.getLength() != n; ++n)
         {
-            rtl::OUString aFilterName;
+            OUString aFilterName;
             if (("PreferredFilter" == aTypes[n].Name) && (aTypes[n].Value >>= aFilterName))
             {
                 rDescriptor.realloc(nDescriptorLen + 1);
diff --git a/writerperfect/qa/unit/WpftLoader.hxx b/writerperfect/qa/unit/WpftLoader.hxx
index d76fb76ea52f..ccd8f9294175 100644
--- a/writerperfect/qa/unit/WpftLoader.hxx
+++ b/writerperfect/qa/unit/WpftLoader.hxx
@@ -63,15 +63,14 @@ namespace test
 class WPFTQAHELPER_DLLPUBLIC WpftLoader
 {
 public:
-    WpftLoader(const rtl::OUString& rURL,
-               const css::uno::Reference<css::document::XFilter>& rxFilter,
-               const rtl::OUString& rFactoryURL,
+    WpftLoader(const OUString& rURL, const css::uno::Reference<css::document::XFilter>& rxFilter,
+               const OUString& rFactoryURL,
                const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
                const css::uno::Reference<css::container::XNameAccess>& rxTypeMap,
                const css::uno::Reference<css::uno::XComponentContext>& rxContext);
     WpftLoader(const css::uno::Reference<css::io::XInputStream>& rxInputStream,
                const css::uno::Reference<css::document::XFilter>& rxFilter,
-               const rtl::OUString& rFactoryURL,
+               const OUString& rFactoryURL,
                const css::uno::Reference<css::frame::XDesktop2>& rxDesktop,
                const css::uno::Reference<css::uno::XComponentContext>& rxContext);
     ~WpftLoader();
@@ -83,12 +82,12 @@ private:
     void impl_dispose();
 
     void impl_detectFilterName(css::uno::Sequence<css::beans::PropertyValue>& rDescriptor,
-                               const rtl::OUString& rTypeName);
+                               const OUString& rTypeName);
 
 private:
-    const rtl::OUString m_aURL;
+    const OUString m_aURL;
     const css::uno::Reference<css::io::XInputStream> m_xInputStream;
-    const rtl::OUString m_aFactoryURL;
+    const OUString m_aFactoryURL;
     const css::uno::Reference<css::document::XFilter> m_xFilter;
     const css::uno::Reference<css::frame::XDesktop2> m_xDesktop;
     const css::uno::Reference<css::container::XNameAccess> m_xTypeMap;