Remove "using namespace ::rtl"

31 files changed, 77 insertions, 36 deletions

diff --git a/extensions/inc/ucbhelper/ext_content.hxx b/extensions/inc/ucbhelper/ext_content.hxx
index 69d4a016eecb..99736f7b764e 100644
--- a/extensions/inc/ucbhelper/ext_content.hxx
+++ b/extensions/inc/ucbhelper/ext_content.hxx
@@ -52,9 +52,10 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::lang;
 using namespace std;
-using namespace rtl;
 using namespace osl;
 
+using ::rtl::OUString;
+
 
 
 template <class Type> class safe_list : public osl::Mutex, public std::list< Type > {};
diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx
index be923bd66a1b..a4dd71df31ba 100644
--- a/extensions/source/bibliography/bibbeam.cxx
+++ b/extensions/source/bibliography/bibbeam.cxx
@@ -46,11 +46,12 @@
 #include "datman.hxx"
 #include "bibtools.hxx"
 
-using namespace rtl;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
 
+using ::rtl::OUString;
+
 #define C2U(cChar) OUString::createFromAscii(cChar)
 
 #define PROPERTY_FRAME                      1
diff --git a/extensions/source/bibliography/bibconfig.cxx b/extensions/source/bibliography/bibconfig.cxx
index c86369f834b6..7e317986e00f 100644
--- a/extensions/source/bibliography/bibconfig.cxx
+++ b/extensions/source/bibliography/bibconfig.cxx
@@ -39,12 +39,13 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/processfactory.hxx>
 
-using namespace rtl;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::lang;
 
+using ::rtl::OUString;
+
 typedef Mapping* MappingPtr;
 SV_DECL_PTRARR_DEL(MappingArray, MappingPtr, 2, 2)
 SV_IMPL_PTRARR(MappingArray, MappingPtr);
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 9fa7ead8b73b..659e4fdc7b35 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -65,12 +65,13 @@
 
 using namespace osl;
 using namespace cppu;
-using namespace rtl;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::uno;
 using namespace com::sun::star;
 
+using ::rtl::OUString;
+
 #define C2U(cChar) OUString::createFromAscii(cChar)
 
 struct DispatchInfo
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
index 742bedecc0e7..658d73a59180 100644
--- a/extensions/source/nsplugin/source/so_instance.cxx
+++ b/extensions/source/nsplugin/source/so_instance.cxx
@@ -64,9 +64,11 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::connection;
 using namespace cppu;
-using namespace rtl;
 using namespace com::sun::star;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+
 char SoPluginInstance::sSO_Dir[] = {0};
 Reference< XMultiServiceFactory > SoPluginInstance::mxRemoteMSF = Reference< XMultiServiceFactory >(NULL);
 
diff --git a/extensions/source/ole/ole2uno.hxx b/extensions/source/ole/ole2uno.hxx
index 8763208bda10..55ca3104bd64 100644
--- a/extensions/source/ole/ole2uno.hxx
+++ b/extensions/source/ole/ole2uno.hxx
@@ -91,10 +91,9 @@ using namespace com::sun::star::registry;
 using namespace com::sun::star::reflection;
 using namespace com::sun::star::beans;
 using namespace osl;
-using namespace rtl;
 using namespace std;
 
