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

4 files changed, 31 insertions, 32 deletions

diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index c4e0ee26e092..db8c498e3d2c 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -134,11 +134,11 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
 //--------------------------------------------------------------------
 
 
-static Image lcl_GetImageFromPngUrl( const ::rtl::OUString &rFileUrl )
+static Image lcl_GetImageFromPngUrl( const OUString &rFileUrl )
 {
     Image aRes;
 
-    ::rtl::OUString aTmp;
+    OUString aTmp;
     osl::FileBase::getSystemPathFromFileURL( rFileUrl, aTmp );
 
     Graphic aGraphic;
@@ -171,9 +171,9 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
     if (aThesLookUpStr.Len() > 0 && nDelimPos != STRING_NOTFOUND)
     {
         // get synonym list for sub menu
-        std::vector< ::rtl::OUString > aSynonyms;
+        std::vector< OUString > aSynonyms;
         SfxThesSubMenuHelper aHelper;
-        ::rtl::OUString aText( aHelper.GetText( aThesLookUpStr, nDelimPos ) );
+        OUString aText( aHelper.GetText( aThesLookUpStr, nDelimPos ) );
         lang::Locale aLocale;
         aHelper.GetLocale( aLocale, aThesLookUpStr, nDelimPos );
         const bool bHasMoreSynonyms = aHelper.GetMeanings( aSynonyms, aText, aLocale, 7 /*max number of synonyms to retrieve*/ );
@@ -188,7 +188,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
 
             Image aImage;
             String sThesImplName( aHelper.GetThesImplName( aLocale ) );
-            ::rtl::OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName ) );
+            OUString aSynonymsImageUrl( aCfg.GetSynonymsContextImage( sThesImplName ) );
             if (sThesImplName.Len() > 0 && !aSynonymsImageUrl.isEmpty())
                 aImage = Image( lcl_GetImageFromPngUrl( aSynonymsImageUrl ) );
 
@@ -199,7 +199,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
 
                 String aItemText( linguistic::GetThesaurusReplaceText( aSynonyms[i] ) );
                 pThesSubMenu->InsertItem( nId, aItemText );
-                ::rtl::OUString aCmd(".uno:ThesaurusFromContext?WordReplace:string=" );
+                OUString aCmd(".uno:ThesaurusFromContext?WordReplace:string=" );
                 aCmd += aItemText;
                 pThesSubMenu->SetItemCommand( nId, aCmd );
 
@@ -209,16 +209,16 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
         }
         else // nNumSynonyms == 0
         {
-            const rtl::OUString aItemText( SfxResId(STR_MENU_NO_SYNONYM_FOUND).toString() );
+            const OUString aItemText( SfxResId(STR_MENU_NO_SYNONYM_FOUND).toString() );
             pThesSubMenu->InsertItem( 1, aItemText, MIB_NOSELECT );
         }
         pThesSubMenu->InsertSeparator();
-        const rtl::OUString sThesaurus( SfxResId(STR_MENU_THESAURUS).toString() );
+        const OUString sThesaurus( SfxResId(STR_MENU_THESAURUS).toString() );
         pThesSubMenu->InsertItem( 100, sThesaurus );
-        pThesSubMenu->SetItemCommand( 100, ::rtl::OUString(".uno:ThesaurusDialog") );
+        pThesSubMenu->SetItemCommand( 100, OUString(".uno:ThesaurusDialog") );
 
         pSVMenu->InsertSeparator();
-        const rtl::OUString sSynonyms( SfxResId(STR_MENU_SYNONYMS).toString() );
+        const OUString sSynonyms( SfxResId(STR_MENU_SYNONYMS).toString() );
         pSVMenu->InsertItem( SID_THES, sSynonyms );
         pSVMenu->SetPopupMenu( SID_THES, pThesSubMenu );
     }
@@ -331,7 +331,7 @@ SfxPopupMenuManager* SfxPopupMenuManager::Popup( const ResId& rResId, SfxViewFra
     aEvent.SourceWindow = VCLUnoHelper::GetInterface( pWindow );
     aEvent.ExecutePosition.X = rPoint.X();
     aEvent.ExecutePosition.Y = rPoint.Y();
-    ::rtl::OUString sDummyMenuName;
+    OUString sDummyMenuName;
     if ( pFrame->GetViewShell()->TryContextMenuInterception( *pSVMenu, sDummyMenuName, pMenu, aEvent ) )
     {
         if ( pMenu )
@@ -381,7 +381,7 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
     aEvent.SourceWindow = VCLUnoHelper::GetInterface( pWindow );
     aEvent.ExecutePosition.X = rPoint.X();
     aEvent.ExecutePosition.Y = rPoint.Y();
-    ::rtl::OUString sDummyMenuName;
+    OUString sDummyMenuName;
     if ( pFrame->GetViewShell()->TryContextMenuInterception( *pSVMenu, sDummyMenuName, pMenu, aEvent ) )
     {
         if ( pMenu )
diff --git a/sfx2/source/menu/thessubmenu.cxx b/sfx2/source/menu/thessubmenu.cxx
index b1075f42640a..287ed2000546 100644
--- a/sfx2/source/menu/thessubmenu.cxx
+++ b/sfx2/source/menu/thessubmenu.cxx
@@ -38,7 +38,6 @@
 #include "thessubmenu.hxx"
 
 using namespace ::com::sun::star;
-using ::rtl::OUString;
 
 OUString SfxThesSubMenuHelper::GetText(
     const String &rLookUpString,
diff --git a/sfx2/source/menu/thessubmenu.hxx b/sfx2/source/menu/thessubmenu.hxx
index a6a274fa5d40..2a12c6ae1728 100644
--- a/sfx2/source/menu/thessubmenu.hxx
+++ b/sfx2/source/menu/thessubmenu.hxx
@@ -42,7 +42,7 @@ public:
     SfxThesSubMenuHelper();
     ~SfxThesSubMenuHelper();
 
-    static ::rtl::OUString     GetText( const String &rLookUpString, xub_StrLen nDelimPos );
+    static OUString     GetText( const String &rLookUpString, xub_StrLen nDelimPos );
 
     // returns the Locale to be used for the selected text when the thesaurus is to be called
     static void GetLocale( css::lang::Locale /*out */ &rLocale, const String &rLookUpString, xub_StrLen nDelimPos );
@@ -51,7 +51,7 @@ public:
     bool    IsSupportedLocale( const css::lang::Locale & rLocale ) const;
 
     // get the first nMax Synonym entries, even if different meanings need to be evaluated
-    bool    GetMeanings( std::vector< ::rtl::OUString > & rSynonyms, const ::rtl::OUString & rWord, const css::lang::Locale & rLocale, sal_Int16 nMaxSynonms );
+    bool    GetMeanings( std::vector< OUString > & rSynonyms, const OUString & rWord, const css::lang::Locale & rLocale, sal_Int16 nMaxSynonms );
 
     String  GetThesImplName( const css::lang::Locale &rLocale ) const;
 };
diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx
index d052c39240d1..ac5f07b20600 100644
--- a/sfx2/source/menu/virtmenu.cxx
+++ b/sfx2/source/menu/virtmenu.cxx
@@ -112,8 +112,8 @@ void SfxMenuImageControl_Impl::Update()
 //=========================================================================
 
 static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFrame,
-                                 const rtl::OUString& aImageId,
-                                 const rtl::OUString& aURL,
+                                 const OUString& aImageId,
+                                 const OUString& aURL,
                                  bool bBigImage
 )
 {
@@ -391,8 +391,8 @@ void SfxVirtualMenu::CreateFromSVMenu()
 
                 if (  Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
                 {
-                    rtl::OUString aSlotURL( "slot:" );
-                    aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
+                    OUString aSlotURL( "slot:" );
+                    aSlotURL += OUString::valueOf( sal_Int32( nSlotId ));
                     Image aImage = GetImage( xFrame, aSlotURL, false );
                     pSVMenu->SetItemImage( nSlotId, aImage );
                 }
@@ -455,7 +455,7 @@ void SfxVirtualMenu::CreateFromSVMenu()
                         Image aImage;
                         if ( bIsAddonPopupMenu || framework::AddonMenuManager::IsAddonMenuId( nSlotId ))
                         {
-                            rtl::OUString aImageId;
+                            OUString aImageId;
 
                             ::framework::MenuConfiguration::Attributes* pMenuAttributes =
                                 (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId );
@@ -467,8 +467,8 @@ void SfxVirtualMenu::CreateFromSVMenu()
                         }
                         else
                         {
-                            rtl::OUString aSlotURL( "slot:" );
-                            aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
+                            OUString aSlotURL( "slot:" );
+                            aSlotURL += OUString::valueOf( sal_Int32( nSlotId ));
                             aImage = GetImage( xFrame, aSlotURL, false );
                         }
 
@@ -535,8 +535,8 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged)
                 if ( framework::AddonMenuManager::IsAddonMenuId( nSlotId ))
                 {
                     // Special code for Add-On menu items. They can appear inside the help menu.
-                    rtl::OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) );
-                    rtl::OUString aImageId;
+                    OUString aCmd( pSVMenu->GetItemCommand( nSlotId ) );
+                    OUString aImageId;
 
                     ::framework::MenuConfiguration::Attributes* pMenuAttributes =
                         (::framework::MenuConfiguration::Attributes*)pSVMenu->GetUserValue( nSlotId );
@@ -548,8 +548,8 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged)
                 }
                 else
                 {
-                    rtl::OUString aSlotURL( "slot:" );
-                    aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlotId ));
+                    OUString aSlotURL( "slot:" );
+                    aSlotURL += OUString::valueOf( sal_Int32( nSlotId ));
                     pSVMenu->SetItemImage( nSlotId, GetImage( xFrame, aSlotURL, false ));
                 }
             }
