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

12 files changed, 63 insertions, 76 deletions

diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index d9303845fe07..4adb755c2e0f 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -36,9 +36,6 @@ using namespace psp;
 using namespace padmin;
 using namespace std;
 
-using ::rtl::OUStringBuffer;
-using ::rtl::OUStringHash;
-using ::rtl::OUStringToOString;
 
 
 APTabPage::APTabPage( AddPrinterDialog* pParent, const ResId& rResId )
@@ -285,7 +282,7 @@ IMPL_LINK( APChooseDriverPage, ClickBtnHdl, PushButton*, pButton )
                         int nPos = file->SearchBackward( '.' );
                         if( file->Copy( 0, nPos ) == String( aPPD ) )
                         {
-                            rtl::OString aSysPath(OUStringToOString(aFile, aEncoding));
+                            OString aSysPath(OUStringToOString(aFile, aEncoding));
                             if (unlink(aSysPath.getStr()))
                             {
                                 OUString aText( PaResId( RID_ERR_REMOVEDRIVERFAILED ) );
@@ -487,37 +484,37 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
 
     // read defaults
     aConfig.SetGroup( "Xprinter,PostScript" );
-    rtl::OString aDefPageSize( aConfig.ReadKey( "PageSize" ) );
-    rtl::OString aDefOrientation( aConfig.ReadKey( "Orientation" ) );
-    rtl::OString aDefMarginLeft( aConfig.ReadKey( "MarginLeft" ) );
-    rtl::OString aDefMarginRight( aConfig.ReadKey( "MarginRight" ) );
-    rtl::OString aDefMarginTop( aConfig.ReadKey( "MarginTop" ) );
-    rtl::OString aDefMarginBottom( aConfig.ReadKey( "MarginBottom" ) );
-    rtl::OString aDefScale( aConfig.ReadKey( "Scale" ) );
+    OString aDefPageSize( aConfig.ReadKey( "PageSize" ) );
+    OString aDefOrientation( aConfig.ReadKey( "Orientation" ) );
+    OString aDefMarginLeft( aConfig.ReadKey( "MarginLeft" ) );
+    OString aDefMarginRight( aConfig.ReadKey( "MarginRight" ) );
+    OString aDefMarginTop( aConfig.ReadKey( "MarginTop" ) );
+    OString aDefMarginBottom( aConfig.ReadKey( "MarginBottom" ) );
+    OString aDefScale( aConfig.ReadKey( "Scale" ) );
 
     aConfig.SetGroup( "devices" );
     int nDevices = aConfig.GetKeyCount();
     for( int nKey = 0; nKey < nDevices; nKey++ )
     {
         aConfig.SetGroup( "devices" );
-        rtl::OString aPrinter(aConfig.GetKeyName(nKey));
-        rtl::OString aValue(aConfig.ReadKey(aPrinter));
-        rtl::OString aPort(aValue.getToken(1, ','));
-        rtl::OString aDriver(aValue.getToken(0, ' '));
-        rtl::OString aPS( aValue.getToken(0, ',').getToken(1, ' ') );
-        rtl::OString aNewDriver(aDriver);
+        OString aPrinter(aConfig.GetKeyName(nKey));
+        OString aValue(aConfig.ReadKey(aPrinter));
+        OString aPort(aValue.getToken(1, ','));
+        OString aDriver(aValue.getToken(0, ' '));
+        OString aPS( aValue.getToken(0, ',').getToken(1, ' ') );
+        OString aNewDriver(aDriver);
         if( aDriver == "GENERIC")
-            aNewDriver = rtl::OString("SGENPRT");
+            aNewDriver = OString("SGENPRT");
 
         if( aPS != "PostScript" )
             continue;
 
-        const PPDParser* pParser = PPDParser::getParser(rtl::OStringToOUString(aNewDriver, aEncoding));
+        const PPDParser* pParser = PPDParser::getParser(OStringToOUString(aNewDriver, aEncoding));
         if( pParser == NULL )
         {
             OUString aText( PaResId( RID_TXT_DRIVERDOESNOTEXIST ) );
-            aText = aText.replaceFirst( OUString(  "%s1"  ), rtl::OStringToOUString(aPrinter, aEncoding) );
-            aText = aText.replaceFirst( OUString(  "%s2"  ), rtl::OStringToOUString(aDriver, aEncoding) );
+            aText = aText.replaceFirst( OUString(  "%s1"  ), OStringToOUString(aPrinter, aEncoding) );
+            aText = aText.replaceFirst( OUString(  "%s2"  ), OStringToOUString(aDriver, aEncoding) );
             InfoBox aBox( this, aText );
             aBox.Execute();
             continue;
@@ -525,28 +522,28 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
 
         // read the command
         aConfig.SetGroup( "ports" );
-        rtl::OString aCommand( aConfig.ReadKey( aPort ) );
+        OString aCommand( aConfig.ReadKey( aPort ) );
         if (!aCommand.isEmpty())
         {
             OUString aText( PaResId( RID_TXT_PRINTERWITHOUTCOMMAND ) );
-            aText = aText.replaceFirst( OUString(  "%s"  ), rtl::OStringToOUString(aPrinter, aEncoding) );
+            aText = aText.replaceFirst( OUString(  "%s"  ), OStringToOUString(aPrinter, aEncoding) );
             InfoBox aBox( this, aText );
             aBox.Execute();
             continue;
         }
 
 
-        String aUPrinter( AddPrinterDialog::uniquePrinterName(rtl::OStringToOUString(aPrinter, aEncoding)) );
+        String aUPrinter( AddPrinterDialog::uniquePrinterName(OStringToOUString(aPrinter, aEncoding)) );
 
         PrinterInfo aInfo;
-        aInfo.m_aDriverName = rtl::OStringToOUString(aNewDriver, aEncoding);
+        aInfo.m_aDriverName = OStringToOUString(aNewDriver, aEncoding);
         aInfo.m_pParser         = pParser;
         aInfo.m_aContext.setParser( pParser );
         aInfo.m_aPrinterName    = aUPrinter;
-        aInfo.m_aCommand = rtl::OStringToOUString(aCommand, aEncoding);
+        aInfo.m_aCommand = OStringToOUString(aCommand, aEncoding);
 
         // read the printer settings
-        rtl::OStringBuffer aGroup(aDriver);
+        OStringBuffer aGroup(aDriver);
         aGroup.append(",PostScript,");
         aGroup.append(aPort);
         aConfig.SetGroup(aGroup.makeStringAndClear());
@@ -554,11 +551,11 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
         aValue = aConfig.ReadKey( "PageSize", aDefPageSize );
         int nLeft, nRight, nTop, nBottom;
         if( !aValue.isEmpty() &&
-            aInfo.m_pParser->getMargins( rtl::OStringToOUString(aValue, aEncoding),
+            aInfo.m_pParser->getMargins( OStringToOUString(aValue, aEncoding),
                                          nLeft, nRight, nTop, nBottom ) )
         {
             const PPDKey* pKey = aInfo.m_pParser->getKey( String(  "PageSize"  ) );
-            const PPDValue* pValue = pKey ? pKey->getValue( rtl::OStringToOUString(aValue, aEncoding) ) : NULL;
+            const PPDValue* pValue = pKey ? pKey->getValue( OStringToOUString(aValue, aEncoding) ) : NULL;
             if( pKey && pValue )
                 aInfo.m_aContext.setValue( pKey, pValue );
             aValue = aConfig.ReadKey( "MarginLeft", aDefMarginLeft );
@@ -580,7 +577,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
             aInfo.m_nCopies = aValue.toInt32();
 
         aValue = aConfig.ReadKey( "Comment" );
-        aInfo.m_aComment = rtl::OStringToOUString(aValue, aEncoding);
+        aInfo.m_aComment = OStringToOUString(aValue, aEncoding);
 
         aValue = aConfig.ReadKey( "Level" );
         if (!aValue.isEmpty())
@@ -592,7 +589,7 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
         int nGroupKeys = aConfig.GetKeyCount();
         for( int nPPDKey = 0; nPPDKey < nGroupKeys; nPPDKey++ )
         {
-            rtl::OString aPPDKey( aConfig.GetKeyName( nPPDKey ) );
+            OString aPPDKey( aConfig.GetKeyName( nPPDKey ) );
             // ignore page region
             // there are some ppd keys in old Xpdefaults that
             // should never have been writte because they are defaults
@@ -602,8 +599,8 @@ APOldPrinterPage::APOldPrinterPage( AddPrinterDialog* pParent )
             {
                 aValue = aConfig.ReadKey( nPPDKey );
                 aPPDKey = aPPDKey.copy(4);
-                const PPDKey* pKey = aInfo.m_pParser->getKey( rtl::OStringToOUString(aPPDKey, RTL_TEXTENCODING_ISO_8859_1) );
-                const PPDValue* pValue = pKey ? ( aValue == "*nil" ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)) ) : NULL;
+                const PPDKey* pKey = aInfo.m_pParser->getKey( OStringToOUString(aPPDKey, RTL_TEXTENCODING_ISO_8859_1) );
+                const PPDValue* pValue = pKey ? ( aValue == "*nil" ? NULL : pKey->getValue(OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)) ) : NULL;
                 if( pKey )
                     aInfo.m_aContext.setValue( pKey, pValue, true );
             }
@@ -1080,22 +1077,22 @@ OUString AddPrinterDialog::uniquePrinterName( const OUString& rBase )
 String AddPrinterDialog::getOldPrinterLocation()
 {
     static const char* pHome = getenv( "HOME" );
-    rtl::OString aFileName;
+    OString aFileName;
 
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
     if( pHome )
     {
-        aFileName = rtl::OStringBuffer().append(pHome).
+        aFileName = OStringBuffer().append(pHome).
             append("/.Xpdefaults").makeStringAndClear();
         if (access(aFileName.getStr(), F_OK))
         {
-            aFileName = rtl::OStringBuffer().append(pHome).
+            aFileName = OStringBuffer().append(pHome).
                 append("/.sversionrc").makeStringAndClear();
-            Config aSVer(rtl::OStringToOUString(aFileName, aEncoding));
+            Config aSVer(OStringToOUString(aFileName, aEncoding));
             aSVer.SetGroup( "Versions" );
             aFileName = aSVer.ReadKey( "StarOffice 5.2" );
             if (!aFileName.isEmpty())
-                aFileName = aFileName + rtl::OString("/share/xp3/Xpdefaults");
+                aFileName = aFileName + OString("/share/xp3/Xpdefaults");
             else if(
                     (aFileName = aSVer.ReadKey( "StarOffice 5.1" ) ).getLength()
                     ||
@@ -1104,14 +1101,14 @@ String AddPrinterDialog::getOldPrinterLocation()
                     (aFileName = aSVer.ReadKey( "StarOffice 4.0" ) ).getLength()
                     )
             {
-                aFileName = aFileName + rtl::OString("/xp3/Xpdefaults");
+                aFileName = aFileName + OString("/xp3/Xpdefaults");
             }
             if (!aFileName.isEmpty() && access(aFileName.getStr(), F_OK))
-                aFileName = rtl::OString();
+                aFileName = OString();
         }
     }
 
-    return !aFileName.isEmpty() ? rtl::OStringToOUString(aFileName, aEncoding) : OUString();
+    return !aFileName.isEmpty() ? OStringToOUString(aFileName, aEncoding) : OUString();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index 169550f3376a..725c850638da 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.hxx
@@ -85,7 +85,7 @@ class APChooseDriverPage : public APTabPage
     DECL_LINK( ClickBtnHdl, PushButton* );
     DECL_LINK( DelPressedHdl, ListBox* );
 
-    void updateDrivers( bool bRefresh = false, const rtl::OUString& rSelectDriver = rtl::OUString( "SGENPRT" ) );
+    void updateDrivers( bool bRefresh = false, const OUString& rSelectDriver = OUString( "SGENPRT" ) );
 public:
     APChooseDriverPage( AddPrinterDialog* pParent );
     ~APChooseDriverPage();
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 911b879ca873..c9b21edc4d67 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -123,7 +123,7 @@ void CommandStore::getStoredCommands( const char* pGroup, ::std::list< String >&
     ::std::list< String >::const_iterator it;
     while( nKeys-- )
     {
-        OUString aCommand( rConfig.ReadKey(rtl::OString::valueOf(nKeys), RTL_TEXTENCODING_UTF8 ) );
+        OUString aCommand( rConfig.ReadKey(OString::valueOf(nKeys), RTL_TEXTENCODING_UTF8 ) );
         if( !aCommand.isEmpty() )
         {
             for( it = rCommands.begin(); it != rCommands.end() && *it != aCommand; ++it )
@@ -166,7 +166,7 @@ void CommandStore::setCommands(
         nWritten--;
     }
     for( nWritten = 0, it = aWriteList.begin(); it != aWriteList.end(); ++it, ++nWritten )
-        rConfig.WriteKey( rtl::OString::valueOf(nWritten), OUStringToOString(*it, RTL_TEXTENCODING_UTF8) );
+        rConfig.WriteKey( OString::valueOf(nWritten), OUStringToOString(*it, RTL_TEXTENCODING_UTF8) );
 }
 
 
diff --git a/padmin/source/desktopcontext.cxx b/padmin/source/desktopcontext.cxx
index 143e3c0cac35..01ba6dee1f09 100644
--- a/padmin/source/desktopcontext.cxx
+++ b/padmin/source/desktopcontext.cxx
@@ -23,7 +23,6 @@
 
 using namespace com::sun::star::uno;
 
-using ::rtl::OUString;
 
 namespace padmin
 {
diff --git a/padmin/source/desktopcontext.hxx b/padmin/source/desktopcontext.hxx
index 3bd0d782fc8e..2eb2dc796213 100644
--- a/padmin/source/desktopcontext.hxx
+++ b/padmin/source/desktopcontext.hxx
@@ -33,7 +33,7 @@ namespace padmin
     DesktopContext( const com::sun::star::uno::Reference< com::sun::star::uno::XCurrentContext > & ctx);
 
         // XCurrentContext
-        virtual com::sun::star::uno::Any SAL_CALL getValueByName( const rtl::OUString& Name )
+        virtual com::sun::star::uno::Any SAL_CALL getValueByName( const OUString& Name )
             throw (com::sun::star::uno::RuntimeException);
 
     private:
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 988cc82fd3ca..3b5e5f75cb47 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -42,8 +42,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ui::dialogs;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 /*
  *  PaResId
@@ -62,7 +60,7 @@ ResId padmin::PaResId( sal_uInt32 nId )
                     OUString("org.openoffice.Setup/L10N") );
         if ( aNode.isValid() )
         {
-            rtl::OUString aLoc;
+            OUString aLoc;
             Any aValue = aNode.getNodeValue( OUString("ooLocale") );
             if( aValue >>= aLoc )
             {
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index 18c0b8ee8802..cd8626778cc8 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -44,7 +44,6 @@ using namespace padmin;
 using namespace psp;
 using namespace osl;
 
-using ::rtl::OUStringToOString;
 
 PPDImportDialog::PPDImportDialog( Window* pParent ) :
         ModalDialog( pParent, PaResId( RID_PPDIMPORT_DLG ) ),
@@ -67,12 +66,12 @@ PPDImportDialog::PPDImportDialog( Window* pParent ) :
 
     Config& rConfig = getPadminRC();
     rConfig.SetGroup( PPDIMPORT_GROUP );
-    m_aPathBox.SetText( rtl::OStringToOUString(rConfig.ReadKey("LastDir"), RTL_TEXTENCODING_UTF8) );
+    m_aPathBox.SetText( OStringToOUString(rConfig.ReadKey("LastDir"), RTL_TEXTENCODING_UTF8) );
     for (sal_Int32 i = 0; i < 11; ++i)
     {
-        rtl::OString aEntry(rConfig.ReadKey(rtl::OString::valueOf(i)));
+        OString aEntry(rConfig.ReadKey(OString::valueOf(i)));
         if (!aEntry.isEmpty())
-            m_aPathBox.InsertEntry(rtl::OStringToOUString(aEntry, RTL_TEXTENCODING_UTF8));
+            m_aPathBox.InsertEntry(OStringToOUString(aEntry, RTL_TEXTENCODING_UTF8));
     }
 
     m_aOKBtn.SetClickHdl( LINK( this, PPDImportDialog, ClickBtnHdl ) );
@@ -100,7 +99,7 @@ void PPDImportDialog::Import()
 
     Config& rConfig = getPadminRC();
     rConfig.SetGroup( PPDIMPORT_GROUP );
-    rConfig.WriteKey( "LastDir", rtl::OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
+    rConfig.WriteKey( "LastDir", OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
 
     int nEntries = m_aPathBox.GetEntryCount();
     while( nEntries-- )
@@ -109,9 +108,9 @@ void PPDImportDialog::Import()
     if( nEntries < 0 )
     {
         sal_Int32 nNextEntry = rConfig.ReadKey("NextEntry").toInt32();
-        rConfig.WriteKey( rtl::OString::valueOf(nNextEntry), rtl::OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
+        rConfig.WriteKey( OString::valueOf(nNextEntry), OUStringToOString(aImportPath, RTL_TEXTENCODING_UTF8) );
         nNextEntry = nNextEntry < 10 ? nNextEntry+1 : 0;
-        rConfig.WriteKey( "NextEntry", rtl::OString::valueOf(nNextEntry) );
+        rConfig.WriteKey( "NextEntry", OString::valueOf(nNextEntry) );
         m_aPathBox.InsertEntry( aImportPath );
     }
     while( m_aDriverLB.GetEntryCount() )
@@ -141,7 +140,7 @@ void PPDImportDialog::Import()
         {
 #if OSL_DEBUG_LEVEL > 1
             fprintf( stderr, "Warning: File %s has empty printer name.\n",
-                     rtl::OUStringToOString( aPath.PathToFileName(), osl_getThreadTextEncoding() ).getStr() );
+                     OUStringToOString( aPath.PathToFileName(), osl_getThreadTextEncoding() ).getStr() );
 #endif
             continue;
         }
@@ -212,7 +211,7 @@ IMPL_LINK( PPDImportDialog, ModifyHdl, ComboBox*, pListBox )
 {
     if( pListBox == &m_aPathBox )
     {
-        rtl::OString aDir(rtl::OUStringToOString(m_aPathBox.GetText(), osl_getThreadTextEncoding()));
+        OString aDir(OUStringToOString(m_aPathBox.GetText(), osl_getThreadTextEncoding()));
         if (!access( aDir.getStr(), F_OK))
             Import();
     }
diff --git a/padmin/source/newppdlg.hxx b/padmin/source/newppdlg.hxx
index c87d8bb62bd1..b94fc4b0c7ae 100644
--- a/padmin/source/newppdlg.hxx
+++ b/padmin/source/newppdlg.hxx
@@ -52,12 +52,12 @@ namespace padmin {
 
         void Import();
 
-        std::list< rtl::OUString >  m_aImportedFiles;
+        std::list< OUString >  m_aImportedFiles;
     public:
         PPDImportDialog( Window* pParent );
         ~PPDImportDialog();
 
-        const std::list< rtl::OUString >& getImportedFiles() const
+        const std::list< OUString >& getImportedFiles() const
         { return m_aImportedFiles; }
     };
 
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index fc04a2c1e67b..c6adfc93f779 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -60,8 +60,6 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
 
 PADialog* PADialog::Create( Window* pParent, sal_Bool bAdmin )
 {
@@ -435,7 +433,7 @@ void SpaPrinterController::printPage( int ) const
     for( unsigned int i = 0; i < SAL_N_ELEMENTS(aResIds); i++ )
     {
         if( aResIds[i].pDirect )
-            aToken = rtl::OUString::createFromAscii(aResIds[i].pDirect);
+            aToken = OUString::createFromAscii(aResIds[i].pDirect);
         else
             aToken = String( PaResId( aResIds[i].nResId ) );
         nMaxWidth = ( nWidth = pPrinter->GetTextWidth( aToken ) ) > nMaxWidth ? nWidth : nMaxWidth;
@@ -564,7 +562,7 @@ void SpaPrinterController::jobFinished( com::sun::star::view::PrintableState )
 
 void PADialog::PrintTestPage()
 {
-    const rtl::OUString sPrinter( getSelectedDevice() );
+    const OUString sPrinter( getSelectedDevice() );
 
     boost::shared_ptr<Printer> pPrinter( new Printer( sPrinter ) );
 
diff --git a/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index 999347405030..bb058cb72473 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.hxx
@@ -64,7 +64,7 @@ namespace padmin {
         String                              m_aRenameStr;
 
         ::psp::PrinterInfoManager&          m_rPIManager;
-        ::std::list< ::rtl::OUString >      m_aPrinters;
+        ::std::list< OUString >      m_aPrinters;
 
         Image                               m_aPrinterImg;
         Image                               m_aFaxImg;
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 70f9267bfdb3..bbccadf032c1 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -43,7 +43,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace comphelper;
 
-using ::rtl::OUString;
 
 class MyApp : public Application
 {
@@ -51,7 +50,7 @@ public:
     int Main();
     virtual sal_uInt16  Exception( sal_uInt16 nError );
 
-    static rtl::OUString ReadStringHook( const rtl::OUString& );
+    static OUString ReadStringHook( const OUString& );
 };
 
 void vclmain::createApplication()
@@ -59,10 +58,10 @@ void vclmain::createApplication()
     static MyApp aMyApp;
 }
 
-rtl::OUString MyApp::ReadStringHook( const rtl::OUString& rStr )
+OUString MyApp::ReadStringHook( const OUString& rStr )
 {
     return rStr.replaceAll(
-        rtl::OUString("%PRODUCTNAME"), utl::ConfigManager::getProductName() );
+        OUString("%PRODUCTNAME"), utl::ConfigManager::getProductName() );
 };
 
 
@@ -73,7 +72,7 @@ sal_uInt16 MyApp::Exception( sal_uInt16 nError )
     switch( nError & EXC_MAJORTYPE )
     {
         case EXC_RSCNOTLOADED:
-            Abort( rtl::OUString( "Error: could not load language resources.\nPlease check your installation.\n" ) );
+            Abort( OUString( "Error: could not load language resources.\nPlease check your installation.\n" ) );
             break;
     }
     return 0;
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 7d58ff9ef4a4..53d09ce0c5e4 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -31,9 +31,6 @@
 using namespace psp;
 using namespace padmin;
 
-using ::rtl::OUString;
-using ::rtl::OUStringHash;
-using ::rtl::OString;
 
 void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, const PPDKey* pKey )
 {
@@ -283,7 +280,7 @@ void RTSPaperPage::update()
 
     // input slots
     if( m_pParent->m_aJobData.m_pParser &&
-        (pKey = m_pParent->m_aJobData.m_pParser->getKey( rtl::OUString("InputSlot") )) )
+        (pKey = m_pParent->m_aJobData.m_pParser->getKey( OUString("InputSlot") )) )
     {
         m_pParent->insertAllPPDValues( *m_pSlotBox, m_pParent->m_aJobData.m_pParser, pKey );
     }
@@ -811,12 +808,12 @@ RTSPWDialog::~RTSPWDialog()
 
 OString RTSPWDialog::getUserName() const
 {
-    return rtl::OUStringToOString( m_aUserEdit.GetText(), osl_getThreadTextEncoding() );
+    return OUStringToOString( m_aUserEdit.GetText(), osl_getThreadTextEncoding() );
 }
 
 OString RTSPWDialog::getPassword() const
 {
-    return rtl::OUStringToOString( m_aPassEdit.GetText(), osl_getThreadTextEncoding() );
+    return OUStringToOString( m_aPassEdit.GetText(), osl_getThreadTextEncoding() );
 }
 
 extern "C" {