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
author: Luboš Luňák <l.lunak@suse.cz> 2013-04-07 12:06:47 +0200
committer: Luboš Luňák <l.lunak@suse.cz> 2013-04-07 14:23:11 +0200
commit: 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
tree: e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /vcl/unx
parent: 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)
64 files changed, 773 insertions, 804 deletions
diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx
index 7ff60cb3ed83..d29b43dd74d8 100644
--- a/vcl/unx/generic/app/i18n_cb.cxx
+++ b/vcl/unx/generic/app/i18n_cb.cxx
@@ -384,7 +384,7 @@ PreeditDrawCallback(XIC ic, XPointer client_data,
       pPreeditData->aInputEv.mpTextAttr = Preedit_FeedbackToSAL(
             pPreeditData->aText.pCharStyle, pPreeditData->aText.nLength, pPreeditData->aInputFlags);
       pPreeditData->aInputEv.mnCursorPos = call_data->caret;
-      pPreeditData->aInputEv.maText = rtl::OUString(pPreeditData->aText.pUnicodeBuffer,
+      pPreeditData->aInputEv.maText = OUString(pPreeditData->aText.pUnicodeBuffer,
                                 pPreeditData->aText.nLength);
     pPreeditData->aInputEv.mnCursorFlags    = 0; // default: make cursor visible
       pPreeditData->aInputEv.mnDeltaStart = 0; // call_data->chg_first;
@@ -546,7 +546,7 @@ StatusDrawCallback (XIC, XPointer, XIMStatusDrawCallbackStruct *call_data)
     else
     {
         fprintf( stderr, "XIMStatusDataType %s not supported\n",
-            call_data->type == XIMBitmapType ? "XIMBitmapType" : rtl::OString::valueOf(static_cast<sal_Int32>(call_data->type)).getStr() );
+            call_data->type == XIMBitmapType ? "XIMBitmapType" : OString::valueOf(static_cast<sal_Int32>(call_data->type)).getStr() );
     }
 #endif
     return;
@@ -556,7 +556,7 @@ void
 SwitchIMCallback (XIC, XPointer, XPointer call_data)
 {
     XIMSwitchIMNotifyCallbackStruct* pCallData = (XIMSwitchIMNotifyCallbackStruct*)call_data;
-    ::vcl::I18NStatus::get().changeIM( rtl::OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) );
+    ::vcl::I18NStatus::get().changeIM( OStringToOUString(pCallData->to->name, RTL_TEXTENCODING_UTF8) );
 }
 
 // ----------------------------------------------------------------------------------
diff --git a/vcl/unx/generic/app/i18n_ic.cxx b/vcl/unx/generic/app/i18n_ic.cxx
index dd8abd8cc16b..54a0ae670258 100644
--- a/vcl/unx/generic/app/i18n_ic.cxx
+++ b/vcl/unx/generic/app/i18n_ic.cxx
@@ -568,7 +568,7 @@ SalI18N_InputContext::CommitKeyEvent(sal_Unicode* pText, sal_Size nLength)
         aTextEvent.mnTime        = 0;
         aTextEvent.mpTextAttr    = 0;
         aTextEvent.mnCursorPos   = nLength;
-        aTextEvent.maText        = rtl::OUString(pText, nLength);
+        aTextEvent.maText        = OUString(pText, nLength);
         aTextEvent.mnCursorFlags = 0;
         aTextEvent.mnDeltaStart  = 0;
         aTextEvent.mbOnlyCursor  = False;
diff --git a/vcl/unx/generic/app/i18n_im.cxx b/vcl/unx/generic/app/i18n_im.cxx
index 430aea2f43d7..0ba5fc14b54e 100644
--- a/vcl/unx/generic/app/i18n_im.cxx
+++ b/vcl/unx/generic/app/i18n_im.cxx
@@ -167,7 +167,7 @@ SetSystemLocale( const char* p_inlocale )
 
 #ifdef SOLARIS
 static void
-SetSystemEnvironment( const rtl::OUString& rLocale )
+SetSystemEnvironment( const OUString& rLocale )
 {
     OUString LC_ALL_Var("LC_ALL");
     osl_setEnvironment(LC_ALL_Var.pData, rLocale.pData);
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 53fa8c270ef2..5d7e7f20ea4b 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -597,7 +597,7 @@ void I18NStatus::setStatusText( const String& rText )
             else
                 pBuffer[i] = pCopy[i];
         }
-        rtl::OUString aText( pBuffer );
+        OUString aText( pBuffer );
         m_pStatusWindow->setText( aText );
         m_pStatusWindow->setPosition( m_pParent );
 
diff --git a/vcl/unx/generic/app/keysymnames.cxx b/vcl/unx/generic/app/keysymnames.cxx
index b733c734e719..6356c61b3ba5 100644
--- a/vcl/unx/generic/app/keysymnames.cxx
+++ b/vcl/unx/generic/app/keysymnames.cxx
@@ -461,7 +461,7 @@ namespace vcl_sal {
     };
 
     // translate keycodes, used within the displayed menu shortcuts
-    rtl::OUString getKeysymReplacementName( rtl::OUString pLang, KeySym nSymbol )
+    OUString getKeysymReplacementName( OUString pLang, KeySym nSymbol )
     {
         for( unsigned int n = 0; n < SAL_N_ELEMENTS(aKeyboards); n++ )
         {
@@ -471,7 +471,7 @@ namespace vcl_sal {
                 for( int m = aKeyboards[n].nReplacements ; m ; )
                 {
                     if( nSymbol == pRepl[--m].aSymbol )
-                        return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 );
+                        return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 );
                 }
             }
         }
@@ -481,10 +481,10 @@ namespace vcl_sal {
         for( int m = SAL_N_ELEMENTS(aImplReplacements_English); m ; )
         {
             if( nSymbol == pRepl[--m].aSymbol )
-                return rtl::OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 );
+                return OUString( pRepl[m].pName, strlen(pRepl[m].pName), RTL_TEXTENCODING_UTF8 );
         }
 
-        return rtl::OUString();
+        return OUString();
     }
 
 }
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index c7f5351dc137..6202b34c077f 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -405,15 +405,15 @@ void SalXLib::Init()
     // is there a -display command line parameter?
 
     sal_uInt32 nParams = osl_getCommandArgCount();
-    rtl::OUString aParam;
-    rtl::OString aDisplay;
+    OUString aParam;
+    OString aDisplay;
     for (sal_uInt16 i=0; i<nParams; i++)
     {
         osl_getCommandArg(i, &aParam.pData);
         if ( aParam == "-display" )
         {
             osl_getCommandArg(i+1, &aParam.pData);
-            aDisplay = rtl::OUStringToOString(
+            aDisplay = OUStringToOString(
                    aParam, osl_getThreadTextEncoding());
 
             if ((pDisp = XOpenDisplay(aDisplay.getStr()))!=NULL)
@@ -436,17 +436,17 @@ void SalXLib::Init()
         // Open $DISPLAY or default...
         char *pDisplay = getenv("DISPLAY");
         if (pDisplay != NULL)
-            aDisplay = rtl::OString(pDisplay);
+            aDisplay = OString(pDisplay);
         pDisp  = XOpenDisplay(pDisplay);
     }
 
     if ( !pDisp )
     {
-        rtl::OUString aProgramFileURL;
+        OUString aProgramFileURL;
         osl_getExecutableFile( &aProgramFileURL.pData );
-        rtl::OUString aProgramSystemPath;
+        OUString aProgramSystemPath;
         osl_getSystemPathFromFileURL (aProgramFileURL.pData, &aProgramSystemPath.pData);
-        rtl::OString  aProgramName = rtl::OUStringToOString(
+        OString  aProgramName = OUStringToOString(
                                             aProgramSystemPath,
                                             osl_getThreadTextEncoding() );
         std::fprintf( stderr, "%s X11 error: Can't open display: %s\n",
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index fdc0c6814dc6..6867f4da1730 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -78,7 +78,6 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
 
 using namespace vcl_sal;
 
-using ::rtl::OUString;
 
 #define SALCOLOR_WHITE      MAKE_SALCOLOR( 0xFF, 0xFF, 0xFF )
 #define SALCOLOR_BLACK      MAKE_SALCOLOR( 0x00, 0x00, 0x00 )
@@ -494,7 +493,7 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const
                          1
                          );
 
-        rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
+        OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
         const char* argv[2];
         argv[0] = "/bin/sh";
         argv[1] = aExec.getStr();
@@ -587,7 +586,7 @@ void SalDisplay::Init()
     const char* pValStr = XGetDefault( pDisp_, "Xft", "dpi" );
     if( pValStr != NULL )
     {
-        const rtl::OString aValStr( pValStr );
+        const OString aValStr( pValStr );
         const long nDPI = (long) aValStr.toDouble();
         // guard against insane resolution
         if( (nDPI >= 50) && (nDPI <= 500) )
@@ -723,10 +722,10 @@ sal_uInt16 SalDisplay::GetIndicatorState() const
     return nState;
 }
 
-rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
+OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
 {
-    rtl::OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage();
-    rtl::OUString aRet;
+    OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage();
+    OUString aRet;
 
     // return an empty string for keysyms that are not bound to
     // any key code
@@ -734,7 +733,7 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
     if( aKeyCode != 0 && aKeyCode != NoSymbol )
     {
         if( !nKeySym )
-            aRet = rtl::OUString( "???" );
+            aRet = OUString( "???" );
         else
         {
             aRet = ::vcl_sal::getKeysymReplacementName( aLang, nKeySym );
@@ -743,9 +742,9 @@ rtl::OUString SalDisplay::GetKeyNameFromKeySym( KeySym nKeySym ) const
                 const char *pString = XKeysymToString( nKeySym );
                 int n = strlen( pString );
                 if( n > 2 && pString[n-2] == '_' )
-                    aRet = rtl::OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 );
+                    aRet = OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 );
                 else
-                    aRet = rtl::OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
+                    aRet = OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 );
             }
         }
     }
@@ -789,7 +788,7 @@ void SalDisplay::ModifierMapping()
     XFreeModifiermap( pXModMap );
 }
 
