Replace rtl::O(U)String with O(U)String

Other changes include:
in bridges/test/testcomp.cxx duplicate 'using namespace ::test' removed,
'using namespace ::rtl' replaced with 'using ::rtl::OUString' and
'using ::rtl::OUStringToOString'

Change-Id: I67a5952afd305adeb07f728c9074620ecba8e9fc
Reviewed-on: https://gerrit.libreoffice.org/2475
Reviewed-by: Andras Timar <atimar@suse.com>
Tested-by: Andras Timar <atimar@suse.com>

11 files changed, 23 insertions, 29 deletions

diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index eaadad5df330..f04b811e59a8 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx
@@ -176,13 +176,13 @@ namespace
 
     private:
         // Ifc XServiceName
-        virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw (uno::RuntimeException)
+        virtual OUString SAL_CALL getServiceName(  ) throw (uno::RuntimeException)
         {
             return OUString( SERVICE_NAME );
         }
 
         // Ifc XSimpleCanvas
-        virtual void SAL_CALL selectFont( const ::rtl::OUString& sFontName,
+        virtual void SAL_CALL selectFont( const OUString& sFontName,
                                           double                 size,
                                           ::sal_Bool             bold,
                                           ::sal_Bool             italic ) throw (uno::RuntimeException)
diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx
index 69e92f11af37..63a62b52c2c4 100644
--- a/canvas/source/tools/cachedprimitivebase.cxx
+++ b/canvas/source/tools/cachedprimitivebase.cxx
@@ -26,7 +26,6 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/tools/canvastools.hxx>
 
-
 using namespace ::com::sun::star;
 
 #define IMPLEMENTATION_NAME "canvas::CachedPrimitiveBase"
@@ -87,7 +86,7 @@ namespace canvas
         return OUString( IMPLEMENTATION_NAME );
     }
 
-    sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
+    sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
     {
         return ServiceName == SERVICE_NAME;
     }
diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index afce14a3f6cb..11ca7ed0b59c 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.cxx
@@ -35,7 +35,6 @@
 
 #include <canvas/parametricpolypolygon.hxx>
 
-
 using namespace ::com::sun::star;
 
 namespace canvas
@@ -52,7 +51,7 @@ namespace canvas
 
     ParametricPolyPolygon* ParametricPolyPolygon::create(
         const uno::Reference< rendering::XGraphicDevice >& rDevice,
-        const ::rtl::OUString& rServiceName,
+        const OUString& rServiceName,
         const uno::Sequence< uno::Any >& rArgs )
     {
         uno::Sequence< uno::Sequence< double > > colorSequence(2);
@@ -208,7 +207,7 @@ namespace canvas
         return OUString( IMPLEMENTATION_NAME );
     }
 
-    sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
+    sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
     {
         return ServiceName == SERVICE_NAME;
     }
diff --git a/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index eabbe89b7670..2cdee08d4d37 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.cxx
@@ -85,7 +85,7 @@ namespace canvas
         initProperties( aMerged );
     }
 
-    bool PropertySetHelper::isPropertyName( const ::rtl::OUString& aPropertyName ) const
+    bool PropertySetHelper::isPropertyName( const OUString& aPropertyName ) const
     {
         if( !mpMap.get() )
             return false;
@@ -101,7 +101,7 @@ namespace canvas
         return uno::Reference< beans::XPropertySetInfo >();
     }
 
