9 files changed, 30 insertions, 14 deletions
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index d746e0455334..d5fff0703c62 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -41,11 +41,15 @@
 #include <boost/unordered_set.hpp>
 
 
-using namespace rtl;
 using namespace psp;
 using namespace padmin;
 using namespace std;
 
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringHash;
+
+
 APTabPage::APTabPage( AddPrinterDialog* pParent, const ResId& rResId )
             : TabPage( pParent, rResId ),
               m_aTitle( PaResId( RID_ADDP_STR_TITLE ) ),
diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index 0b307465b5e5..e986b7d94f6f 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.cxx
@@ -36,9 +36,10 @@
 #include <prtsetup.hxx>
 
 using namespace psp;
-using namespace rtl;
 using namespace padmin;
 
+using ::rtl::OUString;
+
 #define PRINTER_PERSISTENCE_GROUP "KnownPrinterCommands"
 #define FAX_PERSISTENCE_GROUP "KnownFaxCommands"
 #define PDF_PERSISTENCE_GROUP "KnowPdfCommands"
diff --git a/padmin/source/desktopcontext.cxx b/padmin/source/desktopcontext.cxx
index 3aea19862c2b..c0e6c3f27dc6 100644
--- a/padmin/source/desktopcontext.cxx
+++ b/padmin/source/desktopcontext.cxx
@@ -30,9 +30,10 @@
 
 #include <vcl/svapp.hxx>
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 
+using ::rtl::OUString;
+
 namespace padmin
 {
 
diff --git a/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index b1f73862a7bf..a660550589e1 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.cxx
@@ -40,9 +40,14 @@
 
 using namespace padmin;
 using namespace osl;
-using namespace rtl;
 using namespace psp;
 
+using ::rtl::OUString;
+using ::rtl::OUStringHash;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+using ::rtl::OStringHash;
+
 FontNameDlg::FontNameDlg( Window *pParent ) :
         ModalDialog( pParent, PaResId( RID_FONTNAMEDIALOG ) ),
         m_aOKButton( this, PaResId( RID_FNTNM_BTN_OK ) ),
diff --git a/padmin/source/helper.cxx b/padmin/source/helper.cxx
index fb5ce09ad355..2a51c30bd0d3 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.cxx
@@ -47,12 +47,14 @@
 
 
 using namespace osl;
-using namespace rtl;
 using namespace padmin;
 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;
+
 #define MAX_PATH 1024
 
 /*
@@ -65,7 +67,6 @@ ResId padmin::PaResId( sal_uInt32 nId )
     if( ! pPaResMgr )
     {
         ::com::sun::star::lang::Locale aLocale;
-//      LanguageType nLang = LANGUAGE_SYSTEM;
 
         utl::OConfigurationNode aNode =
             utl::OConfigurationTreeRoot::tryCreateWithServiceFactory(
@@ -77,9 +78,6 @@ ResId padmin::PaResId( sal_uInt32 nId )
             Any aValue = aNode.getNodeValue( OUString(RTL_CONSTASCII_USTRINGPARAM("ooLocale")) );
             if( aValue >>= aLoc )
             {
-//                LanguageType nTmpLang = MsLangId::convertIsoStringToLanguage( aLoc );
-//                if( nTmpLang != LANGUAGE_DONTKNOW )
-//                    nLang = nTmpLang;
                 sal_Int32 nIndex = 0;
                 aLocale.Language = aLoc.getToken( 0, '-', nIndex );
                 aLocale.Country = aLoc.getToken( 0, '-', nIndex );
@@ -88,7 +86,6 @@ ResId padmin::PaResId( sal_uInt32 nId )
         }
         pPaResMgr = ResMgr::SearchCreateResMgr( "spa", aLocale );
         AllSettings aSettings = Application::GetSettings();
-//        aSettings.SetUILanguage( nLang );
         aSettings.SetUILocale( aLocale );
         Application::SetSettings( aSettings );
     }
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index cf52a7e23308..68c99eee4b78 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.cxx
@@ -51,7 +51,9 @@
 using namespace padmin;
 using namespace psp;
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 
 PPDImportDialog::PPDImportDialog( Window* pParent ) :
         ModalDialog( pParent, PaResId( RID_PPDIMPORT_DLG ) ),
diff --git a/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index 4f1056a48a1c..a5ce16bcc55e 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.cxx
@@ -63,13 +63,15 @@
 #include "com/sun/star/awt/Size.hpp"
 
 using namespace psp;
-using namespace rtl;
 using namespace padmin;
 using namespace osl;
 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, BOOL bAdmin )
 {
     return new PADialog( pParent, bAdmin );
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index 2c389ebe5d93..0ea2ae14dcbd 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.cxx
@@ -48,12 +48,13 @@
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 
 using namespace padmin;
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace comphelper;
 
+using ::rtl::OUString;
+
 // -----------------------------------------------------------------------
 
 class MyApp : public Application
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index af4223240460..ec9718880032 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -38,10 +38,13 @@
 #define LSCAPE_STRING String( RTL_CONSTASCII_USTRINGPARAM( "Landscape" ) )
 #define PORTRAIT_STRING String( RTL_CONSTASCII_USTRINGPARAM( "Portrait" ) )
 
-using namespace rtl;
 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 )
 {
     if( ! pKey || ! pParser )