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>

1 files changed, 21 insertions, 21 deletions

diff --git a/sfx2/source/appl/shutdowniconaqua.mm b/sfx2/source/appl/shutdowniconaqua.mm
index 582b403ebecb..189910f59864 100644
--- a/sfx2/source/appl/shutdowniconaqua.mm
+++ b/sfx2/source/appl/shutdowniconaqua.mm
@@ -116,17 +116,17 @@ static QSMenuExecute* pExecute = nil;
 
 static std::set< OUString > aShortcuts;
 
-static NSString* getAutoreleasedString( const rtl::OUString& rStr )
+static NSString* getAutoreleasedString( const OUString& rStr )
 {
     return [[[NSString alloc] initWithCharacters: reinterpret_cast<unichar const *>(rStr.getStr()) length: rStr.getLength()] autorelease];
 }
 
 struct RecentMenuEntry
 {
-    rtl::OUString aURL;
-    rtl::OUString aFilter;
-    rtl::OUString aTitle;
-    rtl::OUString aPassword;
+    OUString aURL;
+    OUString aFilter;
+    OUString aTitle;
+    OUString aPassword;
 };
 
 class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStringWidth >
@@ -135,7 +135,7 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
         RecentFilesStringLength() {}
 
         // XStringWidth
-        sal_Int32 SAL_CALL queryStringWidth( const ::rtl::OUString& aString ) override
+        sal_Int32 SAL_CALL queryStringWidth( const OUString& aString ) override
         {
             return aString.getLength();
         }
@@ -208,15 +208,15 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
     // insert new recent items
     for ( std::vector<RecentMenuEntry>::size_type i = 0; i < m_pRecentFilesItems->size(); i++ )
     {
-        rtl::OUString   aMenuTitle;
+        OUString   aMenuTitle;
         INetURLObject   aURL( (*m_pRecentFilesItems)[i].aURL );
 
         if ( aURL.GetProtocol() == INetProtocol::File )
         {
             // Do handle file URL differently => convert it to a system
             // path and abbreviate it with a special function:
-            ::rtl::OUString aSystemPath( aURL.getFSysPath( FSysStyle::Detect ) );
-            ::rtl::OUString aCompactedSystemPath;
+            OUString aSystemPath( aURL.getFSysPath( FSysStyle::Detect ) );
+            OUString aCompactedSystemPath;
 
             oslFileError nError = osl_abbreviateSystemPath( aSystemPath.pData, &aCompactedSystemPath.pData, 46, nullptr );
             if ( !nError )
@@ -258,11 +258,11 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
         aArgsList[1].Name = "AsTemplate";
         aArgsList[1].Value <<= false;
 
-        ::rtl::OUString  aFilter( rRecentFile.aFilter );
+        OUString  aFilter( rRecentFile.aFilter );
         sal_Int32 nPos = aFilter.indexOf( '|' );
         if ( nPos >= 0 )
         {
-            rtl::OUString aFilterOptions;
+            OUString aFilterOptions;
 
             if ( nPos < ( aFilter.getLength() - 1 ) )
                 aFilterOptions = aFilter.copy( nPos+1 );
@@ -284,13 +284,13 @@ class RecentFilesStringLength : public ::cppu::WeakImplHelper< css::util::XStrin
 
 static RecentMenuDelegate* pRecentDelegate = nil;
 
-static rtl::OUString getShortCut( const rtl::OUString& i_rTitle )
+static OUString getShortCut( const OUString& i_rTitle )
 {
     // create shortcut
-    rtl::OUString aKeyEquiv;
+    OUString aKeyEquiv;
     for( sal_Int32 nIndex = 0; nIndex < i_rTitle.getLength(); nIndex++ )
     {
-        rtl::OUString aShortcut( i_rTitle.copy( nIndex, 1 ).toAsciiLowerCase() );
+        OUString aShortcut( i_rTitle.copy( nIndex, 1 ).toAsciiLowerCase() );
         if( aShortcuts.find( aShortcut ) == aShortcuts.end() )
         {
             aShortcuts.insert( aShortcut );
@@ -302,7 +302,7 @@ static rtl::OUString getShortCut( const rtl::OUString& i_rTitle )
     return aKeyEquiv;   
 }
 
-static void appendMenuItem( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const rtl::OUString& i_rTitle, int i_nTag, const rtl::OUString& i_rKeyEquiv )
+static void appendMenuItem( NSMenu* i_pMenu, NSMenu* i_pDockMenu, const OUString& i_rTitle, int i_nTag, const OUString& i_rKeyEquiv )
 {
     if( ! i_rTitle.getLength() )
         return;
@@ -406,14 +406,14 @@ void aqua_init_systray()
 
             // collect the URLs of the entries in the File/New menu
             SvtModuleOptions    aModuleOptions;
-            std::set< rtl::OUString > aFileNewAppsAvailable;
+            std::set< OUString > aFileNewAppsAvailable;
             SvtDynamicMenuOptions aOpt;
             css::uno::Sequence < css::uno::Sequence < css::beans::PropertyValue > > aNewMenu = aOpt.GetMenu( EDynamicMenuType::NewMenu );
 
             for ( auto const & newMenuProp : aNewMenu )
             {
                 comphelper::SequenceAsHashMap aEntryItems( newMenuProp );
-                rtl::OUString sURL( aEntryItems.getUnpackedValueOrDefault( "URL", rtl::OUString() ) );
+                OUString sURL( aEntryItems.getUnpackedValueOrDefault( "URL", OUString() ) );
                 if ( sURL.getLength() )
                     aFileNewAppsAvailable.insert( sURL );
             }
@@ -452,14 +452,14 @@ void aqua_init_systray()
                     // the complete application is not even installed
                     continue;
 
-                rtl::OUString sURL( ::rtl::OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) );
+                OUString sURL( OUString::createFromAscii( aMenuItems[i].pAsciiURLDescription ) );
 
                 if ( aFileNewAppsAvailable.find( sURL ) == aFileNewAppsAvailable.end() )
                     // the application is installed, but the entry has been configured to *not* appear in the File/New
                     // menu => also let not appear it in the quickstarter
                     continue;
 
-                rtl::OUString aKeyEquiv( getShortCut( ShutdownIcon::GetUrlDescription( sURL ) ) );
+                OUString aKeyEquiv( getShortCut( ShutdownIcon::GetUrlDescription( sURL ) ) );
 
                 appendMenuItem( pMenu, pDockMenu, ShutdownIcon::GetUrlDescription( sURL ), aMenuItems[i].nMenuTag, aKeyEquiv );
             }
@@ -469,8 +469,8 @@ void aqua_init_systray()
             // add recent menu
             appendRecentMenu( pMenu, pDockMenu, SfxResId(STR_QUICKSTART_RECENTDOC) );
 
-            rtl::OUString aTitle( SfxResId(STR_QUICKSTART_FROMTEMPLATE) );
-            rtl::OUString aKeyEquiv( getShortCut( aTitle ) );
+            OUString aTitle( SfxResId(STR_QUICKSTART_FROMTEMPLATE) );
+            OUString aKeyEquiv( getShortCut( aTitle ) );
             appendMenuItem( pMenu, pDockMenu, aTitle, MI_TEMPLATE, aKeyEquiv );
             aTitle = SfxResId(STR_QUICKSTART_FILEOPEN);
             aKeyEquiv = getShortCut( aTitle );