::rtl::OUString -> OUString in writerperfect

Change-Id: I2d0f8868779e5ac4a802f3f061704d2de5826c5d

10 files changed, 45 insertions, 55 deletions

diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx
index ba2d19dd6510..1a66c98fbce0 100644
--- a/writerperfect/source/draw/CDRImportFilter.cxx
+++ b/writerperfect/source/draw/CDRImportFilter.cxx
@@ -38,9 +38,6 @@ using com::sun::star::uno::Reference;
 using com::sun::star::io::XInputStream;
 using com::sun::star::io::XSeekable;
 using com::sun::star::uno::Sequence;
-using namespace ::rtl;
-using rtl::OString;
-using rtl::OUString;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::XInterface;
@@ -134,7 +131,7 @@ throw( com::sun::star::uno::RuntimeException )
     }
 
     if (!xInputStream.is())
-        return ::rtl::OUString();
+        return OUString();
 
     WPXSvInputStream input( xInputStream );
 
diff --git a/writerperfect/source/draw/CDRImportFilter.hxx b/writerperfect/source/draw/CDRImportFilter.hxx
index 95189e8a3915..efdfae8ce54c 100644
--- a/writerperfect/source/draw/CDRImportFilter.hxx
+++ b/writerperfect/source/draw/CDRImportFilter.hxx
@@ -38,7 +38,7 @@ protected:
     // oo.org declares
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
-    ::rtl::OUString msFilterName;
+    OUString msFilterName;
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
 
 public:
@@ -57,7 +57,7 @@ public:
     throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     //XExtendedFilterDetection
-    virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
+    virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
     throw( com::sun::star::uno::RuntimeException );
 
     // XInitialization
@@ -65,22 +65,22 @@ public:
     throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
     throw (::com::sun::star::uno::RuntimeException);
 
 };
 
-::rtl::OUString CDRImportFilter_getImplementationName()
+OUString CDRImportFilter_getImplementationName()
 throw ( ::com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL CDRImportFilter_supportsService( const ::rtl::OUString &ServiceName )
+sal_Bool SAL_CALL CDRImportFilter_supportsService( const OUString &ServiceName )
 throw ( ::com::sun::star::uno::RuntimeException );
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames(  )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL CDRImportFilter_getSupportedServiceNames(  )
 throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx
index 7e76eb0cc876..60653542dfc3 100644
--- a/writerperfect/source/draw/CMXImportFilter.cxx
+++ b/writerperfect/source/draw/CMXImportFilter.cxx
@@ -38,8 +38,6 @@ using com::sun::star::uno::Reference;
 using com::sun::star::io::XInputStream;
 using com::sun::star::io::XSeekable;
 using com::sun::star::uno::Sequence;
-using namespace ::rtl;
-using rtl::OUString;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::XInterface;
@@ -133,7 +131,7 @@ throw( com::sun::star::uno::RuntimeException )
     }
 
     if (!xInputStream.is())
-        return ::rtl::OUString();
+        return OUString();
 
     WPXSvInputStream input( xInputStream );
 
diff --git a/writerperfect/source/draw/CMXImportFilter.hxx b/writerperfect/source/draw/CMXImportFilter.hxx
index 151d543ef412..a218ff83194a 100644
--- a/writerperfect/source/draw/CMXImportFilter.hxx
+++ b/writerperfect/source/draw/CMXImportFilter.hxx
@@ -38,7 +38,7 @@ protected:
     // oo.org declares
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
-    ::rtl::OUString msFilterName;
+    OUString msFilterName;
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
 
 public:
@@ -57,7 +57,7 @@ public:
     throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     //XExtendedFilterDetection
-    virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
+    virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
     throw( com::sun::star::uno::RuntimeException );
 
     // XInitialization
@@ -65,22 +65,22 @@ public:
     throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
     throw (::com::sun::star::uno::RuntimeException);
 
 };
 
-::rtl::OUString CMXImportFilter_getImplementationName()
+OUString CMXImportFilter_getImplementationName()
 throw ( ::com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL CMXImportFilter_supportsService( const ::rtl::OUString &ServiceName )
+sal_Bool SAL_CALL CMXImportFilter_supportsService( const OUString &ServiceName )
 throw ( ::com::sun::star::uno::RuntimeException );
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames(  )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL CMXImportFilter_getSupportedServiceNames(  )
 throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx
index 8e04e6d613fb..2ad210b26ff8 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.cxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.cxx
@@ -34,8 +34,6 @@ using com::sun::star::uno::Reference;
 using com::sun::star::io::XInputStream;
 using com::sun::star::io::XSeekable;
 using com::sun::star::uno::Sequence;
-using namespace ::rtl;
-using rtl::OUString;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::XInterface;
@@ -129,7 +127,7 @@ throw( com::sun::star::uno::RuntimeException )
     }
 
     if (!xInputStream.is())
-        return ::rtl::OUString();
+        return OUString();
 
     WPXSvInputStream input( xInputStream );
 
diff --git a/writerperfect/source/draw/MSPUBImportFilter.hxx b/writerperfect/source/draw/MSPUBImportFilter.hxx
index 6d976655d641..90bb2aaee1b6 100644
--- a/writerperfect/source/draw/MSPUBImportFilter.hxx
+++ b/writerperfect/source/draw/MSPUBImportFilter.hxx
@@ -35,7 +35,7 @@ protected:
     // oo.org declares
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
-    ::rtl::OUString msFilterName;
+    OUString msFilterName;
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
 
 public:
