writerfilter: rtl::OUString -> OUString

Change-Id: I1577c1bb8a3dc498b647b930d405c90f80eafaf9

12 files changed, 129 insertions, 129 deletions

diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
index 97e0187f555e..0cab73f1d3b8 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx
@@ -60,9 +60,9 @@ const sal_Char AnalyzeService::IMPLEMENTATION_NAME[40] = "debugservices.doctok.A
 class URLLister
 {
     uno::Reference<io::XInputStream> xInputStream;
-    rtl::OUString mString;
-    rtl::OUString mCRLF;
-    rtl::OUString mLF;
+    OUString mString;
+    OUString mCRLF;
+    OUString mLF;
 
     sal_uInt32 getEOLIndex()
     {
@@ -78,18 +78,18 @@ class URLLister
 
 public:
     URLLister(uno::Reference<com::sun::star::uno::XComponentContext> xContext,
-              rtl::OUString absFileUrl)
+              OUString absFileUrl)
     {
         uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
         xInputStream = xFileAccess->openFileRead(absFileUrl) ;
 
-        mLF = rtl::OUString("\n");
-        mCRLF = rtl::OUString("\r\n");
+        mLF = OUString("\n");
+        mCRLF = OUString("\r\n");
     }
 
-    rtl::OUString getURL()
+    OUString getURL()
     {
-        rtl::OUString aResult;
+        OUString aResult;
 
         sal_Int32 nIndex = getEOLIndex();
 
@@ -106,7 +106,7 @@ public:
                      nCount);
 
                 rtl::OString aTmp(pNew);
-                rtl::OUString aTail(rtl::OStringToOUString
+                OUString aTail(rtl::OStringToOUString
                                     (aTmp, RTL_TEXTENCODING_ASCII_US));
                 mString = mString.concat(aTail);
             }
@@ -137,13 +137,13 @@ xContext( xContext_ )
 }
 
 sal_Int32 SAL_CALL AnalyzeService::run
-( const uno::Sequence< rtl::OUString >& aArguments )
+( const uno::Sequence< OUString >& aArguments )
     throw (uno::RuntimeException)
 {
     uno::Sequence<uno::Any> aUcbInitSequence(2);
-    aUcbInitSequence[0] <<= rtl::OUString("Local");
+    aUcbInitSequence[0] <<= OUString("Local");
     aUcbInitSequence[1] <<=
-        rtl::OUString("Office");
+        OUString("Office");
     uno::Reference<lang::XMultiServiceFactory>
         xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
     uno::Reference<lang::XMultiComponentFactory>
@@ -151,19 +151,19 @@ sal_Int32 SAL_CALL AnalyzeService::run
 
     if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence))
     {
-        rtl::OUString arg=aArguments[0];
+        OUString arg=aArguments[0];
 
         rtl_uString *dir=NULL;
         osl_getProcessWorkingDir(&dir);
 
-        rtl::OUString absFileUrlUrls;
+        OUString absFileUrlUrls;
         osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData);
 
         URLLister aLister(xContext, absFileUrlUrls);
 
         fprintf(stdout, "<analyze>\n");
 
-        rtl::OUString aURL = aLister.getURL();
+        OUString aURL = aLister.getURL();
 
         while (!aURL.isEmpty())
         {
@@ -248,20 +248,20 @@ sal_Int32 SAL_CALL AnalyzeService::run
     return 0;
 }
 
-::rtl::OUString AnalyzeService_getImplementationName ()
+OUString AnalyzeService_getImplementationName ()
 {
-    return rtl::OUString(AnalyzeService::IMPLEMENTATION_NAME );
+    return OUString(AnalyzeService::IMPLEMENTATION_NAME );
 }
 
-sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL AnalyzeService_supportsService( const OUString& ServiceName )
 {
     return ServiceName == AnalyzeService::SERVICE_NAME;
 }
-uno::Sequence< rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
 {
-    uno::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString(AnalyzeService::SERVICE_NAME );
+    uno::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString(AnalyzeService::SERVICE_NAME );
     return aRet;
 }
 
diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx
index 59ba4f0d8b03..03039913c570 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.hxx
@@ -34,7 +34,7 @@ private:
 public:
     AnalyzeService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext);
 
-    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
 
 public:
     const static sal_Char SERVICE_NAME[40];
@@ -42,9 +42,9 @@ public:
 
 };
 
-::rtl::OUString AnalyzeService_getImplementationName ();
-sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+OUString AnalyzeService_getImplementationName ();
+sal_Bool SAL_CALL AnalyzeService_supportsService( const OUString& ServiceName );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL AnalyzeService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception );
 
 } } /* end namespace writerfilter::rtftok */
diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
index 0190050df41f..a2ae1b72b386 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx
@@ -65,22 +65,22 @@ xContext( xContext_ )
 {
 }
 
-sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException)
+sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException)
 {
     uno::Sequence<uno::Any> aUcbInitSequence(2);
-    aUcbInitSequence[0] <<= rtl::OUString("Local");
-    aUcbInitSequence[1] <<= rtl::OUString("Office");
+    aUcbInitSequence[0] <<= OUString("Local");
+    aUcbInitSequence[1] <<= OUString("Office");
     uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
     uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW );
     if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence))
     {
-            rtl::OUString arg=aArguments[0];
+            OUString arg=aArguments[0];
 
             uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
 
             rtl_uString *dir=NULL;
             osl_getProcessWorkingDir(&dir);
-            rtl::OUString absFileUrl;
+            OUString absFileUrl;
             osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData);
             rtl_uString_release(dir);
 
@@ -101,16 +101,16 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
     return 0;
 }
 
-::rtl::OUString ScannerTestService_getImplementationName ()
+OUString ScannerTestService_getImplementationName ()
 {
-    return rtl::OUString(ScannerTestService::IMPLEMENTATION_NAME );
+    return OUString(ScannerTestService::IMPLEMENTATION_NAME );
 }
 
-uno::Sequence< rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
 {
-    uno::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString(ScannerTestService::SERVICE_NAME );
+    uno::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString(ScannerTestService::SERVICE_NAME );
     return aRet;
 }
 
diff --git a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx
index 150ee3ecb048..1310c6bfbf44 100644
--- a/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx
+++ b/writerfilter/unocomponent/debugservices/doctok/DocTokTestService.hxx
@@ -34,7 +34,7 @@ private:
 public:
     ScannerTestService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext);
 
-    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
 
 public:
     const static sal_Char SERVICE_NAME[40];
@@ -42,8 +42,8 @@ public:
 
 };
 
-::rtl::OUString ScannerTestService_getImplementationName ();
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+OUString ScannerTestService_getImplementationName ();
+::com::sun::star::uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ScannerTestService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception );
 
 } } /* end namespace writerfilter::rtftok */
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
index 46161e9324b8..8c538014888e 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx
@@ -61,9 +61,9 @@ const sal_Char AnalyzeService::IMPLEMENTATION_NAME[40] = "debugservices.ooxml.An
 class URLLister
 {
     uno::Reference<io::XInputStream> xInputStream;
-    rtl::OUString mString;
-    rtl::OUString mCRLF;
-    rtl::OUString mLF;
+    OUString mString;
+    OUString mCRLF;
+    OUString mLF;
 
     sal_uInt32 getEOLIndex()
     {
@@ -79,18 +79,18 @@ class URLLister
 
 public:
     URLLister(uno::Reference<com::sun::star::uno::XComponentContext> xContext,
-              rtl::OUString absFileUrl)
+              OUString absFileUrl)
     {
         uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
         xInputStream = xFileAccess->openFileRead(absFileUrl) ;
 
-        mLF = rtl::OUString("\n");
-        mCRLF = rtl::OUString("\r\n");
+        mLF = OUString("\n");
+        mCRLF = OUString("\r\n");
     }
 
-    rtl::OUString getURL()
+    OUString getURL()
     {
-        rtl::OUString aResult;
+        OUString aResult;
 
         sal_Int32 nIndex = getEOLIndex();
 
@@ -107,7 +107,7 @@ public:
                      nCount);
 
                 rtl::OString aTmp(pNew);
-                rtl::OUString aTail(rtl::OStringToOUString
+                OUString aTail(rtl::OStringToOUString
                                     (aTmp, RTL_TEXTENCODING_ASCII_US));
                 mString = mString.concat(aTail);
             }
@@ -138,12 +138,12 @@ xContext( xContext_ )
 }
 
 sal_Int32 SAL_CALL AnalyzeService::run
