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

19 files changed, 125 insertions, 135 deletions

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 0c104009ea75..5a3ad3304768 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -120,12 +120,12 @@ NSMenu* AquaSalInstance::GetDynamicDockMenu()
     return pDockMenu;
 }
 
-bool AquaSalInstance::isOnCommandLine( const rtl::OUString& rArg )
+bool AquaSalInstance::isOnCommandLine( const OUString& rArg )
 {
     sal_uInt32 nArgs = osl_getCommandArgCount();
     for( sal_uInt32 i = 0; i < nArgs; i++ )
     {
-        rtl::OUString aArg;
+        OUString aArg;
         osl_getCommandArg( i, &aArg.pData );
         if( aArg.equals( rArg ) )
             return true;
@@ -217,10 +217,10 @@ sal_Bool ImplSVMainHook( int * pnInit )
     {
         [NSApp postEvent: pEvent atStart: NO];
 
-        rtl::OUString aExeURL, aExe;
+        OUString aExeURL, aExe;
         osl_getExecutableFile( &aExeURL.pData );
         osl_getSystemPathFromFileURL( aExeURL.pData, &aExe.pData );
-        rtl::OString aByteExe( rtl::OUStringToOString( aExe, osl_getThreadTextEncoding() ) );
+        OString aByteExe( OUStringToOString( aExe, osl_getThreadTextEncoding() ) );
 
 #ifdef DEBUG
         aByteExe += OString ( " NSAccessibilityDebugLogLevel 1" );
@@ -241,13 +241,13 @@ sal_Bool ImplSVMainHook( int * pnInit )
 
 // =======================================================================
 
-void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
+void SalAbort( const OUString& rErrorText, bool bDumpCore )
 {
     if( rErrorText.isEmpty() )
         fprintf( stderr, "Application Error " );
     else
         fprintf( stderr, "%s ",
-            rtl::OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() );
+            OUStringToOString( rErrorText, osl_getThreadTextEncoding() ).getStr() );
     if( bDumpCore )
         abort();
     else
@@ -264,7 +264,7 @@ void InitSalData()
 
 // -----------------------------------------------------------------------
 
-const ::rtl::OUString& SalGetDesktopEnvironment()
+const OUString& SalGetDesktopEnvironment()
 {
     static OUString aDesktopEnvironment( "MacOSX" );
     return aDesktopEnvironment;
@@ -923,7 +923,7 @@ void AquaSalInstance::DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo )
 
 // -----------------------------------------------------------------------
 
-rtl::OUString AquaSalInstance::GetDefaultPrinter()
+OUString AquaSalInstance::GetDefaultPrinter()
 {
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
@@ -1013,7 +1013,7 @@ void* AquaSalInstance::GetConnectionIdentifier( ConnectionIdentifierType& rRetur
 
 // We need to re-encode file urls because osl_getFileURLFromSystemPath converts
 // to UTF-8 before encoding non ascii characters, which is not what other apps expect.
-static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
+static OUString translateToExternalUrl(const OUString& internalUrl)
 {
     uno::Reference< uno::XComponentContext > context(
         comphelper::getProcessComponentContext());
@@ -1023,7 +1023,7 @@ static rtl::OUString translateToExternalUrl(const rtl::OUString& internalUrl)
 // #i104525# many versions of OSX have problems with some URLs:
 // when an app requests OSX to add one of these URLs to the "Recent Items" list
 // then this app gets killed (TextEdit, Preview, etc. and also OOo)
-static bool isDangerousUrl( const rtl::OUString& rUrl )
+static bool isDangerousUrl( const OUString& rUrl )
 {
     // use a heuristic that detects all known cases since there is no official comment
     // on the exact impact and root cause of the OSX bug
@@ -1051,10 +1051,10 @@ static bool isDangerousUrl( const rtl::OUString& rUrl )
     return false;
 }
 
-void AquaSalInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& /*rMimeType*/)
+void AquaSalInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& /*rMimeType*/)
 {
     // Convert file URL for external use (see above)
-    rtl::OUString externalUrl = translateToExternalUrl(rFileUrl);
+    OUString externalUrl = translateToExternalUrl(rFileUrl);
     if( externalUrl.isEmpty() )
         externalUrl = rFileUrl;
 
diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index e849f013cbee..9886ecdf35b9 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -29,7 +29,6 @@
 
 #include "svids.hrc"
 
-using ::rtl::OUString;
 
 // =======================================================================
 
@@ -81,7 +80,7 @@ Rectangle AquaSalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScr
     return aRet;
 }
 
-rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen )
+OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen )
 {
    NSArray* pScreens = [NSScreen screens];
    OUString aRet;
@@ -100,7 +99,7 @@ rtl::OUString AquaSalSystem::GetDisplayScreenName( unsigned int nScreen )
 
 static NSString* getStandardString( int nButtonId, bool bUseResources )
 {
-    rtl::OUString aText;
+    OUString aText;
     if( bUseResources )
     {
         aText = Button::GetStandardText( nButtonId );
@@ -109,19 +108,19 @@ static NSString* getStandardString( int nButtonId, bool bUseResources )
     {
         switch( nButtonId )
         {
-        case BUTTON_OK:         aText = rtl::OUString( "OK" );break;
-        case BUTTON_ABORT:      aText = rtl::OUString( "Abort" );break;
-        case BUTTON_CANCEL:     aText = rtl::OUString( "Cancel" );break;
-        case BUTTON_RETRY:      aText = rtl::OUString( "Retry" );break;
-        case BUTTON_YES:        aText = rtl::OUString( "Yes" );break;
-        case BUTTON_NO :        aText = rtl::OUString( "No" );break;
+        case BUTTON_OK:         aText = OUString( "OK" );break;
+        case BUTTON_ABORT:      aText = OUString( "Abort" );break;
+        case BUTTON_CANCEL:     aText = OUString( "Cancel" );break;
+        case BUTTON_RETRY:      aText = OUString( "Retry" );break;
+        case BUTTON_YES:        aText = OUString( "Yes" );break;
+        case BUTTON_NO :        aText = OUString( "No" );break;
         }
     }
     return aText.isEmpty() ? nil : CreateNSString( aText);
 }
 
-int AquaSalSystem::ShowNativeMessageBox( const rtl::OUString& rTitle,
-                                        const rtl::OUString& rMessage,
+int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle,
+                                        const OUString& rMessage,
                                         int nButtonCombination,
                                         int nDefaultButton, bool bUseResources)
 {
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index b030ac8e0fb1..7b5787149844 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -44,9 +44,6 @@ using namespace com::sun::star::lang;
 using namespace cppu;
 using namespace std;
 
-using ::rtl::OUString;
-using ::rtl::OUStringToOString;
-using ::rtl::OString;
 
 namespace // private
 {
@@ -681,7 +678,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor
   return dp;
 }
 
-bool DataFlavorMapper::isValidMimeContentType(const rtl::OUString& contentType) const
+bool DataFlavorMapper::isValidMimeContentType(const OUString& contentType) const
 {
   bool result = true;
 
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index 7ef36401c3ca..ed78689c426c 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -126,11 +126,11 @@ public:
 private:
   /* Determines if the provided Mime content type is valid.
    */
-  bool isValidMimeContentType(const rtl::OUString& contentType) const;
+  bool isValidMimeContentType(const OUString& contentType) const;
 
 private:
   ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
-  typedef boost::unordered_map< rtl::OUString, NSString*, rtl::OUStringHash > OfficeOnlyTypes;
+  typedef boost::unordered_map< OUString, NSString*, OUStringHash > OfficeOnlyTypes;
   mutable OfficeOnlyTypes maOfficeOnlyTypes;
 };
 
diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index 36b6a9fca71c..f2e6081be9ec 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -51,7 +51,6 @@ using namespace com::sun::star::lang;
 using namespace comphelper;
 using namespace std;
 
-using ::rtl::OUString;
 
 // For OOo internal D&D we provide the Transferable without NSDragPboard
 // interference as a shortcut
diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx
index 5ca8ffc68aeb..2932a83e7cef 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/aqua/source/dtrans/DragSource.hxx
@@ -101,9 +101,9 @@ public:
     throw(com::sun::star::uno::RuntimeException);
 
   // XServiceInfo
-  virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
-  virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw (com::sun::star::uno::RuntimeException);
-  virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+  virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
+  virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException);
+  virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
 
   virtual void saveMouseEvent(NSEvent* theEvent);
   virtual unsigned int getSupportedDragOperations(bool isLocal) const;
diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index 1eeebc520186..6c359cc93430 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.cxx
@@ -52,7 +52,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star;
 using namespace comphelper;
 
-using ::rtl::OUString;
 
 OUString dropTarget_getImplementationName()
 {
diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx
index d2050eca5b4f..988943873e6c 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/aqua/source/dtrans/DropTarget.hxx
@@ -118,9 +118,9 @@ public:
   virtual void SAL_CALL dropComplete(sal_Bool success) throw (com::sun::star::uno::RuntimeException);
 
   // XServiceInfo
-  virtual rtl::OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
-  virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw (com::sun::star::uno::RuntimeException);
-  virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
+  virtual OUString SAL_CALL getImplementationName() throw (com::sun::star::uno::RuntimeException);
+  virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (com::sun::star::uno::RuntimeException);
+  virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException);
 
   // NSDraggingDestination protocol functions
   virtual NSDragOperation draggingEntered(id sender);
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index 5d541972f82b..c71bfc452b01 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx
@@ -32,7 +32,6 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::container;
 
-using ::rtl::OUString;
 
 namespace // private
 {
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 0db1318695de..383c7488aa2f 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
@@ -36,7 +36,6 @@ using namespace osl;
 using namespace std;
 using namespace comphelper;
 
-using ::rtl::OUString;
 
 @implementation EventListener;
 
diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
index a12a3ec20f5e..2e7670588ede 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
@@ -97,7 +97,7 @@ public:
                                      const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
     throw( ::com::sun::star::uno::RuntimeException );
 
-  virtual ::rtl::OUString SAL_CALL getName()
+  virtual OUString SAL_CALL getName()
     throw( ::com::sun::star::uno::RuntimeException );
 
   //------------------------------------------------
@@ -127,13 +127,13 @@ public:
   // XServiceInfo
   //------------------------------------------------
 
-  virtual ::rtl::OUString SAL_CALL getImplementationName()
+  virtual OUString SAL_CALL getImplementationName()
     throw(::com::sun::star::uno::RuntimeException);
 
-  virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+  virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
     throw(::com::sun::star::uno::RuntimeException);
 
-  virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+  virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
     throw(::com::sun::star::uno::RuntimeException);
 
   /* Get a reference to the used pastboard.
diff --git a/vcl/aqua/source/gdi/atsui/salatslayout.cxx b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
index ad62d0115355..06bf683afcb1 100644
--- a/vcl/aqua/source/gdi/atsui/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatslayout.cxx
@@ -236,7 +236,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs )
     ByteCount nDummy;
     ATSUGetAttribute( mrATSUStyle, kATSUSizeTag, sizeof(fFontSize), &fFontSize, &nDummy);
     String aUniName( &rArgs.mpStr[rArgs.mnMinCharPos], mnCharCount );
-    rtl::OString aCName(rtl::OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8));
+    OString aCName(OUStringToOString(aUniName, RTL_TEXTENCODING_UTF8));
     fprintf( stderr, "ATSLayout( \"%s\" %d..%d of %d) with h=%4.1f\n",
         aCName.getStr(),rArgs.mnMinCharPos,rArgs.mnEndCharPos,rArgs.mnLength,Fix2X(fFontSize) );
 #endif
diff --git a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
index 1dae840c79b1..0c0f58023c94 100644
--- a/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/atsui/salatsuifontutils.cxx
@@ -40,7 +40,7 @@
 // and SFNT fonts on Mac usually do not contain an OS/2 table.
 static void UpdateAttributesFromPSName( const String& rPSName, ImplDevFontAttributes& rDFA )
 {
-    rtl::OString aPSName( rtl::OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() );
+    OString aPSName( OUStringToOString( rPSName, RTL_TEXTENCODING_UTF8 ).toAsciiLowerCase() );
 
     // TODO: use a multi-string ignore-case matcher once it becomes available
     if( (aPSName.indexOf("regular") != -1)
diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx
index 02e86b1da5a1..f4518f9fb461 100644
--- a/vcl/aqua/source/gdi/atsui/salgdi.cxx
+++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx
@@ -470,13 +470,13 @@ static bool AddLocalTempFontDirs( void )
 
     // add private font files
 
-    rtl::OUString aBrandStr( "$BRAND_BASE_DIR" );
+    OUString aBrandStr( "$BRAND_BASE_DIR" );
     rtl_bootstrap_expandMacros( &aBrandStr.pData );
-    rtl::OUString aBrandSysPath;
+    OUString aBrandSysPath;
     OSL_VERIFY( osl_getSystemPathFromFileURL( aBrandStr.pData, &aBrandSysPath.pData ) == osl_File_E_None );
 
-    rtl::OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 );
-    aBrandFontDir.append( rtl::OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) );
+    OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 );
+    aBrandFontDir.append( OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) );
     aBrandFontDir.append( "/share/fonts/truetype/" );
     return AddTempFontDir( aBrandFontDir.getStr() );
 }
@@ -513,14 +513,14 @@ void AquaSalGraphics::ClearDevFontCache()
 // -----------------------------------------------------------------------
 
 bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*,
-    const rtl::OUString& rFontFileURL, const rtl::OUString& /*rFontName*/ )
+    const OUString& rFontFileURL, const OUString& /*rFontName*/ )
 {
-    ::rtl::OUString aUSytemPath;
+    OUString aUSytemPath;
     OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) );
 
     FSRef aNewRef;
     Boolean bIsDirectory = true;
-    ::rtl::OString aCFileName = rtl::OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 );
+    OString aCFileName = OUStringToOString( aUSytemPath, RTL_TEXTENCODING_UTF8 );
     OSStatus eStatus = FSPathMakeRef( (UInt8*)aCFileName.getStr(), &aNewRef, &bIsDirectory );
     DBG_ASSERT( (eStatus==noErr) && !bIsDirectory, "vcl AddTempDevFont() with invalid fontfile name!" );
     if( eStatus != noErr )
@@ -774,11 +774,11 @@ sal_uInt16 AquaSalGraphics::SetFont( FontSelectPattern* pReqFont, int /*nFallbac
 
 #if OSL_DEBUG_LEVEL > 3
     fprintf( stderr, "SetFont to (\"%s\", \"%s\", fontid=%d) for (\"%s\" \"%s\" weight=%d, slant=%d size=%dx%d orientation=%d)\n",
-             ::rtl::OUStringToOString( pMacFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(),
-             ::rtl::OUStringToOString( pMacFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(),
+             OUStringToOString( pMacFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(),
+             OUStringToOString( pMacFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(),
              (int)nFontID,
-             ::rtl::OUStringToOString( pReqFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(),
-             ::rtl::OUStringToOString( pReqFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(),
+             OUStringToOString( pReqFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ).getStr(),
+             OUStringToOString( pReqFont->GetStyleName(), RTL_TEXTENCODING_UTF8 ).getStr(),
              pReqFont->GetWeight(),
              pReqFont->GetSlant(),
              pReqFont->mnHeight,
diff --git a/vcl/aqua/source/gdi/salgdicommon.cxx b/vcl/aqua/source/gdi/salgdicommon.cxx
index 5b78f3394f64..afedd3b9a339 100644
--- a/vcl/aqua/source/gdi/salgdicommon.cxx
+++ b/vcl/aqua/source/gdi/salgdicommon.cxx
@@ -136,7 +136,7 @@ static void AddPolyPolygonToPath( CGMutablePathRef xPath,
     }
 }
 
-sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
+sal_Bool AquaSalGraphics::CreateFontSubset( const OUString& rToFile,
                                             const PhysicalFontFace* pFontData,
                                             sal_Int32* pGlyphIDs, sal_uInt8* pEncoding,
                                             sal_Int32* pGlyphWidths, int nGlyphCount,
@@ -145,11 +145,11 @@ sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile,
     // TODO: move more of the functionality here into the generic subsetter code
 
     // prepare the requested file name for writing the font-subset file
-    rtl::OUString aSysPath;
+    OUString aSysPath;
     if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) )
         return sal_False;
     const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding();
-    const rtl::OString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) );
+    const OString aToFile( OUStringToOString( aSysPath, aThreadEncoding ) );
 
     // get the raw-bytes from the font to be subset
     ByteVector aBuffer;
diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index a2586ac22cc3..8e2ef02b3bac 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.cxx
@@ -461,7 +461,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
                     const Rectangle& rControlRegion,
                     ControlState nState,
                     const ImplControlValue& aValue,
-                    const rtl::OUString& )
+                    const OUString& )
 {
     sal_Bool bOK = sal_False;
 
@@ -1168,7 +1168,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType,
  *  aCaption:       A caption or title string (like button text etc)
  */
 sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/,
-                                               const ImplControlValue& aValue, const rtl::OUString&,
+                                               const ImplControlValue& aValue, const OUString&,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
 
 {
diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index d32c6d943b0d..6b61398a87b5 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -44,8 +44,6 @@ using namespace vcl;
 using namespace com::sun::star;
 using namespace com::sun::star::beans;
 
-using ::rtl::OUString;
-using ::rtl::OStringToOUString;
 
 // =======================================================================
 
@@ -225,7 +223,7 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio
 
     if( pPaper )
     {
-        NSString* pPaperName = [CreateNSString( rtl::OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease];
+        NSString* pPaperName = [CreateNSString( OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease];
         [mpPrintInfo setPaperName: pPaperName];
     }
     else if( i_nWidth > 0 && i_nHeight > 0 )
@@ -286,9 +284,9 @@ sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* )
 
 // -----------------------------------------------------------------------
 
-rtl::OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
+OUString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong )
 {
-    return rtl::OUString();
+    return OUString();
 }
 
 // -----------------------------------------------------------------------
@@ -376,9 +374,9 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag
     return aPageSize;
 }
 
-sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
-                                   const rtl::OUString& i_rJobName,
-                                   const rtl::OUString& /*i_rAppName*/,
+sal_Bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName,
+                                   const OUString& i_rJobName,
+                                   const OUString& /*i_rAppName*/,
                                    ImplJobSetup* i_pSetupData,
                                    vcl::PrinterController& i_rController
                                    )
@@ -401,7 +399,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
 
     // do we want a progress panel ?
     sal_Bool bShowProgressPanel = sal_True;
-    beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( "MonitorVisible" ) );
+    beans::PropertyValue* pMonitor = i_rController.getValue( OUString( "MonitorVisible" ) );
     if( pMonitor )
         pMonitor->Value >>= bShowProgressPanel;
     if( ! i_rController.isShowDialogs() )