-rtl::OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
+OUString SalDisplay::GetKeyName( sal_uInt16 nKeyCode ) const
 {
     String aStrMap;
     String aCustomKeyName;
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index 7cb72e8d5bf0..cfa587ec7f57 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -138,7 +138,7 @@ SalSession * SessionManagerClient::m_pSession = NULL;
 boost::scoped_ptr< ICEConnectionObserver >
 SessionManagerClient::m_pICEConnectionObserver;
 SmcConn SessionManagerClient::m_pSmcConnection = NULL;
-rtl::OString SessionManagerClient::m_aClientID;
+OString SessionManagerClient::m_aClientID;
 bool SessionManagerClient::m_bDocSaveDone = false; // HACK
 
 extern "C" {
@@ -164,7 +164,7 @@ static void BuildSmPropertyList()
 {
     if( ! pSmProps )
     {
-        rtl::OString aExec(rtl::OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
+        OString aExec(OUStringToOString(SessionManagerClient::getExecName(), osl_getThreadTextEncoding()));
 
         nSmProps = 5;
         pSmProps = new SmProp[ nSmProps ];
@@ -198,8 +198,8 @@ static void BuildSmPropertyList()
         pSmProps[ 2 ].vals[2].length    = aRestartOptionNoLogo.getLength()+1;
         pSmProps[ 2 ].vals[2].value = strdup(aRestartOptionNoLogo.getStr());
 
-        rtl::OUString aUserName;
-        rtl::OString aUser;
+        OUString aUserName;
+        OString aUser;
         oslSecurity aSec = osl_getCurrentSecurity();
         if( aSec )
         {
@@ -431,7 +431,7 @@ void SessionManagerClient::open(SalSession * pSession)
             aCallbacks.save_complete.client_data        = NULL;
             aCallbacks.shutdown_cancelled.callback      = ShutdownCanceledProc;
             aCallbacks.shutdown_cancelled.client_data   = NULL;
-            rtl::OString aPrevId(getPreviousSessionID());
+            OString aPrevId(getPreviousSessionID());
             char* pClientID = NULL;
             char aErrBuf[1024];
             m_pSmcConnection = SmcOpenConnection( NULL,
@@ -476,7 +476,7 @@ void SessionManagerClient::open(SalSession * pSession)
     }
 }
 
-rtl::OString SessionManagerClient::getSessionID()
+OString SessionManagerClient::getSessionID()
 {
     return m_aClientID;
 }
@@ -522,9 +522,9 @@ void SessionManagerClient::interactionDone( bool bCancelShutdown )
 }
 
 
-rtl::OUString SessionManagerClient::getExecName()
+OUString SessionManagerClient::getExecName()
 {
-    rtl::OUString aExec, aSysExec;
+    OUString aExec, aSysExec;
     osl_getExecutableFile( &aExec.pData );
     osl_getSystemPathFromFileURL( aExec.pData, &aSysExec.pData );
 
@@ -534,18 +534,18 @@ rtl::OUString SessionManagerClient::getExecName()
 }
 
 
-rtl::OString SessionManagerClient::getPreviousSessionID()
+OString SessionManagerClient::getPreviousSessionID()
 {
-    rtl::OString aPrevId;
+    OString aPrevId;
 
     sal_uInt32 n = rtl_getAppCommandArgCount();
     for (sal_uInt32 i = 0; i != n; ++i)
     {
-        ::rtl::OUString aArg;
+        OUString aArg;
         rtl_getAppCommandArg( i, &aArg.pData );
         if(aArg.match("--session="))
         {
-            aPrevId = rtl::OUStringToOString(
+            aPrevId = OUStringToOString(
                 aArg.copy(RTL_CONSTASCII_LENGTH("--session=")),
                 osl_getThreadTextEncoding());
             break;
diff --git a/vcl/unx/generic/app/wmadaptor.cxx b/vcl/unx/generic/app/wmadaptor.cxx
index b2de7a048333..c5fa4bc0540c 100644
--- a/vcl/unx/generic/app/wmadaptor.cxx
+++ b/vcl/unx/generic/app/wmadaptor.cxx
@@ -211,7 +211,7 @@ WMAdaptor* WMAdaptor::createWMAdaptor( SalDisplay* pSalDisplay )
 
 #if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "Window Manager's name is \"%s\"\n",
-        rtl::OUStringToOString(pAdaptor->getWindowManagerName(),
+        OUStringToOString(pAdaptor->getWindowManagerName(),
         RTL_TEXTENCODING_UTF8).getStr());
 #endif
     return pAdaptor;
@@ -843,7 +843,7 @@ bool WMAdaptor::getNetWmName()
                                         && nItems != 0
                                         )
                                     {
-                                        rtl::OUString aMetaVersion( (sal_Char*)pProperty, nItems, RTL_TEXTENCODING_UTF8 );
+                                        OUString aMetaVersion( (sal_Char*)pProperty, nItems, RTL_TEXTENCODING_UTF8 );
                                         nVersionMajor = aMetaVersion.getToken(0, '.').toInt32();
                                         nVersionMinor = aMetaVersion.getToken(1, '.').toInt32();
                                     }
@@ -888,8 +888,8 @@ bool WMAdaptor::getWMshouldSwitchWorkspace() const
 
         pWMA->m_bWMshouldSwitchWorkspace = true;
         vcl::SettingsConfigItem* pItem = vcl::SettingsConfigItem::get();
-        rtl::OUString aSetting( pItem->getValue( rtl::OUString( "WM" ),
-                                                 rtl::OUString( "ShouldSwitchWorkspace" ) ) );
+        OUString aSetting( pItem->getValue( OUString( "WM" ),
+                                                 OUString( "ShouldSwitchWorkspace" ) ) );
         if( aSetting.isEmpty() )
         {
             if( m_aWMName.EqualsAscii( "awesome" ) )
@@ -981,27 +981,27 @@ void GnomeWMAdaptor::initAtoms()
 
 void WMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
 {
-    rtl::OString aTitle(rtl::OUStringToOString(rWMName,
+    OString aTitle(OUStringToOString(rWMName,
         osl_getThreadTextEncoding()));
 
     /* FIXME-BCP47: what slumbering dogs may we wake up here? */
-    ::rtl::OString aWMLocale;
+    OString aWMLocale;
     rtl_Locale* pLocale = NULL;
     osl_getProcessLocale( &pLocale );
     if( pLocale )
     {
-        ::rtl::OUString aLocaleString( pLocale->Language );
-        ::rtl::OUString aCountry( pLocale->Country );
-        ::rtl::OUString aVariant( pLocale->Variant );
+        OUString aLocaleString( pLocale->Language );
+        OUString aCountry( pLocale->Country );
+        OUString aVariant( pLocale->Variant );
 
         if( !aCountry.isEmpty() )
         {
-            aLocaleString += ::rtl::OUString("_");
+            aLocaleString += OUString("_");
             aLocaleString += aCountry;
         }
         if( !aVariant.isEmpty() )
             aLocaleString += aVariant;
-        aWMLocale = ::rtl::OUStringToOString( aLocaleString, RTL_TEXTENCODING_ISO_8859_1 );
+        aWMLocale = OUStringToOString( aLocaleString, RTL_TEXTENCODING_ISO_8859_1 );
     }
     else
     {
@@ -1101,7 +1101,7 @@ void NetWMAdaptor::setWMName( X11SalFrame* pFrame, const String& rWMName ) const
 {
     WMAdaptor::setWMName( pFrame, rWMName );
 
-    rtl::OString aTitle(rtl::OUStringToOString(rWMName, RTL_TEXTENCODING_UTF8));
+    OString aTitle(OUStringToOString(rWMName, RTL_TEXTENCODING_UTF8));
     const SystemEnvData* pEnv = pFrame->GetSystemData();
     if( m_aWMAtoms[ NET_WM_NAME ] )
         XChangeProperty( m_pDisplay,
@@ -2386,7 +2386,7 @@ void WMAdaptor::setPID( X11SalFrame* i_pFrame ) const
 */
 void WMAdaptor::setClientMachine( X11SalFrame* i_pFrame ) const
 {
-    rtl::OString aWmClient( rtl::OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) );
+    OString aWmClient( OUStringToOString( GetGenericData()->GetHostname(), RTL_TEXTENCODING_ASCII_US ) );
     XTextProperty aClientProp = { (unsigned char*)aWmClient.getStr(), XA_STRING, 8, sal::static_int_cast<unsigned long>( aWmClient.getLength() ) };
     XSetWMClientMachine( m_pDisplay, i_pFrame->GetShellWindow(), &aClientProp );
 }
diff --git a/vcl/unx/generic/desktopdetect/desktopdetector.cxx b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
index e98dfc2dce8f..465326b4209a 100644
--- a/vcl/unx/generic/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/generic/desktopdetect/desktopdetector.cxx
@@ -35,8 +35,6 @@
 #include <unistd.h>
 #include <string.h>
 
-using ::rtl::OUString;
-using ::rtl::OString;
 
 static bool is_gnome_desktop( Display* pDisplay )
 {
@@ -246,7 +244,7 @@ static bool is_kde_desktop( Display* pDisplay )
             return true; // does not exist => KDE3
         }
 
-        rtl::OUString aVer( "3" );
+        OUString aVer( "3" );
         if ( aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
         {
             return true;
@@ -263,7 +261,7 @@ static bool is_kde4_desktop( Display* pDisplay )
 {
     if ( NULL != getenv( "KDE_FULL_SESSION" ) )
     {
-        rtl::OUString aVer( "4" );
+        OUString aVer( "4" );
 
         const char *pVer = getenv( "KDE_SESSION_VERSION" );
         if ( pVer && aVer.equalsIgnoreAsciiCaseAscii( pVer ) )
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.cxx b/vcl/unx/generic/dtrans/X11_clipboard.cxx
index dee55c4b47c1..82f1ce9ee34c 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.cxx
@@ -44,7 +44,6 @@ using namespace cppu;
 using namespace osl;
 using namespace x11;
 
-using ::rtl::OUString;
 
 X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) :
         ::cppu::WeakComponentImplHelper2<
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 19f56e842780..18c08b036f7e 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -61,7 +61,7 @@ namespace x11 {
         X11Clipboard( SelectionManager& rManager, Atom aSelection );
         virtual ~X11Clipboard();
 
-        static X11Clipboard* get( const ::rtl::OUString& rDisplayName, Atom aSelection );
+        static X11Clipboard* get( const OUString& rDisplayName, Atom aSelection );
 
         /*
          *  XInitialization
@@ -72,13 +72,13 @@ namespace x11 {
          * XServiceInfo
          */
 
-        virtual ::rtl::OUString SAL_CALL getImplementationName(  )
+        virtual OUString SAL_CALL getImplementationName(  )
             throw(RuntimeException);
 
-        virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName )
+        virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
             throw(RuntimeException);
 
-        virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  )
+        virtual Sequence< OUString > SAL_CALL getSupportedServiceNames(  )
             throw(RuntimeException);
 
         /*
@@ -93,7 +93,7 @@ namespace x11 {
             const com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboardOwner >& xClipboardOwner )
             throw(RuntimeException);
 
-        virtual ::rtl::OUString SAL_CALL getName()
+        virtual OUString SAL_CALL getName()
             throw(RuntimeException);
 
         /*
@@ -125,7 +125,7 @@ namespace x11 {
 
 // ------------------------------------------------------------------------
 
-    Sequence< ::rtl::OUString > SAL_CALL X11Clipboard_getSupportedServiceNames();
+    Sequence< OUString > SAL_CALL X11Clipboard_getSupportedServiceNames();
     com::sun::star::uno::Reference< XInterface > SAL_CALL X11Clipboard_createInstance(
         const com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
diff --git a/vcl/unx/generic/dtrans/X11_droptarget.cxx b/vcl/unx/generic/dtrans/X11_droptarget.cxx
index f995006f5356..f262003e10f9 100644
--- a/vcl/unx/generic/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/generic/dtrans/X11_droptarget.cxx
@@ -26,7 +26,6 @@ using namespace com::sun::star::awt;
 using namespace com::sun::star::datatransfer;
 using namespace com::sun::star::datatransfer::dnd;
 
-using ::rtl::OUString;
 
 DropTarget::DropTarget() :
         ::cppu::WeakComponentImplHelper3<
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 46c2910ed8fb..90e14923b31f 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -82,9 +82,6 @@ using namespace cppu;
 
 using namespace x11;
 
-using ::rtl::OUString;
-using ::rtl::OUStringHash;
-using ::rtl::OStringToOUString;
 
 // stubs to satisfy solaris compiler's rather rigid linking warning
 extern "C"
@@ -1022,7 +1019,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In
 
 // ------------------------------------------------------------------------
 
-bool SelectionManager::getPasteData( Atom selection, const ::rtl::OUString& rType, Sequence< sal_Int8 >& rData )
+bool SelectionManager::getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData )
 {
     bool bSuccess = false;
 
diff --git a/vcl/unx/generic/dtrans/X11_selection.hxx b/vcl/unx/generic/dtrans/X11_selection.hxx
index 823cd5f259b7..5e6d45e1342c 100644
--- a/vcl/unx/generic/dtrans/X11_selection.hxx
+++ b/vcl/unx/generic/dtrans/X11_selection.hxx
@@ -51,7 +51,7 @@ namespace x11 {
     class PixmapHolder; // in bmp.hxx
 
 // ------------------------------------------------------------------------
-    rtl_TextEncoding getTextPlainEncoding( const ::rtl::OUString& rMimeType );
+    rtl_TextEncoding getTextPlainEncoding( const OUString& rMimeType );
 
     class SelectionAdaptor
     {
@@ -106,9 +106,9 @@ namespace x11 {
         virtual void        SAL_CALL setDefaultActions( sal_Int8 actions ) throw();
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw();
-        virtual sal_Bool    SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw();
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
+        virtual OUString SAL_CALL getImplementationName() throw();
+        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) throw();
+        virtual ::com::sun::star::uno::Sequence< OUString >
                             SAL_CALL getSupportedServiceNames() throw();
     };
 
@@ -127,9 +127,9 @@ namespace x11 {
         virtual ~SelectionManagerHolder();
 
         // XServiceInfo
-        virtual ::rtl::OUString SAL_CALL getImplementationName() throw();
-        virtual sal_Bool    SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw();
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString >
+        virtual OUString SAL_CALL getImplementationName() throw();
+        virtual sal_Bool    SAL_CALL supportsService( const OUString& ServiceName ) throw();
+        virtual ::com::sun::star::uno::Sequence< OUString >
                             SAL_CALL getSupportedServiceNames() throw();
 
         // XInitialization
@@ -157,7 +157,7 @@ namespace x11 {
         >,
         public SelectionAdaptor
     {
-        static ::boost::unordered_map< ::rtl::OUString, SelectionManager*, ::rtl::OUStringHash >& getInstances();
+        static ::boost::unordered_map< OUString, SelectionManager*, OUStringHash >& getInstances();
 
         // for INCR type selection transfer
         // INCR protocol is used if the data cannot
@@ -361,9 +361,9 @@ namespace x11 {
         Atom                        m_nXdndActionPrivate;
 
         // caching for atoms
-        ::boost::unordered_map< Atom, ::rtl::OUString >
+        ::boost::unordered_map< Atom, OUString >
                                     m_aAtomToString;
-        ::boost::unordered_map< ::rtl::OUString, Atom, ::rtl::OUStringHash >
+        ::boost::unordered_map< OUString, Atom, OUStringHash >
                                     m_aStringToAtom;
 
         // the registered selections
@@ -426,13 +426,13 @@ namespace x11 {
         bool handleXEvent( XEvent& rEvent );
 
         // compound text conversion
-        ::rtl::OString convertToCompound( const ::rtl::OUString& rText );
-        ::rtl::OUString convertFromCompound( const char* pText, int nLen = -1 );
+        OString convertToCompound( const OUString& rText );
+        OUString convertFromCompound( const char* pText, int nLen = -1 );
 
         sal_Int8 getUserDragAction() const;
         sal_Int32 getSelectionTimeout();
     public:
-        static SelectionManager& get( const ::rtl::OUString& rDisplayName = ::rtl::OUString() );
+        static SelectionManager& get( const OUString& rDisplayName = OUString() );
 
         Display * getDisplay() { return m_pDisplay; };
         XLIB_Window getWindow() { return m_aWindow; };
@@ -446,19 +446,19 @@ namespace x11 {
         osl::Mutex& getMutex() { return m_aMutex; }
 
 
-        Atom getAtom( const ::rtl::OUString& rString );
-        const ::rtl::OUString& getString( Atom nAtom );
+        Atom getAtom( const OUString& rString );
+        const OUString& getString( Atom nAtom );
 
         // type conversion
         // note: convertTypeToNative does NOT clear the list, so you can append
         // multiple types to the same list
-        void convertTypeToNative( const ::rtl::OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront = false );
-        ::rtl::OUString convertTypeFromNative( Atom nType, Atom selection, int& rFormat );
+        void convertTypeToNative( const OUString& rType, Atom selection, int& rFormat, ::std::list< Atom >& rConversions, bool bPushFront = false );
+        OUString convertTypeFromNative( Atom nType, Atom selection, int& rFormat );
         void getNativeTypeList( const Sequence< com::sun::star::datatransfer::DataFlavor >& rTypes, std::list< Atom >& rOutTypeList, Atom targetselection );
 
         // methods for transferable
         bool getPasteDataTypes( Atom selection, Sequence< ::com::sun::star::datatransfer::DataFlavor >& rTypes );
-        bool getPasteData( Atom selection, const ::rtl::OUString& rType, Sequence< sal_Int8 >& rData );
+        bool getPasteData( Atom selection, const OUString& rType, Sequence< sal_Int8 >& rData );
 
         // for XDropTarget to register/deregister itself
         void registerDropTarget( XLIB_Window aXLIB_Window, DropTarget* pTarget );
@@ -511,11 +511,11 @@ namespace x11 {
 
 // ------------------------------------------------------------------------
 
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL Xdnd_getSupportedServiceNames();
+    ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_getSupportedServiceNames();
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_createInstance(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL Xdnd_dropTarget_getSupportedServiceNames();
+    ::com::sun::star::uno::Sequence< OUString > SAL_CALL Xdnd_dropTarget_getSupportedServiceNames();
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL Xdnd_dropTarget_createInstance(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & xMultiServiceFactory);
 
diff --git a/vcl/unx/generic/dtrans/X11_service.cxx b/vcl/unx/generic/dtrans/X11_service.cxx
index dc2ff1766ee2..efc36b74205a 100644
--- a/vcl/unx/generic/dtrans/X11_service.cxx
+++ b/vcl/unx/generic/dtrans/X11_service.cxx
@@ -35,7 +35,6 @@ using namespace com::sun::star::datatransfer::clipboard;
 using namespace com::sun::star::awt;
 using namespace x11;
 
-using ::rtl::OUString;
 
 Sequence< OUString > SAL_CALL x11::X11Clipboard_getSupportedServiceNames()
 {
@@ -62,7 +61,7 @@ Sequence< OUString > SAL_CALL x11::Xdnd_dropTarget_getSupportedServiceNames()
 
 css::uno::Reference< XInterface > X11SalInstance::CreateClipboard( const Sequence< Any >& arguments )
 {
-    static boost::unordered_map< OUString, ::boost::unordered_map< Atom, Reference< XClipboard > >, ::rtl::OUStringHash > m_aInstances;
+    static boost::unordered_map< OUString, ::boost::unordered_map< Atom, Reference< XClipboard > >, OUStringHash > m_aInstances;
 
     OUString aDisplayName;
     Atom nSelection;
diff --git a/vcl/unx/generic/dtrans/X11_transferable.cxx b/vcl/unx/generic/dtrans/X11_transferable.cxx
index ccc78570344d..bcf54b664d0f 100644
--- a/vcl/unx/generic/dtrans/X11_transferable.cxx
+++ b/vcl/unx/generic/dtrans/X11_transferable.cxx
@@ -35,7 +35,6 @@ using namespace osl;
 
 using namespace x11;
 
-using ::rtl::OUString;
 
 
 X11Transferable::X11Transferable(
diff --git a/vcl/unx/generic/dtrans/config.cxx b/vcl/unx/generic/dtrans/config.cxx
index 1b49496e1770..4266f1c5ca31 100644
--- a/vcl/unx/generic/dtrans/config.cxx
+++ b/vcl/unx/generic/dtrans/config.cxx
@@ -33,7 +33,7 @@ class DtransX11ConfigItem : public ::utl::ConfigItem
 {
     sal_Int32           m_nSelectionTimeout;
 
-    virtual void Notify( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rPropertyNames );
+    virtual void Notify( const ::com::sun::star::uno::Sequence< OUString >& rPropertyNames );
     virtual void Commit();
 public:
     DtransX11ConfigItem();
@@ -48,7 +48,6 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 using namespace x11;
 
-using ::rtl::OUString;
 
 sal_Int32 SelectionManager::getSelectionTimeout()
 {
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index 8cec77e5bda5..30a1e3b1e6e0 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -88,7 +88,6 @@ struct _XRegion
     BOX *rects;
     BOX extents;
 };
-using ::rtl::OUString;
 // ===========================================================================
 
 // PspKernInfo allows on-demand-querying of psprint provided kerning info (#i29881#)
@@ -529,10 +528,10 @@ X11SalGraphics::SetTextColor( SalColor nSalColor )
 // ----------------------------------------------------------------------------
 
 bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
-    const rtl::OUString& rFileURL, const rtl::OUString& rFontName )
+    const OUString& rFileURL, const OUString& rFontName )
 {
     // inform PSP font manager
-    rtl::OUString aUSystemPath;
+    OUString aUSystemPath;
     OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFileURL, aUSystemPath ) );
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
     OString aOFileName( OUStringToOString( aUSystemPath, aEncoding ) );
@@ -556,7 +555,7 @@ bool X11SalGraphics::AddTempDevFont( ImplDevFontList* pFontList,
 
         int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID );
 
-        const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
+        const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
         rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA );
     }
 
@@ -603,7 +602,7 @@ void X11SalGraphics::GetDevFontList( ImplDevFontList *pList )
         // inform GlyphCache about this font provided by the PsPrint subsystem
         ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes( aInfo );
         aDFA.mnQuality += 4096;
-        const rtl::OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
+        const OString& rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
         rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA, pExtraKernInfo );
    }
 
@@ -787,7 +786,7 @@ SystemFontData X11SalGraphics::GetSysFontData( int nFallbacklevel ) const
 //--------------------------------------------------------------------------
 
 sal_Bool X11SalGraphics::CreateFontSubset(
-                                   const rtl::OUString& rToFile,
+                                   const OUString& rToFile,
                                    const PhysicalFontFace* pFont,
                                    sal_Int32* pGlyphIDs,
                                    sal_uInt8* pEncoding,
diff --git a/vcl/unx/generic/plugadapt/salplug.cxx b/vcl/unx/generic/plugadapt/salplug.cxx
index cbe539420a05..2eec71744955 100644
--- a/vcl/unx/generic/plugadapt/salplug.cxx
+++ b/vcl/unx/generic/plugadapt/salplug.cxx
@@ -33,8 +33,6 @@
 #include <cstdio>
 #include <unistd.h>
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 extern "C" {
 typedef SalInstance*(*salFactoryProc)( oslModule pModule);
 }
@@ -205,7 +203,7 @@ static SalInstance* autodetect_plugin()
     SalInstance* pInst = NULL;
     while( pList[nListEntry] && pInst == NULL )
     {
-        rtl::OUString aTry( rtl::OUString::createFromAscii( pList[nListEntry] ) );
+        OUString aTry( OUString::createFromAscii( pList[nListEntry] ) );
         pInst = tryInstance( aTry );
         #if OSL_DEBUG_LEVEL > 1
         if( pInst )
@@ -277,12 +275,12 @@ void InitSalMain()
 {
 }
 
-void SalAbort( const rtl::OUString& rErrorText, bool bDumpCore )
+void SalAbort( const OUString& rErrorText, bool bDumpCore )
 {
     if( rErrorText.isEmpty() )
         std::fprintf( stderr, "Application Error\n" );
     else
-        std::fprintf( stderr, "%s\n", rtl::OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
+        std::fprintf( stderr, "%s\n", OUStringToOString(rErrorText, osl_getThreadTextEncoding()).getStr() );
     if( bDumpCore )
         abort();
     else
@@ -293,10 +291,10 @@ static const char * desktop_strings[] = { "none", "unknown", "GNOME", "TDE", "KD
 
 const OUString& SalGetDesktopEnvironment()
 {
-    static rtl::OUString aRet;
+    static OUString aRet;
     if( aRet.isEmpty())
     {
-        rtl::OUStringBuffer buf( 8 );
+        OUStringBuffer buf( 8 );
         buf.appendAscii( desktop_strings[ get_desktop_environment() ] );
         aRet = buf.makeStringAndClear();
     }
diff --git a/vcl/unx/generic/printer/cupsmgr.cxx b/vcl/unx/generic/printer/cupsmgr.cxx
index 102d19c7e5b8..fe163bb4b35a 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -40,12 +40,6 @@
 using namespace psp;
 using namespace osl;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
-using ::rtl::OUStringToOString;
-using ::rtl::OStringToOUString;
-using ::rtl::OUStringHash;
-using ::rtl::OString;
 
 struct GetPPDAttribs
 {
@@ -576,7 +570,7 @@ void CUPSManager::setupJobContextData( JobData& rData )
 FILE* CUPSManager::startSpool( const OUString& rPrintername, bool bQuickCommand )
 {
     OSL_TRACE( "endSpool: %s, %s",
-               rtl::OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
+               OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
               bQuickCommand ? "true" : "false" );
 
     if( m_aCUPSDestMap.find( rPrintername ) == m_aCUPSDestMap.end() )
@@ -635,7 +629,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner
 
     if( rJob.m_nPDFDevice > 0 && rJob.m_nCopies > 1 )
     {
-        rtl::OString aVal( rtl::OString::valueOf( sal_Int32( rJob.m_nCopies ) ) );
+        OString aVal( OString::valueOf( sal_Int32( rJob.m_nCopies ) ) );
         rNumOptions = cupsAddOption( "copies", aVal.getStr(), rNumOptions, (cups_option_t**)rOptions );
     }
     if( ! bBanner )
@@ -647,8 +641,8 @@ void CUPSManager::getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner
 int CUPSManager::endSpool( const OUString& rPrintername, const OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner )
 {
     OSL_TRACE( "endSpool: %s, %s, copy count = %d",
-               rtl::OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
-               rtl::OUStringToOString( rJobTitle, RTL_TEXTENCODING_UTF8 ).getStr(),
+               OUStringToOString( rPrintername, RTL_TEXTENCODING_UTF8 ).getStr(),
+               OUStringToOString( rJobTitle, RTL_TEXTENCODING_UTF8 ).getStr(),
                rDocumentJobData.m_nCopies
                );
 
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index c55f64aad12f..d40fffd913a7 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -79,7 +79,7 @@ bool JobData::setPaper( int i_nWidth, int i_nHeight )
     bool bSuccess = false;
     if( m_pParser )
     {
-        rtl::OUString aPaper( m_pParser->matchPaper( i_nWidth, i_nHeight ) );
+        OUString aPaper( m_pParser->matchPaper( i_nWidth, i_nHeight ) );
 
         const PPDKey*   pKey = m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) );
         const PPDValue* pValue = pKey ? pKey->getValueCaseInsensitive( aPaper ) : NULL;
@@ -114,12 +114,12 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes )
     SvMemoryStream aStream;
 
     // write header job data
-    aStream.WriteLine(rtl::OString(RTL_CONSTASCII_STRINGPARAM("JobData 1")));
+    aStream.WriteLine(OString(RTL_CONSTASCII_STRINGPARAM("JobData 1")));
 
-    rtl::OStringBuffer aLine;
+    OStringBuffer aLine;
 
     aLine.append(RTL_CONSTASCII_STRINGPARAM("printer="));
-    aLine.append(rtl::OUStringToOString(m_aPrinterName, RTL_TEXTENCODING_UTF8));
+    aLine.append(OUStringToOString(m_aPrinterName, RTL_TEXTENCODING_UTF8));
     aStream.WriteLine(aLine.makeStringAndClear());
 
     aLine.append(RTL_CONSTASCII_STRINGPARAM("orientation="));
@@ -176,7 +176,7 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes )
 bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobData )
 {
     SvMemoryStream aStream( pData, bytes, STREAM_READ );
-    rtl::OString aLine;
+    OString aLine;
     bool bVersion       = false;
     bool bPrinter       = false;
     bool bOrientation   = false;
@@ -205,7 +205,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
         else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(printerEquals)))
         {
             bPrinter = true;
-            rJobData.m_aPrinterName = rtl::OStringToOUString(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8);
+            rJobData.m_aPrinterName = OStringToOUString(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8);
         }
         else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(orientatationEquals)))
         {
@@ -220,7 +220,7 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
         else if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM(margindajustmentEquals)))
         {
             bMargin = true;
-            rtl::OString aValues(aLine.copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals)));
+            OString aValues(aLine.copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals)));
             rJobData.m_nLeftMarginAdjust = aValues.getToken(0, ',').toInt32();
             rJobData.m_nRightMarginAdjust = aValues.getToken(1, ',').toInt32();
             rJobData.m_nTopMarginAdjust = aValues.getToken(2, ',').toInt32();
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index de65253f3f2a..6b464e9d1cf9 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -70,8 +70,8 @@ namespace psp
             }
         };
 
-        typedef boost::unordered_map< com::sun::star::lang::Locale, rtl::OUString, LocaleHash, LocaleEqual > translation_map;
-        typedef boost::unordered_map< rtl::OUString, translation_map, rtl::OUStringHash > key_translation_map;
+        typedef boost::unordered_map< com::sun::star::lang::Locale, OUString, LocaleHash, LocaleEqual > translation_map;
+        typedef boost::unordered_map< OUString, translation_map, OUStringHash > key_translation_map;
 
         key_translation_map     m_aTranslations;
         public:
@@ -80,46 +80,46 @@ namespace psp
 
 
         void insertValue(
-            const rtl::OUString& i_rKey,
-            const rtl::OUString& i_rOption,
-            const rtl::OUString& i_rValue,
-            const rtl::OUString& i_rTranslation,
+            const OUString& i_rKey,
+            const OUString& i_rOption,
+            const OUString& i_rValue,
+            const OUString& i_rTranslation,
             const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale()
             );
 
-        void insertOption( const rtl::OUString& i_rKey,
-                           const rtl::OUString& i_rOption,
-                           const rtl::OUString& i_rTranslation,
+        void insertOption( const OUString& i_rKey,
+                           const OUString& i_rOption,
+                           const OUString& i_rTranslation,
                            const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() )
         {
-            insertValue( i_rKey, i_rOption, rtl::OUString(), i_rTranslation, i_rLocale );
+            insertValue( i_rKey, i_rOption, OUString(), i_rTranslation, i_rLocale );
         }
 
-        void insertKey( const rtl::OUString& i_rKey,
-                        const rtl::OUString& i_rTranslation,
+        void insertKey( const OUString& i_rKey,
+                        const OUString& i_rTranslation,
                         const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() )
         {
-            insertValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rTranslation, i_rLocale );
+            insertValue( i_rKey, OUString(), OUString(), i_rTranslation, i_rLocale );
         }
 
-        rtl::OUString translateValue(
-            const rtl::OUString& i_rKey,
-            const rtl::OUString& i_rOption,
-            const rtl::OUString& i_rValue,
+        OUString translateValue(
+            const OUString& i_rKey,
+            const OUString& i_rOption,
+            const OUString& i_rValue,
             const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale()
             ) const;
 
-        rtl::OUString translateOption( const rtl::OUString& i_rKey,
-                                       const rtl::OUString& i_rOption,
+        OUString translateOption( const OUString& i_rKey,
+                                       const OUString& i_rOption,
                                        const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const
         {
-            return translateValue( i_rKey, i_rOption, rtl::OUString(), i_rLocale );
+            return translateValue( i_rKey, i_rOption, OUString(), i_rLocale );
         }
 
-        rtl::OUString translateKey( const rtl::OUString& i_rKey,
+        OUString translateKey( const OUString& i_rKey,
                                     const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const
         {
-            return translateValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rLocale );
+            return translateValue( i_rKey, OUString(), OUString(), i_rLocale );
         }
     };
 
@@ -138,14 +138,14 @@ namespace psp
             static const char* pEnvLocale = getenv( "SAL_PPDPARSER_LOCALE" );
             if( pEnvLocale && *pEnvLocale )
             {
-                rtl::OString aStr( pEnvLocale );
+                OString aStr( pEnvLocale );
                 sal_Int32 nLen = aStr.getLength();
-                aLoc.Language = rtl::OStringToOUString( aStr.copy( 0, nLen > 2 ? 2 : nLen ), RTL_TEXTENCODING_MS_1252 );
+                aLoc.Language = OStringToOUString( aStr.copy( 0, nLen > 2 ? 2 : nLen ), RTL_TEXTENCODING_MS_1252 );
                 if( nLen >=5 && aStr.getStr()[2] == '_' )
-                    aLoc.Country = rtl::OStringToOUString( aStr.copy( 3, 2 ), RTL_TEXTENCODING_MS_1252 );
+                    aLoc.Country = OStringToOUString( aStr.copy( 3, 2 ), RTL_TEXTENCODING_MS_1252 );
                 else
-                    aLoc.Country = rtl::OUString();
-                aLoc.Variant = rtl::OUString();
+                    aLoc.Country = OUString();
+                aLoc.Variant = OUString();
             }
             #endif
         }
@@ -157,14 +157,14 @@ namespace psp
     }
 
     void PPDTranslator::insertValue(
-        const rtl::OUString& i_rKey,
-        const rtl::OUString& i_rOption,
-        const rtl::OUString& i_rValue,
-        const rtl::OUString& i_rTranslation,
+        const OUString& i_rKey,
+        const OUString& i_rOption,
+        const OUString& i_rValue,
+        const OUString& i_rTranslation,
         const com::sun::star::lang::Locale& i_rLocale
         )
     {
-        rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 );
+        OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 );
         aKey.append( i_rKey );
         if( !i_rOption.isEmpty() || !i_rValue.isEmpty() )
         {
@@ -178,7 +178,7 @@ namespace psp
         }
         if( aKey.getLength() && !i_rTranslation.isEmpty() )
         {
-            rtl::OUString aK( aKey.makeStringAndClear() );
+            OUString aK( aKey.makeStringAndClear() );
             com::sun::star::lang::Locale aLoc;
             aLoc.Language = i_rLocale.Language.toAsciiLowerCase();
             aLoc.Country  = i_rLocale.Country.toAsciiUpperCase();
@@ -187,16 +187,16 @@ namespace psp
         }
     }
 
-    rtl::OUString PPDTranslator::translateValue(
-        const rtl::OUString& i_rKey,
-        const rtl::OUString& i_rOption,
-        const rtl::OUString& i_rValue,
+    OUString PPDTranslator::translateValue(
+        const OUString& i_rKey,
+        const OUString& i_rOption,
+        const OUString& i_rValue,
         const com::sun::star::lang::Locale& i_rLocale
         ) const
     {
-        rtl::OUString aResult;
+        OUString aResult;
 
-        rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 );
+        OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 );
         aKey.append( i_rKey );
         if( !i_rOption.isEmpty() || !i_rValue.isEmpty() )
         {
@@ -210,7 +210,7 @@ namespace psp
         }
         if( aKey.getLength() )
         {
-            rtl::OUString aK( aKey.makeStringAndClear() );
+            OUString aK( aKey.makeStringAndClear() );
             key_translation_map::const_iterator it = m_aTranslations.find( aK );
             if( it != m_aTranslations.end() )
             {
@@ -227,9 +227,9 @@ namespace psp
                     }
                     switch( nTry )
                     {
-                    case 0: aLoc.Variant  = rtl::OUString();break;
-                    case 1: aLoc.Country  = rtl::OUString();break;
-                    case 2: aLoc.Language = rtl::OUString();break;
+                    case 0: aLoc.Variant  = OUString();break;
+                    case 1: aLoc.Country  = OUString();break;
+                    case 2: aLoc.Language = OUString();break;
                     }
                 }
             }
@@ -241,7 +241,7 @@ namespace psp
     {
     public:
         std::list< PPDParser* > aAllParsers;
-        boost::unordered_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >* pAllPPDFiles;
+        boost::unordered_map< OUString, OUString, OUStringHash >* pAllPPDFiles;
         PPDCache()
             : pAllPPDFiles(NULL)
         {}
@@ -260,12 +260,9 @@ namespace psp
 
 using namespace psp;
 
-using ::rtl::OUString;
-using ::rtl::OStringBuffer;
-using ::rtl::OUStringHash;
 
 #if OSL_DEBUG_LEVEL > 2
-#define BSTRING(x) rtl::OUStringToOString( x, osl_getThreadTextEncoding() )
+#define BSTRING(x) OUStringToOString( x, osl_getThreadTextEncoding() )
 #endif
 
 namespace
@@ -277,25 +274,25 @@ class PPDDecompressStream
 {
     SvFileStream*       mpFileStream;
     SvMemoryStream*     mpMemStream;
-    rtl::OUString       maFileName;
+    OUString       maFileName;
 
     // forbid copying
     PPDDecompressStream( const PPDDecompressStream& );
     PPDDecompressStream& operator=(const PPDDecompressStream& );
 
     public:
-    PPDDecompressStream( const rtl::OUString& rFile );
+    PPDDecompressStream( const OUString& rFile );
     ~PPDDecompressStream();
 
     bool IsOpen() const;
     bool IsEof() const;
-    rtl::OString ReadLine();
-    void Open( const rtl::OUString& i_rFile );
+    OString ReadLine();
+    void Open( const OUString& i_rFile );
     void Close();
-    const rtl::OUString& GetFileName() const { return maFileName; }
+    const OUString& GetFileName() const { return maFileName; }
 };
 
-PPDDecompressStream::PPDDecompressStream( const rtl::OUString& i_rFile ) :
+PPDDecompressStream::PPDDecompressStream( const OUString& i_rFile ) :
     mpFileStream( NULL ),
     mpMemStream( NULL )
 {
@@ -307,7 +304,7 @@ PPDDecompressStream::~PPDDecompressStream()
     Close();
 }
 
-void PPDDecompressStream::Open( const rtl::OUString& i_rFile )
+void PPDDecompressStream::Open( const OUString& i_rFile )
 {
     Close();
 
@@ -320,7 +317,7 @@ void PPDDecompressStream::Open( const rtl::OUString& i_rFile )
         return;
     }
 
-    rtl::OString aLine;
+    OString aLine;
     mpFileStream->ReadLine( aLine );
     mpFileStream->Seek( 0 );
 
@@ -371,9 +368,9 @@ bool PPDDecompressStream::IsEof() const
     return ( mpMemStream ? mpMemStream->IsEof() : ( mpFileStream ? mpFileStream->IsEof() : true ) );
 }
 
-rtl::OString PPDDecompressStream::ReadLine()
+OString PPDDecompressStream::ReadLine()
 {
-    rtl::OString o_rLine;
+    OString o_rLine;
     if( mpMemStream )
         mpMemStream->ReadLine( o_rLine );
     else if( mpFileStream )
@@ -381,7 +378,7 @@ rtl::OString PPDDecompressStream::ReadLine()
     return o_rLine;
 }
 
-static osl::FileBase::RC resolveLink( const rtl::OUString& i_rURL, rtl::OUString& o_rResolvedURL, rtl::OUString& o_rBaseName, osl::FileStatus::Type& o_rType, int nLinkLevel = 10 )
+static osl::FileBase::RC resolveLink( const OUString& i_rURL, OUString& o_rResolvedURL, OUString& o_rBaseName, osl::FileStatus::Type& o_rType, int nLinkLevel = 10 )
 {
     salhelper::LinkResolver aResolver(osl_FileStatus_Mask_FileName |
                                       osl_FileStatus_Mask_Type |
@@ -423,12 +420,12 @@ void PPDParser::scanPPDDir( const String& rDir )
             osl::FileStatus aStatus( osl_FileStatus_Mask_FileName );
             if( aItem.getFileStatus( aStatus ) == osl::FileBase::E_None )
             {
-                rtl::OUStringBuffer aURLBuf( rDir.Len() + 64 );
+                OUStringBuffer aURLBuf( rDir.Len() + 64 );
                 aURLBuf.append( rDir );
                 aURLBuf.append( sal_Unicode( '/' ) );
                 aURLBuf.append( aStatus.getFileName() );
 
-                rtl::OUString aFileURL, aFileName;
+                OUString aFileURL, aFileName;
                 osl::FileStatus::Type eType = osl::FileStatus::Unknown;
 
                 if( resolveLink( aURLBuf.makeStringAndClear(), aFileURL, aFileName, eType ) == osl::FileBase::E_None )
@@ -487,7 +484,7 @@ void PPDParser::initPPDFiles()
             INetURLObject aDir( aExe );
             aDir.removeSegment();
 #ifdef DEBUG
-            fprintf( stderr, "scanning last chance dir: %s\n", rtl::OUStringToOString( aDir.GetMainURL( INetURLObject::NO_DECODE ), osl_getThreadTextEncoding() ).getStr() );
+            fprintf( stderr, "scanning last chance dir: %s\n", OUStringToOString( aDir.GetMainURL( INetURLObject::NO_DECODE ), osl_getThreadTextEncoding() ).getStr() );
 #endif
             scanPPDDir( aDir.GetMainURL( INetURLObject::NO_DECODE ) );
 #ifdef DEBUG
@@ -497,7 +494,7 @@ void PPDParser::initPPDFiles()
     }
 }
 
-void PPDParser::getKnownPPDDrivers( std::list< rtl::OUString >& o_rDrivers, bool bRefresh )
+void PPDParser::getKnownPPDDrivers( std::list< OUString >& o_rDrivers, bool bRefresh )
 {
     PPDCache &rPPDCache = thePPDCache::get();
 
@@ -531,7 +528,7 @@ String PPDParser::getPPDFile( const String& rFile )
             initPPDFiles();
             // some PPD files contain dots beside the extension, so try name first
             // and cut of points after that
-            rtl::OUString aBase( rFile );
+            OUString aBase( rFile );
             sal_Int32 nLastIndex = aBase.lastIndexOf( sal_Unicode( '/' ) );
             if( nLastIndex >= 0 )
                 aBase = aBase.copy( nLastIndex+1 );
@@ -560,7 +557,7 @@ String PPDParser::getPPDFile( const String& rFile )
     String aRet;
     if( aStream.IsOpen() )
     {
-        rtl::OString aLine = aStream.ReadLine();
+        OString aLine = aStream.ReadLine();
         if (aLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("*PPD-Adobe")) == 0)
             aRet = aStream.GetFileName();
         else
@@ -590,8 +587,8 @@ String PPDParser::getPPDPrinterName( const String& rFile )
         String aCurLine;
         while( ! aStream.IsEof() && aStream.IsOpen() )
         {
-            rtl::OString aByteLine = aStream.ReadLine();
-            aCurLine = rtl::OStringToOUString(aByteLine, RTL_TEXTENCODING_MS_1252);
+            OString aByteLine = aStream.ReadLine();
+            aCurLine = OStringToOUString(aByteLine, RTL_TEXTENCODING_MS_1252);
             if( aCurLine.CompareIgnoreCaseToAscii( "*include:", 9 ) == COMPARE_EQUAL )
             {
                 aCurLine.Erase( 0, 9 );
@@ -630,7 +627,7 @@ const PPDParser* PPDParser::getParser( const String& rFile )
     if( ! aFile.Len() )
     {
 #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "Could not get printer PPD file \"%s\" !\n", ::rtl::OUStringToOString( rFile, osl_getThreadTextEncoding() ).getStr() );
+        fprintf( stderr, "Could not get printer PPD file \"%s\" !\n", OUStringToOString( rFile, osl_getThreadTextEncoding() ).getStr() );
 #endif
         return NULL;
     }
@@ -682,17 +679,17 @@ PPDParser::PPDParser( const String& rFile ) :
         m_pTranslator( new PPDTranslator() )
 {
     // read in the file
-    std::list< rtl::OString > aLines;
+    std::list< OString > aLines;
     PPDDecompressStream aStream( m_aFile );
     if( aStream.IsOpen() )
     {
         bool bLanguageEncoding = false;
         while( ! aStream.IsEof() )
         {
-            rtl::OString aCurLine = aStream.ReadLine();
+            OString aCurLine = aStream.ReadLine();
             if( aCurLine[0] == '*' )
             {
-                if (aCurLine.matchIgnoreAsciiCase(rtl::OString("*include:")))
+                if (aCurLine.matchIgnoreAsciiCase(OString("*include:")))
                 {
                     aCurLine = aCurLine.copy(9);
                     aCurLine = comphelper::string::stripStart(aCurLine, ' ');
@@ -704,14 +701,14 @@ PPDParser::PPDParser( const String& rFile ) :
                     aCurLine = comphelper::string::stripStart(aCurLine, '"');
                     aCurLine = comphelper::string::stripEnd(aCurLine, '"');
                     aStream.Close();
-                    aStream.Open(getPPDFile(rtl::OStringToOUString(aCurLine, m_aFileEncoding)));
+                    aStream.Open(getPPDFile(OStringToOUString(aCurLine, m_aFileEncoding)));
                     continue;
                 }
                 else if( ! bLanguageEncoding &&
-                         aCurLine.matchIgnoreAsciiCase(rtl::OString("*languageencoding")) )
+                         aCurLine.matchIgnoreAsciiCase(OString("*languageencoding")) )
                 {
                     bLanguageEncoding = true; // generally only the first one counts
-                    rtl::OString aLower = aCurLine.toAsciiLowerCase();
+                    OString aLower = aCurLine.toAsciiLowerCase();
                     if( aLower.indexOfL(RTL_CONSTASCII_STRINGPARAM("isolatin1"), 17 ) != -1 ||
                         aLower.indexOfL(RTL_CONSTASCII_STRINGPARAM("windowsansi"), 17 ) != -1 )
                         m_aFileEncoding = RTL_TEXTENCODING_MS_1252;
@@ -798,12 +795,12 @@ PPDParser::PPDParser( const String& rFile ) :
     if (m_pImageableAreas == 0) {
         OSL_TRACE(
             OSL_LOG_PREFIX "Warning: no ImageableArea in %s\n",
-            rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
     }
     if (m_pDefaultImageableArea == 0) {
         OSL_TRACE(
             OSL_LOG_PREFIX "Warning: no DefaultImageableArea in %s\n",
-            rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
     }
 
     m_pPaperDimensions = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PaperDimension" ) ) );
@@ -812,12 +809,12 @@ PPDParser::PPDParser( const String& rFile ) :
     if (m_pPaperDimensions == 0) {
         OSL_TRACE(
             OSL_LOG_PREFIX "Warning: no PaperDimensions in %s\n",
-            rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
     }
     if (m_pDefaultPaperDimension == 0) {
         OSL_TRACE(
             OSL_LOG_PREFIX "Warning: no DefaultPaperDimensions in %s\n",
-            rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
     }
 
     m_pResolutions = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ) );
@@ -826,12 +823,12 @@ PPDParser::PPDParser( const String& rFile ) :
     if (m_pResolutions == 0) {
         OSL_TRACE(
             OSL_LOG_PREFIX "Warning: no Resolution in %s\n",
-            rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
     }
     if (m_pDefaultResolution == 0) {
         OSL_TRACE(
             OSL_LOG_PREFIX "Warning: no DefaultResolution in %s\n",
-            rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
     }
 
     m_pInputSlots = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "InputSlot" ) ) );
@@ -840,12 +837,12 @@ PPDParser::PPDParser( const String& rFile ) :
     if (m_pInputSlots == 0) {
         OSL_TRACE(
             OSL_LOG_PREFIX "Warning: no InputSlot in %s\n",
-            rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
     }
     if (m_pDefaultInputSlot == 0) {
         OSL_TRACE(
             OSL_LOG_PREFIX "Warning: no DefaultInputSlot in %s\n",
-            rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
     }
 
     m_pDuplexTypes = getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
@@ -856,7 +853,7 @@ PPDParser::PPDParser( const String& rFile ) :
     if (m_pFontList == 0) {
         OSL_TRACE(
             OSL_LOG_PREFIX "Warning: no Font in %s\n",
-            rtl::OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(m_aFile, RTL_TEXTENCODING_UTF8).getStr());
     }
 
     // fill in direct values
@@ -917,7 +914,7 @@ static sal_uInt8 getNibble( sal_Char cChar )
     return nRet;
 }
 
-String PPDParser::handleTranslation(const rtl::OString& i_rString, bool bIsGlobalized)
+String PPDParser::handleTranslation(const OString& i_rString, bool bIsGlobalized)
 {
     sal_Int32 nOrigLen = i_rString.getLength();
     OStringBuffer aTrans( nOrigLen );
@@ -945,7 +942,7 @@ String PPDParser::handleTranslation(const rtl::OString& i_rString, bool bIsGloba
 
 namespace
 {
-    bool oddDoubleQuoteCount(rtl::OStringBuffer &rBuffer)
+    bool oddDoubleQuoteCount(OStringBuffer &rBuffer)
     {
         bool bHasOddCount = false;
         for (sal_Int32 i = 0; i < rBuffer.getLength(); ++i)
@@ -957,20 +954,20 @@ namespace
     }
 }
 
-void PPDParser::parse( ::std::list< rtl::OString >& rLines )
+void PPDParser::parse( ::std::list< OString >& rLines )
 {
-    std::list< rtl::OString >::iterator line = rLines.begin();
+    std::list< OString >::iterator line = rLines.begin();
     PPDParser::hash_type::const_iterator keyit;
     while( line != rLines.end() )
     {
-        rtl::OString aCurrentLine( *line );
+        OString aCurrentLine( *line );
         ++line;
         if( aCurrentLine[0] != '*' )
             continue;
         if( aCurrentLine[1] == '%' )
             continue;
 
-        rtl::OString aKey = GetCommandLineToken( 0, comphelper::string::getToken(aCurrentLine, 0, ':') );
+        OString aKey = GetCommandLineToken( 0, comphelper::string::getToken(aCurrentLine, 0, ':') );
         sal_Int32 nPos = aKey.indexOf('/');
         if (nPos != -1)
             aKey = aKey.copy(0, nPos);
@@ -1015,7 +1012,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
             bQuery = true;
         }
 
-        String aUniKey(rtl::OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252));
+        String aUniKey(OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252));
         // handle CUPS extension for globalized PPDs
         bool bIsGlobalizedLine = false;
         com::sun::star::lang::Locale aTransLocale;
@@ -1040,7 +1037,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
         nPos = aCurrentLine.indexOf(':');
         if( nPos != -1 )
         {
-            aOption = rtl::OStringToOUString( aCurrentLine.copy( 1, nPos-1 ), RTL_TEXTENCODING_MS_1252 );
+            aOption = OStringToOUString( aCurrentLine.copy( 1, nPos-1 ), RTL_TEXTENCODING_MS_1252 );
             aOption = GetCommandLineToken( 1, aOption );
             int nTransPos = aOption.Search( '/' );
             if( nTransPos != STRING_NOTFOUND )
@@ -1049,12 +1046,12 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
 
         PPDValueType eType = eNo;
         String aValue;
-        rtl::OUString aOptionTranslation;
-        rtl::OUString aValueTranslation;
+        OUString aOptionTranslation;
+        OUString aValueTranslation;
         if( nPos != STRING_NOTFOUND )
         {
             // found a colon, there may be an option
-            rtl::OString aLine = aCurrentLine.copy( 1, nPos-1 );
+            OString aLine = aCurrentLine.copy( 1, nPos-1 );
             aLine = WhitespaceToSpace( aLine );
             sal_Int32 nTransPos = aLine.indexOf('/');
             if (nTransPos != -1)
@@ -1064,7 +1061,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
             aLine = aCurrentLine.copy( nPos+1 );
             if (!aLine.isEmpty())
             {
-                rtl::OStringBuffer aBuffer(aLine);
+                OStringBuffer aBuffer(aLine);
                 while (line != rLines.end() && oddDoubleQuoteCount(aBuffer))
                 {
                     // copy the newlines also
@@ -1092,7 +1089,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
                 nTransPos = aLine.indexOf('"');
                 if (nTransPos == -1)
                     nTransPos = aLine.getLength();
-                aValue = rtl::OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252);
+                aValue = OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252);
                 // after the second doublequote can follow a / and a translation
                 if (nTransPos < aLine.getLength() - 2)
                 {
@@ -1109,7 +1106,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
             else if(aLine[0] == '^')
             {
                 aLine = aLine.copy(1);
-                aValue = rtl::OStringToOUString(aLine, RTL_TEXTENCODING_MS_1252);
+                aValue = OStringToOUString(aLine, RTL_TEXTENCODING_MS_1252);
                 eType = eSymbol;
             }
             else
@@ -1122,7 +1119,7 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
                 nTransPos = aLine.indexOf('/');
                 if (nTransPos == -1)
                     nTransPos = aLine.getLength();
-                aValue = rtl::OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252);
+                aValue = OStringToOUString(aLine.copy(0, nTransPos), RTL_TEXTENCODING_MS_1252);
                 if (nTransPos+1 < aLine.getLength())
                     aValueTranslation = handleTranslation( aLine.copy( nTransPos+1 ), bIsGlobalizedLine );
                 eType = eString;
@@ -1183,15 +1180,15 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
     // second pass: fill in defaults
     for( line = rLines.begin(); line != rLines.end(); ++line )
     {
-        rtl::OString aLine(*line);
+        OString aLine(*line);
         if (aLine.matchL(RTL_CONSTASCII_STRINGPARAM("*Default")))
         {
-            String aKey(rtl::OStringToOUString(aLine.copy(8), RTL_TEXTENCODING_MS_1252));
+            String aKey(OStringToOUString(aLine.copy(8), RTL_TEXTENCODING_MS_1252));
             sal_uInt16 nPos = aKey.Search( ':' );
             if( nPos != STRING_NOTFOUND )
             {
                 aKey.Erase( nPos );
-                rtl::OUString aOption(rtl::OStringToOUString(
+                OUString aOption(OStringToOUString(
                     WhitespaceToSpace(aLine.copy(nPos+9)),
                     RTL_TEXTENCODING_MS_1252));
                 keyit = m_aKeys.find( aKey );
@@ -1223,10 +1220,10 @@ void PPDParser::parse( ::std::list< rtl::OString >& rLines )
     }
 }
 
-void PPDParser::parseOpenUI(const rtl::OString& rLine)
+void PPDParser::parseOpenUI(const OString& rLine)
 {
     String aTranslation;
-    rtl::OString aKey = rLine;
+    OString aKey = rLine;
 
     sal_Int32 nPos = aKey.indexOf(':');
     if( nPos != -1 )
@@ -1240,7 +1237,7 @@ void PPDParser::parseOpenUI(const rtl::OString& rLine)
     aKey = GetCommandLineToken( 1, aKey );
     aKey = aKey.copy(1);
 
-    String aUniKey(rtl::OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252));
+    String aUniKey(OStringToOUString(aKey, RTL_TEXTENCODING_MS_1252));
     PPDParser::hash_type::const_iterator keyit = m_aKeys.find( aUniKey );
     PPDKey* pKey;
     if( keyit == m_aKeys.end() )
@@ -1255,7 +1252,7 @@ void PPDParser::parseOpenUI(const rtl::OString& rLine)
     m_pTranslator->insertKey( pKey->getKey(), aTranslation );
 
     sal_Int32 nIndex = 0;
-    rtl::OString aValue = WhitespaceToSpace( rLine.getToken( 1, ':', nIndex ) );
+    OString aValue = WhitespaceToSpace( rLine.getToken( 1, ':', nIndex ) );
     if( aValue.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("boolean")))
         pKey->m_eUIType = PPDKey::Boolean;
     else if (aValue.equalsIgnoreAsciiCaseL(RTL_CONSTASCII_STRINGPARAM("pickmany")))
@@ -1264,16 +1261,16 @@ void PPDParser::parseOpenUI(const rtl::OString& rLine)
         pKey->m_eUIType = PPDKey::PickOne;
 }
 
-void PPDParser::parseOrderDependency(const rtl::OString& rLine)
+void PPDParser::parseOrderDependency(const OString& rLine)
 {
-    rtl::OString aLine(rLine);
+    OString aLine(rLine);
     sal_Int32 nPos = aLine.indexOf(':');
     if( nPos != -1 )
         aLine = aLine.copy( nPos+1 );
 
     sal_Int32 nOrder = GetCommandLineToken( 0, aLine ).toInt32();
-    rtl::OString aSetup = GetCommandLineToken( 1, aLine );
-    String aKey(rtl::OStringToOUString(GetCommandLineToken(2, aLine), RTL_TEXTENCODING_MS_1252));
+    OString aSetup = GetCommandLineToken( 1, aLine );
+    String aKey(OStringToOUString(GetCommandLineToken(2, aLine), RTL_TEXTENCODING_MS_1252));
     if( aKey.GetChar( 0 ) != '*' )
         return; // invalid order depency
     aKey.Erase( 0, 1 );
@@ -1303,11 +1300,11 @@ void PPDParser::parseOrderDependency(const rtl::OString& rLine)
         pKey->m_eSetupType = PPDKey::AnySetup;
 }
 
-void PPDParser::parseConstraint( const rtl::OString& rLine )
+void PPDParser::parseConstraint( const OString& rLine )
 {
     bool bFailed = false;
 
-    String aLine(rtl::OStringToOUString(rLine, RTL_TEXTENCODING_MS_1252));
+    String aLine(OStringToOUString(rLine, RTL_TEXTENCODING_MS_1252));
     aLine.Erase(0, rLine.indexOf(':') + 1);
     PPDConstraint aConstraint;
     int nTokens = GetCommandLineTokenCount( aLine );
@@ -1515,20 +1512,20 @@ String PPDParser::getFont( int nFont ) const
     return String();
 }
 
-rtl::OUString PPDParser::translateKey( const rtl::OUString& i_rKey,
+OUString PPDParser::translateKey( const OUString& i_rKey,
                                        const com::sun::star::lang::Locale& i_rLocale ) const
 {
-    rtl::OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) );
+    OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) );
     if( aResult.isEmpty() )
         aResult = i_rKey;
     return aResult;
 }
 
-rtl::OUString PPDParser::translateOption( const rtl::OUString& i_rKey,
-                                          const rtl::OUString& i_rOption,
+OUString PPDParser::translateOption( const OUString& i_rKey,
+                                          const OUString& i_rOption,
                                           const com::sun::star::lang::Locale& i_rLocale ) const
 {
-    rtl::OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) );
+    OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) );
     if( aResult.isEmpty() )
         aResult = i_rOption;
     return aResult;
@@ -1879,12 +1876,12 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const
     hash_type::const_iterator it;
     for( it = m_aCurrentValues.begin(); it != m_aCurrentValues.end(); ++it )
     {
-        rtl::OString aCopy(rtl::OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252));
+        OString aCopy(OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252));
         rBytes += aCopy.getLength();
         rBytes += 1; // for ':'
         if( it->second )
         {
-            aCopy = rtl::OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252);
+            aCopy = OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252);
             rBytes += aCopy.getLength();
         }
         else
@@ -1897,13 +1894,13 @@ char* PPDContext::getStreamableBuffer( sal_uLong& rBytes ) const
     char* pRun = pBuffer;
     for( it = m_aCurrentValues.begin(); it != m_aCurrentValues.end(); ++it )
     {
-        rtl::OString aCopy(rtl::OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252));
+        OString aCopy(OUStringToOString(it->first->getKey(), RTL_TEXTENCODING_MS_1252));
         int nBytes = aCopy.getLength();
         memcpy( pRun, aCopy.getStr(), nBytes );
         pRun += nBytes;
         *pRun++ = ':';
         if( it->second )
-            aCopy = rtl::OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252);
+            aCopy = OUStringToOString(it->second->m_aOption, RTL_TEXTENCODING_MS_1252);
         else
             aCopy = "*nil";
         nBytes = aCopy.getLength();
@@ -1927,15 +1924,15 @@ void PPDContext::rebuildFromStreamBuffer( char* pBuffer, sal_uLong nBytes )
     char* pRun = pBuffer;
     while( nBytes && *pRun )
     {
-        rtl::OString aLine( pRun );
+        OString aLine( pRun );
         sal_Int32 nPos = aLine.indexOf(':');
         if( nPos != -1 )
         {
-            const PPDKey* pKey = m_pParser->getKey( rtl::OStringToOUString( aLine.copy( 0, nPos ), RTL_TEXTENCODING_MS_1252 ) );
+            const PPDKey* pKey = m_pParser->getKey( OStringToOUString( aLine.copy( 0, nPos ), RTL_TEXTENCODING_MS_1252 ) );
             if( pKey )
             {
                 const PPDValue* pValue = NULL;
-                rtl::OUString aOption(rtl::OStringToOUString(aLine.copy(nPos+1), RTL_TEXTENCODING_MS_1252));
+                OUString aOption(OStringToOUString(aLine.copy(nPos+1), RTL_TEXTENCODING_MS_1252));
                 if (aOption != "*nil")
                     pValue = pKey->getValue( aOption );
                 m_aCurrentValues[ pKey ] = pValue;
@@ -1977,10 +1974,10 @@ int PPDContext::getRenderResolution() const
 
 // -------------------------------------------------------------------
 
-void PPDContext::getPageSize( rtl::OUString& rPaper, int& rWidth, int& rHeight ) const
+void PPDContext::getPageSize( OUString& rPaper, int& rWidth, int& rHeight ) const
 {
     // initialize to reasonable default, if parser is not set
-    rPaper  = rtl::OUString( "A4" );
+    rPaper  = OUString( "A4" );
     rWidth  = 595;
     rHeight = 842;
     if( m_pParser )
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 3f3353259189..cfe471f4ab20 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -54,10 +54,6 @@
 using namespace psp;
 using namespace osl;
 
-using ::rtl::OUString;
-using ::rtl::OString;
-using ::rtl::OStringToOUString;
-using ::rtl::OUStringHash;
 
 namespace psp
 {
@@ -162,7 +158,7 @@ void PrinterInfoManager::setCUPSDisabled( bool bDisable )
 
 void PrinterInfoManager::initSystemDefaultPaper()
 {
-    m_aSystemDefaultPaper = rtl::OStringToOUString(
+    m_aSystemDefaultPaper = OStringToOUString(
         PaperInfo::toPSName(PaperInfo::getSystemDefaultPaper().getPaper()),
         RTL_TEXTENCODING_UTF8);
 }
@@ -258,11 +254,11 @@ void PrinterInfoManager::initialize()
         if( aConfig.HasGroup( GLOBAL_DEFAULTS_GROUP ) )
         {
             #if OSL_DEBUG_LEVEL > 1
-            fprintf( stderr, "found global defaults in %s\n", rtl::OUStringToOString( aFile.PathToFileName(), RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
+            fprintf( stderr, "found global defaults in %s\n", OUStringToOString( aFile.PathToFileName(), RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
             #endif
             aConfig.SetGroup( GLOBAL_DEFAULTS_GROUP );
 
-            rtl::OString aValue( aConfig.ReadKey( "Copies" ) );
+            OString aValue( aConfig.ReadKey( "Copies" ) );
             if (!aValue.isEmpty())
                 m_aGlobalDefaults.m_nCopies = aValue.toInt32();
 
@@ -318,16 +314,16 @@ void PrinterInfoManager::initialize()
             // get the PPDContext of global JobData
             for( int nKey = 0; nKey < aConfig.GetKeyCount(); ++nKey )
             {
-                rtl::OString aKey( aConfig.GetKeyName( nKey ) );
+                OString aKey( aConfig.GetKeyName( nKey ) );
                 if (aKey.matchL(RTL_CONSTASCII_STRINGPARAM("PPD_")))
                 {
                     aValue = aConfig.ReadKey( aKey );
-                    const PPDKey* pKey = m_aGlobalDefaults.m_pParser->getKey(rtl::OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1));
+                    const PPDKey* pKey = m_aGlobalDefaults.m_pParser->getKey(OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1));
                     if( pKey )
                     {
                         m_aGlobalDefaults.m_aContext.
                         setValue( pKey,
-                        aValue.equals("*nil") ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)),
+                        aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)),
                         sal_True );
                     }
                 }
@@ -384,7 +380,7 @@ void PrinterInfoManager::initialize()
         for( int nGroup = 0; nGroup < aConfig.GetGroupCount(); nGroup++ )
         {
             aConfig.SetGroup( aConfig.GetGroupName( nGroup ) );
-            rtl::OString aValue = aConfig.ReadKey( "Printer" );
+            OString aValue = aConfig.ReadKey( "Printer" );
             if (!aValue.isEmpty())
             {
                 OUString aPrinterName;
@@ -403,10 +399,10 @@ void PrinterInfoManager::initialize()
                 aPrinter.m_aInfo.m_aFontSubstitutes.clear();
                 aPrinter.m_aInfo.m_aFontSubstitutions.clear();
 
-                aPrinterName = rtl::OStringToOUString(aValue.copy(nNamePos+1),
+                aPrinterName = OStringToOUString(aValue.copy(nNamePos+1),
                     RTL_TEXTENCODING_UTF8);
                 aPrinter.m_aInfo.m_aPrinterName = aPrinterName;
-                aPrinter.m_aInfo.m_aDriverName = rtl::OStringToOUString(aValue.copy(0, nNamePos), RTL_TEXTENCODING_UTF8);
+                aPrinter.m_aInfo.m_aDriverName = OStringToOUString(aValue.copy(0, nNamePos), RTL_TEXTENCODING_UTF8);
 
                 // set parser, merge settings
                 // don't do this for CUPS printers as this is done
@@ -460,14 +456,14 @@ void PrinterInfoManager::initialize()
                         aValue = "lpr";
                         #endif
                     }
-                    aPrinter.m_aInfo.m_aCommand = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
+                    aPrinter.m_aInfo.m_aCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
                 }
 
                 aValue = aConfig.ReadKey( "QuickCommand" );
-                aPrinter.m_aInfo.m_aQuickCommand = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
+                aPrinter.m_aInfo.m_aQuickCommand = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
 
                 aValue = aConfig.ReadKey( "Features" );
-                aPrinter.m_aInfo.m_aFeatures = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
+                aPrinter.m_aInfo.m_aFeatures = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
 
                 // override the settings in m_aGlobalDefaults if keys exist
                 aValue = aConfig.ReadKey( "DefaultPrinter" );
@@ -475,10 +471,10 @@ void PrinterInfoManager::initialize()
                     aDefaultPrinter = aPrinterName;
 
                 aValue = aConfig.ReadKey( "Location" );
-                aPrinter.m_aInfo.m_aLocation = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
+                aPrinter.m_aInfo.m_aLocation = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
 
                 aValue = aConfig.ReadKey( "Comment" );
-                aPrinter.m_aInfo.m_aComment = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
+                aPrinter.m_aInfo.m_aComment = OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
 
                 aValue = aConfig.ReadKey( "Copies" );
                 if (!aValue.isEmpty())
@@ -526,16 +522,16 @@ void PrinterInfoManager::initialize()
                 // 2. Font substitution table
                 for( int nKey = 0; nKey < aConfig.GetKeyCount(); ++nKey )
                 {
-                    rtl::OString aKey( aConfig.GetKeyName( nKey ) );
+                    OString aKey( aConfig.GetKeyName( nKey ) );
                     if( aKey.matchL(RTL_CONSTASCII_STRINGPARAM("PPD_")) && aPrinter.m_aInfo.m_pParser )
                     {
                         aValue = aConfig.ReadKey( aKey );
-                        const PPDKey* pKey = aPrinter.m_aInfo.m_pParser->getKey(rtl::OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1));
+                        const PPDKey* pKey = aPrinter.m_aInfo.m_pParser->getKey(OStringToOUString(aKey.copy(4), RTL_TEXTENCODING_ISO_8859_1));
                         if( pKey )
                         {
                             aPrinter.m_aInfo.m_aContext.
                             setValue( pKey,
-                            aValue.equals("*nil") ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)),
+                            aValue.equals("*nil") ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)),
                             sal_True );
                         }
                     }
@@ -622,7 +618,7 @@ void PrinterInfoManager::initialize()
         aPrinter.m_aInfo.m_aComment         = it->m_aComment;
         aPrinter.m_aInfo.m_aLocation        = it->m_aLocation;
         aPrinter.m_bModified                = false;
-        aPrinter.m_aGroup                   = rtl::OUStringToOString(aPrinterName, aEncoding); //provide group name in case user makes this one permanent in padmin
+        aPrinter.m_aGroup                   = OUStringToOString(aPrinterName, aEncoding); //provide group name in case user makes this one permanent in padmin
 
         m_aPrinters[ aPrinterName ] = aPrinter;
     }
@@ -766,22 +762,22 @@ bool PrinterInfoManager::writePrinterConfig()
             pConfig->DeleteGroup( it->second.m_aGroup ); // else some old keys may remain
             pConfig->SetGroup( it->second.m_aGroup );
 
-            rtl::OStringBuffer aValue(rtl::OUStringToOString(it->second.m_aInfo.m_aDriverName, RTL_TEXTENCODING_UTF8));
+            OStringBuffer aValue(OUStringToOString(it->second.m_aInfo.m_aDriverName, RTL_TEXTENCODING_UTF8));
             aValue.append('/');
-            aValue.append(rtl::OUStringToOString(it->first, RTL_TEXTENCODING_UTF8));
+            aValue.append(OUStringToOString(it->first, RTL_TEXTENCODING_UTF8));
             pConfig->WriteKey("Printer", aValue.makeStringAndClear());
             pConfig->WriteKey( "DefaultPrinter", it->first == m_aDefaultPrinter ? "1" : "0" );
-            pConfig->WriteKey( "Location", rtl::OUStringToOString(it->second.m_aInfo.m_aLocation, RTL_TEXTENCODING_UTF8) );
-            pConfig->WriteKey( "Comment", rtl::OUStringToOString(it->second.m_aInfo.m_aComment, RTL_TEXTENCODING_UTF8) );
-            pConfig->WriteKey( "Command", rtl::OUStringToOString(it->second.m_aInfo.m_aCommand, RTL_TEXTENCODING_UTF8) );
-            pConfig->WriteKey( "QuickCommand", rtl::OUStringToOString(it->second.m_aInfo.m_aQuickCommand, RTL_TEXTENCODING_UTF8) );
-            pConfig->WriteKey( "Features", rtl::OUStringToOString(it->second.m_aInfo.m_aFeatures, RTL_TEXTENCODING_UTF8) );
-            pConfig->WriteKey("Copies", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nCopies)));
+            pConfig->WriteKey( "Location", OUStringToOString(it->second.m_aInfo.m_aLocation, RTL_TEXTENCODING_UTF8) );
+            pConfig->WriteKey( "Comment", OUStringToOString(it->second.m_aInfo.m_aComment, RTL_TEXTENCODING_UTF8) );
+            pConfig->WriteKey( "Command", OUStringToOString(it->second.m_aInfo.m_aCommand, RTL_TEXTENCODING_UTF8) );
+            pConfig->WriteKey( "QuickCommand", OUStringToOString(it->second.m_aInfo.m_aQuickCommand, RTL_TEXTENCODING_UTF8) );
+            pConfig->WriteKey( "Features", OUStringToOString(it->second.m_aInfo.m_aFeatures, RTL_TEXTENCODING_UTF8) );
+            pConfig->WriteKey("Copies", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nCopies)));
             pConfig->WriteKey( "Orientation", it->second.m_aInfo.m_eOrientation == orientation::Landscape ? "Landscape" : "Portrait" );
-            pConfig->WriteKey("PSLevel", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPSLevel)));
-            pConfig->WriteKey("PDFDevice", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPDFDevice)));
-            pConfig->WriteKey("ColorDevice", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDevice)));
-            pConfig->WriteKey("ColorDepth", rtl::OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDepth)));
+            pConfig->WriteKey("PSLevel", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPSLevel)));
+            pConfig->WriteKey("PDFDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nPDFDevice)));
+            pConfig->WriteKey("ColorDevice", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDevice)));
+            pConfig->WriteKey("ColorDepth", OString::valueOf(static_cast<sal_Int32>(it->second.m_aInfo.m_nColorDepth)));
             aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nLeftMarginAdjust));
             aValue.append(',');
             aValue.append(static_cast<sal_Int32>(it->second.m_aInfo.m_nRightMarginAdjust));
@@ -797,12 +793,12 @@ bool PrinterInfoManager::writePrinterConfig()
                 for( int i = 0; i < it->second.m_aInfo.m_aContext.countValuesModified(); i++ )
                 {
                     const PPDKey* pKey = it->second.m_aInfo.m_aContext.getModifiedKey( i );
-                    rtl::OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("PPD_"));
-                    aKey.append(rtl::OUStringToOString(pKey->getKey(), RTL_TEXTENCODING_ISO_8859_1));
+                    OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("PPD_"));
+                    aKey.append(OUStringToOString(pKey->getKey(), RTL_TEXTENCODING_ISO_8859_1));
 
                     const PPDValue* pValue = it->second.m_aInfo.m_aContext.getValue( pKey );
                     if (pValue)
-                        aValue.append(rtl::OUStringToOString(pValue->m_aOption, RTL_TEXTENCODING_ISO_8859_1));
+                        aValue.append(OUStringToOString(pValue->m_aOption, RTL_TEXTENCODING_ISO_8859_1));
                     else
                         aValue.append(RTL_CONSTASCII_STRINGPARAM("*nil"));
                     pConfig->WriteKey(aKey.makeStringAndClear(), aValue.makeStringAndClear());
@@ -814,9 +810,9 @@ bool PrinterInfoManager::writePrinterConfig()
             for( ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin();
             subst != it->second.m_aInfo.m_aFontSubstitutes.end(); ++subst )
             {
-                rtl::OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("SubstFont_"));
-                aKey.append(rtl::OUStringToOString(subst->first, RTL_TEXTENCODING_ISO_8859_1));
-                pConfig->WriteKey( aKey.makeStringAndClear(), rtl::OUStringToOString( subst->second, RTL_TEXTENCODING_ISO_8859_1 ) );
+                OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("SubstFont_"));
+                aKey.append(OUStringToOString(subst->first, RTL_TEXTENCODING_ISO_8859_1));
+                pConfig->WriteKey( aKey.makeStringAndClear(), OUStringToOString( subst->second, RTL_TEXTENCODING_ISO_8859_1 ) );
             }
         }
     }
@@ -871,7 +867,7 @@ bool PrinterInfoManager::addPrinter( const OUString& rPrinterName, const OUStrin
         bSuccess = true;
         #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "new printer %s, level = %d, pdfdevice = %d, colordevice = %d, depth = %d\n",
-                 rtl::OUStringToOString( rPrinterName, osl_getThreadTextEncoding() ).getStr(),
+                 OUStringToOString( rPrinterName, osl_getThreadTextEncoding() ).getStr(),
         m_aPrinters[rPrinterName].m_aInfo.m_nPSLevel,
         m_aPrinters[rPrinterName].m_aInfo.m_nPDFDevice,
         m_aPrinters[rPrinterName].m_aInfo.m_nColorDevice,
@@ -1044,12 +1040,12 @@ void PrinterInfoManager::fillFontSubstitutions( PrinterInfo& rInfo ) const
                     fprintf( stderr,
                     "substitute %s %s %d %d\n"
                     " ->        %s %s %d %d\n",
-                             rtl::OUStringToOString( it->m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
+                             OUStringToOString( it->m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
                     it->m_eItalic == ITALIC_NONE ? "r" : it->m_eItalic == ITALIC_OBLIQUE ? "o" : it->m_eItalic == ITALIC_NORMAL ? "i" : "u",
                     it->m_eWeight,
                     it->m_eWidth,
 
-                             rtl::OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
+                             OUStringToOString( aInfo.m_aFamilyName, RTL_TEXTENCODING_ISO_8859_1 ).getStr(),
                     aInfo.m_eItalic == ITALIC_NONE ? "r" : aInfo.m_eItalic == ITALIC_OBLIQUE ? "o" : aInfo.m_eItalic == ITALIC_NORMAL ? "i" : "u",
                     aInfo.m_eWeight,
                     aInfo.m_eWidth
@@ -1095,7 +1091,7 @@ const std::list< PrinterInfoManager::SystemPrintQueue >& PrinterInfoManager::get
     return m_aSystemPrintQueues;
 }
 
-bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& rPrinterName, const char* pToken ) const
+bool PrinterInfoManager::checkFeatureToken( const OUString& rPrinterName, const char* pToken ) const
 {
     const PrinterInfo& rPrinterInfo( getPrinterInfo( rPrinterName ) );
     sal_Int32 nIndex = 0;
@@ -1113,10 +1109,10 @@ bool PrinterInfoManager::checkFeatureToken( const rtl::OUString& rPrinterName, c
 FILE* PrinterInfoManager::startSpool( const OUString& rPrintername, bool bQuickCommand )
 {
     const PrinterInfo&   rPrinterInfo   = getPrinterInfo (rPrintername);
-    const rtl::OUString& rCommand       = (bQuickCommand && !rPrinterInfo.m_aQuickCommand.isEmpty() ) ?
+    const OUString& rCommand       = (bQuickCommand && !rPrinterInfo.m_aQuickCommand.isEmpty() ) ?
                                           rPrinterInfo.m_aQuickCommand : rPrinterInfo.m_aCommand;
-    rtl::OString aShellCommand  = rtl::OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1);
-    aShellCommand += rtl::OString( " 2>/dev/null" );
+    OString aShellCommand  = OUStringToOString (rCommand, RTL_TEXTENCODING_ISO_8859_1);
+    aShellCommand += OString( " 2>/dev/null" );
 
     return popen (aShellCommand.getStr(), "w");
 }
@@ -1155,7 +1151,7 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const
     {
         #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "not setting default paper, already set %s\n",
-                 ::rtl::OUStringToOString( rContext.getValue( pPageSizeKey )->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
+                 OUStringToOString( rContext.getValue( pPageSizeKey )->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
         #endif
         return;
     }
@@ -1172,12 +1168,12 @@ void PrinterInfoManager::setDefaultPaper( PPDContext& rContext ) const
     if( pPaperVal )
     {
         #if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "setting default paper %s\n", ::rtl::OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
+        fprintf( stderr, "setting default paper %s\n", OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
         #endif
         rContext.setValue( pPageSizeKey, pPaperVal );
         #if OSL_DEBUG_LEVEL > 1
         pPaperVal = rContext.getValue( pPageSizeKey );
-        fprintf( stderr, "-> got paper %s\n", ::rtl::OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
+        fprintf( stderr, "-> got paper %s\n", OUStringToOString( pPaperVal->m_aOption, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
         #endif
     }
 }
@@ -1221,7 +1217,7 @@ OUString SystemQueueInfo::getCommand() const
 }
 
 struct SystemCommandParameters;
-typedef void(* tokenHandler)(const std::list< rtl::OString >&,
+typedef void(* tokenHandler)(const std::list< OString >&,
                 std::list< PrinterInfoManager::SystemPrintQueue >&,
                 const SystemCommandParameters*);
 
@@ -1237,7 +1233,7 @@ struct SystemCommandParameters
 
 #if ! (defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
 static void lpgetSysQueueTokenHandler(
-    const std::list< rtl::OString >& i_rLines,
+    const std::list< OString >& i_rLines,
     std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues,
     const SystemCommandParameters* )
 {
@@ -1251,9 +1247,9 @@ static void lpgetSysQueueTokenHandler(
     // printers are to be used for this user at all
 
     // find _all: line
-    rtl::OString aAllLine( "_all:" );
-    rtl::OString aAllAttr( "all=" );
-    for( std::list< rtl::OString >::const_iterator it = i_rLines.begin();
+    OString aAllLine( "_all:" );
+    OString aAllAttr( "all=" );
+    for( std::list< OString >::const_iterator it = i_rLines.begin();
          it != i_rLines.end(); ++it )
     {
         if( it->indexOf( aAllLine, 0 ) == 0 )
@@ -1262,7 +1258,7 @@ static void lpgetSysQueueTokenHandler(
             ++it;
             while( it != i_rLines.end() )
             {
-                rtl::OString aClean( WhitespaceToSpace( *it ) );
+                OString aClean( WhitespaceToSpace( *it ) );
                 if( aClean.indexOf( aAllAttr, 0 ) == 0 )
                 {
                     // insert the comma separated entries into the set of printers to use
@@ -1271,7 +1267,7 @@ static void lpgetSysQueueTokenHandler(
                     {
                         OString aTok( aClean.getToken( 0, ',', nPos ) );
                         if( !aTok.isEmpty() )
-                            aOnlySet.insert( rtl::OStringToOUString( aTok, aEncoding ) );
+                            aOnlySet.insert( OStringToOUString( aTok, aEncoding ) );
                     }
                     break;
                 }
@@ -1281,9 +1277,9 @@ static void lpgetSysQueueTokenHandler(
     }
 
     bool bInsertAttribute = false;
-    rtl::OString aDescrStr( "description=" );
-    rtl::OString aLocStr( "location=" );
-    for( std::list< rtl::OString >::const_iterator it = i_rLines.begin();
+    OString aDescrStr( "description=" );
+    OString aLocStr( "location=" );
+    for( std::list< OString >::const_iterator it = i_rLines.begin();
          it != i_rLines.end(); ++it )
     {
         sal_Int32 nPos = 0;
@@ -1291,7 +1287,7 @@ static void lpgetSysQueueTokenHandler(
         nPos = it->indexOf( ':', 0 );
         if( nPos != -1 )
         {
-            OUString aSysQueue( rtl::OStringToOUString( it->copy( 0, nPos ), aEncoding ) );
+            OUString aSysQueue( OStringToOUString( it->copy( 0, nPos ), aEncoding ) );
             // do not insert duplicates (e.g. lpstat tends to produce such lines)
             // in case there was a "_all" section, insert only those printer explicitly
             // set in the "all" attribute
@@ -1315,18 +1311,18 @@ static void lpgetSysQueueTokenHandler(
             nPos = it->indexOf( aDescrStr, 0 );
             if( nPos != -1 )
             {
-                rtl::OString aComment( WhitespaceToSpace( it->copy(nPos+12) ) );
+                OString aComment( WhitespaceToSpace( it->copy(nPos+12) ) );
                 if( !aComment.isEmpty() )
-                    o_rQueues.back().m_aComment = rtl::OStringToOUString(aComment, aEncoding);
+                    o_rQueues.back().m_aComment = OStringToOUString(aComment, aEncoding);
                 continue;
             }
             // look for "location" attribute, inser as location
             nPos = it->indexOf( aLocStr, 0 );
             if( nPos != -1 )
             {
-                rtl::OString aLoc( WhitespaceToSpace( it->copy(nPos+9) ) );
+                OString aLoc( WhitespaceToSpace( it->copy(nPos+9) ) );
                 if( !aLoc.isEmpty() )
-                    o_rQueues.back().m_aLocation = rtl::OStringToOUString(aLoc, aEncoding);
+                    o_rQueues.back().m_aLocation = OStringToOUString(aLoc, aEncoding);
                 continue;
             }
         }
@@ -1334,17 +1330,17 @@ static void lpgetSysQueueTokenHandler(
 }
 #endif
 static void standardSysQueueTokenHandler(
-    const std::list< rtl::OString >& i_rLines,
+    const std::list< OString >& i_rLines,
     std::list< PrinterInfoManager::SystemPrintQueue >& o_rQueues,
     const SystemCommandParameters* i_pParms)
 {
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
     boost::unordered_set< OUString, OUStringHash > aUniqueSet;
-    rtl::OString aForeToken( i_pParms->pForeToken );
-    rtl::OString aAftToken( i_pParms->pAftToken );
+    OString aForeToken( i_pParms->pForeToken );
+    OString aAftToken( i_pParms->pAftToken );
     /* Normal Unix print queue discovery, also used for Darwin 5 LPR printing
     */
-    for( std::list< rtl::OString >::const_iterator it = i_rLines.begin();
+    for( std::list< OString >::const_iterator it = i_rLines.begin();
          it != i_rLines.end(); ++it )
     {
         sal_Int32 nPos = 0;
@@ -1364,7 +1360,7 @@ static void standardSysQueueTokenHandler(
             if( nAftPos != -1 )
             {
                 // get the queue name between fore and aft tokens
-                OUString aSysQueue( rtl::OStringToOUString( it->copy( nPos, nAftPos - nPos ), aEncoding ) );
+                OUString aSysQueue( OStringToOUString( it->copy( nPos, nAftPos - nPos ), aEncoding ) );
                 // do not insert duplicates (e.g. lpstat tends to produce such lines)
                 if( aUniqueSet.find( aSysQueue ) == aUniqueSet.end() )
                 {
@@ -1396,13 +1392,13 @@ void SystemQueueInfo::run()
 {
     char pBuffer[1024];
     FILE *pPipe;
-    std::list< rtl::OString > aLines;
+    std::list< OString > aLines;
 
     /* Discover which command we can use to get a list of all printer queues */
     for( unsigned int i = 0; i < SAL_N_ELEMENTS(aParms); i++ )
     {
         aLines.clear();
-        rtl::OStringBuffer aCmdLine( 128 );
+        OStringBuffer aCmdLine( 128 );
         aCmdLine.append( aParms[i].pQueueCommand );
         #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "trying print queue command \"%s\" ... ", aParms[i].pQueueCommand );
@@ -1411,7 +1407,7 @@ void SystemQueueInfo::run()
         if( (pPipe = popen( aCmdLine.getStr(), "r" )) )
         {
             while( fgets( pBuffer, 1024, pPipe ) )
-                aLines.push_back( rtl::OString( pBuffer ) );
+                aLines.push_back( OString( pBuffer ) );
             if( ! pclose( pPipe ) )
             {
                 std::list< PrinterInfoManager::SystemPrintQueue > aSysPrintQueues;
@@ -1419,7 +1415,7 @@ void SystemQueueInfo::run()
                 MutexGuard aGuard( m_aMutex );
                 m_bChanged  = true;
                 m_aQueues   = aSysPrintQueues;
-                m_aCommand  = rtl::OUString::createFromAscii( aParms[i].pPrintCommand );
+                m_aCommand  = OUString::createFromAscii( aParms[i].pPrintCommand );
                 #if OSL_DEBUG_LEVEL > 1
                 fprintf( stderr, "success\n" );
                 #endif
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 3ea05095faac..ec482e7801e2 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -1951,7 +1951,7 @@ void X11SalFrame::SetScreenNumber( unsigned int nNewScreen )
     }
 }
 
-void X11SalFrame::SetApplicationID( const rtl::OUString &rWMClass )
+void X11SalFrame::SetApplicationID( const OUString &rWMClass )
 {
     if( rWMClass != m_sWMClass && ! IsChildWindow() )
     {
@@ -1966,10 +1966,10 @@ void X11SalFrame::SetApplicationID( const rtl::OUString &rWMClass )
 void X11SalFrame::updateWMClass()
 {
     XClassHint* pClass = XAllocClassHint();
-    rtl::OString aResName = SalGenericSystem::getFrameResName( mnExtStyle );
+    OString aResName = SalGenericSystem::getFrameResName( mnExtStyle );
     pClass->res_name  = const_cast<char*>(aResName.getStr());
 
-    rtl::OString aResClass = rtl::OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US);
+    OString aResClass = OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US);
     const char *pResClass = !aResClass.isEmpty() ? aResClass.getStr() :
                             SalGenericSystem::getFrameClassName();
 
@@ -2305,7 +2305,7 @@ sal_Bool X11SalFrame::PostEvent( void *pData )
 
 // Title
 
-void X11SalFrame::SetTitle( const rtl::OUString& rTitle )
+void X11SalFrame::SetTitle( const OUString& rTitle )
 {
     if( ! ( IsChildWindow() || (nStyle_ & SAL_FRAME_STYLE_FLOAT ) ) )
     {
@@ -2377,7 +2377,7 @@ void X11SalFrame::EndExtTextInput( sal_uInt16 nFlags )
 
 // -----------------------------------------------------------------------
 
-rtl::OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode )
+OUString X11SalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
     return GetDisplay()->GetKeyName( nKeyCode );
 }
@@ -2882,13 +2882,13 @@ GetAlternateKeyCode( const sal_uInt16 nKeyCode )
 
 void X11SalFrame::beginUnicodeSequence()
 {
-    rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
+    OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
     DeletionListener aDeleteWatch( this );
 
     if( !rSeq.isEmpty() )
         endUnicodeSequence();
 
-    rSeq = rtl::OUString( "u" );
+    rSeq = OUString( "u" );
 
     if( ! aDeleteWatch.isDeleted() )
     {
@@ -2909,7 +2909,7 @@ void X11SalFrame::beginUnicodeSequence()
 bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
 {
     bool bRet = false;
-    rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
+    OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
     if( !rSeq.isEmpty() )
     {
         // range check
@@ -2917,7 +2917,7 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
             (c >= sal_Unicode('a') && c <= sal_Unicode('f')) ||
             (c >= sal_Unicode('A') && c <= sal_Unicode('F')) )
         {
-            rtl::OUStringBuffer aBuf( rSeq.getLength() + 1 );
+            OUStringBuffer aBuf( rSeq.getLength() + 1 );
             aBuf.append( rSeq );
             aBuf.append( c );
             rSeq = aBuf.makeStringAndClear();
@@ -2945,20 +2945,20 @@ bool X11SalFrame::appendUnicodeSequence( sal_Unicode c )
 
 bool X11SalFrame::endUnicodeSequence()
 {
-    rtl::OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
+    OUString& rSeq( GetGenericData()->GetUnicodeCommand() );
 
     DeletionListener aDeleteWatch( this );
     if( rSeq.getLength() > 1 && rSeq.getLength() < 6 )
     {
         // cut the "u"
-        rtl::OUString aNumbers( rSeq.copy( 1 ) );
+        OUString aNumbers( rSeq.copy( 1 ) );
         sal_Int32 nValue = aNumbers.toInt32( 16 );
         if( nValue >= 32 )
         {
             sal_uInt16 nTextAttr = EXTTEXTINPUT_ATTR_UNDERLINE;
             SalExtTextInputEvent aEv;
             aEv.mnTime          = 0;
-            aEv.maText          = rtl::OUString( sal_Unicode(nValue) );
+            aEv.maText          = OUString( sal_Unicode(nValue) );
             aEv.mpTextAttr      = &nTextAttr;
             aEv.mnCursorPos     = 0;
             aEv.mnDeltaStart    = 0;
@@ -2968,7 +2968,7 @@ bool X11SalFrame::endUnicodeSequence()
         }
     }
     bool bWasInput = !rSeq.isEmpty();
-    rSeq = rtl::OUString();
+    rSeq = OUString();
     if( bWasInput && ! aDeleteWatch.isDeleted() )
         CallCallback(SALEVENT_ENDEXTTEXTINPUT, NULL);
     return bWasInput;
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index d4153786c8ff..3dbce852a1e8 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -36,10 +36,10 @@ using namespace ::com::sun::star;
 
 // FIXME
 static G_CONST_RETURN gchar *
-getAsConst( const rtl::OString& rString )
+getAsConst( const OString& rString )
 {
     static const int nMax = 10;
-    static rtl::OString aUgly[nMax];
+    static OString aUgly[nMax];
     static int nIdx = 0;
     nIdx = (nIdx + 1) % nMax;
     aUgly[nIdx] = rString;
@@ -116,13 +116,13 @@ action_wrapper_get_localized_name (AtkAction *, gint)
 }
 
 #define ACTION_NAME_PAIR( OOoName, AtkName ) \
-    std::pair< const rtl::OUString, const gchar * > ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OOoName ) ), AtkName )
+    std::pair< const OUString, const gchar * > ( OUString( RTL_CONSTASCII_USTRINGPARAM( OOoName ) ), AtkName )
 
 static G_CONST_RETURN gchar *
 action_wrapper_get_name (AtkAction *action,
                          gint       i)
 {
-    static std::map< rtl::OUString, const gchar * > aNameMap;
+    static std::map< OUString, const gchar * > aNameMap;
 
     if( aNameMap.empty() )
     {
@@ -135,15 +135,15 @@ action_wrapper_get_name (AtkAction *action,
         accessibility::XAccessibleAction* pAction = getAction( action );
         if( pAction )
         {
-            std::map< rtl::OUString, const gchar * >::iterator iter;
+            std::map< OUString, const gchar * >::iterator iter;
 
-            rtl::OUString aDesc( pAction->getAccessibleActionDescription( i ) );
+            OUString aDesc( pAction->getAccessibleActionDescription( i ) );
 
             iter = aNameMap.find( aDesc );
             if( iter != aNameMap.end() )
                 return iter->second;
 
-            std::pair< const rtl::OUString, const gchar * > aNewVal( aDesc,
+            std::pair< const OUString, const gchar * > aNewVal( aDesc,
                 g_strdup( OUStringToConstGChar(aDesc) ) );
 
             if( aNameMap.insert( aNewVal ).second )
@@ -166,7 +166,7 @@ action_wrapper_get_name (AtkAction *action,
 */
 
 static inline void
-appendKeyStrokes(rtl::OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& rKeyStrokes)
+appendKeyStrokes(OStringBuffer& rBuffer, const uno::Sequence< awt::KeyStroke >& rKeyStrokes)
 {
     for( sal_Int32 i = 0; i < rKeyStrokes.getLength(); i++ )
     {
@@ -222,7 +222,7 @@ action_wrapper_get_keybinding (AtkAction *action,
 
             if( xBinding.is() )
             {
-                rtl::OStringBuffer aRet;
+                OStringBuffer aRet;
 
                 sal_Int32 nmax = std::min( xBinding->getAccessibleKeyBindingCount(), (sal_Int32) 3 );
                 for( sal_Int32 n = 0; n < nmax; n++ )
diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index d0aabd69feb0..7f1d5bd3fe99 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx
@@ -84,7 +84,7 @@ editable_text_wrapper_set_text_contents( AtkEditableText  *text,
         accessibility::XAccessibleEditableText* pEditableText = getEditableText( text );
         if( pEditableText )
         {
-            rtl::OUString aString ( string, strlen(string), RTL_TEXTENCODING_UTF8 );
+            OUString aString ( string, strlen(string), RTL_TEXTENCODING_UTF8 );
             pEditableText->setText( aString );
         }
     }
@@ -103,7 +103,7 @@ editable_text_wrapper_insert_text( AtkEditableText  *text,
         accessibility::XAccessibleEditableText* pEditableText = getEditableText( text );
         if( pEditableText )
         {
-            rtl::OUString aString ( string, length, RTL_TEXTENCODING_UTF8 );
+            OUString aString ( string, length, RTL_TEXTENCODING_UTF8 );
             if( pEditableText->insertText( aString, *pos ) )
                 *pos += length;
         }
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index ed4333ede35c..d7a3852d9cbb 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -60,7 +60,7 @@ hyper_link_get_uri( AtkHyperlink *pLink,
 {
     try {
         uno::Any aAny = getHyperlink( pLink )->getAccessibleActionObject( i );
-        rtl::OUString aUri = aAny.get< rtl::OUString > ();
+        OUString aUri = aAny.get< OUString > ();
         return OUStringToGChar(aUri);
     }
     catch(const uno::Exception& e) {
diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index 8e833225b833..c58a54eef5e5 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.cxx
@@ -28,13 +28,13 @@ using namespace ::com::sun::star;
 
 // FIXME
 static G_CONST_RETURN gchar *
-getAsConst( rtl::OUString rString )
+getAsConst( OUString rString )
 {
     static const int nMax = 10;
-    static rtl::OString aUgly[nMax];
+    static OString aUgly[nMax];
     static int nIdx = 0;
     nIdx = (nIdx + 1) % nMax;
-    aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
+    aUgly[nIdx] = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
     return aUgly[ nIdx ].getStr();
 }
 
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index 8d1b1bd616c8..f4d02cea0cb5 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -289,22 +289,22 @@ void AtkListener::notifyEvent( const accessibility::AccessibleEventObject& aEven
 
         case accessibility::AccessibleEventId::NAME_CHANGED:
         {
-            rtl::OUString aName;
+            OUString aName;
             if( aEvent.NewValue >>= aName )
             {
                 atk_object_set_name(atk_obj,
-                    rtl::OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
+                    OUStringToOString(aName, RTL_TEXTENCODING_UTF8).getStr());
             }
         }
             break;
 
         case accessibility::AccessibleEventId::DESCRIPTION_CHANGED:
         {
-            rtl::OUString aDescription;
+            OUString aDescription;
             if( aEvent.NewValue >>= aDescription )
             {
                 atk_object_set_description(atk_obj,
-                    rtl::OUStringToOString(aDescription, RTL_TEXTENCODING_UTF8).getStr());
+                    OUStringToOString(aDescription, RTL_TEXTENCODING_UTF8).getStr());
             }
         }
             break;
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index f823d32a3725..662eec113b52 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.cxx
@@ -45,13 +45,13 @@ atk_object_wrapper_conditional_ref( const uno::Reference< accessibility::XAccess
 
 // FIXME
 static G_CONST_RETURN gchar *
-getAsConst( rtl::OUString rString )
+getAsConst( OUString rString )
 {
     static const int nMax = 10;
-    static rtl::OString aUgly[nMax];
+    static OString aUgly[nMax];
     static int nIdx = 0;
     nIdx = (nIdx + 1) % nMax;
-    aUgly[nIdx] = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
+    aUgly[nIdx] = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
     return aUgly[ nIdx ].getStr();
 }
 
diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index f8b06e5f4944..5ac6856222b7 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.cxx
@@ -68,7 +68,7 @@ adjust_boundaries( accessibility::XAccessibleText* pText,
                    gint * start_offset, gint * end_offset )
 {
     accessibility::TextSegment aTextSegment;
-    rtl::OUString aString;
+    OUString aString;
     gint start = 0, end = 0;
 
     if( !rTextSegment.SegmentText.isEmpty() )
@@ -274,7 +274,7 @@ text_wrapper_get_text (AtkText *text,
         if( pTextSegment->SegmentStart == start_offset &&
             pTextSegment->SegmentEnd == end_offset )
         {
-            rtl::OString aUtf8 = rtl::OUStringToOString( pTextSegment->SegmentText, RTL_TEXTENCODING_UTF8 );
+            OString aUtf8 = OUStringToOString( pTextSegment->SegmentText, RTL_TEXTENCODING_UTF8 );
             return g_strdup( aUtf8.getStr() );
         }
     }
@@ -283,7 +283,7 @@ text_wrapper_get_text (AtkText *text,
         accessibility::XAccessibleText* pText = getText( text );
         if( pText )
         {
-            rtl::OUString aText;
+            OUString aText;
             sal_Int32 n = pText->getCharacterCount();
 
             if( -1 == end_offset )
@@ -291,7 +291,7 @@ text_wrapper_get_text (AtkText *text,
             else if( start_offset < n )
                 aText = pText->getTextRange(start_offset, end_offset);
 
-            ret = g_strdup( rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8 ).getStr() );
+            ret = g_strdup( OUStringToOString(aText, RTL_TEXTENCODING_UTF8 ).getStr() );
         }
     }
     catch(const uno::Exception& e) {
@@ -537,7 +537,7 @@ text_wrapper_get_run_attributes( AtkText        *text,
         if( pText && pTextAttributes )
         {
             uno::Sequence< beans::PropertyValue > aAttributeList =
-                pTextAttributes->getRunAttributes( offset, uno::Sequence< rtl::OUString > () );
+                pTextAttributes->getRunAttributes( offset, uno::Sequence< OUString > () );
 
             pSet = attribute_set_new_from_property_values( aAttributeList, true, text );
             //  #i100938#
@@ -615,7 +615,7 @@ text_wrapper_get_default_attributes( AtkText *text )
         if( pTextAttributes )
         {
             uno::Sequence< beans::PropertyValue > aAttributeList =
-                pTextAttributes->getDefaultAttributes( uno::Sequence< rtl::OUString > () );
+                pTextAttributes->getDefaultAttributes( uno::Sequence< OUString > () );
 
             pSet = attribute_set_new_from_property_values( aAttributeList, false, text );
         }
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 23738f9009b9..a5612b43e39f 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -532,7 +532,7 @@ String2Underline( uno::Any& rAny, const gchar * value )
 static gchar*
 GetString(const uno::Any& rAny)
 {
-    rtl::OString aFontName = rtl::OUStringToOString( rAny.get< rtl::OUString > (), RTL_TEXTENCODING_UTF8 );
+    OString aFontName = OUStringToOString( rAny.get< OUString > (), RTL_TEXTENCODING_UTF8 );
 
     if( !aFontName.isEmpty() )
         return g_strdup( aFontName.getStr() );
@@ -543,11 +543,11 @@ GetString(const uno::Any& rAny)
 static bool
 SetString( uno::Any& rAny, const gchar * value )
 {
-    rtl::OString aFontName( value );
+    OString aFontName( value );
 
     if( !aFontName.isEmpty() )
     {
-        rAny = uno::makeAny( rtl::OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ) );
+        rAny = uno::makeAny( OStringToOUString( aFontName, RTL_TEXTENCODING_UTF8 ) );
         return true;
     }
 
@@ -709,8 +709,8 @@ Locale2String(const uno::Any& rAny)
 {
     lang::Locale aLocale = rAny.get<lang::Locale> ();
     return g_strdup_printf( "%s-%s",
-        rtl::OUStringToOString( aLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(),
-        rtl::OUStringToOString( aLocale.Country, RTL_TEXTENCODING_ASCII_US).toAsciiLowerCase().getStr() );
+        OUStringToOString( aLocale.Language, RTL_TEXTENCODING_ASCII_US).getStr(),
+        OUStringToOString( aLocale.Country, RTL_TEXTENCODING_ASCII_US).toAsciiLowerCase().getStr() );
 }
 
 static bool
@@ -725,11 +725,11 @@ String2Locale( uno::Any& rAny, const gchar * value )
 
         lang::Locale aLocale;
 
-        aLocale.Language = rtl::OUString::createFromAscii(str_array[0]);
+        aLocale.Language = OUString::createFromAscii(str_array[0]);
         if( str_array[1] != NULL )
         {
             gchar * country = g_ascii_strup(str_array[1], -1);
-            aLocale.Country = rtl::OUString::createFromAscii(country);
+            aLocale.Country = OUString::createFromAscii(country);
             g_free(country);
         }
 
@@ -1339,7 +1339,7 @@ attribute_set_map_to_property_values(
                 if( ! g_TextAttrMap[text_attr].toPropertyValue( aAttributeList[nIndex].Value, attribute->value) )
                     return false;
 
-                aAttributeList[nIndex].Name = rtl::OUString::createFromAscii( g_TextAttrMap[text_attr].name );
+                aAttributeList[nIndex].Name = OUString::createFromAscii( g_TextAttrMap[text_attr].name );
                 aAttributeList[nIndex].State = beans::PropertyState_DIRECT_VALUE;
                 ++nIndex;
             }
diff --git a/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index e5de208d6281..fd396c8f7083 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.cxx
@@ -95,7 +95,7 @@ init_from_window( AtkObject *accessible, Window *pWindow )
                 {
                     role = ATK_ROLE_TOOL_TIP;
                     pChild->SetAccessibleRole( AccessibleRole::LABEL );
-                    accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
+                    accessible->name = g_strdup( OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
                 }
                 else if ( pWindow->GetType() == WINDOW_BORDERWINDOW && pChild->GetType() == WINDOW_FLOATINGWINDOW )
                 {
@@ -105,7 +105,7 @@ init_from_window( AtkObject *accessible, Window *pWindow )
                         // This is a top-level menu popup.  Register it.
                         role = ATK_ROLE_POPUP_MENU;
                         pChild->SetAccessibleRole( AccessibleRole::POPUP_MENU );
-                        accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
+                        accessible->name = g_strdup( OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
                     }
                 }
             }
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 2e7824eb0f94..4c9d5d612d33 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -325,8 +325,8 @@ wrapper_get_name( AtkObject *atk_obj )
     {
         uno::Reference< accessibility::XAccessibleContext > xContext(obj->mpContext);
         try {
-            rtl::OString aName =
-                rtl::OUStringToOString(
+            OString aName =
+                OUStringToOString(
                     xContext->getAccessibleName(),
                     RTL_TEXTENCODING_UTF8);
 
@@ -357,8 +357,8 @@ wrapper_get_description( AtkObject *atk_obj )
     {
         uno::Reference< accessibility::XAccessibleContext > xContext(obj->mpContext);
         try {
-            rtl::OString aDescription =
-                rtl::OUStringToOString(
+            OString aDescription =
+                OUStringToOString(
                     xContext->getAccessibleDescription(),
                     RTL_TEXTENCODING_UTF8);
 
@@ -711,7 +711,7 @@ ensureTypeFor( uno::XInterface *pAccessible )
 {
     int i;
     int bTypes[ aTypeTableSize ] = { 0, };
-    rtl::OString aTypeName( "OOoAtkObj" );
+    OString aTypeName( "OOoAtkObj" );
 
     for( i = 0; i < aTypeTableSize; i++ )
     {
diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index 1427a26d45a3..e613cfa1e90d 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.hxx
@@ -65,7 +65,7 @@ struct _AtkObjectWrapper
 
     AtkObject *child_about_to_be_removed;
     gint       index_of_child_about_to_be_removed;
-//    ::rtl::OString * m_pKeyBindings
+//    OString * m_pKeyBindings
 };
 
 struct _AtkObjectWrapperClass
@@ -106,13 +106,13 @@ void                   valueIfaceInit(AtkValueIface *iface);
     (G_TYPE_CHECK_INSTANCE_CAST ((obj), ATK_TYPE_OBJECT_WRAPPER, AtkObjectWrapper))
 
 static inline gchar *
-OUStringToGChar(const rtl::OUString& rString )
+OUStringToGChar(const OUString& rString )
 {
-    rtl::OString aUtf8 = rtl::OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
+    OString aUtf8 = OUStringToOString( rString, RTL_TEXTENCODING_UTF8 );
     return g_strdup( aUtf8.getStr() );
 }
 
-#define OUStringToConstGChar( string ) rtl::OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr()
+#define OUStringToConstGChar( string ) OUStringToOString( string, RTL_TEXTENCODING_UTF8 ).getStr()
 
 #endif /* __ATK_WRAPPER_HXX__ */
 
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index af98ba210736..dac0f28f4105 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -49,7 +49,6 @@
 
 using namespace vcl_sal;
 
-using ::rtl::OUString;
 
 /***************************************************************
  * class GtkSalDisplay                                         *
@@ -680,7 +679,7 @@ void GtkData::Init()
         osl_getExecutableFile( &aProgramFileURL.pData );
         OUString aProgramSystemPath;
         osl_getSystemPathFromFileURL (aProgramFileURL.pData, &aProgramSystemPath.pData);
-        OString  aProgramName = rtl::OUStringToOString(
+        OString  aProgramName = OUStringToOString(
                                             aProgramSystemPath,
                                             osl_getThreadTextEncoding() );
         fprintf( stderr, "%s X11 error: Can't open display: %s\n",
diff --git a/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index 07172468846d..554c26c9be97 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.cxx
@@ -279,22 +279,22 @@ extern "C"
     typedef void(* addItemFnc)(void *, const char *);
 }
 
-void GtkInstance::AddToRecentDocumentList(const rtl::OUString& rFileUrl, const rtl::OUString& rMimeType)
+void GtkInstance::AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType)
 {
-    rtl::OString sGtkURL;
+    OString sGtkURL;
     rtl_TextEncoding aSystemEnc = osl_getThreadTextEncoding();
     if ((aSystemEnc == RTL_TEXTENCODING_UTF8) || !rFileUrl.startsWith( "file://" ))
-        sGtkURL = rtl::OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8);
+        sGtkURL = OUStringToOString(rFileUrl, RTL_TEXTENCODING_UTF8);
     else
     {
         //Non-utf8 locales are a bad idea if trying to work with non-ascii filenames
         //Decode %XX components
-        rtl::OUString sDecodedUri = rtl::Uri::decode(rFileUrl.copy(7), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);
+        OUString sDecodedUri = rtl::Uri::decode(rFileUrl.copy(7), rtl_UriDecodeToIuri, RTL_TEXTENCODING_UTF8);
         //Convert back to system locale encoding
-        rtl::OString sSystemUrl = rtl::OUStringToOString(sDecodedUri, aSystemEnc);
+        OString sSystemUrl = OUStringToOString(sDecodedUri, aSystemEnc);
         //Encode to an escaped ASCII-encoded URI
         gchar *g_uri = g_filename_to_uri(sSystemUrl.getStr(), NULL, NULL);
-        sGtkURL = rtl::OString(g_uri);
+        sGtkURL = OString(g_uri);
         g_free(g_uri);
     }
 #if GTK_CHECK_VERSION(2,10,0)
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index bc06b25a1ccc..e389eb4ae0a4 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.cxx
@@ -242,14 +242,14 @@ Rectangle GtkSalSystem::GetDisplayScreenWorkAreaPosSizePixel (unsigned int nScre
     return GetDisplayScreenPosSizePixel( nScreen );
 }
 
-rtl::OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen)
+OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen)
 {
     gchar *pStr;
     gint nMonitor;
     GdkScreen *pScreen;
     pScreen = getScreenMonitorFromIdx (nScreen, nMonitor);
     if (!pScreen)
-        return rtl::OUString();
+        return OUString();
 
 #if GTK_CHECK_VERSION(3,0,0) || GTK_CHECK_VERSION(2,14,0)
     pStr = gdk_screen_get_monitor_plug_name (pScreen, nMonitor);
@@ -267,23 +267,23 @@ rtl::OUString GtkSalSystem::GetDisplayScreenName(unsigned int nScreen)
     else
         pStr = g_strdup_printf ("%d", nScreen);
 #endif
-    rtl::OUString aRet (pStr, strlen (pStr), RTL_TEXTENCODING_UTF8);
+    OUString aRet (pStr, strlen (pStr), RTL_TEXTENCODING_UTF8);
     g_free (pStr);
     return aRet;
 }
 
 // convert ~ to indicate mnemonic to '_'
-static rtl::OString MapToGtkAccelerator(const rtl::OUString &rStr)
+static OString MapToGtkAccelerator(const OUString &rStr)
 {
-    return rtl::OUStringToOString(rStr.replaceFirst("~", "_"), RTL_TEXTENCODING_UTF8);
+    return OUStringToOString(rStr.replaceFirst("~", "_"), RTL_TEXTENCODING_UTF8);
 }
 
-int GtkSalSystem::ShowNativeDialog (const rtl::OUString& rTitle, const rtl::OUString& rMessage,
-                                    const std::list< rtl::OUString >& rButtonNames,
+int GtkSalSystem::ShowNativeDialog (const OUString& rTitle, const OUString& rMessage,
+                                    const std::list< OUString >& rButtonNames,
                                     int nDefaultButton)
 {
-    rtl::OString aTitle (rtl::OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8));
-    rtl::OString aMessage (rtl::OUStringToOString (rMessage, RTL_TEXTENCODING_UTF8));
+    OString aTitle (OUStringToOString (rTitle, RTL_TEXTENCODING_UTF8));
+    OString aMessage (OUStringToOString (rMessage, RTL_TEXTENCODING_UTF8));
 
     GtkDialog *pDialog = GTK_DIALOG (
         g_object_new (GTK_TYPE_MESSAGE_DIALOG,
@@ -292,7 +292,7 @@ int GtkSalSystem::ShowNativeDialog (const rtl::OUString& rTitle, const rtl::OUSt
                       "text", aMessage.getStr(),
                       NULL));
     int nButton = 0;
-    std::list< rtl::OUString >::const_iterator it;
+    std::list< OUString >::const_iterator it;
     for (it = rButtonNames.begin(); it != rButtonNames.end(); ++it)
         gtk_dialog_add_button (pDialog, MapToGtkAccelerator(*it).getStr(), nButton++);
     gtk_dialog_set_default_response (pDialog, nDefaultButton);
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
index eebfe68c3b01..5672b030b76e 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx
@@ -236,7 +236,7 @@ SalGtkFilePicker::SalGtkFilePicker( const uno::Reference< uno::XComponentContext
     gtk_container_add (GTK_CONTAINER (m_pFilterExpander), scrolled_window);
     gtk_widget_show (scrolled_window);
 
-    rtl::OString sExpand(getenv("SAL_EXPANDFPICKER"));
+    OString sExpand(getenv("SAL_EXPANDFPICKER"));
     sal_Int32 nExpand  = sExpand.toInt32();
     switch (nExpand)
     {
@@ -368,22 +368,22 @@ void SalGtkFilePicker::impl_controlStateChanged( FilePickerEvent aEvent )
 struct FilterEntry
 {
 protected:
-    ::rtl::OUString     m_sTitle;
-    ::rtl::OUString     m_sFilter;
+    OUString     m_sTitle;
+    OUString     m_sFilter;
 
     UnoFilterList       m_aSubFilters;
 
 public:
-    FilterEntry( const ::rtl::OUString& _rTitle, const ::rtl::OUString& _rFilter )
+    FilterEntry( const OUString& _rTitle, const OUString& _rFilter )
         :m_sTitle( _rTitle )
         ,m_sFilter( _rFilter )
     {
     }
 
-    FilterEntry( const ::rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters );
+    FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters );
 
-    ::rtl::OUString     getTitle() const { return m_sTitle; }
-    ::rtl::OUString     getFilter() const { return m_sFilter; }
+    OUString     getTitle() const { return m_sTitle; }
+    OUString     getFilter() const { return m_sFilter; }
 
     /// determines if the filter has sub filter (i.e., the filter is a filter group in real)
     sal_Bool        hasSubFilters( ) const;
@@ -402,7 +402,7 @@ public:
 //=====================================================================
 
 //---------------------------------------------------------------------
-FilterEntry::FilterEntry( const ::rtl::OUString& _rTitle, const UnoFilterList& _rSubFilters )
+FilterEntry::FilterEntry( const OUString& _rTitle, const UnoFilterList& _rSubFilters )
     :m_sTitle( _rTitle )
     ,m_aSubFilters( _rSubFilters )
 {
@@ -422,13 +422,13 @@ sal_Int32 FilterEntry::getSubFilters( UnoFilterList& _rSubFilterList )
 }
 
 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
         {
@@ -444,8 +444,8 @@ isFilterString( const rtl::OUString &rFilterString, const char *pMatch )
         return bIsFilter;
 }
 
-static rtl::OUString
-shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false )
+static OUString
+shrinkFilterName( const OUString &rFilterName, bool bAllowNoStar = false )
 {
     int i;
     int nBracketLen = -1;
@@ -463,11 +463,11 @@ shrinkFilterName( const rtl::OUString &rFilterName, bool bAllowNoStar = false )
             if( nBracketEnd <= 0 )
                 continue;
             if( isFilterString( rFilterName.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( rFilterName.copy( i + 1, nBracketLen - 1 ), ".") )
-                    aRealName = aRealName.replaceAt( i, nBracketLen + 1, rtl::OUString() );
+                    aRealName = aRealName.replaceAt( i, nBracketLen + 1, OUString() );
             }
         }
     }
@@ -503,10 +503,10 @@ namespace {
     struct FilterTitleMatch : public ::std::unary_function< FilterEntry, bool >
     {
     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 )
@@ -536,7 +536,7 @@ namespace {
 
 
 //------------------------------------------------------------------------------------
-sal_Bool SalGtkFilePicker::FilterNameExists( const ::rtl::OUString& rTitle )
+sal_Bool SalGtkFilePicker::FilterNameExists( const OUString& rTitle )
 {
     sal_Bool bRet = sal_False;
 
@@ -574,7 +574,7 @@ sal_Bool SalGtkFilePicker::FilterNameExists( const UnoFilterList& _rGroupedFilte
 }
 
 //------------------------------------------------------------------------------------
-void SalGtkFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter )
+void SalGtkFilePicker::ensureFilterList( const OUString& _rInitialCurrentFilter )
 {
     if( !m_pFilterList )
     {
@@ -591,7 +591,7 @@ void SalGtkFilePicker::ensureFilterList( const ::rtl::OUString& _rInitialCurrent
 //
 //-----------------------------------------------------------------------------------------
 
-void SAL_CALL SalGtkFilePicker::appendFilter( const rtl::OUString& aTitle, const rtl::OUString& aFilter )
+void SAL_CALL SalGtkFilePicker::appendFilter( const OUString& aTitle, const OUString& aFilter )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard g;
@@ -612,7 +612,7 @@ void SAL_CALL SalGtkFilePicker::appendFilter( const rtl::OUString& aTitle, const
 //
 //-----------------------------------------------------------------------------------------
 
-void SAL_CALL SalGtkFilePicker::setCurrentFilter( const rtl::OUString& aTitle )
+void SAL_CALL SalGtkFilePicker::setCurrentFilter( const OUString& aTitle )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard g;
@@ -679,7 +679,7 @@ void SalGtkFilePicker::UpdateFilterfromUI()
     }
 }
 
-rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
 
@@ -699,7 +699,7 @@ rtl::OUString SAL_CALL SalGtkFilePicker::getCurrentFilter() throw( uno::RuntimeE
 // XFilterGroupManager functions
 //-----------------------------------------------------------------------------------------
 
-void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters )
+void SAL_CALL SalGtkFilePicker::appendFilterGroup( const OUString& /*sGroupTitle*/, const uno::Sequence<beans::StringPair>& aFilters )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard g;
@@ -713,7 +713,7 @@ void SAL_CALL SalGtkFilePicker::appendFilterGroup( const rtl::OUString& /*sGroup
             throw IllegalArgumentException();
 
     // ensure that we have a filter list
-    ::rtl::OUString sInitialCurrentFilter;
+    OUString sInitialCurrentFilter;
     if( aFilters.getLength() )
         sInitialCurrentFilter = aFilters[0].First;
 
@@ -740,7 +740,7 @@ void SAL_CALL SalGtkFilePicker::setMultiSelectionMode( sal_Bool bMode ) throw( u
     gtk_file_chooser_set_select_multiple( GTK_FILE_CHOOSER(m_pDialog), bMode );
 }
 
-void SAL_CALL SalGtkFilePicker::setDefaultName( const rtl::OUString& aName )
+void SAL_CALL SalGtkFilePicker::setDefaultName( const OUString& aName )
     throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
@@ -755,7 +755,7 @@ void SAL_CALL SalGtkFilePicker::setDefaultName( const rtl::OUString& aName )
         gtk_file_chooser_set_current_name( GTK_FILE_CHOOSER( m_pDialog ), aStr.getStr() );
 }
 
-void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const rtl::OUString& rDirectory )
+void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const OUString& rDirectory )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard g;
@@ -763,18 +763,18 @@ void SAL_CALL SalGtkFilePicker::setDisplayDirectory( const rtl::OUString& rDirec
     implsetDisplayDirectory(rDirectory);
 }
 
-rtl::OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkFilePicker::getDisplayDirectory() throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
 
     return implgetDisplayDirectory();
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException )
+uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::RuntimeException )
 {
     // no member access => no mutex needed
 
-    uno::Sequence< rtl::OUString > aFiles = getSelectedFiles();
+    uno::Sequence< OUString > aFiles = getSelectedFiles();
     /*
       The previous multiselection API design was completely broken
       and unimplementable for some hetrogenous pseudo-URIs eg. search://
@@ -784,7 +784,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getFiles() throw( uno::R
     return aFiles;
 }
 
-uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException )
+uno::Sequence<OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
 
@@ -800,7 +800,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
     GtkFileChooserAction eAction = gtk_file_chooser_get_action(
         GTK_FILE_CHOOSER( m_pDialog ));
 
-    uno::Sequence< rtl::OUString > aSelectedFiles(nCount);
+    uno::Sequence< OUString > aSelectedFiles(nCount);
 
     // Convert to OOo
     for( GSList *pElem = pPathList; pElem; pElem = pElem->next)
@@ -828,7 +828,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
             {
                 if( aSelectedFiles[nIndex].indexOf('.') > 0 )
                 {
-                    rtl::OUString sExtension;
+                    OUString sExtension;
                     nTokenIndex = 0;
                     do
                         sExtension = aSelectedFiles[nIndex].getToken( 0, '.', nTokenIndex );
@@ -838,8 +838,8 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
                     {
                         static const OUString aStarDot( "*." );
 
-                        ::rtl::OUString aNewFilter;
-                        ::rtl::OUString aOldFilter = getCurrentFilter();
+                        OUString aNewFilter;
+                        OUString aOldFilter = getCurrentFilter();
                         sal_Bool bChangeFilter = sal_True;
                         for ( FilterList::iterator aListIter = m_pFilterList->begin();
                               aListIter != m_pFilterList->end();
@@ -886,8 +886,8 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
                 OUStringToOString( aFilter, RTL_TEXTENCODING_UTF8 ).getStr() );
 
             nTokenIndex = 0;
-            rtl::OUString sToken;
-            //   rtl::OUString strExt;
+            OUString sToken;
+            //   OUString strExt;
             do
             {
                 sToken = aFilter.getToken( 0, '.', nTokenIndex );
@@ -930,7 +930,7 @@ uno::Sequence<rtl::OUString> SAL_CALL SalGtkFilePicker::getSelectedFiles() throw
 // XExecutableDialog functions
 //-----------------------------------------------------------------------------------------
 
-void SAL_CALL SalGtkFilePicker::setTitle( const rtl::OUString& rTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalGtkFilePicker::setTitle( const OUString& rTitle ) throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
 
@@ -1131,11 +1131,11 @@ static void HackWidthToFirst(GtkComboBox *pWidget)
     gtk_widget_set_size_request(GTK_WIDGET(pWidget), requisition.width, -1);
 }
 
-static void ComboBoxAppendText(GtkComboBox *pCombo, const rtl::OUString &rStr)
+static void ComboBoxAppendText(GtkComboBox *pCombo, const OUString &rStr)
 {
   GtkTreeIter aIter;
   GtkListStore *pStore = GTK_LIST_STORE(gtk_combo_box_get_model(pCombo));
-  rtl::OString aStr = rtl::OUStringToOString(rStr, RTL_TEXTENCODING_UTF8);
+  OString aStr = OUStringToOString(rStr, RTL_TEXTENCODING_UTF8);
   gtk_list_store_append(pStore, &aIter);
   gtk_list_store_set(pStore, &aIter, 0, aStr.getStr(), -1);
 }
@@ -1349,7 +1349,7 @@ throw( uno::RuntimeException )
         OSL_TRACE("enable unknown control %d", nControlId );
 }
 
-void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString& rLabel )
+void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const OUString& rLabel )
     throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
@@ -1386,7 +1386,7 @@ void SAL_CALL SalGtkFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUS
         OSL_TRACE("Can't set label on list");
 }
 
-rtl::OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
+OUString SAL_CALL SalGtkFilePicker::getLabel( sal_Int16 nControlId )
     throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
@@ -1469,8 +1469,8 @@ void SalGtkFilePicker::implChangeType( GtkTreeSelection *selection )
     {
         gchar *title;
         gtk_tree_model_get (model, &iter, 2, &title, -1);
-        aLabel += rtl::OUString( ": " );
-        aLabel += rtl::OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 );
+        aLabel += OUString( ": " );
+        aLabel += OUString( title, strlen(title), RTL_TEXTENCODING_UTF8 );
         g_free (title);
     }
     gtk_expander_set_label (GTK_EXPANDER (m_pFilterExpander),
@@ -1604,7 +1604,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
     uno::Any aAny;
     if( 0 == aArguments.getLength() )
         throw lang::IllegalArgumentException(
-            rtl::OUString( "no arguments" ),
+            OUString( "no arguments" ),
             static_cast<XFilePicker2*>( this ), 1 );
 
     aAny = aArguments[0];
@@ -1612,7 +1612,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
     if( ( aAny.getValueType() != ::getCppuType( ( sal_Int16* )0 ) ) &&
          (aAny.getValueType() != ::getCppuType( ( sal_Int8* )0 ) ) )
          throw lang::IllegalArgumentException(
-            rtl::OUString( "invalid argument type" ),
+            OUString( "invalid argument type" ),
             static_cast<XFilePicker2*>( this ), 1 );
 
     sal_Int16 templateId = -1;
@@ -1701,7 +1701,7 @@ void SAL_CALL SalGtkFilePicker::initialize( const uno::Sequence<uno::Any>& aArgu
                 break;
         default:
                 throw lang::IllegalArgumentException(
-                rtl::OUString( "Unknown template" ),
+                OUString( "Unknown template" ),
                 static_cast< XFilePicker2* >( this ),
                 1 );
     }
@@ -1831,7 +1831,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
     GtkFileFilter *filter = gtk_file_filter_new();
 
     OUString aShrunkName = shrinkFilterName( rFilter );
-    OString aFilterName = rtl::OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 );
+    OString aFilterName = OUStringToOString( aShrunkName, RTL_TEXTENCODING_UTF8 );
     gtk_file_filter_set_name( filter, aFilterName.getStr() );
 
     static const OUString aStarDot( "*." );
@@ -1843,7 +1843,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
     else
     {
         sal_Int32 nIndex = 0;
-        rtl::OUString aToken;
+        OUString aToken;
         do
         {
             aToken = rType.getToken( 0, ';', nIndex );
@@ -1858,16 +1858,16 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O
                 aTokens = aTokens += aToken;
                 gtk_file_filter_add_custom (filter, GTK_FILE_FILTER_URI,
                     case_insensitive_filter,
-                    g_strdup( rtl::OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ),
+                    g_strdup( OUStringToOString(aToken, RTL_TEXTENCODING_UTF8).getStr() ),
                     (GDestroyNotify) g_free );
 
-                OSL_TRACE( "fustering with %s", rtl::OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr());
+                OSL_TRACE( "fustering with %s", OUStringToOString( aToken, RTL_TEXTENCODING_UTF8 ).getStr());
             }
 #if OSL_DEBUG_LEVEL > 0
             else
             {
                 g_warning( "Duff filter token '%s'\n",
-                    rtl::OUStringToOString(
+                    OUStringToOString(
                         rType.getToken( 0, ';', nIndex ), RTL_TEXTENCODING_UTF8 ).getStr() );
             }
 #endif
@@ -1906,7 +1906,7 @@ void SalGtkFilePicker::SetFilters()
     if (m_aInitialFilter.isEmpty())
         m_aInitialFilter = m_aCurrentFilter;
 
-    rtl::OUString sPseudoFilter;
+    OUString sPseudoFilter;
     if( GTK_FILE_CHOOSER_ACTION_SAVE == gtk_file_chooser_get_action( GTK_FILE_CHOOSER( m_pDialog ) ) )
     {
         std::set<OUString> aAllFormats;
@@ -1932,7 +1932,7 @@ void SalGtkFilePicker::SetFilters()
         }
         if (aAllFormats.size() > 1)
         {
-            rtl::OUString sAllFilter;
+            OUString sAllFilter;
             std::set<OUString>::const_iterator aEnd = aAllFormats.end();
             for (std::set<OUString>::const_iterator aIter = aAllFormats.begin(); aIter != aEnd; ++aIter)
             {
diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
index c9fbb9ab8fc9..6a2df47f0707 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx
@@ -37,8 +37,6 @@
 // Implementation class for the XFilePicker Interface
 //----------------------------------------------------------
 
-using ::rtl::OUString;
-using ::rtl::OString;
 struct FilterEntry;
 struct ElementEntry_Impl;
 
@@ -80,7 +78,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         // XExecutableDialog functions
         //------------------------------------------------------------------------------------
 
-        virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
+        virtual void SAL_CALL setTitle( const OUString& aTitle )
             throw( ::com::sun::star::uno::RuntimeException );
 
         virtual sal_Int16 SAL_CALL execute()
@@ -93,44 +91,44 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode )
             throw( ::com::sun::star::uno::RuntimeException );
 
-        virtual void SAL_CALL setDefaultName( const ::rtl::OUString& aName )
+        virtual void SAL_CALL setDefaultName( const OUString& aName )
             throw( ::com::sun::star::uno::RuntimeException );
 
-        virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString& aDirectory )
+        virtual void SAL_CALL setDisplayDirectory( const OUString& aDirectory )
             throw( com::sun::star::lang::IllegalArgumentException,
                 ::com::sun::star::uno::RuntimeException );
 
-        virtual ::rtl::OUString SAL_CALL getDisplayDirectory(  )
+        virtual OUString SAL_CALL getDisplayDirectory(  )
             throw( ::com::sun::star::uno::RuntimeException );
 
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles(  )
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles(  )
             throw( ::com::sun::star::uno::RuntimeException );
 
          //------------------------------------------------------------------------------------
         // XFilePicker2 functions
         //------------------------------------------------------------------------------------
 
-        virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles()
+        virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
                 throw (::com::sun::star::uno::RuntimeException);
 
         //------------------------------------------------------------------------------------
         // XFilterManager functions
         //------------------------------------------------------------------------------------
 
-        virtual void SAL_CALL appendFilter( const ::rtl::OUString& aTitle, const ::rtl::OUString& aFilter )
+        virtual void SAL_CALL appendFilter( const OUString& aTitle, const OUString& aFilter )
             throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
 
-        virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString& aTitle )
+        virtual void SAL_CALL setCurrentFilter( const OUString& aTitle )
             throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
 
-        virtual ::rtl::OUString SAL_CALL getCurrentFilter(  )
+        virtual OUString SAL_CALL getCurrentFilter(  )
             throw( ::com::sun::star::uno::RuntimeException );
 
         //------------------------------------------------------------------------------------
         // XFilterGroupManager functions
         //------------------------------------------------------------------------------------
 
-        virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
+        virtual void SAL_CALL appendFilterGroup( const OUString& sGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair >& aFilters )
                 throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
         //------------------------------------------------------------------------------------
@@ -146,10 +144,10 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable )
             throw(::com::sun::star::uno::RuntimeException );
 
-        virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString& aLabel )
+        virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString& aLabel )
             throw (::com::sun::star::uno::RuntimeException);
 
-        virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId )
+        virtual OUString SAL_CALL getLabel( sal_Int16 nControlId )
             throw (::com::sun::star::uno::RuntimeException);
 
         //------------------------------------------------
@@ -208,10 +206,10 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         SalGtkFilePicker( const SalGtkFilePicker& );
         SalGtkFilePicker& operator=( const SalGtkFilePicker& );
 
-        sal_Bool FilterNameExists( const ::rtl::OUString& rTitle );
+        sal_Bool FilterNameExists( const OUString& rTitle );
         sal_Bool FilterNameExists( const UnoFilterList& _rGroupedFilters );
 
-        void ensureFilterList( const ::rtl::OUString& _rInitialCurrentFilter );
+        void ensureFilterList( const OUString& _rInitialCurrentFilter );
 
         void impl_fileSelectionChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
         void impl_directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
@@ -220,7 +218,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener >
             m_xListener;
-        ::rtl::OUString msPlayLabel;
+        OUString msPlayLabel;
         FilterList *m_pFilterList;
         GtkWidget  *m_pVBox;
 
@@ -244,7 +242,7 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         bool mbToggleVisibility[TOGGLE_LAST];
         bool mbToggleChecked[TOGGLE_LAST];
 
-        static const rtl::OString m_ToggleLabels[TOGGLE_LAST];
+        static const OString m_ToggleLabels[TOGGLE_LAST];
 
         enum {
             PLAY,
@@ -269,8 +267,8 @@ class SalGtkFilePicker : public SalGtkPicker, public SalGtkFilePicker_Base
         gulong mnHID_FolderChange;
         gulong mnHID_SelectionChange;
 
-        ::rtl::OUString m_aCurrentFilter;
-        ::rtl::OUString m_aInitialFilter;
+        OUString m_aCurrentFilter;
+        OUString m_aInitialFilter;
 
         bool bVersionWidthUnset;
         sal_Bool mbPreviewState;
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
index d950dd8dbf9c..e08fdf78f2c4 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx
@@ -70,7 +70,7 @@ void SAL_CALL SalGtkFolderPicker::disposing( const lang::EventObject& )
 {
 }
 
-void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const rtl::OUString& aDirectory )
+void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const OUString& aDirectory )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     SolarMutexGuard g;
@@ -91,7 +91,7 @@ void SAL_CALL SalGtkFolderPicker::setDisplayDirectory( const rtl::OUString& aDir
         aTxt.getStr() );
 }
 
-rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
 
@@ -105,7 +105,7 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDisplayDirectory() throw( uno::Run
     return aCurrentFolderName;
 }
 
-rtl::OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
 
@@ -119,7 +119,7 @@ rtl::OUString SAL_CALL SalGtkFolderPicker::getDirectory() throw( uno::RuntimeExc
     return aSelectedFolderName;
 }
 
-void SAL_CALL SalGtkFolderPicker::setDescription( const rtl::OUString& /*rDescription*/ )
+void SAL_CALL SalGtkFolderPicker::setDescription( const OUString& /*rDescription*/ )
     throw( uno::RuntimeException )
 {
 }
@@ -128,13 +128,13 @@ void SAL_CALL SalGtkFolderPicker::setDescription( const rtl::OUString& /*rDescri
 // XExecutableDialog functions
 //-----------------------------------------------------------------------------------------
 
-void SAL_CALL SalGtkFolderPicker::setTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalGtkFolderPicker::setTitle( const OUString& aTitle ) throw( uno::RuntimeException )
 {
     SolarMutexGuard g;
 
     OSL_ASSERT( m_pDialog != NULL );
 
-    ::rtl::OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 );
+    OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 );
 
     gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() );
 }
diff --git a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
index ca0746288b85..2e7aef490fa8 100644
--- a/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx
@@ -41,7 +41,7 @@ class SalGtkFolderPicker :
         // XExecutableDialog functions
         //------------------------------------------------------------------------------------
 
-        virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle )
+        virtual void SAL_CALL setTitle( const OUString& aTitle )
             throw( ::com::sun::star::uno::RuntimeException );
 
         virtual sal_Int16 SAL_CALL execute(  )
@@ -51,16 +51,16 @@ class SalGtkFolderPicker :
         // XFolderPicker functions
         //------------------------------------------------------------------------------------
 
-        virtual void SAL_CALL setDisplayDirectory( const rtl::OUString& rDirectory )
+        virtual void SAL_CALL setDisplayDirectory( const OUString& rDirectory )
             throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException );
 
-        virtual rtl::OUString SAL_CALL getDisplayDirectory(  )
+        virtual OUString SAL_CALL getDisplayDirectory(  )
             throw( com::sun::star::uno::RuntimeException );
 
-        virtual rtl::OUString SAL_CALL getDirectory( )
+        virtual OUString SAL_CALL getDirectory( )
             throw( com::sun::star::uno::RuntimeException );
 
-        virtual void SAL_CALL setDescription( const rtl::OUString& rDescription )
+        virtual void SAL_CALL setDescription( const OUString& rDescription )
             throw( com::sun::star::uno::RuntimeException );
 
         //------------------------------------------------
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
index db74fc750d38..f69adf4a6bdf 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.cxx
@@ -42,12 +42,12 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
 
-rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
+OUString SalGtkPicker::uritounicode(const gchar* pIn)
 {
     if (!pIn)
-        return rtl::OUString();
+        return OUString();
 
-    rtl::OUString sURL( const_cast<const sal_Char *>(pIn), strlen(pIn),
+    OUString sURL( const_cast<const sal_Char *>(pIn), strlen(pIn),
         RTL_TEXTENCODING_UTF8 );
 
     INetURLObject aURL(sURL);
@@ -58,7 +58,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
         gchar *pEncodedFileName = g_filename_from_uri(pIn, NULL, NULL);
         if ( pEncodedFileName )
         {
-            rtl::OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName),
+            OUString sEncoded(pEncodedFileName, strlen(pEncodedFileName),
                 osl_getThreadTextEncoding());
             INetURLObject aCurrentURL(sEncoded, INetURLObject::FSYS_UNX);
             aCurrentURL.SetHost(aURL.GetHost());
@@ -74,7 +74,7 @@ rtl::OUString SalGtkPicker::uritounicode(const gchar* pIn)
     return sURL;
 }
 
-rtl::OString SalGtkPicker::unicodetouri(const rtl::OUString &rURL)
+OString SalGtkPicker::unicodetouri(const OUString &rURL)
 {
     // all the URLs are handled by office in UTF-8 ( and encoded with "%xx" codes based on UTF-8 )
     // so the Gnome FP related URLs should be converted accordingly
@@ -182,7 +182,7 @@ void SalGtkPicker::setGtkLanguage()
     OUString aLocaleString( Application::GetSettings().GetUILanguageTag().getGlibcLocaleString( ".UTF-8"));
     if (!aLocaleString.isEmpty())
     {
-        rtl::OUString envVar( "LANGUAGE" );
+        OUString envVar( "LANGUAGE" );
         osl_setEnvironment( envVar.pData, aLocaleString.pData );
     }
     bSet = true;
@@ -204,7 +204,7 @@ SalGtkPicker::~SalGtkPicker()
     }
 }
 
-void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const rtl::OUString& aDirectory )
+void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const OUString& aDirectory )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     OSL_ASSERT( m_pDialog != NULL );
@@ -223,23 +223,23 @@ void SAL_CALL SalGtkPicker::implsetDisplayDirectory( const rtl::OUString& aDirec
         aTxt.getStr() );
 }
 
-rtl::OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeException )
+OUString SAL_CALL SalGtkPicker::implgetDisplayDirectory() throw( uno::RuntimeException )
 {
     OSL_ASSERT( m_pDialog != NULL );
 
     gchar* pCurrentFolder =
         gtk_file_chooser_get_current_folder_uri( GTK_FILE_CHOOSER( m_pDialog ) );
-    ::rtl::OUString aCurrentFolderName = uritounicode(pCurrentFolder);
+    OUString aCurrentFolderName = uritounicode(pCurrentFolder);
     g_free( pCurrentFolder );
 
     return aCurrentFolderName;
 }
 
-void SAL_CALL SalGtkPicker::implsetTitle( const rtl::OUString& aTitle ) throw( uno::RuntimeException )
+void SAL_CALL SalGtkPicker::implsetTitle( const OUString& aTitle ) throw( uno::RuntimeException )
 {
     OSL_ASSERT( m_pDialog != NULL );
 
-    ::rtl::OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 );
+    OString aWindowTitle = OUStringToOString( aTitle, RTL_TEXTENCODING_UTF8 );
 
     gtk_window_set_title( GTK_WINDOW( m_pDialog ), aWindowTitle.getStr() );
 }
diff --git a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
index 196e8e901f6b..477c707dd71f 100644
--- a/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
+++ b/vcl/unx/gtk/fpicker/SalGtkPicker.hxx
@@ -48,21 +48,21 @@ class SalGtkPicker
         osl::Mutex m_rbHelperMtx;
         GtkWidget  *m_pDialog;
     protected:
-        virtual void SAL_CALL implsetTitle( const ::rtl::OUString& aTitle )
+        virtual void SAL_CALL implsetTitle( const OUString& aTitle )
             throw( ::com::sun::star::uno::RuntimeException );
 
-        virtual void SAL_CALL implsetDisplayDirectory( const rtl::OUString& rDirectory )
+        virtual void SAL_CALL implsetDisplayDirectory( const OUString& rDirectory )
             throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException );
 
-        virtual rtl::OUString SAL_CALL implgetDisplayDirectory(  )
+        virtual OUString SAL_CALL implgetDisplayDirectory(  )
             throw( com::sun::star::uno::RuntimeException );
-        rtl::OUString uritounicode(const gchar *pIn);
-        rtl::OString unicodetouri(const rtl::OUString &rURL);
+        OUString uritounicode(const gchar *pIn);
+        OString unicodetouri(const OUString &rURL);
 
         // to instantiate own services
         ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
 
-        rtl::OUString getResString( sal_Int32 aId );
+        OUString getResString( sal_Int32 aId );
     private:
         void setGtkLanguage();
 };
diff --git a/vcl/unx/gtk/fpicker/resourceprovider.cxx b/vcl/unx/gtk/fpicker/resourceprovider.cxx
index 498a74ce4579..ec588c1f00c3 100644
--- a/vcl/unx/gtk/fpicker/resourceprovider.cxx
+++ b/vcl/unx/gtk/fpicker/resourceprovider.cxx
@@ -68,9 +68,9 @@ static sal_Int16 CtrlIdToResId( sal_Int32 aControlId )
     return -1;
 }
 
-rtl::OUString SalGtkPicker::getResString( sal_Int32 aId )
+OUString SalGtkPicker::getResString( sal_Int32 aId )
 {
-    rtl::OUString aResString;
+    OUString aResString;
     try
     {
         // translate the control id to a resource id
diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
index 83c92b2cf792..df123c5cc1a7 100644
--- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
@@ -80,9 +80,9 @@ GtkPrintWrapper::~GtkPrintWrapper()
 
 void GtkPrintWrapper::impl_load()
 {
-    m_aModule.load(rtl::OUString("libgtk-x11-2.0.so.0"));
+    m_aModule.load(OUString("libgtk-x11-2.0.so.0"));
     if (!m_aModule.is())
-        m_aModule.load(rtl::OUString("libgtk-x11-2.0.so"));
+        m_aModule.load(OUString("libgtk-x11-2.0.so"));
     if (!m_aModule.is())
         return;
 
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 405fcc3a65c8..4ece2aa4c1ce 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -60,7 +60,6 @@ GtkSalGraphics::~GtkSalGraphics()
 {
 }
 
-using ::rtl::OUString;
 
 /*************************************
  * Cached native widget objects
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index c97e16e01212..c87f7652d18a 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -95,7 +95,7 @@ public:
     }
     void updateControllerPrintRange();
 #if 0
-    void ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings* pSettings) const;
+    void ExportAsPDF(const OUString &rFileURL, GtkPrintSettings* pSettings) const;
 #endif
     ~GtkPrintDialog();
 
@@ -130,7 +130,7 @@ private:
 private:
     GtkWidget* m_pDialog;
     vcl::PrinterController& m_rController;
-    std::map<GtkWidget*, rtl::OUString> m_aControlToPropertyMap;
+    std::map<GtkWidget*, OUString> m_aControlToPropertyMap;
     std::map<GtkWidget*, sal_Int32> m_aControlToNumValMap;
     boost::shared_ptr<GtkPrintWrapper> m_pWrapper;
 };
@@ -138,8 +138,8 @@ private:
 
 struct GtkSalPrinter_Impl
 {
-    rtl::OString m_sSpoolFile;
-    rtl::OUString m_sJobName;
+    OString m_sSpoolFile;
+    OUString m_sJobName;
     GtkPrinter* m_pPrinter;
     GtkPrintSettings* m_pSettings;
 
@@ -197,9 +197,9 @@ GtkSalPrinter::GtkSalPrinter(SalInfoPrinter* const i_pInfoPrinter)
 
 bool
 GtkSalPrinter::impl_doJob(
-        const rtl::OUString* const i_pFileName,
-        const rtl::OUString& i_rJobName,
-        const rtl::OUString& i_rAppName,
+        const OUString* const i_pFileName,
+        const OUString& i_rJobName,
+        const OUString& i_rAppName,
         ImplJobSetup* const io_pSetupData,
         const int i_nCopies,
         const bool i_bCollate,
@@ -231,9 +231,9 @@ GtkSalPrinter::impl_doJob(
 
 sal_Bool
 GtkSalPrinter::StartJob(
-        const rtl::OUString* const i_pFileName,
-        const rtl::OUString& i_rJobName,
-        const rtl::OUString& i_rAppName,
+        const OUString* const i_pFileName,
+        const OUString& i_rJobName,
+        const OUString& i_rAppName,
         ImplJobSetup* io_pSetupData,
         vcl::PrinterController& io_rController)
 {
@@ -245,9 +245,9 @@ GtkSalPrinter::StartJob(
     m_pImpl.reset(new GtkSalPrinter_Impl());
     m_pImpl->m_sJobName = i_rJobName;
 
-    rtl::OString sFileName;
+    OString sFileName;
     if (i_pFileName)
-        sFileName = rtl::OUStringToOString(*i_pFileName, osl_getThreadTextEncoding());
+        sFileName = OUStringToOString(*i_pFileName, osl_getThreadTextEncoding());
 
     GtkPrintDialog aDialog(io_rController);
     if (!aDialog.run())
@@ -265,7 +265,7 @@ GtkSalPrinter::StartJob(
         const gchar *pStr = gtk_print_settings_get(m_pImpl->m_pSettings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT);
         if (pStr && !strcmp(pStr, "pdf"))
         {
-            aDialog.ExportAsPDF(rtl::OUString((const sal_Char *)uri, strlen((const sal_Char *)uri), RTL_TEXTENCODING_UTF8), m_pImpl->m_pSettings);
+            aDialog.ExportAsPDF(OUString((const sal_Char *)uri, strlen((const sal_Char *)uri), RTL_TEXTENCODING_UTF8), m_pImpl->m_pSettings);
             bDoJob = false;
         }
     }
@@ -277,10 +277,10 @@ GtkSalPrinter::StartJob(
     bool bCollate = false;
 
     //To-Do proper name, watch for encodings
-    sFileName = rtl::OString("/tmp/hacking.ps");
+    sFileName = OString("/tmp/hacking.ps");
     m_pImpl->m_sSpoolFile = sFileName;
 
-    rtl::OUString aFileName = rtl::OStringToOUString(sFileName, osl_getThreadTextEncoding());
+    OUString aFileName = OStringToOUString(sFileName, osl_getThreadTextEncoding());
 
     //To-Do, swap ps/pdf for gtk_printer_accepts_ps()/gtk_printer_accepts_pdf() ?
 
@@ -315,7 +315,7 @@ GtkSalPrinter::EndJob()
 #endif
 
     GtkPrintJob* const pJob = pWrapper->print_job_new(
-        rtl::OUStringToOString(m_pImpl->m_sJobName, RTL_TEXTENCODING_UTF8).getStr(),
+        OUStringToOString(m_pImpl->m_sJobName, RTL_TEXTENCODING_UTF8).getStr(),
         m_pImpl->m_pPrinter, m_pImpl->m_pSettings, pPageSetup);
 
     GError* error = NULL;
@@ -344,13 +344,13 @@ namespace
 void
 lcl_setHelpText(
         GtkWidget* const io_pWidget,
-        const uno::Sequence<rtl::OUString>& i_rHelpTexts,
+        const uno::Sequence<OUString>& i_rHelpTexts,
         const sal_Int32 i_nIndex)
 {
 #if GTK_CHECK_VERSION(2,12,0)
     if (i_nIndex >= 0 && i_nIndex < i_rHelpTexts.getLength())
         gtk_widget_set_tooltip_text(io_pWidget,
-            rtl::OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(i_rHelpTexts.getConstArray()[i_nIndex], RTL_TEXTENCODING_UTF8).getStr());
 #else
     (void)io_pWidget;
     (void)i_rHelpTexts;
@@ -362,8 +362,8 @@ lcl_setHelpText(
 static GtkWidget*
 lcl_makeFrame(
         GtkWidget* const i_pChild,
-        const rtl::OUString &i_rText,
-        const uno::Sequence<rtl::OUString> &i_rHelpTexts,
+        const OUString &i_rText,
+        const uno::Sequence<OUString> &i_rHelpTexts,
         sal_Int32* const io_pCurHelpText)
 {
     GtkWidget* const pLabel = gtk_label_new(NULL);
@@ -372,7 +372,7 @@ lcl_makeFrame(
 
     {
         gchar* const pText = g_markup_printf_escaped("<b>%s</b>",
-            rtl::OUStringToOString(i_rText, RTL_TEXTENCODING_UTF8).getStr());
+            OUStringToOString(i_rText, RTL_TEXTENCODING_UTF8).getStr());
         gtk_label_set_markup_with_mnemonic(GTK_LABEL(pLabel), pText);
         g_free(pText);
     }
@@ -391,11 +391,11 @@ lcl_makeFrame(
 void
 lcl_extractHelpTextsOrIds(
         const beans::PropertyValue& rEntry,
-        uno::Sequence<rtl::OUString>& rHelpStrings)
+        uno::Sequence<OUString>& rHelpStrings)
 {
     if (!(rEntry.Value >>= rHelpStrings))
     {
-        rtl::OUString aHelpString;
+        OUString aHelpString;
         if ((rEntry.Value >>= aHelpString))
         {
             rHelpStrings.realloc(1);
@@ -473,8 +473,8 @@ GtkPrintDialog::impl_initDialog()
 void
 GtkPrintDialog::impl_initCustomTab()
 {
-    typedef std::map<rtl::OUString, GtkWidget*> DependencyMap_t;
-    typedef std::vector<std::pair<GtkWidget*, rtl::OUString> > CustomTabs_t;
+    typedef std::map<OUString, GtkWidget*> DependencyMap_t;
+    typedef std::vector<std::pair<GtkWidget*, OUString> > CustomTabs_t;
 
     const uno::Sequence<beans::PropertyValue>& rOptions(m_rController.getUIOptions());
     DependencyMap_t aPropertyToDependencyRowMap;
@@ -489,15 +489,15 @@ GtkPrintDialog::impl_initCustomTab()
         uno::Sequence<beans::PropertyValue> aOptProp;
         rOptions[i].Value >>= aOptProp;
 
-        rtl::OUString aCtrlType;
-        rtl::OUString aText;
-        rtl::OUString aPropertyName;
-        uno::Sequence<rtl::OUString> aChoices;
+        OUString aCtrlType;
+        OUString aText;
+        OUString aPropertyName;
+        uno::Sequence<OUString> aChoices;
         uno::Sequence<sal_Bool> aChoicesDisabled;
-        uno::Sequence<rtl::OUString> aHelpTexts;
+        uno::Sequence<OUString> aHelpTexts;
         sal_Int64 nMinValue = 0, nMaxValue = 0;
         sal_Int32 nCurHelpText = 0;
-        rtl::OUString aDependsOnName;
+        OUString aDependsOnName;
         sal_Int32 nDependsOnValue = 0;
         sal_Bool bUseDependencyRow = sal_False;
         sal_Bool bIgnore = sal_False;
@@ -509,7 +509,7 @@ GtkPrintDialog::impl_initCustomTab()
             const beans::PropertyValue& rEntry(aOptProp[ n ]);
             if ( rEntry.Name == "Text" )
             {
-                rtl::OUString aValue;
+                OUString aValue;
                 rEntry.Value >>= aValue;
                 aText = aValue.replace('~', '_');
             }
@@ -537,7 +537,7 @@ GtkPrintDialog::impl_initCustomTab()
                 rEntry.Value >>= nMaxValue;
             else if ( rEntry.Name == "HelpId" )
             {
-                uno::Sequence<rtl::OUString> aHelpIds;
+                uno::Sequence<OUString> aHelpIds;
                 lcl_extractHelpTextsOrIds(rEntry, aHelpIds);
                 Help* const pHelp = Application::GetHelp();
                 if (pHelp)
@@ -619,7 +619,7 @@ GtkPrintDialog::impl_initCustomTab()
             if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Bool")) && pCurParent)
             {
                 pWidget = gtk_check_button_new_with_mnemonic(
-                    rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr());
+                    OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr());
                 lcl_setHelpText(pWidget, aHelpTexts, 0);
                 m_aControlToPropertyMap[pWidget] = aPropertyName;
 
@@ -649,14 +649,14 @@ GtkPrintDialog::impl_initCustomTab()
                 {
                     pWidget = gtk_radio_button_new_with_mnemonic_from_widget(
                         GTK_RADIO_BUTTON(m == 0 ? NULL : pWidget),
-                        rtl::OUStringToOString(aChoices[m].replace('~', '_'), RTL_TEXTENCODING_UTF8).getStr());
+                        OUStringToOString(aChoices[m].replace('~', '_'), RTL_TEXTENCODING_UTF8).getStr());
                     lcl_setHelpText(pWidget, aHelpTexts, nCurHelpText++);
                     m_aControlToPropertyMap[pWidget] = aPropertyName;
                     m_aControlToNumValMap[pWidget] = m;
                     GtkWidget* const pRow = gtk_hbox_new(FALSE, 12);
                     gtk_box_pack_start(GTK_BOX(pVbox), pRow, FALSE, FALSE, 0);
                     gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0);
-                    aPropertyToDependencyRowMap[aPropertyName + rtl::OUString::valueOf(m)] = pRow;
+                    aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(m)] = pRow;
                     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(pWidget), m == nSelectVal);
                     gtk_widget_set_sensitive(pWidget,
                         m_rController.isUIOptionEnabled(aPropertyName) && pVal != NULL);
@@ -684,7 +684,7 @@ GtkPrintDialog::impl_initCustomTab()
                    for (sal_Int32 m = 0; m != aChoices.getLength(); m++)
                    {
                        lcl_combo_box_text_append(pWidget,
-                           rtl::OUStringToOString(aChoices[m], RTL_TEXTENCODING_UTF8).getStr());
+                           OUStringToOString(aChoices[m], RTL_TEXTENCODING_UTF8).getStr());
                    }
 
                    sal_Int32 nSelectVal = 0;
@@ -698,12 +698,12 @@ GtkPrintDialog::impl_initCustomTab()
                 {
                    pWidget = gtk_entry_new();
 
-                   rtl::OUString aCurVal;
+                   OUString aCurVal;
                    pVal = m_rController.getValue(aPropertyName);
                    if (pVal && pVal->Value.hasValue())
                        pVal->Value >>= aCurVal;
                    gtk_entry_set_text(GTK_ENTRY(pWidget),
-                       rtl::OUStringToOString(aCurVal, RTL_TEXTENCODING_UTF8).getStr());
+                       OUStringToOString(aCurVal, RTL_TEXTENCODING_UTF8).getStr());
                 }
                 else if (aCtrlType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("Range")) && pCurParent)
                 {
@@ -725,7 +725,7 @@ GtkPrintDialog::impl_initCustomTab()
                 if (!aText.isEmpty())
                 {
                     GtkWidget* const pLabel = gtk_label_new_with_mnemonic(
-                        rtl::OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr());
+                        OUStringToOString(aText, RTL_TEXTENCODING_UTF8).getStr());
                     gtk_label_set_mnemonic_widget(GTK_LABEL(pLabel), pWidget);
                     gtk_box_pack_start(GTK_BOX(pHbox), pLabel, FALSE, FALSE, 0);
                 }
@@ -743,7 +743,7 @@ GtkPrintDialog::impl_initCustomTab()
             {
                 if (bUseDependencyRow && !aDependsOnName.isEmpty())
                 {
-                    pRow = aPropertyToDependencyRowMap[aDependsOnName + rtl::OUString::valueOf(nDependsOnValue)];
+                    pRow = aPropertyToDependencyRowMap[aDependsOnName + OUString::valueOf(nDependsOnValue)];
                     if (!pRow)
                     {
                         gtk_widget_destroy(pWidget);
@@ -759,7 +759,7 @@ GtkPrintDialog::impl_initCustomTab()
                     gtk_box_pack_start(GTK_BOX(pCurParent), pRow, FALSE, FALSE, 0);
                 }
                 if (!pGroup)
-                    aPropertyToDependencyRowMap[aPropertyName + rtl::OUString::valueOf(sal_Int32(0))] = pRow;
+                    aPropertyToDependencyRowMap[aPropertyName + OUString::valueOf(sal_Int32(0))] = pRow;
                 gtk_box_pack_start(GTK_BOX(pRow), pWidget, FALSE, FALSE, 0);
             }
         }
@@ -773,7 +773,7 @@ GtkPrintDialog::impl_initCustomTab()
     {
         gtk_widget_show_all(aI->first);
         m_pWrapper->print_unix_dialog_add_custom_tab(GTK_PRINT_UNIX_DIALOG(m_pDialog), aI->first,
-            gtk_label_new(rtl::OUStringToOString(aI->second, RTL_TEXTENCODING_UTF8).getStr()));
+            gtk_label_new(OUStringToOString(aI->second, RTL_TEXTENCODING_UTF8).getStr()));
     }
 }
 
@@ -798,7 +798,7 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled
     }
 
     beans::PropertyValue* const pPrintContent(
-            m_rController.getValue(rtl::OUString("PrintContent")));
+            m_rController.getValue(OUString("PrintContent")));
 
     if (pPrintContent)
     {
@@ -835,7 +835,7 @@ GtkPrintDialog::impl_initPrintContent(uno::Sequence<sal_Bool> const& i_rDisabled
 void
 GtkPrintDialog::impl_checkOptionalControlDependencies()
 {
-    for (std::map<GtkWidget*, rtl::OUString>::iterator it = m_aControlToPropertyMap.begin();
+    for (std::map<GtkWidget*, OUString>::iterator it = m_aControlToPropertyMap.begin();
          it != m_aControlToPropertyMap.end(); ++it)
     {
         gtk_widget_set_sensitive(it->first, m_rController.isUIOptionEnabled(it->second));
@@ -847,7 +847,7 @@ beans::PropertyValue*
 GtkPrintDialog::impl_queryPropertyValue(GtkWidget* const i_pWidget) const
 {
     beans::PropertyValue* pVal(0);
-    std::map<GtkWidget*, rtl::OUString>::const_iterator aIt(m_aControlToPropertyMap.find(i_pWidget));
+    std::map<GtkWidget*, OUString>::const_iterator aIt(m_aControlToPropertyMap.find(i_pWidget));
     if (aIt != m_aControlToPropertyMap.end())
     {
         pVal = m_rController.getValue(aIt->second);
@@ -936,7 +936,7 @@ GtkPrintDialog::run()
 }
 
 #if 0
-void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings *pSettings) const
+void GtkPrintDialog::ExportAsPDF(const OUString &rFileURL, GtkPrintSettings *pSettings) const
 {
     uno::Reference < XDesktop2 > xDesktop = Desktop::create( ::comphelper::getProcessComponentContext() );
     uno::Reference < XFrame > xFrame(xDesktop->getActiveFrame());
@@ -944,7 +944,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
         xFrame = uno::Reference < XFrame >(xDesktop, UNO_QUERY);
 
     uno::Reference < XFilter > xFilter(
-        ::comphelper::getProcessServiceFactory()->createInstance(rtl::OUString("com.sun.star.document.PDFFilter")),
+        ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.document.PDFFilter")),
         UNO_QUERY);
 
     if (xFilter.is())
@@ -962,9 +962,9 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
         uno::Reference< XExporter > xExport(xFilter, UNO_QUERY);
         xExport->setSourceDocument(xDoc);
         uno::Sequence<beans::PropertyValue> aFilterData(2);
-        aFilterData[0].Name = rtl::OUString("PageLayout");
+        aFilterData[0].Name = OUString("PageLayout");
         aFilterData[0].Value <<= sal_Int32(0);
-        aFilterData[1].Name = rtl::OUString("FirstPageOnLeft");
+        aFilterData[1].Name = OUString("FirstPageOnLeft");
         aFilterData[1].Value <<= sal_False;
 
 
@@ -987,8 +987,8 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
                     aRangeText.AppendAscii(",");
             }
             aFilterData.realloc(aFilterData.getLength()+1);
-            aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange");
-            aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(aRangeText);
+            aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange");
+            aFilterData[aFilterData.getLength()-1].Value <<= OUString(aRangeText);
         }
         else if (pStr && !strcmp(pStr, "current"))
         {
@@ -1012,7 +1012,7 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
                        xSheets = uno::Reference< XIndexAccess >(xSheetDoc->getSheets(), UNO_QUERY);
                    if (xSheets.is())
                    {
-                       const rtl::OUString &rName = xName->getName();
+                       const OUString &rName = xName->getName();
 
                        sal_Int32 i;
 
@@ -1027,8 +1027,8 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
                        if (i < xSheets->getCount())
                        {
                             aFilterData.realloc(aFilterData.getLength()+1);
-                            aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("PageRange");
-                            aFilterData[aFilterData.getLength()-1].Value <<= rtl::OUString(OUString::number(i + 1));
+                            aFilterData[aFilterData.getLength()-1].Name = OUString("PageRange");
+                            aFilterData[aFilterData.getLength()-1].Value <<= OUString(OUString::number(i + 1));
                        }
                    }
             }
@@ -1053,15 +1053,15 @@ void GtkPrintDialog::ExportAsPDF(const rtl::OUString &rFileURL, GtkPrintSettings
             if (aSelection.hasValue())
             {
                 aFilterData.realloc(aFilterData.getLength()+1);
-                aFilterData[aFilterData.getLength()-1].Name = rtl::OUString("Selection");
+                aFilterData[aFilterData.getLength()-1].Name = OUString("Selection");
                 aFilterData[aFilterData.getLength()-1].Value <<= aSelection;
             }
         }
 #endif
         uno::Sequence<beans::PropertyValue> aArgs(2);
-        aArgs[0].Name = rtl::OUString("FilterData");
+        aArgs[0].Name = OUString("FilterData");
         aArgs[0].Value <<= aFilterData;
-        aArgs[1].Name = rtl::OUString("OutputStream");
+        aArgs[1].Name = OUString("OutputStream");
         aArgs[1].Value <<= xOStm;
         xFilter->filter(aArgs);
     }
@@ -1076,9 +1076,9 @@ GtkPrintDialog::updateControllerPrintRange()
     // TODO: use get_print_pages
     if (const gchar* const pStr = m_pWrapper->print_settings_get(pSettings, GTK_PRINT_SETTINGS_PRINT_PAGES))
     {
-        beans::PropertyValue* pVal = m_rController.getValue(rtl::OUString("PrintRange"));
+        beans::PropertyValue* pVal = m_rController.getValue(OUString("PrintRange"));
         if (!pVal)
-            pVal = m_rController.getValue(rtl::OUString("PrintContent"));
+            pVal = m_rController.getValue(OUString("PrintContent"));
         SAL_WARN_IF(!pVal, "vcl.gtk", "Nothing to map standard print options to!");
         if (pVal)
         {
@@ -1093,11 +1093,11 @@ GtkPrintDialog::updateControllerPrintRange()
 
             if (nVal == 1)
             {
-                pVal = m_rController.getValue(rtl::OUString("PageRange"));
+                pVal = m_rController.getValue(OUString("PageRange"));
                 SAL_WARN_IF(!pVal, "vcl.gtk", "PageRange doesn't exist!");
                 if (pVal)
                 {
-                    rtl::OUStringBuffer sBuf;
+                    OUStringBuffer sBuf;
                     gint num_ranges;
                     const GtkPageRange* const pRanges = m_pWrapper->print_settings_get_page_ranges(pSettings, &num_ranges);
                     for (gint i = 0; i != num_ranges && pRanges; ++i)
@@ -1133,11 +1133,11 @@ GtkPrintDialog::impl_readFromSettings()
     vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get());
     GtkPrintSettings* const pSettings(getSettings());
 
-    const rtl::OUString aPrintDialogStr("PrintDialog");
-    const rtl::OUString aCopyCount(pItem->getValue(aPrintDialogStr,
-                rtl::OUString("CopyCount")));
-    const rtl::OUString aCollate(pItem->getValue(aPrintDialogStr,
-                rtl::OUString("Collate")));
+    const OUString aPrintDialogStr("PrintDialog");
+    const OUString aCopyCount(pItem->getValue(aPrintDialogStr,
+                OUString("CopyCount")));
+    const OUString aCollate(pItem->getValue(aPrintDialogStr,
+                OUString("Collate")));
 
     bool bChanged(false);
 
@@ -1171,17 +1171,17 @@ const
     vcl::SettingsConfigItem* const pItem(vcl::SettingsConfigItem::get());
     GtkPrintSettings* const pSettings(getSettings());
 
-    const rtl::OUString aPrintDialogStr("PrintDialog");
+    const OUString aPrintDialogStr("PrintDialog");
     pItem->setValue(aPrintDialogStr,
-            rtl::OUString("CopyCount"),
-            rtl::OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings))));
+            OUString("CopyCount"),
+            OUString::valueOf(sal_Int32(m_pWrapper->print_settings_get_n_copies(pSettings))));
     pItem->setValue(aPrintDialogStr,
-            rtl::OUString("Collate"),
+            OUString("Collate"),
             m_pWrapper->print_settings_get_collate(pSettings)
-                ? rtl::OUString("true")
-                : rtl::OUString("false"))
+                ? OUString("true")
+                : OUString("false"))
         ;
-    // pItem->setValue(aPrintDialog, rtl::OUString::createFromAscii("ToFile"), );
+    // pItem->setValue(aPrintDialog, OUString::createFromAscii("ToFile"), );
     g_object_unref(G_OBJECT(pSettings));
     pItem->Commit();
 }
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 3e9da947db95..efd6c13800d8 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -1333,11 +1333,11 @@ sal_Bool GtkSalFrame::PostEvent( void* pData )
     return sal_True;
 }
 
-void GtkSalFrame::SetTitle( const rtl::OUString& rTitle )
+void GtkSalFrame::SetTitle( const OUString& rTitle )
 {
     m_aTitle = rTitle;
     if( m_pWindow && ! isChild() )
-        gtk_window_set_title( GTK_WINDOW(m_pWindow), rtl::OUStringToOString( rTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
+        gtk_window_set_title( GTK_WINDOW(m_pWindow), OUStringToOString( rTitle, RTL_TEXTENCODING_UTF8 ).getStr() );
 }
 
 static inline sal_uInt8 *
@@ -1552,7 +1552,7 @@ static void initClientId()
     if (!bOnce)
     {
         bOnce = true;
-        const rtl::OString& rID = SessionManagerClient::getSessionID();
+        const OString& rID = SessionManagerClient::getSessionID();
         if (!rID.isEmpty())
             gdk_set_sm_client_id(rID.getStr());
     }
@@ -2133,7 +2133,7 @@ void GtkSalFrame::SetScreenNumber( unsigned int nNewScreen )
 
 void GtkSalFrame::updateWMClass()
 {
-    rtl::OString aResClass = rtl::OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US);
+    OString aResClass = OUStringToOString(m_sWMClass, RTL_TEXTENCODING_ASCII_US);
     const char *pResClass = !aResClass.isEmpty() ? aResClass.getStr() :
                                                     SalGenericSystem::getFrameClassName();
     Display *display;
@@ -2150,7 +2150,7 @@ void GtkSalFrame::updateWMClass()
     if( IS_WIDGET_REALIZED( m_pWindow ) )
     {
         XClassHint* pClass = XAllocClassHint();
-        rtl::OString aResName = SalGenericSystem::getFrameResName( m_nExtStyle );
+        OString aResName = SalGenericSystem::getFrameResName( m_nExtStyle );
         pClass->res_name  = const_cast<char*>(aResName.getStr());
         pClass->res_class = const_cast<char*>(pResClass);
         XSetClassHint( display,
@@ -2160,7 +2160,7 @@ void GtkSalFrame::updateWMClass()
     }
 }
 
-void GtkSalFrame::SetApplicationID( const rtl::OUString &rWMClass )
+void GtkSalFrame::SetApplicationID( const OUString &rWMClass )
 {
     if( rWMClass != m_sWMClass && ! isChild() )
     {
@@ -2548,14 +2548,14 @@ void GtkSalFrame::Sync()
     gdk_display_sync( getGdkDisplay() );
 }
 
-rtl::OUString GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode )
+OUString GtkSalFrame::GetKeyName( sal_uInt16 nKeyCode )
 {
 #if !GTK_CHECK_VERSION(3,0,0)
     return getDisplay()->GetKeyName( nKeyCode );
 #else
   (void)nKeyCode;
 # warning FIXME - key names
-  return rtl::OUString();
+  return OUString();
 #endif
 }
 
@@ -4200,13 +4200,13 @@ gboolean GtkSalFrame::IMHandler::signalIMRetrieveSurrounding( GtkIMContext* pCon
     if (xText.is())
     {
         sal_uInt32 nPosition = xText->getCaretPosition();
-        rtl::OUString sAllText = xText->getText();
+        OUString sAllText = xText->getText();
         if (sAllText.isEmpty())
             return sal_False;
-    rtl::OString sUTF = rtl::OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
-    rtl::OUString sCursorText(sAllText.copy(0, nPosition));
+    OString sUTF = OUStringToOString(sAllText, RTL_TEXTENCODING_UTF8);
+    OUString sCursorText(sAllText.copy(0, nPosition));
     gtk_im_context_set_surrounding(pContext, sUTF.getStr(), sUTF.getLength(),
-        rtl::OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
+        OUStringToOString(sCursorText, RTL_TEXTENCODING_UTF8).getLength());
     return sal_True;
     }
 
diff --git a/vcl/unx/gtk/window/gtksalmenu.cxx b/vcl/unx/gtk/window/gtksalmenu.cxx
index 132d3a301c25..688fda4a9419 100644
--- a/vcl/unx/gtk/window/gtksalmenu.cxx
+++ b/vcl/unx/gtk/window/gtksalmenu.cxx
@@ -49,8 +49,8 @@ static gchar* GetCommandForItem( GtkSalMenuItem* pSalMenuItem, gchar* aCurrentCo
         if ( !pMenu )
             return NULL;
 
-        rtl::OUString aMenuCommand = pMenu->GetItemCommand( nId );
-        gchar* aCommandStr = g_strdup( rtl::OUStringToOString( aMenuCommand, RTL_TEXTENCODING_UTF8 ).getStr() );
+        OUString aMenuCommand = pMenu->GetItemCommand( nId );
+        gchar* aCommandStr = g_strdup( OUStringToOString( aMenuCommand, RTL_TEXTENCODING_UTF8 ).getStr() );
         aCommand = g_strdup( aCommandStr );
 
         // Some items could have duplicated commands. A new one should be generated.
@@ -551,12 +551,12 @@ void GtkSalMenu::NativeSetEnableItem( gchar* aCommand, gboolean bEnable )
         g_lo_action_group_set_action_enabled( pActionGroup, aCommand, bEnable );
 }
 
-void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const rtl::OUString& rText )
+void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText )
 {
     SolarMutexGuard aGuard;
     // Replace the '~' character with '_'.
-    rtl::OUString aText = rText.replace( '~', '_' );
-    rtl::OString aConvertedText = OUStringToOString( aText, RTL_TEXTENCODING_UTF8 );
+    OUString aText = rText.replace( '~', '_' );
+    OString aConvertedText = OUStringToOString( aText, RTL_TEXTENCODING_UTF8 );
 
     // Update item text only when necessary.
     gchar* aLabel = g_lo_menu_get_label_from_item_in_section( G_LO_MENU( mpMenuModel ), nSection, nItemPos );
@@ -568,7 +568,7 @@ void GtkSalMenu::NativeSetItemText( unsigned nSection, unsigned nItemPos, const
         g_free( aLabel );
 }
 
-void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const rtl::OUString& rKeyName )
+void GtkSalMenu::NativeSetAccelerator( unsigned nSection, unsigned nItemPos, const KeyCode& rKeyCode, const OUString& rKeyName )
 {
     SolarMutexGuard aGuard;
 
@@ -662,7 +662,7 @@ GtkSalMenu* GtkSalMenu::GetMenuForItemCommand( gchar* aCommand, gboolean bGetSub
         GtkSalMenuItem *pSalItem = maItems[ nPos ];
 
         String aItemCommand = mpVCLMenu->GetItemCommand( pSalItem->mnId );
-        gchar* aItemCommandStr = (gchar*) rtl::OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr();
+        gchar* aItemCommandStr = (gchar*) OUStringToOString( aItemCommand, RTL_TEXTENCODING_UTF8 ).getStr();
 
         if ( g_strcmp0( aItemCommandStr, aCommand ) == 0 )
         {
@@ -764,7 +764,7 @@ void GtkSalMenu::ShowItem( unsigned nPos, sal_Bool bShow )
 }
 
 
-void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const rtl::OUString& )
+void GtkSalMenu::SetItemText( unsigned, SalMenuItem*, const OUString& )
 {
 }
 
@@ -772,7 +772,7 @@ void GtkSalMenu::SetItemImage( unsigned, SalMenuItem*, const Image& )
 {
 }
 
-void GtkSalMenu::SetAccelerator( unsigned, SalMenuItem*, const KeyCode&, const rtl::OUString& )
+void GtkSalMenu::SetAccelerator( unsigned, SalMenuItem*, const KeyCode&, const OUString& )
 {
 }
 
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 281be6f42c3e..50a2003192a3 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -773,7 +773,7 @@ void GtkSalGraphics::PaintCombobox( GtkStyleContext *context,
 
 sal_Bool GtkSalGraphics::drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion,
                                             ControlState nState, const ImplControlValue& aValue,
-                                            const rtl::OUString& )
+                                            const OUString& )
 {
     GtkStateFlags flags;
     GtkShadowType shadow;
@@ -997,7 +997,7 @@ void GtkSalGraphics::renderAreaToPix( cairo_t *cr,
 }
 
 sal_Bool GtkSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState,
-                                                const ImplControlValue&, const rtl::OUString&,
+                                                const ImplControlValue&, const OUString&,
                                                 Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion )
 {
     /* TODO: all this funcions needs improvements */
@@ -1306,7 +1306,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
     psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILanguageTag().getLocale() );
     fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
                   aInfo.m_nID != 0 ? "succeeded" : "failed",
-                  rtl::OUStringToOString( aInfo.m_aStyleName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
+                  OUStringToOString( aInfo.m_aStyleName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
 
     int nPointHeight = 0;
     /*sal_Int32 nDispDPIY = GetDisplay()->GetResolution().B();
diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx
index c7f30edeabe9..d281949f6e37 100644
--- a/vcl/unx/kde/UnxCommandThread.cxx
+++ b/vcl/unx/kde/UnxCommandThread.cxx
@@ -50,26 +50,26 @@ sal_Bool SAL_CALL UnxFilePickerCommandThread::result()
     return m_aResult;
 }
 
-::rtl::OUString SAL_CALL UnxFilePickerCommandThread::getCurrentFilter()
+OUString SAL_CALL UnxFilePickerCommandThread::getCurrentFilter()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_aGetCurrentFilter;
 }
 
-::rtl::OUString SAL_CALL UnxFilePickerCommandThread::getDirectory()
+OUString SAL_CALL UnxFilePickerCommandThread::getDirectory()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     return m_aGetDirectory;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePickerCommandThread::getFiles()
+uno::Sequence< OUString > SAL_CALL UnxFilePickerCommandThread::getFiles()
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
     sal_Int32 nSize = m_aGetFiles.size();
-    uno::Sequence< ::rtl::OUString > aFiles( ( nSize > 1 )? nSize + 1: nSize );
+    uno::Sequence< OUString > aFiles( ( nSize > 1 )? nSize + 1: nSize );
 
     if ( nSize == 1 )
         aFiles[0] = m_aGetFiles.front();
@@ -78,18 +78,18 @@ uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePickerCommandThread::getFiles()
         // First entry in the sequence must be the dirname, the others are the
         // filenames, so we have to rearrange the list...
 
-        ::rtl::OUString aFront = m_aGetFiles.front();
+        OUString aFront = m_aGetFiles.front();
         sal_Int32 nLastSlash = aFront.lastIndexOf( '/' );
 
-        aFiles[0] = ( nLastSlash >= 0 )? aFront.copy( 0, nLastSlash ): ::rtl::OUString();
+        aFiles[0] = ( nLastSlash >= 0 )? aFront.copy( 0, nLastSlash ): OUString();
         ++nLastSlash;
 
         sal_Int32 nIdx = 1;
-        for ( ::std::list< ::rtl::OUString >::const_iterator it = m_aGetFiles.begin();
+        for ( ::std::list< OUString >::const_iterator it = m_aGetFiles.begin();
                 it != m_aGetFiles.end(); ++it, ++nIdx )
         {
             sal_Int32 nLength = (*it).getLength() - nLastSlash;
-            aFiles[nIdx] = ( nLength >= 0 )? (*it).copy( nLastSlash, nLength ): ::rtl::OUString();
+            aFiles[nIdx] = ( nLength >= 0 )? (*it).copy( nLastSlash, nLength ): OUString();
         }
     }
 
@@ -133,7 +133,7 @@ void SAL_CALL UnxFilePickerCommandThread::run()
                 if ( strcmp( pEntryBegin, "exited" ) == 0 )
                     bShouldExit = sal_True;
                 else
-                    handleCommand( ::rtl::OUString( pEntryBegin, pEntryEnd - pEntryBegin, RTL_TEXTENCODING_UTF8 )/*, bQuit*/ );
+                    handleCommand( OUString( pEntryBegin, pEntryEnd - pEntryBegin, RTL_TEXTENCODING_UTF8 )/*, bQuit*/ );
 
                 pEntryBegin = pEntryEnd + 1;
             }
@@ -162,7 +162,7 @@ void SAL_CALL UnxFilePickerCommandThread::run()
     }
 }
 
-void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &rCommand )
+void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rCommand )
 {
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -171,12 +171,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
         OUStringToOString( rCommand, RTL_TEXTENCODING_ASCII_US ).getStr() << "\"" << ::std::endl;
 #endif
 
-    ::std::list< ::rtl::OUString > aList = tokenize( rCommand );
+    ::std::list< OUString > aList = tokenize( rCommand );
 
     if ( aList.empty() )
         return;
 
-    ::rtl::OUString aCommandName = aList.front();
+    OUString aCommandName = aList.front();
     aList.pop_front();
 
     if ( aCommandName == "accept" )
@@ -201,7 +201,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
     }
     else if ( aCommandName == "value" )
     {
-        ::rtl::OUString aType;
+        OUString aType;
         if ( !aList.empty() )
         {
             aType = aList.front();
@@ -226,7 +226,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
         }
         else if ( aType == "string" )
         {
-            ::rtl::OUString aValue;
+            OUString aValue;
             if ( !aList.empty() )
                 aValue = aList.front();
 
@@ -235,9 +235,9 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
         }
         else if ( aType == "stringList" )
         {
-            uno::Sequence< ::rtl::OUString > aSequence( aList.size() );
+            uno::Sequence< OUString > aSequence( aList.size() );
             sal_Int32 nIdx = 0;
-            for ( ::std::list< ::rtl::OUString >::const_iterator it = aList.begin(); it != aList.end(); ++it, ++nIdx )
+            for ( ::std::list< OUString >::const_iterator it = aList.begin(); it != aList.end(); ++it, ++nIdx )
                 aSequence[nIdx] = (*it);
 
             m_aGetValue <<= aSequence;
@@ -251,12 +251,12 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
     }
     else if ( aCommandName == "currentFilter" )
     {
-        m_aGetCurrentFilter = aList.empty()? ::rtl::OUString(): aList.front();
+        m_aGetCurrentFilter = aList.empty()? OUString(): aList.front();
         m_aGetCurrentFilterCondition.set();
     }
     else if ( aCommandName == "currentDirectory" )
     {
-        m_aGetDirectory = aList.empty()? ::rtl::OUString(): aList.front();
+        m_aGetDirectory = aList.empty()? OUString(): aList.front();
         m_aGetDirectoryCondition.set();
     }
     else
@@ -268,10 +268,10 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const ::rtl::OUString &
     }
 }
 
-::std::list< ::rtl::OUString > SAL_CALL UnxFilePickerCommandThread::tokenize( const ::rtl::OUString &rCommand )
+::std::list< OUString > SAL_CALL UnxFilePickerCommandThread::tokenize( const OUString &rCommand )
 {
-    ::std::list< ::rtl::OUString > aList;
-    ::rtl::OUStringBuffer aBuffer( 1024 );
+    ::std::list< OUString > aList;
+    OUStringBuffer aBuffer( 1024 );
 
     const sal_Unicode *pUnicode = rCommand.getStr();
     const sal_Unicode *pEnd     = pUnicode + rCommand.getLength();
diff --git a/vcl/unx/kde/UnxCommandThread.hxx b/vcl/unx/kde/UnxCommandThread.hxx
index 787899af7fbc..ef569740eaec 100644
--- a/vcl/unx/kde/UnxCommandThread.hxx
+++ b/vcl/unx/kde/UnxCommandThread.hxx
@@ -84,13 +84,13 @@ protected:
     sal_Bool                    m_aResult;
 
     ::osl::Condition            m_aGetCurrentFilterCondition;
-    ::rtl::OUString             m_aGetCurrentFilter;
+    OUString             m_aGetCurrentFilter;
 
     ::osl::Condition            m_aGetDirectoryCondition;
-    ::rtl::OUString             m_aGetDirectory;
+    OUString             m_aGetDirectory;
 
     ::osl::Condition            m_aGetFilesCondition;
-    ::std::list< ::rtl::OUString > m_aGetFiles;
+    ::std::list< OUString > m_aGetFiles;
 
     ::osl::Condition            m_aGetValueCondition;
     ::com::sun::star::uno::Any  m_aGetValue;
@@ -103,13 +103,13 @@ public:
     sal_Bool SAL_CALL           result();
 
     ::osl::Condition& SAL_CALL  getCurrentFilterCondition() { return m_aGetCurrentFilterCondition; }
-    ::rtl::OUString SAL_CALL    getCurrentFilter();
+    OUString SAL_CALL    getCurrentFilter();
 
     ::osl::Condition& SAL_CALL  getDirectoryCondition() { return m_aGetDirectoryCondition; }
-    ::rtl::OUString SAL_CALL    getDirectory();
+    OUString SAL_CALL    getDirectory();
 
     ::osl::Condition& SAL_CALL  getFilesCondition() { return m_aGetFilesCondition; }
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles();
+    ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles();
 
     ::osl::Condition& SAL_CALL  getValueCondition() { return m_aGetValueCondition; }
     ::com::sun::star::uno::Any SAL_CALL getValue();
@@ -117,8 +117,8 @@ public:
 protected:
     virtual void SAL_CALL       run();
 
-    virtual void SAL_CALL       handleCommand( const ::rtl::OUString &rCommand/*, sal_Bool &rQuit*/ );
-    ::std::list< ::rtl::OUString > SAL_CALL tokenize( const ::rtl::OUString &rCommand );
+    virtual void SAL_CALL       handleCommand( const OUString &rCommand/*, sal_Bool &rQuit*/ );
+    ::std::list< OUString > SAL_CALL tokenize( const OUString &rCommand );
 };
 
 #endif // _UNXCOMMANDTHREAD_HXX_
diff --git a/vcl/unx/kde/UnxFilePicker.cxx b/vcl/unx/kde/UnxFilePicker.cxx
index afd4350f8719..5ccc84251544 100644
--- a/vcl/unx/kde/UnxFilePicker.cxx
+++ b/vcl/unx/kde/UnxFilePicker.cxx
@@ -68,15 +68,15 @@ namespace
     const bool STARTUP_SUSPENDED = true;
     const bool STARTUP_ALIVE     = false;
 
-    uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
+    uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
-        uno::Sequence<rtl::OUString> aRet(3);
-        aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
-        aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
+        uno::Sequence<OUString> aRet(3);
+        aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker");
+        aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker");
 #if ENABLE_TDE
-        aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.TDEFilePicker");
+        aRet[2] = OUString("com.sun.star.ui.dialogs.TDEFilePicker");
 #else // ENABLE_TDE
-        aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDEFilePicker");
+        aRet[2] = OUString("com.sun.star.ui.dialogs.KDEFilePicker");
 #endif // ENABLE_TDE
         return aRet;
     }
@@ -101,7 +101,7 @@ UnxFilePicker::~UnxFilePicker()
 {
     if ( m_nFilePickerPid > 0 )
     {
-        sendCommand( ::rtl::OUString( "exit" ) );
+        sendCommand( OUString( "exit" ) );
         waitpid( m_nFilePickerPid, NULL, 0 );
     }
 
@@ -148,13 +148,13 @@ void SAL_CALL UnxFilePicker::removeFilePickerListener( const uno::Reference<XFil
     m_pNotifyThread->removeFilePickerListener( xListener );
 }
 
-void SAL_CALL UnxFilePicker::setTitle( const rtl::OUString &rTitle )
+void SAL_CALL UnxFilePicker::setTitle( const OUString &rTitle )
     throw( uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUStringBuffer aBuffer( 1024 );
+    OUStringBuffer aBuffer( 1024 );
 
     aBuffer.appendAscii( "setTitle " );
     appendEscaped( aBuffer, rTitle );
@@ -170,7 +170,7 @@ sal_Int16 SAL_CALL UnxFilePicker::execute()
     // this is _not_ an osl::Condition, see i#93366
     m_pCommandThread->execCondition().reset();
 
-    sendCommand( ::rtl::OUString( "exec" ));
+    sendCommand( OUString( "exec" ));
 
     m_pCommandThread->execCondition().wait();
 
@@ -183,20 +183,20 @@ void SAL_CALL UnxFilePicker::setMultiSelectionMode( sal_Bool bMode )
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUString aString = bMode?
-        ::rtl::OUString( "setMultiSelection true" ):
-        ::rtl::OUString( "setMultiSelection false" );
+    OUString aString = bMode?
+        OUString( "setMultiSelection true" ):
+        OUString( "setMultiSelection false" );
 
     sendCommand( aString );
 }
 
-void SAL_CALL UnxFilePicker::setDefaultName( const ::rtl::OUString &rName )
+void SAL_CALL UnxFilePicker::setDefaultName( const OUString &rName )
     throw( uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUStringBuffer aBuffer( 1024 );
+    OUStringBuffer aBuffer( 1024 );
 
     aBuffer.appendAscii( "setDefaultName " );
     appendEscaped( aBuffer, rName );
@@ -204,13 +204,13 @@ void SAL_CALL UnxFilePicker::setDefaultName( const ::rtl::OUString &rName )
     sendCommand( aBuffer.makeStringAndClear() );
 }
 
-void SAL_CALL UnxFilePicker::setDisplayDirectory( const rtl::OUString &rDirectory )
+void SAL_CALL UnxFilePicker::setDisplayDirectory( const OUString &rDirectory )
     throw( uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUStringBuffer aBuffer( 1024 );
+    OUStringBuffer aBuffer( 1024 );
 
     aBuffer.appendAscii( "setDirectory " );
     appendEscaped( aBuffer, rDirectory );
@@ -218,37 +218,37 @@ void SAL_CALL UnxFilePicker::setDisplayDirectory( const rtl::OUString &rDirector
     sendCommand( aBuffer.makeStringAndClear() );
 }
 
-rtl::OUString SAL_CALL UnxFilePicker::getDisplayDirectory()
+OUString SAL_CALL UnxFilePicker::getDisplayDirectory()
     throw( uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sendCommand( ::rtl::OUString( "getDirectory" ),
+    sendCommand( OUString( "getDirectory" ),
                  m_pCommandThread->getDirectoryCondition() );
 
     return m_pCommandThread->getDirectory();
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getFiles()
+uno::Sequence< OUString > SAL_CALL UnxFilePicker::getFiles()
     throw( uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sendCommand( ::rtl::OUString( "getFiles" ),
+    sendCommand( OUString( "getFiles" ),
                  m_pCommandThread->getFilesCondition() );
 
     return m_pCommandThread->getFiles();
 }
 
-void SAL_CALL UnxFilePicker::appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter )
+void SAL_CALL UnxFilePicker::appendFilter( const OUString &rTitle, const OUString &rFilter )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUStringBuffer aBuffer( 1024 );
+    OUStringBuffer aBuffer( 1024 );
 
     aBuffer.appendAscii( "appendFilter " );
     appendEscaped( aBuffer, rTitle );
@@ -258,13 +258,13 @@ void SAL_CALL UnxFilePicker::appendFilter( const ::rtl::OUString &rTitle, const
     sendCommand( aBuffer.makeStringAndClear() );
 }
 
-void SAL_CALL UnxFilePicker::setCurrentFilter( const rtl::OUString &rTitle )
+void SAL_CALL UnxFilePicker::setCurrentFilter( const OUString &rTitle )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUStringBuffer aBuffer( 1024 );
+    OUStringBuffer aBuffer( 1024 );
 
     aBuffer.appendAscii( "setCurrentFilter " );
     appendEscaped( aBuffer, rTitle );
@@ -272,25 +272,25 @@ void SAL_CALL UnxFilePicker::setCurrentFilter( const rtl::OUString &rTitle )
     sendCommand( aBuffer.makeStringAndClear() );
 }
 
-rtl::OUString SAL_CALL UnxFilePicker::getCurrentFilter()
+OUString SAL_CALL UnxFilePicker::getCurrentFilter()
     throw( uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    sendCommand( ::rtl::OUString( "getCurrentFilter" ),
+    sendCommand( OUString( "getCurrentFilter" ),
                  m_pCommandThread->getCurrentFilterCondition() );
 
     return m_pCommandThread->getCurrentFilter();
 }
 
-void SAL_CALL UnxFilePicker::appendFilterGroup( const rtl::OUString &rGroupTitle, const uno::Sequence<beans::StringPair> &rFilters )
+void SAL_CALL UnxFilePicker::appendFilterGroup( const OUString &rGroupTitle, const uno::Sequence<beans::StringPair> &rFilters )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUStringBuffer aBuffer( 1024 );
+    OUStringBuffer aBuffer( 1024 );
 
     aBuffer.appendAscii( "appendFilterGroup " );
     appendEscaped( aBuffer, rGroupTitle );
@@ -314,13 +314,13 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUString aType;
-    ::rtl::OUString aAction;
+    OUString aType;
+    OUString aAction;
     sal_Int32 nTitleId;
 
     if ( controlIdInfo( nControlId, aType, nTitleId ) && controlActionInfo( nControlAction, aAction ) )
     {
-        ::rtl::OUStringBuffer aBuffer( 1024 );
+        OUStringBuffer aBuffer( 1024 );
 
         aBuffer.appendAscii( "setValue " );
         aBuffer.append( static_cast< sal_Int32 >( nControlId ) );
@@ -342,7 +342,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
                 case ControlActions::ADD_ITEM:
                 case ControlActions::SET_HELP_URL:
                     {
-                        ::rtl::OUString aString;
+                        OUString aString;
                         if ( rValue >>= aString )
                         {
                             aBuffer.appendAscii( " ", 1 );
@@ -353,7 +353,7 @@ void SAL_CALL UnxFilePicker::setValue( sal_Int16 nControlId, sal_Int16 nControlA
 
                 case ControlActions::ADD_ITEMS:
                     {
-                        uno::Sequence< ::rtl::OUString > aSequence;
+                        uno::Sequence< OUString > aSequence;
                         if ( rValue >>= aSequence )
                         {
                             for ( sal_Int32 nIdx = 0; nIdx < aSequence.getLength(); ++nIdx )
@@ -395,11 +395,11 @@ uno::Any SAL_CALL UnxFilePicker::getValue( sal_Int16 nControlId, sal_Int16 nCont
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUString aAction;
+    OUString aAction;
 
     if ( controlActionInfo( nControlAction, aAction ) )
     {
-        ::rtl::OUStringBuffer aBuffer( 1024 );
+        OUStringBuffer aBuffer( 1024 );
 
         aBuffer.appendAscii( "getValue " );
         aBuffer.append( static_cast< sal_Int32 >( nControlId ) );
@@ -421,7 +421,7 @@ void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnab
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUStringBuffer aBuffer( 1024 );
+    OUStringBuffer aBuffer( 1024 );
 
     aBuffer.appendAscii( "enableControl " );
     aBuffer.append( static_cast< sal_Int32 >( nControlId ) );
@@ -430,13 +430,13 @@ void SAL_CALL UnxFilePicker::enableControl( sal_Int16 nControlId, sal_Bool bEnab
     sendCommand( aBuffer.makeStringAndClear() );
 }
 
-void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel )
+void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const OUString &rLabel )
     throw( uno::RuntimeException )
 {
     checkFilePicker();
     ::osl::MutexGuard aGuard( m_aMutex );
 
-    ::rtl::OUStringBuffer aBuffer( 1024 );
+    OUStringBuffer aBuffer( 1024 );
 
     aBuffer.appendAscii( "setLabel " );
     aBuffer.append( static_cast< sal_Int32 >( nControlId ) );
@@ -446,7 +446,7 @@ void SAL_CALL UnxFilePicker::setLabel( sal_Int16 nControlId, const ::rtl::OUStri
     sendCommand( aBuffer.makeStringAndClear() );
 }
 
-rtl::OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/)
+OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/)
     throw ( uno::RuntimeException )
 {
     // FIXME getLabel() is not yet implemented
@@ -454,7 +454,7 @@ rtl::OUString SAL_CALL UnxFilePicker::getLabel(sal_Int16 /*nControlId*/)
     ::osl::MutexGuard aGuard( m_aMutex );
 
     // TODO return m_pImpl->getLabel(nControlId);
-    return ::rtl::OUString();
+    return OUString();
 }
 
 /* TODO
@@ -531,21 +531,21 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
     uno::Any aAny;
     if ( 0 == rArguments.getLength( ) )
         throw lang::IllegalArgumentException(
-                rtl::OUString( "no arguments" ),
+                OUString( "no arguments" ),
                 static_cast< XFilePicker2* >( this ), 1 );
 
     aAny = rArguments[0];
 
     if ( ( aAny.getValueType() != ::getCppuType( (sal_Int16*)0 ) ) && ( aAny.getValueType() != ::getCppuType( (sal_Int8*)0 ) ) )
         throw lang::IllegalArgumentException(
-                rtl::OUString( "invalid argument type" ),
+                OUString( "invalid argument type" ),
                 static_cast< XFilePicker2* >( this ), 1 );
 
     sal_Int16 templateId = -1;
     aAny >>= templateId;
 
-    ::rtl::OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" ));
-    ::rtl::OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" ));
+    OUString aTypeOpen(RTL_CONSTASCII_USTRINGPARAM( "setType \"open\"" ));
+    OUString aTypeSaveAs(RTL_CONSTASCII_USTRINGPARAM( "setType \"save\"" ));
 
     switch ( templateId )
     {
@@ -622,7 +622,7 @@ void SAL_CALL UnxFilePicker::initialize( const uno::Sequence<uno::Any> &rArgumen
 
         default:
             throw lang::IllegalArgumentException(
-                    rtl::OUString( "Unknown template" ),
+                    OUString( "Unknown template" ),
                     static_cast< XFilePicker2* >( this ),
                     1 );
     }
@@ -647,16 +647,16 @@ void SAL_CALL UnxFilePicker::disposing( const lang::EventObject &rEvent )
         removeFilePickerListener( xFilePickerListener );
 }
 
-rtl::OUString SAL_CALL UnxFilePicker::getImplementationName()
+OUString SAL_CALL UnxFilePicker::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
 }
 
-sal_Bool SAL_CALL UnxFilePicker::supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL UnxFilePicker::supportsService( const OUString& ServiceName )
     throw( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames();
+    uno::Sequence< OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames();
 
     for ( sal_Int32 n = SupportedServicesNames.getLength(); n--; )
     {
@@ -667,7 +667,7 @@ sal_Bool SAL_CALL UnxFilePicker::supportsService( const rtl::OUString& ServiceNa
     return sal_False;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSupportedServiceNames()
     throw( uno::RuntimeException )
 {
     return FilePicker_getSupportedServiceNames();
@@ -704,14 +704,14 @@ void UnxFilePicker::initFilePicker()
 
         // The executable name
 #if ENABLE_TDE
-        rtl::OUString helperurl("${ORIGIN}/tdefilepicker");
+        OUString helperurl("${ORIGIN}/tdefilepicker");
 #else // ENABLE_TDE
-        rtl::OUString helperurl("${ORIGIN}/kdefilepicker");
+        OUString helperurl("${ORIGIN}/kdefilepicker");
 #endif // ENABLE_TDE
         rtl::Bootstrap::expandMacros( helperurl );
-        rtl::OUString helperpath;
+        OUString helperpath;
         osl::FileBase::getSystemPathFromFileURL( helperurl, helperpath );
-        rtl::OString helper( rtl::OUStringToOString( helperpath, osl_getThreadTextEncoding()));
+        OString helper( OUStringToOString( helperpath, osl_getThreadTextEncoding()));
 
         // ID of the main window
         const int nIdLen = 20;
@@ -769,17 +769,17 @@ void UnxFilePicker::checkFilePicker() throw( ::com::sun::star::uno::RuntimeExcep
     else
     {
         throw uno::RuntimeException(
-                ::rtl::OUString( "the external file picker does not run" ),
+                OUString( "the external file picker does not run" ),
                 *this );
     }
 }
 
-void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand )
+void UnxFilePicker::sendCommand( const OUString &rCommand )
 {
     if ( m_nFilePickerWrite < 0 )
         return;
 
-    ::rtl::OString aUtfString = OUStringToOString( rCommand + ::rtl::OUString( "\n" ), RTL_TEXTENCODING_UTF8 );
+    OString aUtfString = OUStringToOString( rCommand + OUString( "\n" ), RTL_TEXTENCODING_UTF8 );
 
 #if OSL_DEBUG_LEVEL > 0
     ::std::cerr << "UnxFilePicker sent: \"" << aUtfString.getStr() << "\"" << ::std::endl;
@@ -788,7 +788,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand )
     write( m_nFilePickerWrite, aUtfString.getStr(), aUtfString.getLength() );
 }
 
-void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand, ::osl::Condition &rCondition )
+void UnxFilePicker::sendCommand( const OUString &rCommand, ::osl::Condition &rCondition )
 {
     rCondition.reset();
 
@@ -797,7 +797,7 @@ void UnxFilePicker::sendCommand( const ::rtl::OUString &rCommand, ::osl::Conditi
     rCondition.wait();
 }
 
-void UnxFilePicker::appendEscaped( ::rtl::OUStringBuffer &rBuffer, const ::rtl::OUString &rString )
+void UnxFilePicker::appendEscaped( OUStringBuffer &rBuffer, const OUString &rString )
 {
     const sal_Unicode *pUnicode = rString.getStr();
     const sal_Unicode *pEnd     = pUnicode + rString.getLength();
@@ -819,20 +819,20 @@ void UnxFilePicker::appendEscaped( ::rtl::OUStringBuffer &rBuffer, const ::rtl::
     rBuffer.appendAscii( "\"", 1 );
 }
 
-sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rType, sal_Int32 &rTitleId )
+sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId )
 {
     typedef struct {
         sal_Int16 nId;
-        const ::rtl::OUString *pType;
+        const OUString *pType;
         sal_Int32 nTitle;
     } ElementToName;
 
-    const ::rtl::OUString aCheckBox(   "checkbox" );
-    const ::rtl::OUString aControl(    "control" );
-    const ::rtl::OUString aEdit(       "edit" );
-    const ::rtl::OUString aLabel(      "label" );
-    const ::rtl::OUString aListBox(    "listbox" );
-    const ::rtl::OUString aPushButton( "pushbutton" );
+    const OUString aCheckBox(   "checkbox" );
+    const OUString aControl(    "control" );
+    const OUString aEdit(       "edit" );
+    const OUString aLabel(      "label" );
+    const OUString aListBox(    "listbox" );
+    const OUString aPushButton( "pushbutton" );
 
     const ElementToName *pPtr;
     const ElementToName pArray[] =
@@ -873,27 +873,27 @@ sal_Bool UnxFilePicker::controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rT
     return sal_False;
 }
 
-sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, ::rtl::OUString &rType )
+sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, OUString &rType )
 {
     typedef struct {
         sal_Int16 nId;
-        const ::rtl::OUString pType;
+        const OUString pType;
     } ElementToName;
 
     const ElementToName *pPtr;
     const ElementToName pArray[] =
     {
-        { ControlActions::ADD_ITEM,                ::rtl::OUString( "addItem" ) },
-        { ControlActions::ADD_ITEMS,               ::rtl::OUString( "addItems" ) },
-        { ControlActions::DELETE_ITEM,             ::rtl::OUString( "deleteItem" ) },
-        { ControlActions::DELETE_ITEMS,            ::rtl::OUString( "deleteItems" ) },
-        { ControlActions::SET_SELECT_ITEM,         ::rtl::OUString( "setSelectedItem" ) },
-        { ControlActions::GET_ITEMS,               ::rtl::OUString( "getItems" ) },
-        { ControlActions::GET_SELECTED_ITEM,       ::rtl::OUString( "getSelectedItem" ) },
-        { ControlActions::GET_SELECTED_ITEM_INDEX, ::rtl::OUString( "getSelectedItemIndex" ) },
-        { ControlActions::SET_HELP_URL,            ::rtl::OUString( "setHelpURL" ) },
-        { ControlActions::GET_HELP_URL,            ::rtl::OUString( "getHelpURL" ) },
-        { 0,                                       ::rtl::OUString( "noAction" ) }
+        { ControlActions::ADD_ITEM,                OUString( "addItem" ) },
+        { ControlActions::ADD_ITEMS,               OUString( "addItems" ) },
+        { ControlActions::DELETE_ITEM,             OUString( "deleteItem" ) },
+        { ControlActions::DELETE_ITEMS,            OUString( "deleteItems" ) },
+        { ControlActions::SET_SELECT_ITEM,         OUString( "setSelectedItem" ) },
+        { ControlActions::GET_ITEMS,               OUString( "getItems" ) },
+        { ControlActions::GET_SELECTED_ITEM,       OUString( "getSelectedItem" ) },
+        { ControlActions::GET_SELECTED_ITEM_INDEX, OUString( "getSelectedItemIndex" ) },
+        { ControlActions::SET_HELP_URL,            OUString( "setHelpURL" ) },
+        { ControlActions::GET_HELP_URL,            OUString( "getHelpURL" ) },
+        { 0,                                       OUString( "noAction" ) }
     };
 
     for ( pPtr = pArray; pPtr->nId && ( pPtr->nId != nControlAction ); ++pPtr )
@@ -906,12 +906,12 @@ sal_Bool UnxFilePicker::controlActionInfo( sal_Int16 nControlAction, ::rtl::OUSt
 
 void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId )
 {
-    ::rtl::OUString aType;
+    OUString aType;
     sal_Int32 nTitleId;
 
     if ( controlIdInfo( nControlId, aType, nTitleId ) )
     {
-        ::rtl::OUStringBuffer aBuffer( 1024 );
+        OUStringBuffer aBuffer( 1024 );
 
         aBuffer.appendAscii( "appendControl " );
         aBuffer.append( static_cast< sal_Int32 >( nControlId ) );
@@ -924,7 +924,7 @@ void UnxFilePicker::sendAppendControlCommand( sal_Int16 nControlId )
     }
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL UnxFilePicker::getSelectedFiles()
+uno::Sequence< OUString > SAL_CALL UnxFilePicker::getSelectedFiles()
     throw( uno::RuntimeException )
 {
     return getFiles();
diff --git a/vcl/unx/kde/UnxFilePicker.hxx b/vcl/unx/kde/UnxFilePicker.hxx
index afc5b6cae4d1..198eba03a962 100644
--- a/vcl/unx/kde/UnxFilePicker.hxx
+++ b/vcl/unx/kde/UnxFilePicker.hxx
@@ -83,34 +83,34 @@ public:
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL       setTitle( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException );
     virtual sal_Int16 SAL_CALL  execute() throw( ::com::sun::star::uno::RuntimeException );
 
     // XFilePicker functions
 
     virtual void SAL_CALL       setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL       setDefaultName( const ::rtl::OUString &rName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL       setDisplayDirectory( const ::rtl::OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
 
     // XFilterManager functions
 
-    virtual void SAL_CALL       appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL       setCurrentFilter( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL       setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
 
     // XFilterGroupManager functions
 
-    virtual void SAL_CALL       appendFilterGroup( const ::rtl::OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL       appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     // XFilePickerControlAccess functions
 
     virtual void SAL_CALL       setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL       enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL       setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL       setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException);
 
     /* TODO XFilePreview
 
@@ -125,7 +125,7 @@ public:
 
     // XFilePicker2
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
             throw (::com::sun::star::uno::RuntimeException);
 
     // XInitialization
@@ -142,9 +142,9 @@ public:
 
     // XServiceInfo
 
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL   supportsService( const ::rtl::OUString &rServiceName ) 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 &rServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
 
 private:
     // prevent copy and assignment
@@ -156,14 +156,14 @@ protected:
     void                        checkFilePicker() throw( ::com::sun::star::uno::RuntimeException );
 
     // Async sendCommand
-    void                        sendCommand( const ::rtl::OUString &rCommand );
+    void                        sendCommand( const OUString &rCommand );
     // Synchronized sendCommand
-    void                        sendCommand( const ::rtl::OUString &rCommand, ::osl::Condition &rCondition );
-    void                        appendEscaped( ::rtl::OUStringBuffer &rBuffer, const ::rtl::OUString &rString );
+    void                        sendCommand( const OUString &rCommand, ::osl::Condition &rCondition );
+    void                        appendEscaped( OUStringBuffer &rBuffer, const OUString &rString );
 
 private:
-    sal_Bool                    controlIdInfo( sal_Int16 nControlId, ::rtl::OUString &rType, sal_Int32 &rTitleId );
-    sal_Bool                    controlActionInfo( sal_Int16 nControlId, ::rtl::OUString &rType );
+    sal_Bool                    controlIdInfo( sal_Int16 nControlId, OUString &rType, sal_Int32 &rTitleId );
+    sal_Bool                    controlActionInfo( sal_Int16 nControlId, OUString &rType );
     void                        sendAppendControlCommand( sal_Int16 nControlId );
 };
 
diff --git a/vcl/unx/kde/UnxNotifyThread.hxx b/vcl/unx/kde/UnxNotifyThread.hxx
index 36e74cef1de7..266f190f49e9 100644
--- a/vcl/unx/kde/UnxNotifyThread.hxx
+++ b/vcl/unx/kde/UnxNotifyThread.hxx
@@ -65,7 +65,7 @@ public:
     void SAL_CALL               fileSelectionChanged();
     /* TODO
     void SAL_CALL directoryChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
-    rtl::OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const;
+    OUString SAL_CALL helpRequested( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent ) const;
     void SAL_CALL controlStateChanged( ::com::sun::star::ui::dialogs::FilePickerEvent aEvent );
     void SAL_CALL dialogSizeChanged( );
      */
diff --git a/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 07706b2ec921..9c6e19d4a3ed 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.cxx
@@ -127,8 +127,8 @@ void KDEXLib::Init()
     m_nFakeCmdLineArgs = 1;
     sal_uInt16 nIdx;
     int nParams = osl_getCommandArgCount();
-    rtl::OString aDisplay;
-    rtl::OUString aParam, aBin;
+    OString aDisplay;
+    OUString aParam, aBin;
 
     for ( nIdx = 0; nIdx < nParams; ++nIdx )
     {
@@ -136,7 +136,7 @@ void KDEXLib::Init()
         if ( !m_pFreeCmdLineArgs && aParam == "-display" && nIdx + 1 < nParams )
         {
             osl_getCommandArg( nIdx + 1, &aParam.pData );
-            aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() );
+            aDisplay = OUStringToOString( aParam, osl_getThreadTextEncoding() );
 
             m_nFakeCmdLineArgs = 3;
             m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs ];
@@ -149,7 +149,7 @@ void KDEXLib::Init()
 
     osl_getExecutableFile( &aParam.pData );
     osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData );
-    rtl::OString aExec = rtl::OUStringToOString( aBin, osl_getThreadTextEncoding() );
+    OString aExec = OUStringToOString( aBin, osl_getThreadTextEncoding() );
     m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() );
 
     // make a copy of the string list for freeing it since
@@ -214,7 +214,7 @@ extern "C" {
         if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
             XInitThreads();
 
-        rtl::OString aVersion( qVersion() );
+        OString aVersion( qVersion() );
         SAL_INFO( "vcl.kde", "qt version string is \"" << aVersion << "\"" );
 
         sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0, nMicro = 0;
diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
index cd20d3da69e6..d2731b095168 100644
--- a/vcl/unx/kde4/KDE4FilePicker.cxx
+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
@@ -74,23 +74,23 @@ namespace
     const bool STARTUP_SUSPENDED = true;
     const bool STARTUP_ALIVE     = false;
 
-    uno::Sequence<rtl::OUString> SAL_CALL FilePicker_getSupportedServiceNames()
+    uno::Sequence<OUString> SAL_CALL FilePicker_getSupportedServiceNames()
     {
-        uno::Sequence<rtl::OUString> aRet(3);
-        aRet[0] = rtl::OUString("com.sun.star.ui.dialogs.FilePicker");
-        aRet[1] = rtl::OUString("com.sun.star.ui.dialogs.SystemFilePicker");
-        aRet[2] = rtl::OUString("com.sun.star.ui.dialogs.KDE4FilePicker");
+        uno::Sequence<OUString> aRet(3);
+        aRet[0] = OUString("com.sun.star.ui.dialogs.FilePicker");
+        aRet[1] = OUString("com.sun.star.ui.dialogs.SystemFilePicker");
+        aRet[2] = OUString("com.sun.star.ui.dialogs.KDE4FilePicker");
         return aRet;
     }
 }
 
-rtl::OUString toOUString(const QString& s)
+OUString toOUString(const QString& s)
 {
     // QString stores UTF16, just like OUString
-    return rtl::OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length());
+    return OUString(reinterpret_cast<const sal_Unicode*>(s.data()), s.length());
 }
 
-QString toQString(const rtl::OUString& s)
+QString toQString(const OUString& s)
 {
     return QString::fromUtf16(s.getStr(), s.getLength());
 }
@@ -133,7 +133,7 @@ void SAL_CALL KDE4FilePicker::removeFilePickerListener( const uno::Reference<XFi
     m_xListener.clear();
 }
 
-void SAL_CALL KDE4FilePicker::setTitle( const rtl::OUString &title )
+void SAL_CALL KDE4FilePicker::setTitle( const OUString &title )
     throw( uno::RuntimeException )
 {
     _dialog->setCaption(toQString(title));
@@ -194,28 +194,28 @@ void SAL_CALL KDE4FilePicker::setMultiSelectionMode( sal_Bool multiSelect )
         _dialog->setMode(KFile::File | KFile::LocalOnly);
 }
 
-void SAL_CALL KDE4FilePicker::setDefaultName( const ::rtl::OUString &name )
+void SAL_CALL KDE4FilePicker::setDefaultName( const OUString &name )
     throw( uno::RuntimeException )
 {
     const QString url = toQString(name);
     _dialog->setSelection(url);
 }
 
-void SAL_CALL KDE4FilePicker::setDisplayDirectory( const rtl::OUString &dir )
+void SAL_CALL KDE4FilePicker::setDisplayDirectory( const OUString &dir )
     throw( uno::RuntimeException )
 {
     const QString url = toQString(dir);
     _dialog->setUrl(KUrl(url));
 }
 
-rtl::OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
+OUString SAL_CALL KDE4FilePicker::getDisplayDirectory()
     throw( uno::RuntimeException )
 {
     QString dir = _dialog->baseUrl().url();
     return toOUString(dir);
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
+uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getFiles()
     throw( uno::RuntimeException )
 {
     QStringList rawFiles = _dialog->selectedFiles();
@@ -252,10 +252,10 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
     }
 
     // add all files and leading directory to outgoing OO sequence
-    uno::Sequence< ::rtl::OUString > seq(files.size());
+    uno::Sequence< OUString > seq(files.size());
     for (int i = 0; i < files.size(); ++i)
     {
-        rtl::OUString aFile(toOUString(files[i])), aURL;
+        OUString aFile(toOUString(files[i])), aURL;
         osl_getFileURLFromSystemPath(aFile.pData, &aURL.pData );
         seq[i] = aURL;
     }
@@ -263,13 +263,13 @@ uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getFiles()
     return seq;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getSelectedFiles()
+uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSelectedFiles()
     throw( uno::RuntimeException )
 {
     return getFiles();
 }
 
-void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const ::rtl::OUString &filter )
+void SAL_CALL KDE4FilePicker::appendFilter( const OUString &title, const OUString &filter )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     QString t = toQString(title);
@@ -291,7 +291,7 @@ void SAL_CALL KDE4FilePicker::appendFilter( const ::rtl::OUString &title, const
     _filter.append(QString("%1|%2").arg(f).arg(t));
 }
 
-void SAL_CALL KDE4FilePicker::setCurrentFilter( const rtl::OUString &title )
+void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title )
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     QString t = toQString(title);
@@ -299,7 +299,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const rtl::OUString &title )
     _dialog->filterWidget()->setCurrentFilter(t);
 }
 
-rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
+OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
     throw( uno::RuntimeException )
 {
     // _dialog->currentFilter() wouldn't quite work, because it returns only e.g. "*.doc",
@@ -315,7 +315,7 @@ rtl::OUString SAL_CALL KDE4FilePicker::getCurrentFilter()
     return toOUString(filter);
 }
 
-void SAL_CALL KDE4FilePicker::appendFilterGroup( const rtl::OUString& , const uno::Sequence<beans::StringPair>& filters)
+void SAL_CALL KDE4FilePicker::appendFilterGroup( const OUString& , const uno::Sequence<beans::StringPair>& filters)
     throw( lang::IllegalArgumentException, uno::RuntimeException )
 {
     const sal_uInt16 length = filters.getLength();
@@ -419,7 +419,7 @@ void SAL_CALL KDE4FilePicker::enableControl( sal_Int16 controlId, sal_Bool enabl
     }
 }
 
-void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const ::rtl::OUString &label )
+void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const OUString &label )
     throw( uno::RuntimeException )
 {
     QWidget* widget = _customWidgets[controlId];
@@ -453,7 +453,7 @@ void SAL_CALL KDE4FilePicker::setLabel( sal_Int16 controlId, const ::rtl::OUStri
     }
 }
 
-rtl::OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
+OUString SAL_CALL KDE4FilePicker::getLabel(sal_Int16 controlId)
     throw ( uno::RuntimeException )
 {
     QWidget* widget = _customWidgets[controlId];
@@ -550,7 +550,7 @@ void KDE4FilePicker::addCustomControl(sal_Int16 controlId)
 
             if (_resMgr && resId != -1)
             {
-                rtl::OUString s = String(ResId( resId, *_resMgr ));
+                OUString s = String(ResId( resId, *_resMgr ));
                 label = toQString(s);
                 label.replace("~", "&");
             }
@@ -591,7 +591,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
     if (args.getLength() == 0)
     {
         throw lang::IllegalArgumentException(
-                rtl::OUString( "no arguments" ),
+                OUString( "no arguments" ),
                 static_cast< XFilePicker2* >( this ), 1 );
     }
 
@@ -601,7 +601,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
         ( arg.getValueType() != ::getCppuType((sal_Int8*)0)))
     {
         throw lang::IllegalArgumentException(
-                rtl::OUString( "invalid argument type" ),
+                OUString( "invalid argument type" ),
                 static_cast< XFilePicker2* >( this ), 1 );
     }
 
@@ -673,7 +673,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence<uno::Any> &args )
 
         default:
             throw lang::IllegalArgumentException(
-                    rtl::OUString( "Unknown template" ),
+                    OUString( "Unknown template" ),
                     static_cast< XFilePicker2* >( this ),
                     1 );
     }
@@ -699,16 +699,16 @@ void SAL_CALL KDE4FilePicker::disposing( const lang::EventObject &rEvent )
     }
 }
 
-rtl::OUString SAL_CALL KDE4FilePicker::getImplementationName()
+OUString SAL_CALL KDE4FilePicker::getImplementationName()
     throw( uno::RuntimeException )
 {
-    return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
+    return OUString(RTL_CONSTASCII_USTRINGPARAM( FILE_PICKER_IMPL_NAME ));
 }
 
-sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceName )
+sal_Bool SAL_CALL KDE4FilePicker::supportsService( const OUString& ServiceName )
     throw( uno::RuntimeException )
 {
-    uno::Sequence< ::rtl::OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames();
+    uno::Sequence< OUString > SupportedServicesNames = FilePicker_getSupportedServiceNames();
 
     for ( sal_Int32 n = SupportedServicesNames.getLength(); n--; )
     {
@@ -719,7 +719,7 @@ sal_Bool SAL_CALL KDE4FilePicker::supportsService( const rtl::OUString& ServiceN
     return sal_False;
 }
 
-uno::Sequence< ::rtl::OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames()
+uno::Sequence< OUString > SAL_CALL KDE4FilePicker::getSupportedServiceNames()
     throw( uno::RuntimeException )
 {
     return FilePicker_getSupportedServiceNames();
diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx
index 1170f96597b8..01eb8084c81d 100644
--- a/vcl/unx/kde4/KDE4FilePicker.hxx
+++ b/vcl/unx/kde4/KDE4FilePicker.hxx
@@ -88,34 +88,34 @@ public:
 
     // XExecutableDialog functions
 
-    virtual void SAL_CALL setTitle( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL setTitle( const OUString &rTitle ) throw( ::com::sun::star::uno::RuntimeException );
     virtual sal_Int16 SAL_CALL execute() throw( ::com::sun::star::uno::RuntimeException );
 
     // XFilePicker functions
 
     virtual void SAL_CALL setMultiSelectionMode( sal_Bool bMode ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setDefaultName( const ::rtl::OUString &rName ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setDisplayDirectory( const ::rtl::OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL setDefaultName( const OUString &rName ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL setDisplayDirectory( const OUString &rDirectory ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getDisplayDirectory() throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getFiles() throw( ::com::sun::star::uno::RuntimeException );
 
     // XFilterManager functions
 
-    virtual void SAL_CALL appendFilter( const ::rtl::OUString &rTitle, const ::rtl::OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setCurrentFilter( const ::rtl::OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual ::rtl::OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString &rFilter ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+    virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+    virtual OUString SAL_CALL getCurrentFilter() throw( ::com::sun::star::uno::RuntimeException );
 
     // XFilterGroupManager functions
 
-    virtual void SAL_CALL appendFilterGroup( const ::rtl::OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL appendFilterGroup( const OUString &rGroupTitle, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::StringPair > &rFilters ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
     // XFilePickerControlAccess functions
 
     virtual void SAL_CALL setValue( sal_Int16 nControlId, sal_Int16 nControlAction, const ::com::sun::star::uno::Any &rValue ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Any SAL_CALL getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL enableControl( sal_Int16 nControlId, sal_Bool bEnable ) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setLabel( sal_Int16 nControlId, const ::rtl::OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setLabel( sal_Int16 nControlId, const OUString &rLabel ) throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getLabel( sal_Int16 nControlId ) throw (::com::sun::star::uno::RuntimeException);
 
     /* TODO XFilePreview
 
@@ -130,7 +130,7 @@ public:
 
     // XFilePicker2 functions
 
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSelectedFiles()
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSelectedFiles()
             throw (::com::sun::star::uno::RuntimeException);
 
     // XInitialization
@@ -148,9 +148,9 @@ public:
 
     // XServiceInfo
 
-    virtual ::rtl::OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString &rServiceName ) 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 &rServiceName ) throw( ::com::sun::star::uno::RuntimeException );
+    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException );
 
 private:
     // prevent copy and assignment
diff --git a/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index 39c3a52a48ab..b25afd652564 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -67,7 +67,7 @@ class KDESalGraphics : public X11SalGraphics
         virtual sal_Bool drawNativeControl( ControlType type, ControlPart part,
                                         const Rectangle& rControlRegion, ControlState nControlState,
                                         const ImplControlValue& aValue,
-                                        const rtl::OUString& aCaption );
+                                        const OUString& aCaption );
 
         /** Check if the bounding regions match.
 
@@ -89,7 +89,7 @@ class KDESalGraphics : public X11SalGraphics
         virtual sal_Bool getNativeControlRegion( ControlType type, ControlPart part,
                                             const Rectangle& rControlRegion, ControlState nControlState,
                                             const ImplControlValue& aValue,
-                                            const rtl::OUString& aCaption,
+                                            const OUString& aCaption,
                                             Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion );
 };
 
diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index 73915ee74cfe..0e5a88b16558 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.cxx
@@ -122,8 +122,8 @@ void KDEXLib::Init()
     sal_uInt16 nIdx;
 
     int nParams = osl_getCommandArgCount();
-    rtl::OString aDisplay;
-    rtl::OUString aParam, aBin;
+    OString aDisplay;
+    OUString aParam, aBin;
 
     for ( nIdx = 0; nIdx < nParams; ++nIdx )
     {
@@ -131,7 +131,7 @@ void KDEXLib::Init()
         if ( !m_pFreeCmdLineArgs && aParam == "-display" && nIdx + 1 < nParams )
         {
             osl_getCommandArg( nIdx + 1, &aParam.pData );
-            aDisplay = rtl::OUStringToOString( aParam, osl_getThreadTextEncoding() );
+            aDisplay = OUStringToOString( aParam, osl_getThreadTextEncoding() );
 
             m_pFreeCmdLineArgs = new char*[ m_nFakeCmdLineArgs + 2 ];
             m_pFreeCmdLineArgs[ m_nFakeCmdLineArgs + 0 ] = strdup( "-display" );
@@ -144,7 +144,7 @@ void KDEXLib::Init()
 
     osl_getExecutableFile( &aParam.pData );
     osl_getSystemPathFromFileURL( aParam.pData, &aBin.pData );
-    rtl::OString aExec = rtl::OUStringToOString( aBin, osl_getThreadTextEncoding() );
+    OString aExec = OUStringToOString( aBin, osl_getThreadTextEncoding() );
     m_pFreeCmdLineArgs[0] = strdup( aExec.getStr() );
     m_pFreeCmdLineArgs[1] = strdup( "--nocrashhandler" );
 
diff --git a/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 45c158437b4f..1061e39e5580 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.cxx
@@ -60,7 +60,7 @@ extern "C" {
 
 #if QT_VERSION < 0x050000
         // Qt 4.x support needs >= 4.1.0
-        rtl::OString aVersion( qVersion() );
+        OString aVersion( qVersion() );
         SAL_INFO( "vcl.kde4", "qt version string is " << aVersion );
 
         sal_Int32 nIndex = 0, nMajor = 0, nMinor = 0;
diff --git a/vcl/unx/x11/x11sys.cxx b/vcl/unx/x11/x11sys.cxx
index d911b5c8205c..66a07753271c 100644
--- a/vcl/unx/x11/x11sys.cxx
+++ b/vcl/unx/x11/x11sys.cxx
@@ -90,17 +90,17 @@ Rectangle X11SalSystem::GetDisplayScreenWorkAreaPosSizePixel( unsigned int nScre
     return GetDisplayScreenPosSizePixel( nScreen );
 }
 
-rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
+OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
 {
-    rtl::OUString aScreenName;
+    OUString aScreenName;
     SalDisplay* pSalDisp = GetGenericData()->GetSalDisplay();
     if( pSalDisp->IsXinerama() )
     {
         const std::vector< Rectangle >& rScreens = pSalDisp->GetXineramaScreens();
         if( nScreen >= rScreens.size() )
             nScreen = 0;
-        rtl::OUStringBuffer aBuf( 256 );
-        aBuf.append( rtl::OStringToOUString( rtl::OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
+        OUStringBuffer aBuf( 256 );
+        aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
         aBuf.appendAscii( " [" );
         aBuf.append( static_cast<sal_Int32>(nScreen) );
         aBuf.append( sal_Unicode(']') );
@@ -110,8 +110,8 @@ rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
     {
         if( nScreen >= static_cast<unsigned int>(pSalDisp->GetXScreenCount()) )
             nScreen = 0;
-        rtl::OUStringBuffer aBuf( 256 );
-        aBuf.append( rtl::OStringToOUString( rtl::OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
+        OUStringBuffer aBuf( 256 );
+        aBuf.append( OStringToOUString( OString( DisplayString( pSalDisp->GetDisplay() ) ), osl_getThreadTextEncoding() ) );
         // search backwards for ':'
         int nPos = aBuf.getLength();
         if( nPos > 0 )
@@ -131,7 +131,7 @@ rtl::OUString X11SalSystem::GetDisplayScreenName( unsigned int nScreen )
     return aScreenName;
 }
 
-int X11SalSystem::ShowNativeDialog( const rtl::OUString& rTitle, const rtl::OUString& rMessage, const std::list< rtl::OUString >& rButtons, int nDefButton )
+int X11SalSystem::ShowNativeDialog( const OUString& rTitle, const OUString& rMessage, const std::list< OUString >& rButtons, int nDefButton )
 {
     int nRet = -1;
 
@@ -144,7 +144,7 @@ int X11SalSystem::ShowNativeDialog( const rtl::OUString& rTitle, const rtl::OUSt
     aWarn.Clear();
 
     sal_uInt16 nButton = 0;
-    for( std::list< rtl::OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
+    for( std::list< OUString >::const_iterator it = rButtons.begin(); it != rButtons.end(); ++it )
     {
             aWarn.AddButton( *it, nButton+1, nButton == (sal_uInt16)nDefButton ? BUTTONDIALOG_DEFBUTTON : 0 );
             nButton++;
author	Luboš Luňák <l.lunak@suse.cz>	2013-04-07 12:06:47 +0200
committer	Luboš Luňák <l.lunak@suse.cz>	2013-04-07 14:23:11 +0200
commit	1946794ae09ba732022fe6a74ea45e304ab70b84 (patch)
tree	e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /vcl/unx
parent	5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff)