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

2 files changed, 58 insertions, 59 deletions

diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index 4fed654bd1b2..582d462f1618 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -133,13 +133,13 @@ void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults, const
 
 static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj )
 {
-    static const rtl::OUString  sExtrusion( "Extrusion" );
-    static const rtl::OUString  sProjectionMode( "ProjectionMode" );
-    static const rtl::OUString  sRotateAngle( "RotateAngle" );
-    static const rtl::OUString  sViewPoint( "ViewPoint" );
-    static const rtl::OUString  sOrigin( "Origin" );
-    static const rtl::OUString  sSkew( "Skew" );
-    static const rtl::OUString  sDepth( "Depth" );
+    static const OUString  sExtrusion( "Extrusion" );
+    static const OUString  sProjectionMode( "ProjectionMode" );
+    static const OUString  sRotateAngle( "RotateAngle" );
+    static const OUString  sViewPoint( "ViewPoint" );
+    static const OUString  sOrigin( "Origin" );
+    static const OUString  sSkew( "Skew" );
+    static const OUString  sDepth( "Depth" );
 
     sal_uInt16 nSID = rReq.GetSlot();
     switch( nSID )
@@ -316,7 +316,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
     break;
     case SID_EXTRUSION_3D_COLOR:
     {
-        static const rtl::OUString  sExtrusionColor( "Color" );
+        static const OUString  sExtrusionColor( "Color" );
 
         if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_3D_COLOR ) == SFX_ITEM_SET)
         {
@@ -343,10 +343,10 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
     break;
     case SID_EXTRUSION_SURFACE:
     {
-        static const rtl::OUString sShadeMode( "ShadeMode" );
-        static const rtl::OUString sSpecularity( "Specularity" );
-        static const rtl::OUString sDiffusion( "Diffusion" );
-        static const rtl::OUString sMetal( "Metal" );
+        static const OUString sShadeMode( "ShadeMode" );
+        static const OUString sSpecularity( "Specularity" );
+        static const OUString sDiffusion( "Diffusion" );
+        static const OUString sMetal( "Metal" );
 
         if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_SURFACE ) == SFX_ITEM_SET)
         {
@@ -395,12 +395,12 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
     break;
     case SID_EXTRUSION_LIGHTING_INTENSITY:
     {
-        static const rtl::OUString sBrightness( "Brightness" );
-        static const rtl::OUString sLightFace( "LightFace" );
-        static const rtl::OUString sFirstLightHarsh( "FirstLightHarsh" );
-        static const rtl::OUString sSecondLightHarsh( "SecondLightHarsh" );
-        static const rtl::OUString sFirstLightLevel( "FirstLightLevel" );
-        static const rtl::OUString sSecondLightLevel( "SecondLightLevel" );
+        static const OUString sBrightness( "Brightness" );
+        static const OUString sLightFace( "LightFace" );
+        static const OUString sFirstLightHarsh( "FirstLightHarsh" );
+        static const OUString sSecondLightHarsh( "SecondLightHarsh" );
+        static const OUString sFirstLightLevel( "FirstLightLevel" );
+        static const OUString sSecondLightLevel( "SecondLightLevel" );
 
         if( rReq.GetArgs() && rReq.GetArgs()->GetItemState( SID_EXTRUSION_LIGHTING_INTENSITY ) == SFX_ITEM_SET)
         {
@@ -468,8 +468,8 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
 
             if((nDirection >= 0) && (nDirection < 9))
             {
-                const rtl::OUString sFirstLightDirection( "FirstLightDirection" );
-                const rtl::OUString sSecondLightDirection( "SecondLightDirection" );
+                const OUString sFirstLightDirection( "FirstLightDirection" );
+                const OUString sSecondLightDirection( "SecondLightDirection" );
 
                 const Direction3D * pLighting1Defaults;
                 const Direction3D * pLighting2Defaults;
@@ -642,11 +642,11 @@ void getExtrusionDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
-    static const rtl::OUString  sExtrusion( "Extrusion" );
-    static const rtl::OUString  sViewPoint( "ViewPoint" );
-    static const rtl::OUString  sOrigin( "Origin" );
-    static const rtl::OUString  sSkew( "Skew" );
-    static const rtl::OUString  sProjectionMode( "ProjectionMode" );
+    static const OUString  sExtrusion( "Extrusion" );
+    static const OUString  sViewPoint( "ViewPoint" );
+    static const OUString  sOrigin( "Origin" );
+    static const OUString  sSkew( "Skew" );
+    static const OUString  sProjectionMode( "ProjectionMode" );
 
     com::sun::star::uno::Any* pAny;
 
@@ -793,8 +793,8 @@ void getExtrusionProjectionState( SdrView* pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
-    static const rtl::OUString  sExtrusion( "Extrusion" );
-    static const rtl::OUString  sProjectionMode( "ProjectionMode" );
+    static const OUString  sExtrusion( "Extrusion" );
+    static const OUString  sProjectionMode( "ProjectionMode" );
 
     com::sun::star::uno::Any* pAny;
 
@@ -849,10 +849,10 @@ void getExtrusionSurfaceState( SdrView* pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
-    static const rtl::OUString  sExtrusion( "Extrusion" );
-    static const rtl::OUString  sShadeMode( "ShadeMode" );
-    static const rtl::OUString  sSpecularity( "Specularity" );
-    static const rtl::OUString  sMetal( "Metal" );
+    static const OUString  sExtrusion( "Extrusion" );
+    static const OUString  sShadeMode( "ShadeMode" );
+    static const OUString  sSpecularity( "Specularity" );
+    static const OUString  sMetal( "Metal" );
 
     com::sun::star::uno::Any* pAny;
 
@@ -937,8 +937,8 @@ void getExtrusionDepthState( SdrView* pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
-    static const rtl::OUString  sExtrusion( "Extrusion" );
-    static const rtl::OUString  sDepth( "Depth" );
+    static const OUString  sExtrusion( "Extrusion" );
+    static const OUString  sDepth( "Depth" );
 
     com::sun::star::uno::Any* pAny;
 
@@ -1017,9 +1017,9 @@ void getExtrusionLightingDirectionState( SdrView* pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
-    static const rtl::OUString  sExtrusion( "Extrusion" );
-    static const rtl::OUString  sFirstLightDirection( "FirstLightDirection" );
-    static const rtl::OUString  sSecondLightDirection( "SecondLightDirection" );
+    static const OUString  sExtrusion( "Extrusion" );
+    static const OUString  sFirstLightDirection( "FirstLightDirection" );
+    static const OUString  sSecondLightDirection( "SecondLightDirection" );
 
     const Direction3D * pLighting1Defaults;
     const Direction3D * pLighting2Defaults;
@@ -1098,8 +1098,8 @@ void getExtrusionLightingIntensityState( SdrView* pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
-    static const rtl::OUString  sExtrusion( "Extrusion" );
-    static const rtl::OUString  sBrightness( "Brightness" );
+    static const OUString  sExtrusion( "Extrusion" );
+    static const OUString  sBrightness( "Brightness" );
 
     com::sun::star::uno::Any* pAny;
 
@@ -1166,8 +1166,8 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
-    static const rtl::OUString  sExtrusion( "Extrusion" );
-    static const rtl::OUString  sExtrusionColor( "Color" );
+    static const OUString  sExtrusion( "Extrusion" );
+    static const OUString  sExtrusionColor( "Color" );
 
     com::sun::star::uno::Any* pAny;
 
@@ -1236,7 +1236,7 @@ void getExtrusionColorState( SdrView* pSdrView, SfxItemSet& rSet )
 namespace svx {
 bool checkForSelectedCustomShapes( SdrView* pSdrView, bool bOnlyExtruded )
 {
-    static const rtl::OUString  sExtrusion( "Extrusion" );
+    static const OUString  sExtrusion( "Extrusion" );
 
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index a324bb9ef184..d77bb338d169 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -41,7 +41,6 @@
 #include <svx/fontworkbar.hxx>
 #include "svx/fontworkgallery.hxx"
 
-using ::rtl::OUString;
 
 using namespace ::svx;
 using namespace ::cppu;
@@ -135,26 +134,26 @@ void SetFontWorkShapeTypeState( SdrView* pSdrView, SfxItemSet& rSet )
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
 
-    rtl::OUString aFontWorkShapeType;
+    OUString aFontWorkShapeType;
 
     for( i = 0; i < nCount; i++ )
     {
         SdrObject* pObj = rMarkList.GetMark( i )->GetMarkedSdrObj();
         if( pObj->ISA( SdrObjCustomShape ) )
         {
-            const rtl::OUString sType( "Type" );
+            const OUString sType( "Type" );
             SdrCustomShapeGeometryItem aGeometryItem( (SdrCustomShapeGeometryItem&)pObj->GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
             Any* pAny = aGeometryItem.GetPropertyValueByName( sType );
             if( pAny )
             {
-                rtl::OUString aType;
+                OUString aType;
                 if ( *pAny >>= aType )
                 {
                     if ( !aFontWorkShapeType.isEmpty() )
                     {
                         if ( !aFontWorkShapeType.equals( aType ) )  // different FontWorkShapeTypes selected ?
                         {
-                            aFontWorkShapeType = rtl::OUString();
+                            aFontWorkShapeType = OUString();
                             break;
                         }
                     }
@@ -240,7 +239,7 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
     if ( nCheckStatus & 2 )
         return ( nCheckStatus & 1 ) != 0;
 
-    static const rtl::OUString  sTextPath( "TextPath" );
+    static const OUString  sTextPath( "TextPath" );
 
     const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
     sal_uIntPtr nCount = rMarkList.GetMarkCount(), i;
@@ -265,8 +264,8 @@ bool checkForSelectedFontWork( SdrView* pSdrView, sal_uInt32& nCheckStatus )
 
 static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj )
 {
-    static const rtl::OUString  sTextPath( "TextPath" );
-    static const rtl::OUString  sSameLetterHeights( "SameLetterHeights" );
+    static const OUString  sTextPath( "TextPath" );
+    static const OUString  sSameLetterHeights( "SameLetterHeights" );
 
     sal_uInt16 nSID = rReq.GetSlot();
     switch( nSID )
@@ -339,21 +338,21 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem
 #include <svx/fmpage.hxx>
 #include <svl/itempool.hxx>
 
-void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const rtl::OUString rCustomShape )
+void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const OUString rCustomShape )
 {
-    const rtl::OUString sType( "Type" );
+    const OUString sType( "Type" );
 
     com::sun::star::beans::PropertyValue aPropVal;
     aPropVal.Name = sType;
     aPropVal.Value <<= rCustomShape;
     rGeometryItem.SetPropertyValue( aPropVal );
 
-    const rtl::OUString sAdjustmentValues( "AdjustmentValues" );
-    const rtl::OUString sCoordinateOrigin( "CoordinateOrigin" );
-    const rtl::OUString sCoordinateSize( "CoordinateSize" );
-    const rtl::OUString sEquations( "Equations" );
-    const rtl::OUString sHandles( "Handles" );
-    const rtl::OUString sPath( "Path" );
+    const OUString sAdjustmentValues( "AdjustmentValues" );
+    const OUString sCoordinateOrigin( "CoordinateOrigin" );
+    const OUString sCoordinateSize( "CoordinateSize" );
+    const OUString sEquations( "Equations" );
+    const OUString sHandles( "Handles" );
+    const OUString sPath( "Path" );
     rGeometryItem.ClearPropertyValue( sAdjustmentValues );
     rGeometryItem.ClearPropertyValue( sCoordinateOrigin );
     rGeometryItem.ClearPropertyValue( sCoordinateSize );
@@ -366,7 +365,7 @@ void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const
 
     if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
     {
-        std::vector< rtl::OUString > aObjList;
+        std::vector< OUString > aObjList;
         if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) )
         {
             sal_uInt16 i;
@@ -458,7 +457,7 @@ void FontworkBar::execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBi
 
         case SID_FONTWORK_SHAPE_TYPE:
         {
-            rtl::OUString aCustomShape;
+            OUString aCustomShape;
             const SfxItemSet* pArgs = rReq.GetArgs();
             if ( pArgs )
             {