-( const uno::Sequence< rtl::OUString >& aArguments )
+( const uno::Sequence< OUString >& aArguments )
     throw (uno::RuntimeException)
 {
     uno::Sequence<uno::Any> aUcbInitSequence(2);
-    aUcbInitSequence[0] <<= rtl::OUString("Local");
-    aUcbInitSequence[1] <<= rtl::OUString("Office");
+    aUcbInitSequence[0] <<= OUString("Local");
+    aUcbInitSequence[1] <<= OUString("Office");
     uno::Reference<lang::XMultiServiceFactory>
         xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
     uno::Reference<lang::XMultiComponentFactory>
@@ -153,12 +153,12 @@ sal_Int32 SAL_CALL AnalyzeService::run
     {
         ::comphelper::setProcessServiceFactory(xServiceFactory);
 
-        rtl::OUString arg=aArguments[0];
+        OUString arg=aArguments[0];
 
         rtl_uString *dir=NULL;
         osl_getProcessWorkingDir(&dir);
 
-        rtl::OUString absFileUrlUrls;
+        OUString absFileUrlUrls;
         osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrlUrls.pData);
 
         URLLister aLister(xContext, absFileUrlUrls);
@@ -167,7 +167,7 @@ sal_Int32 SAL_CALL AnalyzeService::run
 
         writerfilter::analyzerIds();
 
-        rtl::OUString aURL = aLister.getURL();
+        OUString aURL = aLister.getURL();
 
         while (!aURL.isEmpty())
         {
@@ -245,20 +245,20 @@ sal_Int32 SAL_CALL AnalyzeService::run
     return 0;
 }
 
-::rtl::OUString AnalyzeService_getImplementationName ()
+OUString AnalyzeService_getImplementationName ()
 {
-    return rtl::OUString(AnalyzeService::IMPLEMENTATION_NAME );
+    return OUString(AnalyzeService::IMPLEMENTATION_NAME );
 }
 
-sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL AnalyzeService_supportsService( const OUString& ServiceName )
 {
     return ServiceName == AnalyzeService::SERVICE_NAME;
 }
-uno::Sequence< rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
 {
-    uno::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString(AnalyzeService::SERVICE_NAME );
+    uno::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString(AnalyzeService::SERVICE_NAME );
     return aRet;
 }
 
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx
index 2650be0000c9..36038dcbaf1a 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.hxx
@@ -34,7 +34,7 @@ private:
 public:
     AnalyzeService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext);
 
-    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
 
 public:
     const static sal_Char SERVICE_NAME[40];
@@ -42,9 +42,9 @@ public:
 
 };
 
-::rtl::OUString AnalyzeService_getImplementationName ();
-sal_Bool SAL_CALL AnalyzeService_supportsService( const ::rtl::OUString& ServiceName );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+OUString AnalyzeService_getImplementationName ();
+sal_Bool SAL_CALL AnalyzeService_supportsService( const OUString& ServiceName );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL AnalyzeService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL AnalyzeService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception );
 
 } } /* end namespace writerfilter::rtftok */
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
index 1a9c434b9855..92d0144aa518 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx
@@ -72,11 +72,11 @@ xContext( xContext_ )
 {
 }
 
-sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException)
+sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException)
 {
     uno::Sequence<uno::Any> aUcbInitSequence(2);
-    aUcbInitSequence[0] <<= rtl::OUString("Local");
-    aUcbInitSequence[1] <<= rtl::OUString("Office");
+    aUcbInitSequence[0] <<= OUString("Local");
+    aUcbInitSequence[1] <<= OUString("Office");
     uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
     uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW );
     if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence))
@@ -87,7 +87,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
         debugLogger->startDocument();
 #endif
 
-        rtl::OUString arg=aArguments[0];
+        OUString arg=aArguments[0];
 
         ::comphelper::setProcessServiceFactory(xServiceFactory);
 
@@ -95,7 +95,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
 
         rtl_uString *dir=NULL;
         osl_getProcessWorkingDir(&dir);
-        rtl::OUString absFileUrl;
+        OUString absFileUrl;
         osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData);
         rtl_uString_release(dir);
 