@@ -409,7 +407,7 @@ sal_Bool AquaSalInfoPrinter::StartJob( const rtl::OUString* i_pFileName,
 
     // possibly create one job for collated output
     sal_Bool bSinglePrintJobs = sal_False;
-    beans::PropertyValue* pSingleValue = i_rController.getValue( rtl::OUString( "PrintCollateAsSingleJobs" ) );
+    beans::PropertyValue* pSingleValue = i_rController.getValue( OUString( "PrintCollateAsSingleJobs" ) );
     if( pSingleValue )
     {
         pSingleValue->Value >>= bSinglePrintJobs;
@@ -621,9 +619,9 @@ AquaSalPrinter::~AquaSalPrinter()
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName,
-                               const rtl::OUString& i_rJobName,
-                               const rtl::OUString& i_rAppName,
+sal_Bool AquaSalPrinter::StartJob( const OUString* i_pFileName,
+                               const OUString& i_rJobName,
+                               const OUString& i_rAppName,
                                ImplJobSetup* i_pSetupData,
                                vcl::PrinterController& i_rController )
 {
@@ -632,9 +630,9 @@ sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* i_pFileName,
 
 // -----------------------------------------------------------------------
 
-sal_Bool AquaSalPrinter::StartJob( const rtl::OUString* /*i_pFileName*/,
-                               const rtl::OUString& /*i_rJobName*/,
-                               const rtl::OUString& /*i_rAppName*/,
+sal_Bool AquaSalPrinter::StartJob( const OUString* /*i_pFileName*/,
+                               const OUString& /*i_rJobName*/,
+                               const OUString& /*i_rAppName*/,
                                sal_uLong /*i_nCopies*/,
                                bool /*i_bCollate*/,
                                bool /*i_bDirect*/,
@@ -696,7 +694,7 @@ void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
                 {
                     NSString* pPaper = [pPaperNames objectAtIndex: i];
                     // first try to match the name
-                    rtl::OString aPaperName( [pPaper UTF8String] );
+                    OString aPaperName( [pPaper UTF8String] );
                     Paper ePaper = PaperInfo::fromPSName( aPaperName );
                     if( ePaper != PAPER_USER )
                     {
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 1d03c30d95eb..608e9d891305 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -308,7 +308,7 @@ sal_Bool AquaSalFrame::PostEvent( void *pData )
 }
 
 // -----------------------------------------------------------------------
-void AquaSalFrame::SetTitle(const rtl::OUString& rTitle)
+void AquaSalFrame::SetTitle(const OUString& rTitle)
 {
     if ( !mpWindow )
         return;
@@ -352,14 +352,14 @@ void AquaSalFrame::SetIcon( sal_uInt16 )
 
 // -----------------------------------------------------------------------
 
-void AquaSalFrame::SetRepresentedURL( const rtl::OUString& i_rDocURL )
+void AquaSalFrame::SetRepresentedURL( const OUString& i_rDocURL )
 {
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
 
     if( i_rDocURL.indexOfAsciiL( "file:", 5 ) == 0 )
     {
-        rtl::OUString aSysPath;
+        OUString aSysPath;
         osl_getSystemPathFromFileURL( i_rDocURL.pData, &aSysPath.pData );
         NSString* pStr = CreateNSString( aSysPath );
         if( pStr )
@@ -728,7 +728,7 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
     }
 }
 
-void AquaSalFrame::SetApplicationID( const rtl::OUString &/*rApplicationID*/ )
+void AquaSalFrame::SetApplicationID( const OUString &/*rApplicationID*/ )
 {
 }
 
@@ -1054,74 +1054,74 @@ void AquaSalFrame::EndExtTextInput( sal_uInt16 )
 
 // -----------------------------------------------------------------------
 
-rtl::OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
+OUString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
-    static std::map< sal_uInt16, rtl::OUString > aKeyMap;
+    static std::map< sal_uInt16, OUString > aKeyMap;
     if( aKeyMap.empty() )
     {
         sal_uInt16 i;
         for( i = KEY_A; i <= KEY_Z; i++ )
-            aKeyMap[ i ] = rtl::OUString( sal_Unicode( 'A' + (i - KEY_A) ) );
+            aKeyMap[ i ] = OUString( sal_Unicode( 'A' + (i - KEY_A) ) );
         for( i = KEY_0; i <= KEY_9; i++ )
-            aKeyMap[ i ] = rtl::OUString( sal_Unicode( '0' + (i - KEY_0) ) );
+            aKeyMap[ i ] = OUString( sal_Unicode( '0' + (i - KEY_0) ) );
         for( i = KEY_F1; i <= KEY_F26; i++ )
         {
-            rtl::OUStringBuffer aKey( 3 );
+            OUStringBuffer aKey( 3 );
             aKey.append( sal_Unicode( 'F' ) );
             aKey.append( sal_Int32( i - KEY_F1 + 1 ) );
             aKeyMap[ i ] = aKey.makeStringAndClear();
         }
 
-        aKeyMap[ KEY_DOWN ]     = rtl::OUString( sal_Unicode( 0x21e3 ) );
-        aKeyMap[ KEY_UP ]       = rtl::OUString( sal_Unicode( 0x21e1 ) );
-        aKeyMap[ KEY_LEFT ]     = rtl::OUString( sal_Unicode( 0x21e0 ) );
-        aKeyMap[ KEY_RIGHT ]    = rtl::OUString( sal_Unicode( 0x21e2 ) );
-        aKeyMap[ KEY_HOME ]     = rtl::OUString( sal_Unicode( 0x2196 ) );
-        aKeyMap[ KEY_END ]      = rtl::OUString( sal_Unicode( 0x2198 ) );
-        aKeyMap[ KEY_PAGEUP ]   = rtl::OUString( sal_Unicode( 0x21de ) );
-        aKeyMap[ KEY_PAGEDOWN ] = rtl::OUString( sal_Unicode( 0x21df ) );
-        aKeyMap[ KEY_RETURN ]   = rtl::OUString( sal_Unicode( 0x21a9 ) );
-        aKeyMap[ KEY_ESCAPE ]   = rtl::OUString( "esc" );
-        aKeyMap[ KEY_TAB ]      = rtl::OUString( sal_Unicode( 0x21e5 ) );
-        aKeyMap[ KEY_BACKSPACE ]= rtl::OUString( sal_Unicode( 0x232b ) );
-        aKeyMap[ KEY_SPACE ]    = rtl::OUString( sal_Unicode( 0x2423 ) );
-        aKeyMap[ KEY_DELETE ]   = rtl::OUString( sal_Unicode( 0x2326 ) );
-        aKeyMap[ KEY_ADD ]      = rtl::OUString( sal_Unicode( '+' ) );
-        aKeyMap[ KEY_SUBTRACT ] = rtl::OUString( sal_Unicode( '-' ) );
-        aKeyMap[ KEY_DIVIDE ]   = rtl::OUString( sal_Unicode( '/' ) );
-        aKeyMap[ KEY_MULTIPLY ] = rtl::OUString( sal_Unicode( '*' ) );
-        aKeyMap[ KEY_POINT ]    = rtl::OUString( sal_Unicode( '.' ) );
-        aKeyMap[ KEY_COMMA ]    = rtl::OUString( sal_Unicode( ',' ) );
-        aKeyMap[ KEY_LESS ]     = rtl::OUString( sal_Unicode( '<' ) );
-        aKeyMap[ KEY_GREATER ]  = rtl::OUString( sal_Unicode( '>' ) );
-        aKeyMap[ KEY_EQUAL ]    = rtl::OUString( sal_Unicode( '=' ) );
-        aKeyMap[ KEY_OPEN ]     = rtl::OUString( sal_Unicode( 0x23cf ) );
+        aKeyMap[ KEY_DOWN ]     = OUString( sal_Unicode( 0x21e3 ) );
+        aKeyMap[ KEY_UP ]       = OUString( sal_Unicode( 0x21e1 ) );
+        aKeyMap[ KEY_LEFT ]     = OUString( sal_Unicode( 0x21e0 ) );
+        aKeyMap[ KEY_RIGHT ]    = OUString( sal_Unicode( 0x21e2 ) );
+        aKeyMap[ KEY_HOME ]     = OUString( sal_Unicode( 0x2196 ) );
+        aKeyMap[ KEY_END ]      = OUString( sal_Unicode( 0x2198 ) );
+        aKeyMap[ KEY_PAGEUP ]   = OUString( sal_Unicode( 0x21de ) );
+        aKeyMap[ KEY_PAGEDOWN ] = OUString( sal_Unicode( 0x21df ) );
+        aKeyMap[ KEY_RETURN ]   = OUString( sal_Unicode( 0x21a9 ) );
+        aKeyMap[ KEY_ESCAPE ]   = OUString( "esc" );
+        aKeyMap[ KEY_TAB ]      = OUString( sal_Unicode( 0x21e5 ) );
+        aKeyMap[ KEY_BACKSPACE ]= OUString( sal_Unicode( 0x232b ) );
+        aKeyMap[ KEY_SPACE ]    = OUString( sal_Unicode( 0x2423 ) );
+        aKeyMap[ KEY_DELETE ]   = OUString( sal_Unicode( 0x2326 ) );
+        aKeyMap[ KEY_ADD ]      = OUString( sal_Unicode( '+' ) );
+        aKeyMap[ KEY_SUBTRACT ] = OUString( sal_Unicode( '-' ) );
+        aKeyMap[ KEY_DIVIDE ]   = OUString( sal_Unicode( '/' ) );
+        aKeyMap[ KEY_MULTIPLY ] = OUString( sal_Unicode( '*' ) );
+        aKeyMap[ KEY_POINT ]    = OUString( sal_Unicode( '.' ) );
+        aKeyMap[ KEY_COMMA ]    = OUString( sal_Unicode( ',' ) );
+        aKeyMap[ KEY_LESS ]     = OUString( sal_Unicode( '<' ) );
+        aKeyMap[ KEY_GREATER ]  = OUString( sal_Unicode( '>' ) );
+        aKeyMap[ KEY_EQUAL ]    = OUString( sal_Unicode( '=' ) );
+        aKeyMap[ KEY_OPEN ]     = OUString( sal_Unicode( 0x23cf ) );
 
         /* yet unmapped KEYCODES:
-        aKeyMap[ KEY_INSERT ]   = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_CUT ]      = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_COPY ]     = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_PASTE ]    = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_UNDO ]     = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_REPEAT ]   = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_FIND ]     = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_PROPERTIES ]     = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_FRONT ]    = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_CONTEXTMENU ]    = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_MENU ]     = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_HELP ]     = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_HANGUL_HANJA ]   = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_DECIMAL ]  = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_TILDE ]    = rtl::OUString( sal_Unicode( ) );
-        aKeyMap[ KEY_QUOTELEFT ]= rtl::OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_INSERT ]   = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_CUT ]      = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_COPY ]     = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_PASTE ]    = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_UNDO ]     = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_REPEAT ]   = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_FIND ]     = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_PROPERTIES ]     = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_FRONT ]    = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_CONTEXTMENU ]    = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_MENU ]     = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_HELP ]     = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_HANGUL_HANJA ]   = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_DECIMAL ]  = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_TILDE ]    = OUString( sal_Unicode( ) );
+        aKeyMap[ KEY_QUOTELEFT ]= OUString( sal_Unicode( ) );
         */
 
     }
 
-    rtl::OUStringBuffer aResult( 16 );
+    OUStringBuffer aResult( 16 );
 
     sal_uInt16 nUnmodifiedCode = (nKeyCode & KEY_CODE);
-    std::map< sal_uInt16, rtl::OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode );
+    std::map< sal_uInt16, OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode );
     if( it != aKeyMap.end() )
     {
         if( (nKeyCode & KEY_SHIFT) != 0 )
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 8f37ddc41d24..0bdf9ed8c729 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -62,11 +62,11 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL;
     }
     else
     {
-        rtl::OUString aDialog;
+        OUString aDialog;
         if( nDialog == SHOWDIALOG_ID_ABOUT )
-            aDialog = rtl::OUString("ABOUT");
+            aDialog = OUString("ABOUT");
         else if( nDialog == SHOWDIALOG_ID_PREFERENCES )
-            aDialog = rtl::OUString("PREFERENCES");
+            aDialog = OUString("PREFERENCES");
         const ApplicationEvent* pAppEvent = new ApplicationEvent(
             ApplicationEvent::TYPE_SHOWDIALOG, aDialog);
         AquaSalInstance::aAppEventList.push_back( pAppEvent );
@@ -668,7 +668,7 @@ void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Imag
         [pImage release];
 }
 
-void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const rtl::OUString& i_rText )
+void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const OUString& i_rText )
 {
     if (!i_pSalMenuItem)
         return;
@@ -703,7 +703,7 @@ void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem,
     }
 }
 
-void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const rtl::OUString& /*rKeyName*/ )
+void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const OUString& /*rKeyName*/ )
 {
     sal_uInt16 nModifier;
     sal_Unicode nCommandKey = 0;
@@ -779,7 +779,7 @@ void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem,
         nItemModifier |= NSControlKeyMask;
 
     AquaSalMenuItem *pAquaSalMenuItem = (AquaSalMenuItem *) pSalMenuItem;
-    NSString* pString = CreateNSString( rtl::OUString( &nCommandKey, 1 ) );
+    NSString* pString = CreateNSString( OUString( &nCommandKey, 1 ) );
     [pAquaSalMenuItem->mpMenuItem setKeyEquivalent: pString];
     [pAquaSalMenuItem->mpMenuItem setKeyEquivalentModifierMask: nItemModifier];
     if (pString)