@@ -54,7 +54,7 @@ public:
     throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     //XExtendedFilterDetection
-    virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
+    virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
     throw( com::sun::star::uno::RuntimeException );
 
     // XInitialization
@@ -62,22 +62,22 @@ public:
     throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
     throw (::com::sun::star::uno::RuntimeException);
 
 };
 
-::rtl::OUString MSPUBImportFilter_getImplementationName()
+OUString MSPUBImportFilter_getImplementationName()
 throw ( ::com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL MSPUBImportFilter_supportsService( const ::rtl::OUString &ServiceName )
+sal_Bool SAL_CALL MSPUBImportFilter_supportsService( const OUString &ServiceName )
 throw ( ::com::sun::star::uno::RuntimeException );
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames(  )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL MSPUBImportFilter_getSupportedServiceNames(  )
 throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx
index 3e6a22a9f4ce..d2b0dc03b731 100644
--- a/writerperfect/source/draw/VisioImportFilter.cxx
+++ b/writerperfect/source/draw/VisioImportFilter.cxx
@@ -34,8 +34,6 @@ using com::sun::star::uno::Reference;
 using com::sun::star::io::XInputStream;
 using com::sun::star::io::XSeekable;
 using com::sun::star::uno::Sequence;
-using namespace ::rtl;
-using rtl::OUString;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::XInterface;
@@ -129,7 +127,7 @@ throw( com::sun::star::uno::RuntimeException )
     }
 
     if (!xInputStream.is())
-        return ::rtl::OUString();
+        return OUString();
 
     WPXSvInputStream input( xInputStream );
 
diff --git a/writerperfect/source/draw/VisioImportFilter.hxx b/writerperfect/source/draw/VisioImportFilter.hxx
index 3af4b1b67632..b0018652c598 100644
--- a/writerperfect/source/draw/VisioImportFilter.hxx
+++ b/writerperfect/source/draw/VisioImportFilter.hxx
@@ -35,7 +35,7 @@ protected:
     // oo.org declares
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
-    ::rtl::OUString msFilterName;
+    OUString msFilterName;
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
 
 public:
@@ -54,7 +54,7 @@ public:
     throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     //XExtendedFilterDetection
-    virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
+    virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
     throw( com::sun::star::uno::RuntimeException );
 
     // XInitialization
@@ -62,22 +62,22 @@ public:
     throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
     throw (::com::sun::star::uno::RuntimeException);
 
 };
 
-::rtl::OUString VisioImportFilter_getImplementationName()
+OUString VisioImportFilter_getImplementationName()
 throw ( ::com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL VisioImportFilter_supportsService( const ::rtl::OUString &ServiceName )
+sal_Bool SAL_CALL VisioImportFilter_supportsService( const OUString &ServiceName )
 throw ( ::com::sun::star::uno::RuntimeException );
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames(  )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL VisioImportFilter_getSupportedServiceNames(  )
 throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx
index 2c0e715cbc2d..d7629c5c64ea 100644
--- a/writerperfect/source/draw/WPGImportFilter.cxx
+++ b/writerperfect/source/draw/WPGImportFilter.cxx
@@ -40,7 +40,6 @@ using com::sun::star::io::XInputStream;
 using com::sun::star::io::XSeekable;
 using com::sun::star::uno::Sequence;
 using namespace ::rtl;
-using rtl::OUString;
 using com::sun::star::uno::Any;
 using com::sun::star::uno::UNO_QUERY;
 using com::sun::star::uno::XInterface;
@@ -134,7 +133,7 @@ throw( com::sun::star::uno::RuntimeException )
     }
 
     if (!xInputStream.is())
-        return ::rtl::OUString();
+        return OUString();
 
     WPXSvInputStream input( xInputStream );
 
diff --git a/writerperfect/source/draw/WPGImportFilter.hxx b/writerperfect/source/draw/WPGImportFilter.hxx
index f648aea2b27a..12bbf58a68cf 100644
--- a/writerperfect/source/draw/WPGImportFilter.hxx
+++ b/writerperfect/source/draw/WPGImportFilter.hxx
@@ -40,7 +40,7 @@ protected:
     // oo.org declares
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxContext;
     ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > mxDoc;
-    ::rtl::OUString msFilterName;
+    OUString msFilterName;
     ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler;
 
 public:
@@ -59,7 +59,7 @@ public:
     throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     //XExtendedFilterDetection
-    virtual ::rtl::OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
+    virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& Descriptor )
     throw( com::sun::star::uno::RuntimeException );
 
     // XInitialization
@@ -67,22 +67,22 @@ public:
     throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
 
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+    virtual OUString SAL_CALL getImplementationName(  )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &ServiceName )
+    virtual sal_Bool SAL_CALL supportsService( const OUString &ServiceName )
     throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
     throw (::com::sun::star::uno::RuntimeException);
 
 };
 
-::rtl::OUString WPGImportFilter_getImplementationName()
+OUString WPGImportFilter_getImplementationName()
 throw ( ::com::sun::star::uno::RuntimeException );
 
-sal_Bool SAL_CALL WPGImportFilter_supportsService( const ::rtl::OUString &ServiceName )
+sal_Bool SAL_CALL WPGImportFilter_supportsService( const OUString &ServiceName )
 throw ( ::com::sun::star::uno::RuntimeException );
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames(  )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL WPGImportFilter_getSupportedServiceNames(  )
 throw ( ::com::sun::star::uno::RuntimeException );
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >