Remove "using namespace ::rtl"

48 files changed, 132 insertions, 58 deletions

diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index 6874eb80285b..d75b669b51f4 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.cxx
@@ -43,7 +43,8 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 SalSession::~SalSession()
 {
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 6323d4820010..253c9f8d2ff2 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -52,8 +52,7 @@
 #include <postwin.h>
 #endif
 
-using namespace rtl;
-
+using ::rtl::OUString;
 // =======================================================================
 
 DBG_NAME( AllSettings )
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 9b5c380fcc55..b21ee99b777e 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.cxx
@@ -71,7 +71,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::awt;
-using namespace rtl;
+using ::rtl::OUString;
 
 // =======================================================================
 
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 6bb2e8252574..6ce752d35c4b 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -39,10 +39,9 @@
 #include "rtl/string.hxx"
 #include "tools/rc.h"
 
+using ::rtl::OUString;
 
 
-using namespace rtl;
-
 /*  #i77549#
     HACK: for scrollbars in case of thumb rect, page up and page down rect we
     abuse the HitTestNativeControl interface. All theming engines but aqua
diff --git a/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx
index 02524920a2bb..9912b3e91509 100644
--- a/vcl/source/gdi/base14.cxx
+++ b/vcl/source/gdi/base14.cxx
@@ -33,7 +33,9 @@
 #include <rtl/strbuf.hxx>
 
 using namespace vcl;
-using namespace rtl;
+
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
 
 OString PDFWriterImpl::BuiltinFont::getNameObject() const
 {
diff --git a/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx
index 2660f4e4cfcc..f71827fc7413 100644
--- a/vcl/source/gdi/bmpconv.cxx
+++ b/vcl/source/gdi/bmpconv.cxx
@@ -44,7 +44,8 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::awt;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 namespace vcl {
 
diff --git a/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index 44abee10b84a..ff701ab640fa 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 
-using namespace rtl;
 using namespace utl;
 using namespace vcl;
 using namespace com::sun::star::uno;
@@ -43,6 +42,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::container;
 
+using ::rtl::OUString;
+
 #define SETTINGS_CONFIGNODE "VCL/Settings"
 
 /*
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index 9cb0737dfcb4..97b6ae716de8 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -70,7 +70,14 @@
 #include <vcl/lineinfo.hxx>
 
 using namespace vcl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+using ::rtl::OStringHash;
+using ::rtl::OUStringHash;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringBuffer;
 
 #if (OSL_DEBUG_LEVEL < 2)
 #define COMPRESS_PAGES
diff --git a/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index 0912f2e20125..0bf74e46d3fd 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.cxx
@@ -31,7 +31,7 @@
 
 #include <vcl/salgdi.hxx>
 
-using namespace rtl;
+using ::rtl::OUString;
 
 /****************************************************************
  *  Placeholder for no native widgets
diff --git a/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index 972441cef060..0d03348e7712 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.cxx
@@ -35,12 +35,12 @@
 #include "vcl/salinst.hxx"
 #include "vcl/svapp.hxx"
 
-using namespace rtl;
 using namespace osl;
 using namespace vcl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::awt;
 
+using ::rtl::OUString;
 
 DisplayConnection::DisplayConnection()
 {
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index f08b9c7282a5..f17c7d0ef87e 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -48,7 +48,8 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 
 using namespace vcl;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 // =======================================================================
 
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 0469c99f73f6..512dd6c79002 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -97,7 +97,6 @@
 #include <set>
 #include <typeinfo>
 
-using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::datatransfer::clipboard;
@@ -105,6 +104,8 @@ using namespace ::com::sun::star::datatransfer::dnd;
 using namespace ::com::sun::star;
 using namespace com::sun;
 
+using ::rtl::OUString;
+
 using ::com::sun::star::awt::XTopWindow;
 
 // =======================================================================
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index d7f90ce17ad9..8b7296e9a777 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.cxx
@@ -64,9 +64,10 @@
 
 #include <vcl/svapp.hxx>
 
-using namespace rtl;
 using namespace vcl_sal;
 
+using ::rtl::OUString;
+
 /***************************************************************************
  * class GtkDisplay                                                        *
  ***************************************************************************/
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index 81f4b951bf7d..bb3e878abe06 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -59,8 +59,7 @@ GtkSalGraphics::~GtkSalGraphics()
 {
 }
 
-
-using namespace rtl;
+using ::rtl::OUString;
 
 /*************************************
  * Cached native widget objects
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index a70cff10541f..dbbfdd8e312e 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.cxx
@@ -45,7 +45,9 @@
 #include <sys/wait.h>
 
 using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 
 /*
  *  static helpers
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index c45a4e8886d0..1c803b58f913 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.cxx
@@ -57,10 +57,10 @@
 #include <sys/types.h>
 
 using namespace psp;
-using namespace rtl;
 using namespace basebmp;
 using namespace basegfx;
-
+using ::rtl::OUString;
+using ::rtl::OString;
 // ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer ---------------
 
 class SalPrinterBmp : public psp::PrinterBmp
diff --git a/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/source/app/i18n_status.cxx
index 2f055c573fa3..b609081cc68c 100644
--- a/vcl/unx/source/app/i18n_status.cxx
+++ b/vcl/unx/source/app/i18n_status.cxx
@@ -56,7 +56,6 @@
 #include <vcl/sysdata.hxx>
 
 using namespace vcl;
-using namespace rtl;
 
 namespace vcl {
 
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index 13bc7fc180de..d85b100bcf0e 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.cxx
@@ -97,9 +97,10 @@ Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
 #include <osl/socket.h>
 #include <poll.h>
 
-using namespace rtl;
 using namespace vcl_sal;
 
+using ::rtl::OUString;
+
 // -=-= #defines -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #define PSEUDOCOLOR12
diff --git a/vcl/unx/source/desktopdetect/desktopdetector.cxx b/vcl/unx/source/desktopdetect/desktopdetector.cxx
index 268b225160be..e94861705864 100644
--- a/vcl/unx/source/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/source/desktopdetect/desktopdetector.cxx
@@ -44,8 +44,8 @@
 #include <unistd.h>
 #include <string.h>
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
 enum {
     DESKTOP_NONE = 0,
     DESKTOP_UNKNOWN,
diff --git a/vcl/unx/source/dtrans/X11_clipboard.cxx b/vcl/unx/source/dtrans/X11_clipboard.cxx
index afe7c17595e8..4f1934397397 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/source/dtrans/X11_clipboard.cxx
@@ -53,9 +53,10 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::awt;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
 using namespace x11;
 
+using ::rtl::OUString;
+
 X11Clipboard::X11Clipboard( SelectionManager& rManager, Atom aSelection ) :
         ::cppu::WeakComponentImplHelper4<
     ::com::sun::star::datatransfer::clipboard::XClipboardEx,
diff --git a/vcl/unx/source/dtrans/X11_droptarget.cxx b/vcl/unx/source/dtrans/X11_droptarget.cxx
index ce4851ace375..d72c5c4c7eeb 100644
--- a/vcl/unx/source/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/source/dtrans/X11_droptarget.cxx
@@ -32,12 +32,13 @@
 #include <X11_selection.hxx>
 
 using namespace x11;
-using namespace rtl;
 using namespace com::sun::star::lang;
 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<
             XDropTarget,
diff --git a/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index 66f3b1a0c9b1..ff5adda33ae8 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.cxx
@@ -89,10 +89,13 @@ using namespace com::sun::star::awt;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::frame;
 using namespace cppu;
-using namespace rtl;
 
 using namespace x11;
 
+using ::rtl::OUString;
+using ::rtl::OUStringHash;
+using ::rtl::OStringToOUString;
+
 // stubs to satisfy solaris compiler's rather rigid linking warning
 extern "C"
 {
diff --git a/vcl/unx/source/dtrans/X11_service.cxx b/vcl/unx/source/dtrans/X11_service.cxx
index b9ec35fc23e1..215fb1a20011 100644
--- a/vcl/unx/source/dtrans/X11_service.cxx
+++ b/vcl/unx/source/dtrans/X11_service.cxx
@@ -40,13 +40,14 @@
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/compbase1.hxx>
 
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::lang;
 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()
 {
     Sequence< OUString > aRet(1);
diff --git a/vcl/unx/source/dtrans/X11_transferable.cxx b/vcl/unx/source/dtrans/X11_transferable.cxx
index cb5511f6bf3d..076da0917a40 100644
--- a/vcl/unx/source/dtrans/X11_transferable.cxx
+++ b/vcl/unx/source/dtrans/X11_transferable.cxx
@@ -43,11 +43,11 @@ using namespace com::sun::star::io;
 using namespace com::sun::star::uno;
 using namespace cppu;
 using namespace osl;
-using namespace rtl;
-
 
 using namespace x11;
 
+using ::rtl::OUString;
+
 
 X11Transferable::X11Transferable(
     SelectionManager& rManager,
diff --git a/vcl/unx/source/dtrans/bmp.cxx b/vcl/unx/source/dtrans/bmp.cxx
index 9b0bb2729c95..57ad8ecf8a4d 100644
--- a/vcl/unx/source/dtrans/bmp.cxx
+++ b/vcl/unx/source/dtrans/bmp.cxx
@@ -42,7 +42,6 @@ using namespace x11;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::script;
 using namespace com::sun::star::awt;
-using namespace rtl;
 
 /*
  *  helper functions
diff --git a/vcl/unx/source/dtrans/config.cxx b/vcl/unx/source/dtrans/config.cxx
index 74b8ca8eba05..5f711da47434 100644
--- a/vcl/unx/source/dtrans/config.cxx
+++ b/vcl/unx/source/dtrans/config.cxx
@@ -57,9 +57,10 @@ public:
 
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
-using namespace rtl;
 using namespace x11;
 
+using ::rtl::OUString;
+
 sal_Int32 SelectionManager::getSelectionTimeout()
 {
     if( m_nSelectionTimeout < 1 )
diff --git a/vcl/unx/source/fontmanager/fontcache.cxx b/vcl/unx/source/fontmanager/fontcache.cxx
index a0bece000fe4..e916e039d7f2 100644
--- a/vcl/unx/source/fontmanager/fontcache.cxx
+++ b/vcl/unx/source/fontmanager/fontcache.cxx
@@ -51,10 +51,13 @@
 #define CACHE_MAGIC "PspFontCacheFile format 4"
 
 using namespace std;
-using namespace rtl;
 using namespace psp;
 using namespace utl;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+
 /*
  *  static helpers
  */
diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx
index d41093372990..25ed2f68eff7 100644
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
+++ b/vcl/unx/source/fontmanager/fontconfig.cxx
@@ -90,7 +90,9 @@ using namespace psp;
 #include <algorithm>
 
 using namespace osl;
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
 
 namespace
 {
diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/source/fontmanager/fontmanager.cxx
index 9c59bf9af524..9292fe12531d 100644
--- a/vcl/unx/source/fontmanager/fontmanager.cxx
+++ b/vcl/unx/source/fontmanager/fontmanager.cxx
@@ -94,11 +94,19 @@ using namespace vcl;
 using namespace utl;
 using namespace psp;
 using namespace osl;
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringHash;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringHash;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
+
 /*
  *  static helpers
  */
diff --git a/vcl/unx/source/fontmanager/helper.cxx b/vcl/unx/source/fontmanager/helper.cxx
index 9fdb4d4daaad..4b0d327a9a03 100644
--- a/vcl/unx/source/fontmanager/helper.cxx
+++ b/vcl/unx/source/fontmanager/helper.cxx
@@ -42,7 +42,12 @@
 #include "osl/process.h"
 #include "rtl/bootstrap.hxx"
 
-using namespace rtl;
+using ::rtl::Bootstrap;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
 
 namespace psp {
 
diff --git a/vcl/unx/source/gdi/dtint.cxx b/vcl/unx/source/gdi/dtint.cxx
index e9c2f51698a7..704e4b977450 100644
--- a/vcl/unx/source/gdi/dtint.cxx
+++ b/vcl/unx/source/gdi/dtint.cxx
@@ -64,9 +64,10 @@
 #endif
 
 
-using namespace rtl;
 using namespace vcl_sal;
 
+using ::rtl::OUString;
+
 String DtIntegrator::aHomeDir;
 
 DtIntegrator::DtIntegrator() :
diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx
index c4bdf66d1af6..6eb3c5216e02 100644
--- a/vcl/unx/source/gdi/pspgraphics.cxx
+++ b/vcl/unx/source/gdi/pspgraphics.cxx
@@ -56,7 +56,9 @@
 #endif
 
 using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
 
 // ----- Implementation of PrinterBmp by means of SalBitmap/BitmapBuffer ---------------
 
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx
index 1b805cb2a765..b135ac4eb00e 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/source/gdi/salgdi3.cxx
@@ -111,8 +111,7 @@ struct _XRegion
     BOX *rects;
     BOX extents;
 };
-using namespace rtl;
-
+using ::rtl::OUString;
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 // ----------------------------------------------------------------------------
diff --git a/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx
index d6985422f3d1..6f94b5d90018 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/source/gdi/salprnpsp.cxx
@@ -63,7 +63,10 @@
 #include "osl/module.h"
 
 using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringHash;
+using ::rtl::OUStringToOString;
 
 /*
  *  static helpers
diff --git a/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/source/gdi/xrender_peer.cxx
index 533836e2e5d0..6ad312bef70b 100644
--- a/vcl/unx/source/gdi/xrender_peer.cxx
+++ b/vcl/unx/source/gdi/xrender_peer.cxx
@@ -33,8 +33,8 @@
 #include <rtl/ustring.hxx>
 #include <osl/module.h>
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 #include <xrender_peer.hxx>
 
 #include <salunx.h>
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index f5e4480a26e4..eecb026087e1 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.cxx
@@ -41,8 +41,8 @@
 #include <cstdio>
 #include <unistd.h>
 
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 extern "C" {
 typedef SalInstance*(*salFactoryProc)( oslModule pModule);
 }
diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/source/printer/cupsmgr.cxx
index fca9a4513f27..13652ae23924 100644
--- a/vcl/unx/source/printer/cupsmgr.cxx
+++ b/vcl/unx/source/printer/cupsmgr.cxx
@@ -139,7 +139,13 @@ public:
 
 using namespace psp;
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringHash;
+using ::rtl::OString;
 
 /*
  *  CUPSWrapper class
diff --git a/vcl/unx/source/printer/jobdata.cxx b/vcl/unx/source/printer/jobdata.cxx
index 3007a80e8a58..ae5dd71c43ed 100644
--- a/vcl/unx/source/printer/jobdata.cxx
+++ b/vcl/unx/source/printer/jobdata.cxx
@@ -37,7 +37,6 @@
 #include "sal/alloca.h"
 
 using namespace psp;
-using namespace rtl;
 
 JobData& JobData::operator=(const JobData& rRight)
 {
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index f477b43c335b..22e17aa774d9 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.cxx
@@ -269,7 +269,11 @@ namespace psp
 }
 
 using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringHash;
+
 
 #undef DBG_ASSERT
 #if defined DBG_UTIL || (OSL_DEBUG_LEVEL > 1)
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index b722a8b7804b..68223d6fdf8f 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.cxx
@@ -61,9 +61,13 @@
 #include <boost/unordered_set.hpp>
 
 using namespace psp;
-using namespace rtl;
 using namespace osl;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringHash;
+
 namespace psp
 {
     class SystemQueueInfo : public Thread
diff --git a/vcl/unx/source/printergfx/glyphset.cxx b/vcl/unx/source/printergfx/glyphset.cxx
index df2e0bf119b9..189d8419f4ec 100644
--- a/vcl/unx/source/printergfx/glyphset.cxx
+++ b/vcl/unx/source/printergfx/glyphset.cxx
@@ -51,7 +51,11 @@
 
 using namespace vcl;
 using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
 
 GlyphSet::GlyphSet ()
         : mnFontID   (-1),
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index e9104ce381fe..d4e488eeb1ab 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.cxx
@@ -57,7 +57,11 @@
 #include <vector>
 
 using namespace psp;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
 
 // forward declaration
 
diff --git a/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 7352d1a48fa4..f06108393716 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.cxx
@@ -40,8 +40,7 @@
 #include <tools/poly.hxx>
 #include <rtl/strbuf.hxx>
 
-using namespace rtl;
-
+using ::rtl::OStringBuffer;
 // =======================================================================
 
 // comment out to prevent use of beziers on GDI functions
diff --git a/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 494cc7846fac..446b98892f6d 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.cxx
@@ -45,9 +45,10 @@
 #include <map>
 #include <string>
 
-using namespace rtl;
 using namespace std;
 
+using ::rtl::OUString;
+
 typedef map< wstring, HTHEME > ThemeMap;
 static ThemeMap aThemeMap;
 
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index 5d731f471fa9..87f851e2ef0d 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.cxx
@@ -97,7 +97,7 @@
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::ui::dialogs;
-using namespace rtl;
+using ::rtl::OUString;
 
 // =======================================================================
 
diff --git a/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index cd15389af818..1114de6f098b 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.cxx
@@ -84,7 +84,9 @@ typedef std::set<int> IntSet;
 
 #define DROPPED_OUTGLYPH 0xFFFF
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
 
 // =======================================================================
 
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 94971f292dc3..39f97c476051 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.cxx
@@ -59,11 +59,17 @@
 #include <netinet/in.h>
 
 
-using namespace rtl;
 using namespace cppu;
 using namespace comphelper;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
+
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OStringBuffer;
 // -----------------------------------------------------------------------
 
 // Forward declaration
diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 544f246a030b..d5c736b74450 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.cxx
@@ -47,9 +47,11 @@
 #include <cppuhelper/servicefactory.hxx>
 #include <cppuhelper/bootstrap.hxx>
 
-using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 // -----------------------------------------------------------------------
 
 // Forward declaration