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>

21 files changed, 25 insertions, 28 deletions

diff --git a/svx/inc/AccessibleSvxFindReplaceDialog.hxx b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
index 5b46c3b7f6db..a460dcc80b4e 100644
--- a/svx/inc/AccessibleSvxFindReplaceDialog.hxx
+++ b/svx/inc/AccessibleSvxFindReplaceDialog.hxx
@@ -31,8 +31,8 @@ public:
     virtual ~VCLXAccessibleSvxFindReplaceDialog() override;
     virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override;
     // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName() override;
-    virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override;
+    virtual OUString SAL_CALL getImplementationName() override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
 
 };
 
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index 59df1c3e30fb..fc2df2c76a9f 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -138,7 +138,7 @@ uno::Sequence<uno::Type> SAL_CALL
 uno::Any SAL_CALL AccessibleOLEShape::getExtendedAttributes()
 {
     uno::Any strRet;
-    ::rtl::OUString style;
+    OUString style;
     if( m_pShape )
     {
         style = "style:" + static_cast<SdrOle2Obj*>(m_pShape)->GetStyleString();
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index c417c94eab56..daeaa702732c 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -53,7 +53,7 @@
 using namespace ::com::sun::star;
 
 
-static bool FileExists( const INetURLObject &rURL, const rtl::OUString &rExt )
+static bool FileExists( const INetURLObject &rURL, const OUString &rExt )
 {
     INetURLObject aURL( rURL );
     aURL.setExtension( rExt );
diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx
index 73c6f649ddef..f9e324160d0a 100644
--- a/svx/source/gengal/gengal.cxx
+++ b/svx/source/gengal/gengal.cxx
@@ -183,7 +183,7 @@ void GalApp::Init()
         css::ucb::UniversalContentBroker::create(xComponentContext);
     } catch (const uno::Exception &e) {
         fprintf( stderr, "Bootstrap exception '%s'\n",
-                 rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
+                 OUStringToOString( e.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
         exit( 1 );
     }
 }
@@ -192,7 +192,7 @@ static std::vector<OUString> ReadResponseFile_Impl(OUString const& rInput)
 {
     osl::File file(rInput);
     osl::FileBase::RC rc = file.open(osl_File_OpenFlag_Read);
-    OString const uInput(rtl::OUStringToOString(rInput, RTL_TEXTENCODING_UTF8));
+    OString const uInput(OUStringToOString(rInput, RTL_TEXTENCODING_UTF8));
     if (osl::FileBase::E_None != rc)
     {
         fprintf(stderr, "error while opening response file: %s (%d)\n",
diff --git a/svx/source/inc/DefaultShapesPanel.hxx b/svx/source/inc/DefaultShapesPanel.hxx
index d2e94258b965..6c7f7c99735e 100644
--- a/svx/source/inc/DefaultShapesPanel.hxx
+++ b/svx/source/inc/DefaultShapesPanel.hxx
@@ -61,7 +61,7 @@ private:
     VclPtr<ValueSet>          mpStarSet;
     VclPtr<ValueSet>          mp3DObjectSet;
     Reference< XFrame >       mxFrame;
-    std::map<VclPtr<ValueSet>, std::map<sal_uInt16, rtl::OUString>> mpShapesSetMap;
+    std::map<VclPtr<ValueSet>, std::map<sal_uInt16, OUString>> mpShapesSetMap;
 
     void populateShapes();
     void Initialize();
diff --git a/svx/source/inc/ShapesUtil.hxx b/svx/source/inc/ShapesUtil.hxx
index e6385c9a69d0..45b246cc1881 100644
--- a/svx/source/inc/ShapesUtil.hxx
+++ b/svx/source/inc/ShapesUtil.hxx
@@ -27,7 +27,7 @@ class SvxShapeCommandsMap
 {
 public:
     SvxShapeCommandsMap();
-    std::map<sal_uInt16, rtl::OUString> mpLineShapes, mpCurveShapes,
+    std::map<sal_uInt16, OUString> mpLineShapes, mpCurveShapes,
                     mpConnectorShapes, mpBasicShapes, mpSymbolShapes,
                     mpBlockArrowShapes, mpFlowchartShapes,
                     mpCalloutShapes, mpStarShapes, mp3DShapes;
diff --git a/svx/source/inc/charmapacc.hxx b/svx/source/inc/charmapacc.hxx
index 5c0e5fd18735..cdc225da1288 100644
--- a/svx/source/inc/charmapacc.hxx
+++ b/svx/source/inc/charmapacc.hxx
@@ -201,7 +201,7 @@ namespace svx
         // XAccessibleAction
         virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
         virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
-        virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+        virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
         virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
 
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 36ce4e7f6d43..7dbbd48327e7 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -202,7 +202,7 @@ public:
     // XAccessibleAction
     virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override;
     virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override;
-    virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
+    virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override;
     virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override;
 
     // internal
diff --git a/svx/source/items/galleryitem.cxx b/svx/source/items/galleryitem.cxx
index c64d1e1a310a..f5cf28f06906 100644
--- a/svx/source/items/galleryitem.cxx
+++ b/svx/source/items/galleryitem.cxx
@@ -74,7 +74,7 @@ bool SvxGalleryItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /* nMemberId
     bool bAllConverted( true );
 
     sal_Int8 nType(0);
-    rtl::OUString aURL, aFilterName;
+    OUString aURL, aFilterName;
     css::uno::Reference< css::lang::XComponent > xDrawing;
     css::uno::Reference< css::graphic::XGraphic > xGraphic;
 
diff --git a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx
index 5591ee389200..230ced107676 100644
--- a/svx/source/sidebar/ContextChangeEventMultiplexer.cxx
+++ b/svx/source/sidebar/ContextChangeEventMultiplexer.cxx
@@ -60,7 +60,7 @@ void ContextChangeEventMultiplexer::NotifyContextChange (
 }
 
 
-::rtl::OUString ContextChangeEventMultiplexer::GetModuleName (
+OUString ContextChangeEventMultiplexer::GetModuleName (
     const css::uno::Reference<css::frame::XFrame>& rxFrame)
 {
     try
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index f180d4b3d927..4eb6270dab2f 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -70,7 +70,7 @@ public:
 
     // XUIElementFactory
     css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement (
-        const ::rtl::OUString& rsResourceURL,
+        const OUString& rsResourceURL,
         const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
 
     OUString SAL_CALL getImplementationName() override
@@ -89,7 +89,7 @@ PanelFactory::PanelFactory()
 }
 
 Reference<ui::XUIElement> SAL_CALL PanelFactory::createUIElement (
-    const ::rtl::OUString& rsResourceURL,
+    const OUString& rsResourceURL,
     const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
 {
     const ::comphelper::NamedValueCollection aArguments (rArguments);
diff --git a/svx/source/sidebar/SelectionChangeHandler.cxx b/svx/source/sidebar/SelectionChangeHandler.cxx
index 6ec2baed0d86..9858820d6a36 100644
--- a/svx/source/sidebar/SelectionChangeHandler.cxx
+++ b/svx/source/sidebar/SelectionChangeHandler.cxx
@@ -31,7 +31,7 @@ using namespace css::uno;
 namespace svx { namespace sidebar {
 
 SelectionChangeHandler::SelectionChangeHandler (
-    const std::function<rtl::OUString()>& rSelectionChangeCallback,
+    const std::function<OUString()>& rSelectionChangeCallback,
     const Reference<css::frame::XController>& rxController,
     const vcl::EnumContext::Context eDefaultContext)
     : SelectionChangeHandlerInterfaceBase(m_aMutex),
diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
index 33f4646645d4..a0a2b899375b 100644
--- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx
+++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx
@@ -26,7 +26,6 @@
 #include <sfx2/dispatch.hxx>
 #include <avmedia/MediaControlBase.hxx>
 
-using ::rtl::OUString;
 using namespace avmedia;
 
 namespace svx { namespace sidebar {
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 4d21ea94fd9e..ca1f29938304 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -448,8 +448,8 @@ sal_uInt16 NumberingTypeMgr::GetNBOIndexForNumRule(SvxNumRule& aNum,sal_uInt16 m
         return sal_uInt16(0xFFFF);
 
     const SvxNumberFormat& aFmt(aNum.GetLevel(nActLv));
-    //sal_Unicode cPrefix = rtl::OUString(aFmt.GetPrefix())[0];
-    //sal_Unicode cSuffix = rtl::OUString(aFmt.GetSuffix())[0];
+    //sal_Unicode cPrefix = OUString(aFmt.GetPrefix())[0];
+    //sal_Unicode cSuffix = :OUString(aFmt.GetSuffix())[0];
     const OUString& sPrefix = aFmt.GetPrefix();
     const OUString& sLclSuffix = aFmt.GetSuffix();
     sal_Int16 eNumType = aFmt.GetNumberingType();
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 4e4eaffbb125..084fb7d1c718 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -408,7 +408,7 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl, Button*, void )
 
     // mpCbxScale must synchronized with that on Position and Size tabpage on Shape Properties dialog
     SvtViewOptions aPageOpt(EViewType::TabPage, "cui/ui/possizetabpage/PositionAndSize");
-    aPageOpt.SetUserItem( USERITEM_NAME, css::uno::makeAny( ::rtl::OUString::number( int(mpCbxScale->IsChecked()) ) ) );
+    aPageOpt.SetUserItem( USERITEM_NAME, css::uno::makeAny( OUString::number( int(mpCbxScale->IsChecked()) ) ) );
 }
 
 
@@ -803,7 +803,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
     SvtViewOptions aPageOpt(EViewType::TabPage, "cui/ui/possizetabpage/PositionAndSize");
     OUString  sUserData;
     css::uno::Any  aUserItem = aPageOpt.GetUserItem( USERITEM_NAME );
-    ::rtl::OUString aTemp;
+    OUString aTemp;
     if ( aUserItem >>= aTemp )
         sUserData = aTemp;
     mpCbxScale->Check( static_cast<bool>(sUserData.toInt32()) );
diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
index 1f8c2d10b58c..74079228f65e 100644
--- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
+++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx
@@ -23,8 +23,6 @@
 #include <vcl/outdev.hxx>
 #include <vcl/commandinfoprovider.hxx>
 
-using ::rtl::OUString;
-
 namespace svx { namespace sidebar {
 
 DefaultShapesPanel::DefaultShapesPanel (
@@ -125,7 +123,7 @@ void DefaultShapesPanel::populateShapes()
     for(auto& aSet : mpShapesSetMap)
     {
         aSet.first->SetColCount(6);
-        for(std::map<sal_uInt16, rtl::OUString>::size_type i = 0; i < aSet.second.size(); i++)
+        for(std::map<sal_uInt16, OUString>::size_type i = 0; i < aSet.second.size(); i++)
         {
             sSlotStr = aSet.second[i];
             aSlotImage = vcl::CommandInfoProvider::GetImageForCommand(sSlotStr, mxFrame);
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
index 9846b9898ee2..acbbac52f21e 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
@@ -108,7 +108,7 @@ void TextCharacterSpacingControl::Initialize()
     if(aWinOpt.Exists())
     {
         css::uno::Sequence<css::beans::NamedValue> aSeq = aWinOpt.GetUserData();
-        ::rtl::OUString aTmp;
+        OUString aTmp;
         if(aSeq.getLength())
             aSeq[0].Value >>= aTmp;
 
diff --git a/svx/source/smarttags/SmartTagMgr.cxx b/svx/source/smarttags/SmartTagMgr.cxx
index 7d2ae7ea4365..b6c1d7f90c2d 100644
--- a/svx/source/smarttags/SmartTagMgr.cxx
+++ b/svx/source/smarttags/SmartTagMgr.cxx
@@ -126,7 +126,7 @@ void SmartTagMgr::RecognizeTextRange(const Reference< text::XTextRange>& xRange,
         const sal_uInt32 nSmartTagCount = xRecognizer->getSmartTagCount();
         for ( sal_uInt32 j = 0; j < nSmartTagCount && !bCallRecognizer; ++j )
         {
-            const rtl::OUString aSmartTagName = xRecognizer->getSmartTagName(j);
+            const OUString aSmartTagName = xRecognizer->getSmartTagName(j);
             if ( IsSmartTagTypeEnabled( aSmartTagName ) )
                 bCallRecognizer = true;
         }
diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx
index 4eff1c5bb569..ad2029bd7c53 100644
--- a/svx/source/tbxctrls/tbxcolor.cxx
+++ b/svx/source/tbxctrls/tbxcolor.cxx
@@ -35,7 +35,7 @@ namespace svx
     #define TOOLBAR_RESNAME         "private:resource/toolbar/"
     #define PROPNAME_LAYOUTMANAGER  "LayoutManager"
 
-    ToolboxAccess::ToolboxAccess( const ::rtl::OUString& rToolboxName ) :
+    ToolboxAccess::ToolboxAccess( const OUString& rToolboxName ) :
         m_sToolboxResName   ( TOOLBAR_RESNAME )
     {
         m_sToolboxResName += rToolboxName;
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 492c92a5eeb3..73e24198df1b 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -724,7 +724,7 @@ static SfxItemPropertyMapEntry const * ImplGetSvxTableShapePropertyMap()
         { OUString(UNO_NAME_MISC_OBJ_MOVEPROTECT),  SDRATTR_OBJMOVEPROTECT, cppu::UnoType<bool>::get(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_SIZEPROTECT),  SDRATTR_OBJSIZEPROTECT, cppu::UnoType<bool>::get(),0, 0},
         { OUString(UNO_NAME_MISC_OBJ_BOUNDRECT),    OWN_ATTR_BOUNDRECT, cppu::UnoType<css::awt::Rectangle>::get(), css::beans::PropertyAttribute::READONLY, 0},
-        { OUString(UNO_NAME_MISC_OBJ_NAME),         SDRATTR_OBJECTNAME, cppu::UnoType<rtl::OUString>::get(),    0,      0},
+        { OUString(UNO_NAME_MISC_OBJ_NAME),         SDRATTR_OBJECTNAME, cppu::UnoType<OUString>::get(),    0,      0},
         { OUString(UNO_NAME_MISC_OBJ_TITLE),        OWN_ATTR_MISC_OBJ_TITLE         , cppu::UnoType<OUString>::get(),    0,  0},
         { OUString(UNO_NAME_MISC_OBJ_DESCRIPTION),  OWN_ATTR_MISC_OBJ_DESCRIPTION   , cppu::UnoType<OUString>::get(),    0,  0},
         { OUString("Model"),                        OWN_ATTR_OLEMODEL               , cppu::UnoType<css::table::XTable>::get(), css::beans::PropertyAttribute::READONLY, 0},
diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx
index c9b538920c68..a640d9a61055 100644
--- a/svx/source/xoutdev/xtabgrdt.cxx
+++ b/svx/source/xoutdev/xtabgrdt.cxx
@@ -65,7 +65,7 @@ uno::Reference< container::XNameContainer > XGradientList::createInstance()
 
 bool XGradientList::Create()
 {
-    rtl::OUStringBuffer aStr(SvxResId(RID_SVXSTR_GRADIENT));
+    OUStringBuffer aStr(SvxResId(RID_SVXSTR_GRADIENT));
     aStr.append(" 1");
     sal_Int32 nLen = aStr.getLength() - 1;
     Insert(o3tl::make_unique<XGradientEntry>(XGradient(COL_BLACK,   COL_WHITE, css::awt::GradientStyle_LINEAR    ,    0,10,10, 0,100,100),aStr.toString()));