@@ -123,16 +123,16 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
     return 0;
 }
 
-::rtl::OUString ScannerTestService_getImplementationName ()
+OUString ScannerTestService_getImplementationName ()
 {
-    return rtl::OUString(ScannerTestService::IMPLEMENTATION_NAME );
+    return OUString(ScannerTestService::IMPLEMENTATION_NAME );
 }
 
-uno::Sequence< rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
 {
-    uno::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString(ScannerTestService::SERVICE_NAME );
+    uno::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString(ScannerTestService::SERVICE_NAME );
     return aRet;
 }
 
diff --git a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx
index 8283540790d2..a2de044e4730 100644
--- a/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx
+++ b/writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.hxx
@@ -34,7 +34,7 @@ private:
 public:
     ScannerTestService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext);
 
-    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
 
 public:
     const static sal_Char SERVICE_NAME[40];
@@ -42,8 +42,8 @@ public:
 
 };
 
-::rtl::OUString ScannerTestService_getImplementationName ();
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+OUString ScannerTestService_getImplementationName ();
+::com::sun::star::uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ScannerTestService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception );
 
 } } /* end namespace writerfilter::ooxml */
diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
index aa2d24ce3eaf..e085f3ea26f8 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
@@ -125,24 +125,24 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
             aArgs0[0] <<= myStream;
             uno::Reference< container::XNameContainer > xNameContainer(
             xServiceFactory->createInstanceWithArguments(
-                    ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"),
+                    OUString("com.sun.star.embed.OLESimpleStorage"),
                     aArgs0 ),
             uno::UNO_QUERY_THROW );
             try {
                 printf("TRY\n");
-        ::com::sun::star::uno::Sequence< ::rtl::OUString > names=xNameContainer->getElementNames();
+        ::com::sun::star::uno::Sequence< OUString > names=xNameContainer->getElementNames();
                 printf("OK\n");
 
             for(int i=0;i<names.getLength();i++)
             {
-                rtl::OUString &name=names[i];
+                OUString &name=names[i];
                 wprintf(L"name=%s\n", name.getStr());
             }
             {
                 uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement(
-                    rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
+                    OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
                 uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW);
-                xContentStreamPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.sun.star.oleobject")));
+                xContentStreamPropSet->setPropertyValue(OUString("MediaType"), uno::makeAny(OUString("application/vnd.sun.star.oleobject")));
                 uno::Reference<io::XOutputStream> myOutStream=xContentStream->getOutputStream();
                 uno::Sequence< ::sal_Int8 > seq1(binLen);
                 unsigned char *data1=binBufferStr;
@@ -165,23 +165,23 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
                 printf("SEQ OK\n");
 
                 uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement(
-                    rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
+                    OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
                 uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW);
-                xContentStreamPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.sun.star.oleobject")));
+                xContentStreamPropSet->setPropertyValue(OUString("MediaType"), uno::makeAny(OUString("application/vnd.sun.star.oleobject")));
                 printf("CONTENT STREAM OK\n");
 
                 uno::Sequence< uno::Any > aArgs1( 1 );
                 aArgs1[0] <<= xContentStream;
                 uno::Reference< container::XNameContainer > xNameContainer2(
                     xServiceFactory->createInstanceWithArguments(
-                    ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"),
+                    OUString("com.sun.star.embed.OLESimpleStorage"),
                     aArgs1 ),
                     uno::UNO_QUERY_THROW );
                 printf("OLE STORAGE OK\n");
 
                 uno::Any anyStream;
                 anyStream <<= myInStream;
-                xNameContainer2->insertByName(rtl::OUString("\1Ole10Native"), anyStream);
+                xNameContainer2->insertByName(OUString("\1Ole10Native"), anyStream);
                 printf("INSERT OK\n");
 
                 uno::Reference<embed::XTransactedObject> xTransact(xNameContainer2, uno::UNO_QUERY);
@@ -273,7 +273,7 @@ public:
             bytesTotal=xSeekable->getLength();
         if (xStatusIndicator.is() && xSeekable.is())
         {
-            xStatusIndicator->start(::rtl::OUString("Converting"), 100);
+            xStatusIndicator->start(OUString("Converting"), 100);
         }
     }
 
@@ -298,7 +298,7 @@ public:
                 {
                     char buf1[100];
                     sprintf(buf1, "Converted %" SAL_PRIdINT64 " KB", bytesRead/1024);
-                    xStatusIndicator->start(::rtl::OUString::createFromAscii(buf1), 0);
+                    xStatusIndicator->start(OUString::createFromAscii(buf1), 0);
                 }
             }
             return len;