-    void PropertySetHelper::setPropertyValue( const ::rtl::OUString& aPropertyName,
+    void PropertySetHelper::setPropertyValue( const OUString& aPropertyName,
                                               const uno::Any&        aValue )
     {
         Callbacks aCallbacks;
@@ -118,7 +118,7 @@ namespace canvas
         aCallbacks.setter(aValue);
     }
 
-    uno::Any PropertySetHelper::getPropertyValue( const ::rtl::OUString& aPropertyName ) const
+    uno::Any PropertySetHelper::getPropertyValue( const OUString& aPropertyName ) const
     {
         Callbacks aCallbacks;
         if( !mpMap.get() ||
@@ -136,7 +136,7 @@ namespace canvas
         return uno::Any();
     }
 
-    void PropertySetHelper::addPropertyChangeListener( const ::rtl::OUString&                                  aPropertyName,
+    void PropertySetHelper::addPropertyChangeListener( const OUString&                                  aPropertyName,
                                                        const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
     {
         // check validity of property, but otherwise ignore the
@@ -145,13 +145,13 @@ namespace canvas
             throwUnknown( aPropertyName );
     }
 
-    void PropertySetHelper::removePropertyChangeListener( const ::rtl::OUString&                                  /*aPropertyName*/,
+    void PropertySetHelper::removePropertyChangeListener( const OUString&                                  /*aPropertyName*/,
                                                           const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
     {
         // ignore request, no listener added in the first place
     }
 
-    void PropertySetHelper::addVetoableChangeListener( const ::rtl::OUString&                                  aPropertyName,
+    void PropertySetHelper::addVetoableChangeListener( const OUString&                                  aPropertyName,
                                                        const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
     {
         // check validity of property, but otherwise ignore the
@@ -160,7 +160,7 @@ namespace canvas
             throwUnknown( aPropertyName );
     }
 
-    void PropertySetHelper::removeVetoableChangeListener( const ::rtl::OUString&                                  /*aPropertyName*/,
+    void PropertySetHelper::removeVetoableChangeListener( const OUString&                                  /*aPropertyName*/,
                                                           const uno::Reference< beans::XVetoableChangeListener >& /*xListener*/ )
     {
         // ignore request, no listener added in the first place
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 4b59cef867e7..5a44e4016307 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -40,7 +40,6 @@
 #include "canvas.hxx"
 #include "windowoutdevholder.hxx"
 
-
 using namespace ::com::sun::star;
 
 namespace vclcanvas
@@ -101,7 +100,7 @@ namespace vclcanvas
         OutputDevice* pOutDev = reinterpret_cast<OutputDevice*>(nPtr);
         if( !pOutDev )
             throw lang::NoSupportException(
-                ::rtl::OUString( "Passed OutDev invalid!" ),
+                OUString( "Passed OutDev invalid!" ),
                 NULL);
 
         OutDevProviderSharedPtr pOutdevProvider( new OutDevHolder(*pOutDev) );
@@ -131,9 +130,9 @@ namespace vclcanvas
         CanvasBaseT::disposeThis();
     }
 
-    ::rtl::OUString SAL_CALL Canvas::getServiceName(  ) throw (::com::sun::star::uno::RuntimeException)
+    OUString SAL_CALL Canvas::getServiceName(  ) throw (::com::sun::star::uno::RuntimeException)
     {
-        return ::rtl::OUString( CANVAS_SERVICE_NAME );
+        return OUString( CANVAS_SERVICE_NAME );
     }
 
     bool Canvas::repaint( const GraphicObjectSharedPtr& rGrf,
diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx
index b941eb18f806..a469e448ed41 100644
--- a/canvas/source/vcl/canvasbitmap.cxx
+++ b/canvas/source/vcl/canvasbitmap.cxx
@@ -79,7 +79,7 @@ namespace vclcanvas
         return OUString( IMPLEMENTATION_NAME );
     }
 
-    sal_Bool SAL_CALL CanvasBitmap::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
+    sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
     {
         return ServiceName == SERVICE_NAME;
     }
diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx
index a45221278c42..9dead83713de 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -42,7 +42,6 @@
 
 #include "canvascustomsprite.hxx"
 
-
 using namespace ::com::sun::star;
 
 
@@ -126,7 +125,7 @@ namespace vclcanvas
         return OUString( IMPLEMENTATION_NAME );
     }
 
-    sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+    sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
     {
         return ServiceName == SERVICE_NAME;
     }
diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index 8f422f73b358..c314e5d3298c 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.cxx
@@ -158,7 +158,7 @@ namespace vclcanvas
         return OUString( IMPLEMENTATION_NAME );
     }
 
-    sal_Bool SAL_CALL CanvasFont::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+    sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
     {
         return ServiceName == SERVICE_NAME;
     }
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index dc663954d254..d9a77f22212e 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -36,7 +36,6 @@
 #include "spritecanvashelper.hxx"
 #include "canvascustomsprite.hxx"
 
-
 using namespace ::com::sun::star;
 
 #define FPS_BOUNDS Rectangle(0,0,130,90)
@@ -158,7 +157,7 @@ namespace vclcanvas
         }
 
         void renderInfoText( OutputDevice&          rOutDev,
-                             const ::rtl::OUString& rStr,
+                             const OUString& rStr,
                              const Point&           rPos )
         {
             Font aVCLFont;
@@ -641,8 +640,8 @@ namespace vclcanvas
             sal_Int32 nCount(0);
 
             mpRedrawManager->forEachSprite( makeAdder(nCount,sal_Int32(1)) );
-            ::rtl::OUString text(
-                ::rtl::OUString::valueOf(
+            OUString text(
+                OUString::valueOf(
                     // disambiguate overload...
                     static_cast<sal_Int64>(nCount) ) );
 
diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 534e0cb9e9f6..541115884f29 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.cxx
@@ -396,7 +396,7 @@ namespace vclcanvas
                     rTargetSurface.SetTextColor( COL_RED );
                     rTargetSurface.SetFont( aVCLFont );
 
-                    ::rtl::OUString text( ::rtl::math::doubleToUString( getPriority(),
+                    OUString text( ::rtl::math::doubleToUString( getPriority(),
                                                                         rtl_math_StringFormat_F,
                                                                         2,'.',NULL,' ') );
 
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 72ede12ae85b..d8a0b14fbed5 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -37,7 +37,6 @@
 
 #include <boost/scoped_array.hpp>
 
-
 using namespace ::com::sun::star;
 
 namespace vclcanvas
@@ -471,7 +470,7 @@ namespace vclcanvas
         return OUString( IMPLEMENTATION_NAME );
     }
 
-    sal_Bool SAL_CALL TextLayout::supportsService( const ::rtl::OUString& ServiceName ) throw( uno::RuntimeException )
+    sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException )
     {
         return ServiceName == SERVICE_NAME;
     }