-
+using ::rtl::OUString;
 
 namespace ole_adapter
 {
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index 8b9ea5e50886..5c74aff9e191 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -69,7 +69,6 @@
 using namespace std;
 using namespace boost;
 using namespace osl;
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::script;
 using namespace com::sun::star::lang;
@@ -77,6 +76,8 @@ using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::oleautomation;
 using namespace com::sun::star::bridge::ModelDependent;
 
+using ::rtl::OUString;
+
 #define JSCRIPT_ID_PROPERTY L"_environment"
 #define JSCRIPT_ID          L"jscript"
 namespace ole_adapter
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index ecfed6825814..b9e0ca21cd56 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -65,12 +65,12 @@
 #include "unoconversionutilities.hxx"
 #include "windata.hxx"
 using namespace cppu;
-using namespace rtl;
 using namespace std;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::oleautomation;
 
+using ::rtl::OUString;
 namespace ole_adapter
 {
 
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index 958a6c8de913..a72b6bc5845f 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -56,14 +56,13 @@ extern CComModule _Module;
 
 
 using namespace cppu;
-using namespace rtl;
 using namespace osl;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::ModelDependent;
 
-
+using ::rtl::OUString;
 
 namespace ole_adapter
 {
diff --git a/extensions/source/ole/servreg.cxx b/extensions/source/ole/servreg.cxx
index 7311f965ca8d..6284bc1f8246 100644
--- a/extensions/source/ole/servreg.cxx
+++ b/extensions/source/ole/servreg.cxx
@@ -34,10 +34,11 @@
 #include "servprov.hxx"
 #include <rtl/ustring.hxx>
 #include <cppuhelper/factory.hxx>
-using namespace rtl;
 using namespace ole_adapter;
 using namespace cppu;
 
+using ::rtl::OUString;
+
 namespace ole_adapter
 {
 rtl_StandardModuleCount globalModuleCount= MODULE_COUNT_INIT;
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 622ddf5894fa..96cc39625512 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -66,7 +66,6 @@
 #include "servprov.hxx"
 
 using namespace std;
-using namespace rtl;
 using namespace osl;
 using namespace cppu;
 using namespace com::sun::star::uno;
@@ -77,7 +76,7 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::bridge::ModelDependent;
 using namespace com::sun::star::reflection;
 
-
+using ::rtl::OUString;
 
 #if _MSC_VER < 1200
 extern "C" const GUID IID_IDispatchEx;
diff --git a/extensions/source/plugin/aqua/macmgr.cxx b/extensions/source/plugin/aqua/macmgr.cxx
index 2d7d87c93fd0..2a67cc994b8e 100644
--- a/extensions/source/plugin/aqua/macmgr.cxx
+++ b/extensions/source/plugin/aqua/macmgr.cxx
@@ -33,11 +33,17 @@
 #include "osl/file.h"
 #include "osl/module.hxx"
 
-using namespace rtl;
 using namespace std;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::plugin;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
 namespace plugstringhelper
 {
 
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx
index 39e3fc5cc4c4..f4896f119382 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.cxx
@@ -38,9 +38,11 @@ extern NPNetscapeFuncs aNPNFuncs;
 
 #include <tools/debug.hxx>
 
-using namespace rtl;
 using namespace plugstringhelper;
 
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
 #if OSL_DEBUG_LEVEL > 1
 void TRACE( char const * s );
 void TRACEN( char const * s, long n );
diff --git a/extensions/source/plugin/base/nfuncs.cxx b/extensions/source/plugin/base/nfuncs.cxx
index 094772501f1d..24e9939cb2ad 100644
--- a/extensions/source/plugin/base/nfuncs.cxx
+++ b/extensions/source/plugin/base/nfuncs.cxx
@@ -84,9 +84,12 @@ void TRACES( char const* s, char const* s2 )
 #define TRACES(x,s)
 #endif
 
-using namespace rtl;
 using namespace com::sun::star::lang;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+
 NPNetscapeFuncs aNPNFuncs =
 {
     sizeof( NPNetscapeFuncs ),
diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx
index c479a4002f67..1eac4dd9c983 100644
--- a/extensions/source/plugin/base/xplugin.cxx
+++ b/extensions/source/plugin/base/xplugin.cxx
@@ -60,9 +60,11 @@ using namespace com::sun::star;
 using namespace com::sun::star::io;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::plugin;
-using namespace rtl;
 using namespace osl;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+
 class PluginDisposer : public salhelper::Timer
 {
 private:
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 20c91bfba8b8..3ec32edd795b 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -46,11 +46,15 @@
 #include <vcl/svapp.hxx>
 #include <plugin/impl.hxx>
 
-using namespace rtl;
 using namespace std;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::plugin;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OStringToOUString;
+
 // Unix specific implementation
 static bool CheckPlugin( const ByteString& rPath, list< PluginDescription* >& rDescriptions )
 {
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index 5e244768a980..149dce3067d5 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -51,7 +51,9 @@ extern NPNetscapeFuncs aNPNFuncs;
 
 #include <tools/debug.hxx>
 
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
 
 #if OSL_DEBUG_LEVEL > 1
 void TRACE( char const * s );
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index 04859d46b4e2..b754383139a4 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -56,12 +56,16 @@
 #include <algorithm>
 
 
-using namespace rtl;
 using namespace std;
 using namespace osl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::plugin;
 
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
+
 typedef map< OString, OUString, less< OString > > PluginLocationMap;
 
 //__________________________________________________________________________________________________
diff --git a/extensions/source/resource/resource.cxx b/extensions/source/resource/resource.cxx
index 7c0a0fd60616..55fd5944bbbd 100644
--- a/extensions/source/resource/resource.cxx
+++ b/extensions/source/resource/resource.cxx
@@ -51,7 +51,6 @@
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.hxx>
 
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
@@ -59,6 +58,11 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::beans;
 using namespace com::sun::star::reflection;
 
+using ::rtl::OUString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
 //------------------------------------------------------------------------
diff --git a/extensions/source/scanner/scanner.hxx b/extensions/source/scanner/scanner.hxx
index 52bba3113938..15af9d83f144 100644
--- a/extensions/source/scanner/scanner.hxx
+++ b/extensions/source/scanner/scanner.hxx
@@ -42,11 +42,12 @@
 #include <com/sun/star/scanner/XScannerManager.hpp>
 #include <com/sun/star/scanner/ScannerException.hpp>
 
-using namespace rtl;
 using namespace cppu;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::scanner;
 
+using ::rtl::OUString;
+
 // -----------
 // - Defines -
 // -----------
diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx
index 71049b7702c5..fe780c7a2ecc 100644
--- a/extensions/test/ole/OleClient/clientTest.cxx
+++ b/extensions/test/ole/OleClient/clientTest.cxx
@@ -60,9 +60,8 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::script;
 using namespace com::sun::star::bridge::oleautomation;
 using namespace cppu;
-using namespace rtl;
-
 
+using ::rtl::OUString;
 
 Reference<XInvocation> convertComObject( IUnknown* pUnk);
 Reference<XInvocation> getComObject( OUString progId);
diff --git a/extensions/test/ole/OleClient/funcs.cxx b/extensions/test/ole/OleClient/funcs.cxx
index 231f5bc825db..5f2d1d8b6c90 100644
--- a/extensions/test/ole/OleClient/funcs.cxx
+++ b/extensions/test/ole/OleClient/funcs.cxx
@@ -50,9 +50,10 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::script;
 using namespace com::sun::star::bridge::oleautomation;
-using namespace rtl;
 using namespace cppu;
 
+using ::rtl::OUString;
+
 template< class T >
 bool equalSequences(const Sequence<T>& seqIn, const Sequence<Any> & returned);
 
diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx
index 6cc6e47462ac..c9955d40d169 100644
--- a/extensions/test/ole/OleConverterVar1/convTest.cxx
+++ b/extensions/test/ole/OleConverterVar1/convTest.cxx
@@ -63,7 +63,9 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::uno;
 using namespace oletest;
 using namespace cppu;
-using namespace rtl;
+
+using ::rtl::OUString;
+
 HRESULT doTest();
 HRESULT InitializeParameter();
 void printResultVariantArray( VARIANT & var);
diff --git a/extensions/test/ole/cpnt/cpnt.cxx b/extensions/test/ole/cpnt/cpnt.cxx
index 14d6f0ffcd6a..c7d6661ddf9d 100644
--- a/extensions/test/ole/cpnt/cpnt.cxx
+++ b/extensions/test/ole/cpnt/cpnt.cxx
@@ -62,7 +62,6 @@
 using namespace cppu;
 using namespace osl;
 using namespace oletest;
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -70,6 +69,8 @@ using namespace com::sun::star::registry;
 using namespace com::sun::star::script;
 using namespace com::sun::star::reflection;
 
+using ::rtl::OUString;
+
 
 #define IMPL_NAME L"oletest.OleTestImpl"  // oletest.OleTestImpl in applicat.rdb
 #define SERVICE_NAME L"oletest.OleTest"
diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx b/extensions/test/ole/cppToUno/testcppuno.cxx
index 6c4745a0f5cd..80d93dfb731c 100644
--- a/extensions/test/ole/cppToUno/testcppuno.cxx
+++ b/extensions/test/ole/cppToUno/testcppuno.cxx
@@ -54,7 +54,7 @@ using namespace com::sun::star::script;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::bridge::ModelDependent;
 using namespace cppu;
-using namespace rtl;
+
 HRESULT doTest();
 bool incrementMultidimensionalIndex(
     sal_Int32 dimensions,
diff --git a/extensions/test/sax/testsax.cxx b/extensions/test/sax/testsax.cxx
index e08231409bed..67ea67a31038 100644
--- a/extensions/test/sax/testsax.cxx
+++ b/extensions/test/sax/testsax.cxx
@@ -51,10 +51,8 @@
 
 #include "factory.hxx"
 
-using namespace rtl;
 using namespace usr;
 
-
 #define BUILD_ERROR(expr, Message)\
         {\
             m_seqErrors.realloc( m_seqErrors.getLen() + 1 ); \
diff --git a/extensions/test/sax/testwriter.cxx b/extensions/test/sax/testwriter.cxx
index 19efbc72a947..1f778092e2eb 100644
--- a/extensions/test/sax/testwriter.cxx
+++ b/extensions/test/sax/testwriter.cxx
@@ -51,7 +51,6 @@
 #include <usr/reflserv.hxx>  // for EXTERN_SERVICE_CALLTYPE
 
 using namespace std;
-using namespace rtl;
 using namespace usr;
 
 #define BUILD_ERROR(expr, Message)\
diff --git a/extensions/workben/pythonautotest.cxx b/extensions/workben/pythonautotest.cxx
index aab403885835..e0d3469476b9 100644
--- a/extensions/workben/pythonautotest.cxx
+++ b/extensions/workben/pythonautotest.cxx
@@ -42,9 +42,11 @@
 #include <tools/string.hxx>
 #include <osl/conditn.hxx>
 
-using namespace rtl;
 using namespace usr;
 
+using ::rtl::StringToOUString;
+using ::rtl::OUStringToString;
+
 #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM)
 #define USTRING_TO_PCHAR(x) OUStringToString(x , CHARSET_DONTKNOW ).GetCharStr()
 
diff --git a/extensions/workben/pythontest.cxx b/extensions/workben/pythontest.cxx
index dfb3fa3e0019..7f480af53c05 100644
--- a/extensions/workben/pythontest.cxx
+++ b/extensions/workben/pythontest.cxx
@@ -43,9 +43,12 @@
 #include <tools/string.hxx>
 #include <osl/conditn.hxx>
 
-using namespace rtl;
 using namespace usr;
 
+using ::rtl::OUStringToString;
+using ::rtl::StringToOUString;
+
+
 #define PCHAR_TO_USTRING(x) StringToOUString(String(x),CHARSET_SYSTEM)
 
 
diff --git a/extensions/workben/testcomponent.cxx b/extensions/workben/testcomponent.cxx
index 9ba161f9eea8..ece2570df35c 100644
--- a/extensions/workben/testcomponent.cxx
+++ b/extensions/workben/testcomponent.cxx
@@ -50,9 +50,12 @@
 
 #include <smart/com/sun/star/test/XSimpleTest.hxx>
 
-using namespace rtl;
 using namespace usr;
 
+using ::rtl::OString;
+using ::rtl::OWStringToOString;
+using ::rtl::OStringToOWString;
+
 
 // Needed to switch on solaris threads
 #ifdef SOLARIS
diff --git a/extensions/workben/testresource.cxx b/extensions/workben/testresource.cxx
index 069f33c631b7..eca30044bbdc 100644
--- a/extensions/workben/testresource.cxx
+++ b/extensions/workben/testresource.cxx
@@ -37,8 +37,8 @@
 #include <usr/services.hxx>
 #include <vcl/svapp.hxx>
 
-using namespace rtl;
 using namespace usr;
+using ::rtl::StringToOUString;
 
 class MyApp : public Application
 {