@@ -319,14 +319,14 @@ xContext( xContext_ )
 {
 }
 
-sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException)
+sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException)
 {
 
   printf("TEST\n");
 
     uno::Sequence<uno::Any> aUcbInitSequence(2);
-    aUcbInitSequence[0] <<= rtl::OUString("Local");
-    aUcbInitSequence[1] <<= rtl::OUString("Office");
+    aUcbInitSequence[0] <<= OUString("Local");
+    aUcbInitSequence[1] <<= OUString("Office");
     uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
   printf("A\n");
     uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW );
@@ -334,20 +334,20 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
     if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence))
     {
   printf("C\n");
-            rtl::OUString arg=aArguments[0];
+            OUString arg=aArguments[0];
 
             uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
 
             rtl_uString *dir=NULL;
             osl_getProcessWorkingDir(&dir);
-            rtl::OUString absFileUrl;
+            OUString absFileUrl;
             osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData);
             rtl_uString_release(dir);
 
             uno::Reference <lang::XSingleServiceFactory> xStorageFactory(
-                xServiceFactory->createInstance (rtl::OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
+                xServiceFactory->createInstance (OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
 
-            rtl::OUString outFileUrl;
+            OUString outFileUrl;
             {
             rtl_uString *dir1=NULL;
             osl_getProcessWorkingDir(&dir1);
@@ -360,7 +360,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
             aArgs2[1] <<= embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE;
             uno::Reference<embed::XStorage> xStorage(xStorageFactory->createInstanceWithArguments(aArgs2), uno::UNO_QUERY_THROW);
             uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW);
-            xPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.oasis.opendocument.text")));
+            xPropSet->setPropertyValue(OUString("MediaType"), uno::makeAny(OUString("application/vnd.oasis.opendocument.text")));
             uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl);
             uno::Reference< task::XStatusIndicator > xStatusIndicator;
 
@@ -389,20 +389,20 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
     return 0;
 }
 
-::rtl::OUString ScannerTestService_getImplementationName ()
+OUString ScannerTestService_getImplementationName ()
 {
-    return rtl::OUString(ScannerTestService::IMPLEMENTATION_NAME );
+    return OUString(ScannerTestService::IMPLEMENTATION_NAME );
 }
 
-sal_Bool SAL_CALL ScannerTestService_supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL ScannerTestService_supportsService( const OUString& ServiceName )
 {
     return ServiceName == ScannerTestService::SERVICE_NAME;
 }
-uno::Sequence< rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (uno::RuntimeException)
 {
-    uno::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString(ScannerTestService::SERVICE_NAME );
+    uno::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString(ScannerTestService::SERVICE_NAME );
     return aRet;
 }
 
diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx
index 9d7cd5af8aca..61d4ed1bba70 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.hxx
@@ -34,7 +34,7 @@ private:
 public:
     ScannerTestService(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext);
 
-    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
 
 public:
     const static sal_Char SERVICE_NAME[40];
@@ -42,9 +42,9 @@ public:
 
 };
 
-::rtl::OUString ScannerTestService_getImplementationName ();
-sal_Bool SAL_CALL ScannerTestService_supportsService( const ::rtl::OUString& ServiceName );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+OUString ScannerTestService_getImplementationName ();
+sal_Bool SAL_CALL ScannerTestService_supportsService( const OUString& ServiceName );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL ScannerTestService_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ScannerTestService_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception );
 
 } } /* end namespace writerfilter::rtftok */
diff --git a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
index 2e62863a34cd..819e92fa272e 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx
@@ -191,7 +191,7 @@ public:
             bytesTotal=xSeekable->getLength();
         if (xStatusIndicator.is() && xSeekable.is())
         {
-            xStatusIndicator->start(::rtl::OUString("Converting"), 100);
+            xStatusIndicator->start(OUString("Converting"), 100);
         }
     }
 
