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>

5 files changed, 10 insertions, 15 deletions

diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx
index 669e84b880a4..15f01a02e543 100644
--- a/framework/source/uielement/genericstatusbarcontroller.cxx
+++ b/framework/source/uielement/genericstatusbarcontroller.cxx
@@ -31,8 +31,6 @@
 #include <com/sun/star/awt/XGraphics2.hpp>
 #include <com/sun/star/graphic/GraphicType.hpp>
 
-using ::rtl::OUString;
-
 using namespace ::cppu;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -89,7 +87,7 @@ void SAL_CALL GenericStatusbarController::statusChanged(
 
     m_bEnabled = rEvent.IsEnabled;
 
-    rtl::OUString aStrValue;
+    OUString aStrValue;
     Reference< graphic::XGraphic > aGraphic;
 
     if ( rEvent.State >>= aStrValue )
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 93c458ec15e3..022f5d766c5d 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -1303,7 +1303,7 @@ void MenuBarManager::RetrieveShortcuts( std::vector< std::unique_ptr<MenuItemHan
         const sal_uInt32 nCount = aMenuShortCuts.size();
         for ( sal_uInt32 i = 0; i < nCount; ++i )
         {
-            rtl::OUString aItemURL = aMenuShortCuts[i]->aMenuItemURL;
+            OUString aItemURL = aMenuShortCuts[i]->aMenuItemURL;
             if( aItemURL.isEmpty() && aMenuShortCuts[i]->xSubMenuManager.is())
                 aItemURL = "-"; // tdf#99527 prevent throw in case of empty commands
             aSeq[i] = aItemURL;
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx
index 157fc8e3b6cf..631c65603e3f 100644
--- a/framework/source/uielement/newmenucontroller.cxx
+++ b/framework/source/uielement/newmenucontroller.cxx
@@ -313,7 +313,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu > const &
     {
         Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
         URL aTargetURL;
-        aTargetURL.Complete = rtl::OUString::createFromAscii(m_bNewMenu ? aSlotNewDocDirect : aSlotAutoPilot);
+        aTargetURL.Complete = OUString::createFromAscii(m_bNewMenu ? aSlotNewDocDirect : aSlotAutoPilot);
         m_xURLTransformer->parseStrict( aTargetURL );
         Reference< XDispatch > xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
         if(xMenuItemDispatch == nullptr)
diff --git a/framework/source/uielement/statusbaritem.cxx b/framework/source/uielement/statusbaritem.cxx
index 959ea4fbec29..7ceb2a24434f 100644
--- a/framework/source/uielement/statusbaritem.cxx
+++ b/framework/source/uielement/statusbaritem.cxx
@@ -24,8 +24,6 @@
 #include <com/sun/star/ui/ItemStyle.hpp>
 
 using namespace com::sun::star::ui;
-
-using rtl::OUString;
 using com::sun::star::uno::RuntimeException;
 
 namespace framework
@@ -64,7 +62,7 @@ sal_uInt16 impl_convertItemBitsToItemStyle( StatusBarItemBits nItemBits )
 StatusbarItem::StatusbarItem(
     StatusBar              *pStatusBar,
     sal_uInt16              nId,
-    const rtl::OUString&    aCommand )
+    const OUString&    aCommand )
     : StatusbarItem_Base( m_aMutex )
     , m_pStatusBar( pStatusBar )
     , m_nId( nId )
diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx
index 455950458304..3fabfc6ea695 100644
--- a/framework/source/uielement/statusbarmerger.cxx
+++ b/framework/source/uielement/statusbarmerger.cxx
@@ -18,7 +18,6 @@
  */
 #include <uielement/statusbarmerger.hxx>
 
-using rtl::OUString;
 using com::sun::star::beans::PropertyValue;
 using com::sun::star::uno::Sequence;
 
@@ -138,7 +137,7 @@ bool lcl_ReplaceItem( StatusBar* pStatusbar,
 
 bool lcl_RemoveItems( StatusBar* pStatusbar,
                              sal_uInt16 nPos,
-                             const ::rtl::OUString& rMergeCommandParameter )
+                             const OUString& rMergeCommandParameter )
 {
     sal_Int32 nCount = rMergeCommandParameter.toInt32();
     if ( nCount > 0 )
@@ -180,7 +179,7 @@ sal_uInt16 StatusbarMerger::FindReferencePos(
 {
     for ( sal_uInt16 nPos = 0; nPos < pStatusbar->GetItemCount(); nPos++ )
     {
-        const ::rtl::OUString rCmd = pStatusbar->GetItemCommand( pStatusbar->GetItemId( nPos ) );
+        const OUString rCmd = pStatusbar->GetItemCommand( pStatusbar->GetItemId( nPos ) );
         if ( rReferencePoint == rCmd )
             return nPos;
     }
@@ -192,8 +191,8 @@ bool StatusbarMerger::ProcessMergeOperation(
     StatusBar* pStatusbar,
     sal_uInt16 nPos,
     sal_uInt16& rItemId,
-    const ::rtl::OUString& rMergeCommand,
-    const ::rtl::OUString& rMergeCommandParameter,
+    const OUString& rMergeCommand,
+    const OUString& rMergeCommandParameter,
     const AddonStatusbarItemContainer& rItems )
 {
     if ( rMergeCommand == MERGECOMMAND_ADDAFTER )
@@ -211,8 +210,8 @@ bool StatusbarMerger::ProcessMergeOperation(
 bool StatusbarMerger::ProcessMergeFallback(
     StatusBar* pStatusbar,
     sal_uInt16& rItemId,
-    const ::rtl::OUString& rMergeCommand,
-    const ::rtl::OUString& rMergeFallback,
+    const OUString& rMergeCommand,
+    const OUString& rMergeFallback,
     const AddonStatusbarItemContainer& rItems )
 {
     // fallback IGNORE or REPLACE/REMOVE item not found