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>

9 files changed, 78 insertions, 79 deletions

diff --git a/fpicker/source/aqua/CFStringUtilities.mm b/fpicker/source/aqua/CFStringUtilities.mm
index 2458116a4288..b56f5d38242c 100644
--- a/fpicker/source/aqua/CFStringUtilities.mm
+++ b/fpicker/source/aqua/CFStringUtilities.mm
@@ -20,10 +20,10 @@
 #include <sal/log.hxx>
 #include "CFStringUtilities.hxx"
 
-rtl::OUString CFStringToOUString(const CFStringRef sOrig)
+OUString CFStringToOUString(const CFStringRef sOrig)
 {
     if (nullptr == sOrig) {
-        return rtl::OUString();
+        return OUString();
     }
 
     CFRetain(sOrig);
@@ -38,23 +38,23 @@ rtl::OUString CFStringToOUString(const CFStringRef sOrig)
     //we no longer need the original string
     CFRelease(sOrig);
 
-    return rtl::OUString(reinterpret_cast<sal_Unicode *>(unichars));
+    return OUString(reinterpret_cast<sal_Unicode *>(unichars));
 }
 
-CFStringRef CFStringCreateWithOUString(const rtl::OUString& aString)
+CFStringRef CFStringCreateWithOUString(const OUString& aString)
 {
     CFStringRef ref = CFStringCreateWithCharacters(kCFAllocatorDefault, reinterpret_cast<UniChar const *>(aString.getStr()), aString.getLength());
 
     return ref;
 }
 
-rtl::OUString FSRefToOUString(FSRef const & fsRef, InfoType info)
+OUString FSRefToOUString(FSRef const & fsRef, InfoType info)
 {
     SAL_WNODEPRECATED_DECLARATIONS_PUSH //TODO: 10.9 CFURLCreateFromFSRef
     CFURLRef aUrlRef = CFURLCreateFromFSRef(nullptr, &fsRef);
     SAL_WNODEPRECATED_DECLARATIONS_POP
 
-    rtl::OUString sResult = CFURLRefToOUString(aUrlRef, info);
+    OUString sResult = CFURLRefToOUString(aUrlRef, info);
 
     //we no longer need the CFURLRef
     CFRelease(aUrlRef);
@@ -62,7 +62,7 @@ rtl::OUString FSRefToOUString(FSRef const & fsRef, InfoType info)
     return sResult;
 }
 
-rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
+OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
 {
     CFStringRef sURLString = nullptr;
 
@@ -97,7 +97,7 @@ rtl::OUString CFURLRefToOUString(CFURLRef aUrlRef, InfoType info)
             break;
     }
 
-    rtl::OUString sResult = CFStringToOUString(sURLString);
+    OUString sResult = CFStringToOUString(sURLString);
 
     CFRelease(sURLString);
 
diff --git a/fpicker/source/aqua/ControlHelper.mm b/fpicker/source/aqua/ControlHelper.mm
index 1b10248630b2..cd67c04b037f 100644
--- a/fpicker/source/aqua/ControlHelper.mm
+++ b/fpicker/source/aqua/ControlHelper.mm
@@ -270,7 +270,7 @@ OUString ControlHelper::getLabel( sal_Int16 nControlId )
         return OUString();
     }
 
