[Libreoffice-commits] .: automation/source extensions/inc extensions/source extensions/test extensions/workben

Julien Nabet serval2412 at kemper.freedesktop.org
Fri Feb 25 16:15:22 PST 2011


 automation/source/miniapp/testapp.cxx             |    3 ++-
 automation/source/server/XMLParser.cxx            |    3 ++-
 automation/source/testtool/objtest.cxx            |    2 +-
 extensions/inc/ucbhelper/ext_content.hxx          |    3 ++-
 extensions/source/bibliography/bibbeam.cxx        |    3 ++-
 extensions/source/bibliography/bibconfig.cxx      |    3 ++-
 extensions/source/bibliography/framectr.cxx       |    3 ++-
 extensions/source/nsplugin/source/so_instance.cxx |    4 +++-
 extensions/source/ole/ole2uno.hxx                 |    3 +--
 extensions/source/ole/oleobjw.cxx                 |    3 ++-
 extensions/source/ole/oleobjw.hxx                 |    2 +-
 extensions/source/ole/servprov.cxx                |    3 +--
 extensions/source/ole/servreg.cxx                 |    3 ++-
 extensions/source/ole/unoobjw.cxx                 |    3 +--
 extensions/source/plugin/aqua/macmgr.cxx          |    8 +++++++-
 extensions/source/plugin/aqua/sysplug.cxx         |    4 +++-
 extensions/source/plugin/base/nfuncs.cxx          |    5 ++++-
 extensions/source/plugin/base/xplugin.cxx         |    4 +++-
 extensions/source/plugin/unx/unxmgr.cxx           |    6 +++++-
 extensions/source/plugin/win/sysplug.cxx          |    4 +++-
 extensions/source/plugin/win/winmgr.cxx           |    6 +++++-
 extensions/source/resource/resource.cxx           |    6 +++++-
 extensions/source/scanner/scanner.hxx             |    3 ++-
 extensions/test/ole/OleClient/clientTest.cxx      |    3 +--
 extensions/test/ole/OleClient/funcs.cxx           |    3 ++-
 extensions/test/ole/OleConverterVar1/convTest.cxx |    4 +++-
 extensions/test/ole/cpnt/cpnt.cxx                 |    3 ++-
 extensions/test/ole/cppToUno/testcppuno.cxx       |    2 +-
 extensions/test/sax/testsax.cxx                   |    2 --
 extensions/test/sax/testwriter.cxx                |    1 -
 extensions/workben/pythonautotest.cxx             |    4 +++-
 extensions/workben/pythontest.cxx                 |    5 ++++-
 extensions/workben/testcomponent.cxx              |    5 ++++-
 extensions/workben/testresource.cxx               |    2 +-
 34 files changed, 82 insertions(+), 39 deletions(-)

New commits:
commit d7f4a4a91ab88a116a98fa4b714c5f95b3eee5f4
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Feb 26 01:14:41 2011 +0100

    Remove "using namespace ::rtl"

diff --git a/automation/source/miniapp/testapp.cxx b/automation/source/miniapp/testapp.cxx
index 4a22421..89a8161 100644
--- a/automation/source/miniapp/testapp.cxx
+++ b/automation/source/miniapp/testapp.cxx
@@ -52,12 +52,13 @@
 
 using namespace comphelper;
 using namespace cppu;
-using namespace rtl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::registry;
 using namespace com::sun::star::ucb;
 
+using ::rtl::OUString;
+
 static ResMgr* pAppMgr = NULL;
 
 MainWindow::MainWindow(MyApp *pAppl)
diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index 332af61..992cfa0 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -49,7 +49,8 @@ using namespace com::sun::star::xml::sax;
 using namespace com::sun::star::io;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::util;
-using namespace rtl;
+
+using ::rtl::OUString;
 
 class SVInputStream : public cppu::WeakImplHelper1< XInputStream >
 {
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index da97d47..4048a1f 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -61,8 +61,8 @@ using namespace com::sun::star::lang;
 using namespace com::sun::star::frame;
 using namespace com::sun::star::bridge;
 using namespace com::sun::star::connection;
-using namespace rtl;
 
+using ::rtl::OUString;
 
 #include <svtools/svmedit.hxx>
 
diff --git a/extensions/inc/ucbhelper/ext_content.hxx b/extensions/inc/ucbhelper/ext_content.hxx
index 50d7f83..c940105 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 a09439b..849eec3 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 849d2b1..640d1ea 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 cf0339c..b509479 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 742bede..658d73a 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 85df4b5..1eb7aa5 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 ef17f86..4d2be51 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 4bba578..9ba939f 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 45378cc..e279694 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 16a99df..6272008 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 bb0aa97..406f4be 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 a7fdf55..de8677c 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 3139b5c..96ef2cf 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 d80787b..5543562 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 434c818..68f5ef7 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 7dfebbf..9a644db 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 928365b..f527645 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 657a879..e9312e8 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 8af8c9a..10a2858 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 53fc3b9..5295231 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 77b8f99..a1b0e22 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 6658143..b797ab1 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 7e89e66..8b8da67 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 01971c1..08581e7 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 d1606c3..df0ce91 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 431d2c4..8f3ef90 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 3871af1..5877e39 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 1b44b17..47acef9 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 85a9953..d9410f7 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 bf0afb6..3d94279 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 73852cf..a0c0662 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
 {


More information about the Libreoffice-commits mailing list