Remove "using namespace ::rtl"

22 files changed, 48 insertions, 25 deletions

diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 5659c66dc460..8a0c7e517c01 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.cxx
@@ -48,7 +48,8 @@
 #include <rscdb.hxx>
 #include <rscrsc.hxx>
 
-using namespace rtl;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
 
 /*************************************************************************
 |*
diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index a3fea2ea5172..5c38c66790ca 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.cxx
@@ -51,7 +51,9 @@
 #include <rtl/textenc.h>
 #include <tools/list.hxx>
 
-using namespace rtl;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OStringHash;
 
 const char* StringContainer::putString( const char* pString )
 {
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index bf653c76badd..132d60483867 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_rsc.hxx"
 /****************************************************************/
-/*                  Include File                                */
+/*                  Include File        */
 /****************************************************************/
 
 #include <stdlib.h>
@@ -68,7 +68,10 @@
 #include <vector>
 
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OStringToOUString;
 
 /*************** F o r w a r d s *****************************************/
 /*************** G l o b a l e   V a r i a b l e n **********************/
diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx
index 2acf6f15e376..424b24c0246d 100644
--- a/rsc/source/tools/rschash.cxx
+++ b/rsc/source/tools/rschash.cxx
@@ -30,7 +30,8 @@
 #include "precompiled_rsc.hxx"
 #include <rschash.hxx>
 
-using namespace rtl;
+using ::rtl::OString;
+using ::rtl::OStringHash;
 
 AtomContainer::AtomContainer()
 {
diff --git a/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index f1202d986921..a5079d9f37d0 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.cxx
@@ -56,7 +56,8 @@
 #define ONLY_NEW
 #endif
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
 
 /****************** C o d e **********************************************/
 /*************************************************************************
diff --git a/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 421220ec8c5e..b7aa1cad0424 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.cxx
@@ -35,10 +35,11 @@
 
 #include <com/sun/star/io/XInputStream.hpp>
 
-using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::io;
 
+using ::rtl::OString;
+
 #include "xml2utf.hxx"
 
 namespace sax_expatwrap {
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 1e46a7e091df..fd93521261de 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -37,12 +37,14 @@
 #include <rtl/math.hxx>
 #include "sax/tools/converter.hxx"
 
-using namespace rtl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::util;
 using namespace ::com::sun::star::i18n;
 
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
 namespace sax {
 
 static const sal_Char* gpsMM = "mm";
diff --git a/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
index 9093ca72026e..efebd3a37836 100644
--- a/svl/source/config/asiancfg.cxx
+++ b/svl/source/config/asiancfg.cxx
@@ -39,12 +39,13 @@
 
 //-----------------------------------------------------------------------------
 using namespace utl;
-using namespace rtl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 
+using ::rtl::OUString;
+
 #define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
 
 //-----------------------------------------------------------------------------
diff --git a/svl/source/config/srchcfg.cxx b/svl/source/config/srchcfg.cxx
index 8d513b31e770..e2450bdd0e84 100644
--- a/svl/source/config/srchcfg.cxx
+++ b/svl/source/config/srchcfg.cxx
@@ -39,11 +39,12 @@
 
 //-----------------------------------------------------------------------------
 using namespace utl;
-using namespace rtl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
+using ::rtl::OUString;
+
 #define C2U(cChar) OUString(RTL_CONSTASCII_USTRINGPARAM(cChar))
 
 //-----------------------------------------------------------------------------
diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index 7aacaba3ae81..c655a8dd86a3 100644
--- a/svl/source/misc/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.cxx
@@ -35,8 +35,8 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.hxx>
 
-
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
 
 namespace linguistic
 {
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 53243d1933fc..9561fc533f76 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -52,8 +52,8 @@
 #include <itemholder2.hxx>
 
 using namespace utl;
-using namespace rtl;
 using namespace com::sun::star::uno;
+
 namespace css = com::sun::star;
 
 #define HELP_TIP_TIMEOUT 0xffff     // max. timeout setting to pretend a non-timeout
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 503ca80ffa7e..cc972b197fb3 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -54,9 +54,10 @@
 
 //-----------------------------------------------------------------------------
 using namespace utl;
-using namespace rtl;
 using namespace com::sun::star;
 
+using ::rtl::OUString;
+
 namespace svtools
 {
 
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 424e234b6b50..8425e83a7538 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.cxx
@@ -54,9 +54,10 @@
 
 //-----------------------------------------------------------------------------
 using namespace utl;
-using namespace rtl;
 using namespace com::sun::star;
 
+using ::rtl::OUString;
+
 namespace svtools
 {
 
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index e929efab0a90..0412049e5dea 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -40,11 +40,12 @@
 #include <rtl/logfile.hxx>
 
 using namespace utl;
-using namespace rtl;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
+using ::rtl::OUString;
+
 #define C2U(cChar) OUString::createFromAscii(cChar)
 
 const sal_Char cReplacement[] = "Replacement";
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 7582712389f7..e7b8dce0fde9 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.cxx
@@ -43,10 +43,11 @@
 #include "itemholder2.hxx"
 
 using namespace utl;
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star;
 
+using ::rtl::OUString;
+
 static SvtHelpOptions_Impl* pOptions = NULL;
 static sal_Int32           nRefCount = 0;
 
diff --git a/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
index 3008be6dbc1b..8647d7e5ad54 100644
--- a/svtools/source/config/htmlcfg.cxx
+++ b/svtools/source/config/htmlcfg.cxx
@@ -49,9 +49,10 @@
 #define HTMLCFG_NUMBERS_ENGLISH_US      0x100
 
 using namespace utl;
-using namespace rtl;
 using namespace com::sun::star::uno;
 
+using ::rtl::OUString;
+
 static SvxHtmlOptions* pOptions = 0;
 
 #define C2U(cChar) OUString::createFromAscii(cChar)
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 93e3f7479f56..e9cca4d402fa 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.cxx
@@ -36,7 +36,8 @@
 #include <rtfkeywd.hxx>
 #include <rtfout.hxx>
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
 
 #if defined(UNX)
 const sal_Char RTFOutFuncs::sNewLine = '\012';
diff --git a/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index 70da235bdb38..81fa73ee962b 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.cxx
@@ -37,7 +37,7 @@
 #include <osl/module.h>
 #include <rtl/ustring.hxx>
 
-using namespace rtl;
+using ::rtl::OUString;
 
 extern "C" {
 struct VersionInfo
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index a276bf3bfca3..001e80d13bb0 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.cxx
@@ -63,7 +63,8 @@
 
 
 using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 int ApiRet2ToSolarError_Impl( int nApiRet );
 
diff --git a/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx
index 2bf0e6121698..6b4187de1ef3 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.cxx
@@ -47,7 +47,7 @@
 #define DBG(x)
 #endif
 
-using namespace rtl;
+using ::rtl::OUString;
 
 //==================================================================
 
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index eb55ff3f5bfd..ab8fbe585432 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -69,7 +69,11 @@
 
 #define SEARCH_PATH_DELIMITER_STRING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SEARCH_PATH_DELIMITER_CHAR_STRING ) )
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringHash;
+
 using namespace osl;
 
 // for thread safety
diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx
index 22cddf65673c..8ed3ffd2d76c 100644
--- a/tools/source/testtoolloader/testtoolloader.cxx
+++ b/tools/source/testtoolloader/testtoolloader.cxx
@@ -39,8 +39,7 @@
 
 #include <comphelper/uieventslogger.hxx>
 
-using namespace rtl;
-
+using ::rtl::OUString;
 namespace tools
 {
     typedef void ( *pfunc_CreateRemoteControl)();