@@ -216,7 +216,7 @@ public:
                 {
                     char buf1[100];
                     sprintf(buf1, "Converted %" SAL_PRIdINT64 " KB", bytesRead/1024);
-                    xStatusIndicator->start(::rtl::OUString::createFromAscii(buf1), 0);
+                    xStatusIndicator->start(OUString::createFromAscii(buf1), 0);
                 }
             }
             return len;
@@ -237,26 +237,26 @@ xContext( xContext_ )
 {
 }
 
-sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArguments ) throw (uno::RuntimeException)
+sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< OUString >& aArguments ) throw (uno::RuntimeException)
 {
     uno::Sequence<uno::Any> aUcbInitSequence(2);
-    aUcbInitSequence[0] <<= rtl::OUString("Local");
-    aUcbInitSequence[1] <<= rtl::OUString("Office");
+    aUcbInitSequence[0] <<= OUString("Local");
+    aUcbInitSequence[1] <<= OUString("Office");
     uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
     if (::ucbhelper::ContentBroker::initialize(xServiceFactory, aUcbInitSequence))
     {
-            rtl::OUString arg=aArguments[0];
+            OUString arg=aArguments[0];
 
             uno::Reference<ucb::XSimpleFileAccess2> xFileAccess(ucb::SimpleFileAccess::create(xContext));
 
             rtl_uString *dir=NULL;
             osl_getProcessWorkingDir(&dir);
-            rtl::OUString absFileUrl;
+            OUString absFileUrl;
             osl_getAbsoluteFileURL(dir, arg.pData, &absFileUrl.pData);
             rtl_uString_release(dir);
 
             uno::Reference <lang::XSingleServiceFactory> xStorageFactory(
-                xServiceFactory->createInstance (rtl::OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
+                xServiceFactory->createInstance (OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
 
             uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl);
             uno::Reference< task::XStatusIndicator > xStatusIndicator;
@@ -279,20 +279,20 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
     return 0;
 }
 
-::rtl::OUString XMLScanner_getImplementationName ()
+OUString XMLScanner_getImplementationName ()
 {
-    return rtl::OUString(XMLScanner::IMPLEMENTATION_NAME );
+    return OUString(XMLScanner::IMPLEMENTATION_NAME );
 }
 
-sal_Bool SAL_CALL XMLScanner_supportsService( const ::rtl::OUString& ServiceName )
+sal_Bool SAL_CALL XMLScanner_supportsService( const OUString& ServiceName )
 {
     return ServiceName == XMLScanner::SERVICE_NAME;
 }
-uno::Sequence< rtl::OUString > SAL_CALL XMLScanner_getSupportedServiceNames(  ) throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL XMLScanner_getSupportedServiceNames(  ) throw (uno::RuntimeException)
 {
-    uno::Sequence < rtl::OUString > aRet(1);
-    rtl::OUString* pArray = aRet.getArray();
-    pArray[0] =  rtl::OUString(XMLScanner::SERVICE_NAME );
+    uno::Sequence < OUString > aRet(1);
+    OUString* pArray = aRet.getArray();
+    pArray[0] =  OUString(XMLScanner::SERVICE_NAME );
     return aRet;
 }
 
diff --git a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx
index 7908b2090802..10be77462aaf 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/XMLScanner.hxx
@@ -34,7 +34,7 @@ private:
 public:
     XMLScanner(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext);
 
-    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL run( const ::com::sun::star::uno::Sequence< OUString >& aArguments ) throw (::com::sun::star::uno::RuntimeException);
 
 public:
     const static sal_Char SERVICE_NAME[40];
@@ -42,9 +42,9 @@ public:
 
 };
 
-::rtl::OUString XMLScanner_getImplementationName ();
-sal_Bool SAL_CALL XMLScanner_supportsService( const ::rtl::OUString& ServiceName );
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL XMLScanner_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
+OUString XMLScanner_getImplementationName ();
+sal_Bool SAL_CALL XMLScanner_supportsService( const OUString& ServiceName );
+::com::sun::star::uno::Sequence< OUString > SAL_CALL XMLScanner_getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL XMLScanner_createInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > &xContext) throw( ::com::sun::star::uno::Exception );
 
 } } /* end namespace writerfilter::rtftok */