-    rtl::OUString retVal;
+    OUString retVal;
     if ([pControl class] == [NSPopUpButton class]) {
         NSString *temp = m_aMapListLabels[pControl];
         if (temp != nil)
diff --git a/fpicker/source/aqua/FilterHelper.mm b/fpicker/source/aqua/FilterHelper.mm
index 3e748021079f..5db89a745f6f 100644
--- a/fpicker/source/aqua/FilterHelper.mm
+++ b/fpicker/source/aqua/FilterHelper.mm
@@ -32,10 +32,10 @@
 
 namespace {
 
-void fillSuffixList(OUStringList& aSuffixList, const ::rtl::OUString& suffixString) {
+void fillSuffixList(OUStringList& aSuffixList, const OUString& suffixString) {
     sal_Int32 nIndex = 0;
     do {
-        rtl::OUString aToken = suffixString.getToken( 0, ';', nIndex );
+        OUString aToken = suffixString.getToken( 0, ';', nIndex );
         aSuffixList.push_back(aToken.copy(1));
     } while ( nIndex >= 0 );
 }
@@ -46,7 +46,7 @@ void fillSuffixList(OUStringList& aSuffixList, const ::rtl::OUString& suffixStri
 
 #pragma mark FilterEntry
 
-FilterEntry::FilterEntry( const rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters )
+FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters )
 :m_sTitle( _rTitle )
 ,m_aSubFilters( _rSubFilters )
 {
@@ -71,13 +71,13 @@ sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
 
 #pragma mark statics
 static bool
-isFilterString( const rtl::OUString& rFilterString, const char *pMatch )
+isFilterString( const OUString& rFilterString, const char *pMatch )
 {
     sal_Int32 nIndex = 0;
-    rtl::OUString aToken;
+    OUString aToken;
     bool bIsFilter = true;
 
-    rtl::OUString aMatch(rtl::OUString::createFromAscii(pMatch));
+    OUString aMatch(OUString::createFromAscii(pMatch));
 
     do
     {
@@ -95,11 +95,11 @@ isFilterString( const rtl::OUString& rFilterString, const char *pMatch )
 
 
 
-static rtl::OUString
-shrinkFilterName( const rtl::OUString& aFilterName, bool bAllowNoStar = false )
+static OUString
+shrinkFilterName( const OUString& aFilterName, bool bAllowNoStar = false )
 {
     sal_Int32 nBracketEnd = -1;
-    rtl::OUString aRealName(aFilterName);
+    OUString aRealName(aFilterName);
 
     for( sal_Int32 i = aRealName.getLength() - 1; i > 0; i-- )
     {
@@ -111,11 +111,11 @@ shrinkFilterName( const rtl::OUString& aFilterName, bool bAllowNoStar = false )
             if( nBracketEnd <= 0 )
                 continue;
             if( isFilterString( aFilterName.copy( i + 1, nBracketLen - 1 ), "*." ) )
-                aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() );
+                aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() );
             else if (bAllowNoStar)
             {
                 if( isFilterString( aFilterName.copy( i + 1, nBracketLen - 1 ), ".") )
-                    aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() );
+                    aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() );
             }
         }
     }
@@ -129,10 +129,10 @@ namespace {
     struct FilterTitleMatch
     {
 protected:
-        const rtl::OUString rTitle;
+        const OUString rTitle;
 
 public:
-        FilterTitleMatch( const rtl::OUString& _rTitle ) : rTitle( _rTitle ) { }
+        FilterTitleMatch( const OUString& _rTitle ) : rTitle( _rTitle ) { }
 
 
         bool operator () ( const FilterEntry& _rEntry )
@@ -140,12 +140,12 @@ public:
             bool bMatch;
             if( !_rEntry.hasSubFilters() ) {
                 //first try the complete filter name
-                rtl::OUString title = _rEntry.getTitle();
+                OUString title = _rEntry.getTitle();
                 bMatch = title.equals(rTitle);
                 if (!bMatch) {
                     //we didn't find a match using the full name, let's give it another
                     //try using the shrunk version
-                    rtl::OUString aShrunkName = shrinkFilterName( _rEntry.getTitle() ).trim();
+                    OUString aShrunkName = shrinkFilterName( _rEntry.getTitle() ).trim();
                     bMatch = aShrunkName.equals(rTitle);
                 }
             }
@@ -161,7 +161,7 @@ public:
 
         bool operator () ( const UnoFilterEntry& _rEntry )
         {
-            rtl::OUString aShrunkName = shrinkFilterName( _rEntry.First );
+            OUString aShrunkName = shrinkFilterName( _rEntry.First );
             bool retVal = aShrunkName.equals(rTitle);
             return retVal;
         }
@@ -194,7 +194,7 @@ FilterHelper::~FilterHelper()
 }
 
 
-bool FilterHelper::FilterNameExists( const rtl::OUString& rTitle )
+bool FilterHelper::FilterNameExists( const OUString& rTitle )
 {
     bool bRet = false;
 
@@ -229,7 +229,7 @@ bool FilterHelper::FilterNameExists( const UnoFilterList& _rGroupedFilters )
 }
 
 
-void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter )
+void FilterHelper::ensureFilterList( const OUString& _rInitialCurrentFilter )
 {
     if( nullptr == m_pFilterList )
     {
@@ -240,7 +240,7 @@ void FilterHelper::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilt
     }
 }
 
-void FilterHelper::SetCurFilter( const rtl::OUString& rFilter )
+void FilterHelper::SetCurFilter( const OUString& rFilter )
 {
     SolarMutexGuard aGuard;
 
@@ -260,7 +260,7 @@ void FilterHelper::SetFilters()
     }
 }
 
-void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilterString)
+void FilterHelper::appendFilter(const OUString& aTitle, const OUString& aFilterString)
 {
     SolarMutexGuard aGuard;
 
@@ -277,19 +277,19 @@ void FilterHelper::appendFilter(const ::rtl::OUString& aTitle, const ::rtl::OUSt
     m_pFilterList->push_back(FilterEntry( aTitle, suffixList ) );
 }
 
-void FilterHelper::setCurrentFilter( const ::rtl::OUString& aTitle )
+void FilterHelper::setCurrentFilter( const OUString& aTitle )
 {
     SetCurFilter(aTitle);
 }
 
-::rtl::OUString FilterHelper::getCurrentFilter(  )
+OUString FilterHelper::getCurrentFilter(  )
 {
-    ::rtl::OUString sReturn = m_aCurrentFilter;
+    OUString sReturn = m_aCurrentFilter;
 
     return sReturn;
 }
 
-void FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters )
+void FilterHelper::appendFilterGroup( const OUString& /* sGroupTitle */, const css::uno::Sequence< css::beans::StringPair >& aFilters )
 {
     SolarMutexGuard aGuard;
 
@@ -297,7 +297,7 @@ void FilterHelper::appendFilterGroup( const ::rtl::OUString& /* sGroupTitle */,
     bool bPrependSeparator = m_pFilterList != nullptr;
 
     // ensure that we have a filter list
-    ::rtl::OUString sInitialCurrentFilter;
+    OUString sInitialCurrentFilter;
     if( aFilters.getLength() > 0)
         sInitialCurrentFilter = aFilters[0].First;
     ensureFilterList( sInitialCurrentFilter );
@@ -345,7 +345,7 @@ bool FilterHelper::filenameMatchesFilter(NSString* sFilename)
     OUStringList suffixList = filter->getFilterSuffixList();
 
     {
-        rtl::OUString aName = [sFilename OUString];
+        OUString aName = [sFilename OUString];
         for(OUStringList::iterator iter = suffixList.begin(); iter != suffixList.end(); ++iter) {
             if (*iter == ".*" || aName.endsWithIgnoreAsciiCase(*iter)) {
                 return true;
@@ -401,7 +401,7 @@ int FilterHelper::getCurrentFilterIndex()
     if (m_aCurrentFilter.getLength() > 0) {
         int i = 0;
         for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); ++iter, ++i) {
-            rtl::OUString aTitle = iter->getTitle();
+            OUString aTitle = iter->getTitle();
             if (m_aCurrentFilter.equals(aTitle)) {
                 result = i;
                 break;
@@ -423,7 +423,7 @@ OUStringList FilterHelper::getCurrentFilterSuffixList()
     OUStringList retVal;
     if (m_aCurrentFilter.getLength() > 0) {
         for (FilterList::iterator iter = m_pFilterList->begin(); iter != m_pFilterList->end(); ++iter) {
-            rtl::OUString aTitle = iter->getTitle();
+            OUString aTitle = iter->getTitle();
             if (m_aCurrentFilter.equals(aTitle)) {
                 retVal = iter->getFilterSuffixList();
                 break;
diff --git a/fpicker/source/aqua/NSString_OOoAdditions.mm b/fpicker/source/aqua/NSString_OOoAdditions.mm
index 99075d3c56fe..aaca75a18827 100644
--- a/fpicker/source/aqua/NSString_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSString_OOoAdditions.mm
@@ -22,14 +22,14 @@
 
 @implementation NSString (OOoAdditions) 
 
-+ (id) stringWithOUString:(const rtl::OUString&)ouString
++ (id) stringWithOUString:(const OUString&)ouString
 {
     NSString *string = [[NSString alloc] initWithCharacters:reinterpret_cast<unichar const *>(ouString.getStr()) length:ouString.getLength()];
 
     return [string autorelease];
 }
 
-- (rtl::OUString) OUString
+- (OUString) OUString
 {
     unsigned int nFileNameLength = [self length];
 
@@ -40,7 +40,7 @@
 
     [self getCharacters:unichars];
 
-    return rtl::OUString(reinterpret_cast<sal_Unicode *>(unichars));
+    return OUString(reinterpret_cast<sal_Unicode *>(unichars));
 }
 
 @end
diff --git a/fpicker/source/aqua/NSURL_OOoAdditions.mm b/fpicker/source/aqua/NSURL_OOoAdditions.mm
index 7c4ddbade36a..8e5398da6d53 100644
--- a/fpicker/source/aqua/NSURL_OOoAdditions.mm
+++ b/fpicker/source/aqua/NSURL_OOoAdditions.mm
@@ -22,7 +22,7 @@
 #include <sal/log.hxx>
 
 @implementation NSURL (OOoAdditions)
-- (rtl::OUString) OUStringForInfo:(InfoType)info
+- (OUString) OUStringForInfo:(InfoType)info
 {
     NSAutoreleasePool *pool = [NSAutoreleasePool new];
 
@@ -66,7 +66,7 @@
             break;
     }
 
-    rtl::OUString sResult = [sURLString OUString];
+    OUString sResult = [sURLString OUString];
     [sURLString release];
 
     [pool release];
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm b/fpicker/source/aqua/SalAquaFilePicker.mm
index ec55964971ba..c46cd9cb8739 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -63,9 +63,9 @@ using namespace ::com::sun::star::uno;
 
 namespace
 {
-    uno::Sequence<rtl::OUString> FilePicker_getSupportedServiceNames()
+    uno::Sequence<OUString> FilePicker_getSupportedServiceNames()
     {
-        uno::Sequence<rtl::OUString> aRet(3);
+        uno::Sequence<OUString> aRet(3);
         aRet[0] = "com.sun.star.ui.dialogs.FilePicker";
         aRet[1] = "com.sun.star.ui.dialogs.SystemFilePicker";
         aRet[2] = "com.sun.star.ui.dialogs.AquaFilePicker";
@@ -108,7 +108,7 @@ void SAL_CALL SalAquaFilePicker::removeFilePickerListener( const uno::Reference<
 
 #pragma mark XAsynchronousExecutableDialog
 
-void SAL_CALL SalAquaFilePicker::setTitle( const rtl::OUString& aTitle )
+void SAL_CALL SalAquaFilePicker::setTitle( const OUString& aTitle )
 {
     SolarMutexGuard aGuard;
     implsetTitle(aTitle);
@@ -140,7 +140,7 @@ sal_Int16 SAL_CALL SalAquaFilePicker::execute()
             if (nullptr != frontWindow) {
                 NSString *windowTitle = [frontWindow title];
                 if (windowTitle != nil) {
-                    rtl::OUString ouName = [windowTitle OUString];
+                    OUString ouName = [windowTitle OUString];
                     //a window title will typically be something like "Untitled1 - OpenOffice.org Writer"
                     //but we only want the "Untitled1" part of it
                     sal_Int32 indexOfDash = ouName.indexOf(" - ");
@@ -200,30 +200,30 @@ void SAL_CALL SalAquaFilePicker::setMultiSelectionMode( sal_Bool /* bMode */ )
     }
 }
 
-void SAL_CALL SalAquaFilePicker::setDefaultName( const rtl::OUString& aName )
+void SAL_CALL SalAquaFilePicker::setDefaultName( const OUString& aName )
 {
     SolarMutexGuard aGuard;
 
     m_sSaveFileName = aName;
 }
 
-void SAL_CALL SalAquaFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory )
+void SAL_CALL SalAquaFilePicker::setDisplayDirectory( const OUString& rDirectory )
 {
     SolarMutexGuard aGuard;
 
     implsetDisplayDirectory(rDirectory);
 }
 
-rtl::OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory()
+OUString SAL_CALL SalAquaFilePicker::getDisplayDirectory()
 {
-    rtl::OUString retVal = implgetDisplayDirectory();
+    OUString retVal = implgetDisplayDirectory();
 
     return retVal;
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles()
+uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getFiles()
 {
-    uno::Sequence< rtl::OUString > aSelectedFiles = getSelectedFiles();
+    uno::Sequence< OUString > aSelectedFiles = getSelectedFiles();
     // multiselection doesn't really work with getFiles
     // so just retrieve the first url
     if (aSelectedFiles.getLength() > 1)
@@ -232,7 +232,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getFiles()
     return aSelectedFiles;
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
+uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
 {
     SolarMutexGuard aGuard;
 
@@ -258,7 +258,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
     long nFiles = [files count];
     SAL_INFO("fpicker.aqua", "# of items: " << nFiles);
 
-    uno::Sequence< rtl::OUString > aSelectedFiles(nFiles);
+    uno::Sequence< OUString > aSelectedFiles(nFiles);
 
     for(long nIndex = 0; nIndex < nFiles; nIndex += 1)
     {
@@ -296,7 +296,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSelectedFiles()
 
 #pragma mark XFilterManager
 
-void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter )
+void SAL_CALL SalAquaFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter )
 {
     SolarMutexGuard aGuard;
 
@@ -305,7 +305,7 @@ void SAL_CALL SalAquaFilePicker::appendFilter( const rtl::OUString& aTitle, cons
     m_pControlHelper->setFilterControlNeeded(true);
 }
 
-void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
+void SAL_CALL SalAquaFilePicker::setCurrentFilter( const OUString& aTitle )
 {
     SolarMutexGuard aGuard;
 
@@ -316,7 +316,7 @@ void SAL_CALL SalAquaFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
     updateSaveFileNameExtension();
 }
 
-rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter()
+OUString SAL_CALL SalAquaFilePicker::getCurrentFilter()
 {
     SolarMutexGuard aGuard;
 
@@ -327,7 +327,7 @@ rtl::OUString SAL_CALL SalAquaFilePicker::getCurrentFilter()
 
 #pragma mark XFilterGroupManager
 
-void SAL_CALL SalAquaFilePicker::appendFilterGroup( const rtl::OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters )
+void SAL_CALL SalAquaFilePicker::appendFilterGroup( const OUString& sGroupTitle, const uno::Sequence<beans::StringPair>& aFilters )
 {
     SolarMutexGuard aGuard;
 
@@ -361,7 +361,7 @@ void SAL_CALL SalAquaFilePicker::enableControl( sal_Int16 nControlId, sal_Bool b
     m_pControlHelper->enableControl(nControlId, bEnable);
 }
 
-void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel )
+void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const OUString& aLabel )
 {
     SolarMutexGuard aGuard;
 
@@ -369,7 +369,7 @@ void SAL_CALL SalAquaFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OU
     m_pControlHelper->setLabel( nControlId, sLabel ) ;
 }
 
-rtl::OUString SAL_CALL SalAquaFilePicker::getLabel( sal_Int16 nControlId )
+OUString SAL_CALL SalAquaFilePicker::getLabel( sal_Int16 nControlId )
 {
     return m_pControlHelper->getLabel(nControlId);
 }
@@ -476,17 +476,17 @@ void SalAquaFilePicker::disposing( const lang::EventObject& aEvent )
 
 #pragma mark XServiceInfo
 
-rtl::OUString SAL_CALL SalAquaFilePicker::getImplementationName()
+OUString SAL_CALL SalAquaFilePicker::getImplementationName()
 {
     return FILE_PICKER_IMPL_NAME;
 }
 
-sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const rtl::OUString& sServiceName )
+sal_Bool SAL_CALL SalAquaFilePicker::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL SalAquaFilePicker::getSupportedServiceNames()
 {
     return FilePicker_getSupportedServiceNames();
 }
@@ -557,7 +557,7 @@ void SalAquaFilePicker::updateSaveFileNameExtension()
         if( aStringList.empty()) // #i9328#
             return;
 
-        rtl::OUString suffix = (*(aStringList.begin())).copy(1);
+        OUString suffix = (*(aStringList.begin())).copy(1);
         NSString *requiredFileType = [NSString stringWithOUString:suffix];
 
         [m_pDialog setAllowedFileTypes:[NSArray arrayWithObjects:requiredFileType, nil]];
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm b/fpicker/source/aqua/SalAquaFolderPicker.mm
index f9de585be0d3..b47d8138018d 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -51,9 +51,9 @@ using namespace ::com::sun::star::uno;
 namespace
 {
     // controlling event notifications
-    uno::Sequence<rtl::OUString> FolderPicker_getSupportedServiceNames()
+    uno::Sequence<OUString> FolderPicker_getSupportedServiceNames()
     {
-        uno::Sequence<rtl::OUString> aRet(2);
+        uno::Sequence<OUString> aRet(2);
         aRet[0] = "com.sun.star.ui.dialogs.SystemFolderPicker";
         aRet[1] = "com.sun.star.ui.dialogs.AquaFolderPicker";
         return aRet;
@@ -68,7 +68,7 @@ SalAquaFolderPicker::SalAquaFolderPicker( const uno::Reference<lang::XMultiServi
 
 // XExecutableDialog
 
-void SAL_CALL SalAquaFolderPicker::setTitle( const rtl::OUString& aTitle )
+void SAL_CALL SalAquaFolderPicker::setTitle( const OUString& aTitle )
 {
     SolarMutexGuard aGuard;
 
@@ -103,14 +103,14 @@ sal_Int16 SAL_CALL SalAquaFolderPicker::execute()
 
 // XFolderPicker
 
-void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory )
+void SAL_CALL SalAquaFolderPicker::setDisplayDirectory( const OUString& aDirectory )
 {
     SolarMutexGuard aGuard;
 
     implsetDisplayDirectory(aDirectory);
 }
 
-rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory()
+OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory()
 {
     SolarMutexGuard aGuard;
 
@@ -119,7 +119,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDisplayDirectory()
     return aDirectory;
 }
 
-rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory()
+OUString SAL_CALL SalAquaFolderPicker::getDirectory()
 {
     SolarMutexGuard aGuard;
 
@@ -135,7 +135,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory()
         throw uno::RuntimeException("no directory selected", static_cast< cppu::OWeakObject * >( this ));
     }
 
-    rtl::OUString aDirectory;
+    OUString aDirectory;
 
     NSURL *url = [files objectAtIndex:0];
 
@@ -146,24 +146,24 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory()
     return aDirectory;
 }
 
-void SAL_CALL SalAquaFolderPicker::setDescription( const rtl::OUString& rDescription )
+void SAL_CALL SalAquaFolderPicker::setDescription( const OUString& rDescription )
 {
     [m_pDialog setMessage:[NSString stringWithOUString:rDescription]];
 }
 
 // XServiceInfo
 
-rtl::OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
+OUString SAL_CALL SalAquaFolderPicker::getImplementationName()
 {
     return FOLDER_PICKER_IMPL_NAME;
 }
 
-sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const rtl::OUString& sServiceName )
+sal_Bool SAL_CALL SalAquaFolderPicker::supportsService( const OUString& sServiceName )
 {
     return cppu::supportsService(this, sServiceName);
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNames()
+uno::Sequence<OUString> SAL_CALL SalAquaFolderPicker::getSupportedServiceNames()
 {
     return FolderPicker_getSupportedServiceNames();
 }
diff --git a/fpicker/source/aqua/SalAquaPicker.mm b/fpicker/source/aqua/SalAquaPicker.mm
index 1753ad7d80e3..b6f40989e9cb 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -189,7 +189,7 @@ int SalAquaPicker::runandwaitforresult()
     return status;
 }
 
-void SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory )
+void SalAquaPicker::implsetDisplayDirectory( const OUString& aDirectory )
 {
     SolarMutexGuard aGuard;
 
@@ -198,12 +198,12 @@ void SalAquaPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory )
     }
 }
 
-rtl::OUString const & SalAquaPicker::implgetDisplayDirectory()
+OUString const & SalAquaPicker::implgetDisplayDirectory()
 {
     return m_sDisplayDirectory;
 }
 
-void SalAquaPicker::implsetTitle( const rtl::OUString& aTitle )
+void SalAquaPicker::implsetTitle( const OUString& aTitle )
 {
     SolarMutexGuard aGuard;
 
diff --git a/fpicker/source/aqua/resourceprovider.mm b/fpicker/source/aqua/resourceprovider.mm
index 1f07273da954..3ad1714aa2ed 100644
--- a/fpicker/source/aqua/resourceprovider.mm
+++ b/fpicker/source/aqua/resourceprovider.mm
@@ -33,7 +33,6 @@
 #include <fpsofficeResMgr.hxx>
 #include "resourceprovider.hxx"
 
-using rtl::OUString;
 using namespace ::com::sun::star::ui::dialogs::ExtendedFilePickerElementIds;
 using namespace ::com::sun::star::ui::dialogs::CommonFilePickerElementIds;