@@ -604,7 +604,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu )
             PopupMenu* pPopup = pMenu->GetPopupMenu( nSlotId );
             if ( pMenu->GetItemType( nPos ) != MENUITEM_SEPARATOR )
             {
-                rtl::OUString aImageId;
+                OUString aImageId;
 
                 ::framework::MenuConfiguration::Attributes* pMenuAttributes =
                     (::framework::MenuConfiguration::Attributes*)pMenu->GetUserValue( nSlotId );
@@ -671,7 +671,7 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu )
 
                 // Check if the popup is an Add-On popup menu
                 // Either the popup menu has a special ID  or a special command URL prefix!
-                rtl::OUString aCommand = pSVMenu->GetItemCommand( nSID );
+                OUString aCommand = pSVMenu->GetItemCommand( nSID );
                 if ( ( nSID == SID_ADDONS ) ||
                      ( nSID == SID_ADDONHELP ) ||
                      (( (sal_uInt32)aCommand.getLength() > nAddonsPopupPrefixLen ) &&
@@ -782,7 +782,7 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
     if ( pAddonMenu && pAddonMenu->GetItemCount() > 0 )
     {
         sal_uInt16 nItemCount = pMenu->GetItemCount();
-        rtl::OUString aAddonsTitle(SfxResId(STR_MENU_ADDONS).toString());
+        OUString aAddonsTitle(SfxResId(STR_MENU_ADDONS).toString());
         if ( nItemCount > 0 && pMenu->GetItemType( nItemCount-1 ) != MENUITEM_SEPARATOR )
             pMenu->InsertSeparator();
         pMenu->InsertItem( SID_ADDONS, aAddonsTitle );
@@ -790,8 +790,8 @@ void SfxVirtualMenu::InsertAddOnsMenuItem( Menu* pMenu )
 
         if ( Application::GetSettings().GetStyleSettings().GetUseImagesInMenus() )
         {
-               rtl::OUString aSlotURL( "slot:" );
-               aSlotURL += rtl::OUString::valueOf( sal_Int32( SID_ADDONS ));
+               OUString aSlotURL( "slot:" );
+               aSlotURL += OUString::valueOf( sal_Int32( SID_ADDONS ));
          pMenu->SetItemImage( SID_ADDONS, GetImage( xFrame, aSlotURL, false ));
         }
     }
@@ -840,7 +840,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu )
         if ( pParent && pSVMenu == pParent->pWindowMenu )
         {
             // update window list
-            ::std::vector< ::rtl::OUString > aNewWindowListVector;
+            ::std::vector< OUString > aNewWindowListVector;
             Reference< XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );;
 
             sal_uInt16  nActiveItemId = 0;