diff options
44 files changed, 146 insertions, 57 deletions
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx index 8f13ad0d8654..1af3b7ac1352 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx @@ -49,7 +49,11 @@ #include <hash.cxx> // need a += operator for OString and sal_Char -namespace rtl +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; { inline OString& operator+=( OString& rString, sal_Char cAdd ) { @@ -62,7 +66,6 @@ namespace rtl using namespace std; using namespace osl; -using namespace rtl; using namespace com::sun::star::uno; namespace CPPU_CURRENT_NAMESPACE diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx index b72ebc0ac1f3..287ca5deadd7 100644 --- a/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx @@ -42,9 +42,10 @@ #include "cc50_solaris_intel.hxx" -using namespace rtl; using namespace com::sun::star::uno; +using ::rtl::OUString; + namespace { diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx index 916a42bb75e5..d0e8a4fc8bbb 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx @@ -50,7 +50,12 @@ #include <hash.cxx> // need a += operator for OString and sal_Char -namespace rtl +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; + { inline OString& operator+=( OString& rString, sal_Char cAdd ) { @@ -63,7 +68,6 @@ namespace rtl using namespace std; using namespace osl; -using namespace rtl; using namespace com::sun::star::uno; namespace CPPU_CURRENT_NAMESPACE diff --git a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx index 6a0c7d2eec7f..9d0d139850ec 100644 --- a/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx @@ -42,9 +42,10 @@ #include "cc50_solaris_sparc.hxx" -using namespace rtl; using namespace com::sun::star::uno; +using ::rtl::OUString; + namespace { diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx index ffce7fa008d4..f99e60d0d6fd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx @@ -39,9 +39,12 @@ #include "share.hxx" -using namespace rtl; using namespace com::sun::star::uno; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; + namespace { //================================================================================================== diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx index c7636bb5b191..81dbb5dcea53 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx @@ -41,9 +41,12 @@ #include <sal/alloca.h> -using namespace rtl; using namespace com::sun::star::uno; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; + namespace { //================================================================================================== diff --git a/bridges/source/remote/urp/urp_threadid.cxx b/bridges/source/remote/urp/urp_threadid.cxx index e603a73bab83..5c991e142eef 100644 --- a/bridges/source/remote/urp/urp_threadid.cxx +++ b/bridges/source/remote/urp/urp_threadid.cxx @@ -32,7 +32,8 @@ #include <rtl/strbuf.hxx> -using namespace rtl; +using ::rtl::OString; +using ::rtl::OStringBuffer; namespace bridges_urp { diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 1adef3d91bb6..070e0a621873 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -54,7 +54,9 @@ namespace cssu= com::sun::star::uno; namespace sri= System::Runtime::InteropServices; -using namespace rtl; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; namespace cli_uno { diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx index e3b07fd3d8df..23288d0074a6 100644 --- a/cli_ure/source/uno_bridge/cli_data.cxx +++ b/cli_ure/source/uno_bridge/cli_data.cxx @@ -56,9 +56,11 @@ namespace sr = System::Reflection; namespace st = System::Text; namespace ucss = unoidl::com::sun::star; -using namespace rtl; using namespace std; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; + namespace cli_uno { diff --git a/cli_ure/source/uno_bridge/cli_proxy.cxx b/cli_ure/source/uno_bridge/cli_proxy.cxx index 3ee72d9d5388..85d5d1b3503b 100644 --- a/cli_ure/source/uno_bridge/cli_proxy.cxx +++ b/cli_ure/source/uno_bridge/cli_proxy.cxx @@ -53,7 +53,11 @@ namespace css = com::sun::star; namespace ucss = unoidl::com::sun::star; using namespace cli_uno; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; +using ::rtl::OUStringBuffer; extern "C" { //------------------------------------------------------------------------------ diff --git a/cli_ure/source/uno_bridge/cli_uno.cxx b/cli_ure/source/uno_bridge/cli_uno.cxx index 63840c1ec0c1..3e5b709bd313 100644 --- a/cli_ure/source/uno_bridge/cli_uno.cxx +++ b/cli_ure/source/uno_bridge/cli_uno.cxx @@ -36,7 +36,8 @@ namespace sr=System::Reflection; namespace css=com::sun::star; -using namespace rtl; + +using ::rtl::OUStringBuffer; namespace cli_uno { diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index 2019e96b3518..8748db53c2c8 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -31,7 +31,7 @@ #include "codemaker/options.hxx" -using namespace rtl; +using ::rtl::OString; Options::Options() { diff --git a/codemaker/source/codemaker/typemanager.cxx b/codemaker/source/codemaker/typemanager.cxx index b65120aa1aa0..639a7cca71e6 100644 --- a/codemaker/source/codemaker/typemanager.cxx +++ b/codemaker/source/codemaker/typemanager.cxx @@ -34,7 +34,10 @@ #include "registry/reader.hxx" #include "registry/version.h" -using namespace rtl; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringToOUString; +using ::rtl::OUStringToOString; TypeManager::TypeManager() { diff --git a/codemaker/source/cppumaker/cppumaker.cxx b/codemaker/source/cppumaker/cppumaker.cxx index 82edce406682..ae24f4291d8e 100644 --- a/codemaker/source/cppumaker/cppumaker.cxx +++ b/codemaker/source/cppumaker/cppumaker.cxx @@ -39,7 +39,8 @@ #include "cppuoptions.hxx" #include "cpputype.hxx" -using namespace rtl; +using ::rtl::OString; +using ::rtl::OUString; namespace { diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index f1ec221b89e5..c77a15904442 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -35,8 +35,9 @@ #include "osl/thread.h" #include "osl/process.h" -using namespace rtl; - +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; sal_Bool CppuOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw( IllegalArgument ) { diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index 3029d96f7d2d..735591f1a476 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -51,9 +51,12 @@ #include "dumputils.hxx" #include "includes.hxx" -using namespace rtl; using namespace codemaker::cpp; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringBuffer; + namespace { rtl::OString translateSimpleUnoType(rtl::OString const & unoType, bool cppuUnoType=false) { diff --git a/codemaker/source/javamaker/javamaker.cxx b/codemaker/source/javamaker/javamaker.cxx index bb7ec071fb19..4deeb727a4c0 100644 --- a/codemaker/source/javamaker/javamaker.cxx +++ b/codemaker/source/javamaker/javamaker.cxx @@ -38,8 +38,8 @@ #include "javaoptions.hxx" #include "javatype.hxx" -using namespace rtl; - +using ::rtl::OUString; +using ::rtl::OString; sal_Bool produceAllTypes(RegistryKey& rTypeKey, sal_Bool bIsExtraType, TypeManager const & typeMgr, codemaker::GeneratedTypeSet & generated, diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx index db4980ba6a69..82fa4d55ad87 100644 --- a/codemaker/source/javamaker/javaoptions.cxx +++ b/codemaker/source/javamaker/javaoptions.cxx @@ -34,8 +34,9 @@ #include "osl/process.h" #include "osl/thread.h" -using namespace rtl; - +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; sal_Bool JavaOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile) throw( IllegalArgument ) { diff --git a/cppu/source/typelib/static_types.cxx b/cppu/source/typelib/static_types.cxx index 9aa9afcf648f..4af4fb1251c8 100644 --- a/cppu/source/typelib/static_types.cxx +++ b/cppu/source/typelib/static_types.cxx @@ -43,7 +43,9 @@ using namespace osl; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringBuffer; extern "C" { diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 1ab46fdb8b22..f84350f27691 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -53,10 +53,13 @@ #include <typelib/typedescription.h> #include <uno/any2.h> -using namespace rtl; using namespace std; using namespace osl; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OString; + #ifdef SAL_W32 #pragma pack(push, 8) #elif defined(SAL_OS2) diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index 13d34554bac8..0d3664c1a3da 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -57,9 +57,11 @@ using namespace std; using namespace osl; -using namespace rtl; using namespace com::sun::star::uno; - +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OUStringToOString; +using ::rtl::OString; namespace cppu { diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx index 13ee0d8f60f9..4a879cdf211d 100644 --- a/cppuhelper/source/component.cxx +++ b/cppuhelper/source/component.cxx @@ -36,11 +36,13 @@ #include "com/sun/star/uno/RuntimeException.hpp" using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; +using ::rtl::OUString; +using ::rtl::OUStringToOString; + namespace cppu { diff --git a/cppuhelper/source/factory.cxx b/cppuhelper/source/factory.cxx index b0d5fcbface9..4e34b470e608 100644 --- a/cppuhelper/source/factory.cxx +++ b/cppuhelper/source/factory.cxx @@ -55,13 +55,14 @@ using namespace osl; -using namespace rtl; using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::loader; using namespace com::sun::star::registry; +using ::rtl::OUString; + namespace cppu { diff --git a/cppuhelper/source/propshlp.cxx b/cppuhelper/source/propshlp.cxx index c37bedec9902..9abc35dd3632 100644 --- a/cppuhelper/source/propshlp.cxx +++ b/cppuhelper/source/propshlp.cxx @@ -41,9 +41,11 @@ using namespace osl; using namespace com::sun::star::uno; using namespace com::sun::star::beans; using namespace com::sun::star::lang; -using namespace rtl; using namespace cppu; +using ::rtl::OUString; +using ::rtl::OUStringToOString; + namespace cppu { IPropertyArrayHelper::~IPropertyArrayHelper() diff --git a/cppuhelper/source/stdidlclass.cxx b/cppuhelper/source/stdidlclass.cxx index 1852b6827b78..1c617da22f24 100644 --- a/cppuhelper/source/stdidlclass.cxx +++ b/cppuhelper/source/stdidlclass.cxx @@ -45,7 +45,8 @@ using namespace com::sun::star; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::reflection; -using namespace rtl; + +using ::rtl::OUString; namespace cppu { diff --git a/cppuhelper/test/testhelper.cxx b/cppuhelper/test/testhelper.cxx index d99fc9903387..431c3cb16251 100644 --- a/cppuhelper/test/testhelper.cxx +++ b/cppuhelper/test/testhelper.cxx @@ -50,13 +50,16 @@ #include "testhelper.hxx" -using namespace rtl; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::registry; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; + SAL_IMPLEMENT_MAIN() { try diff --git a/cppuhelper/test/testimplhelper.cxx b/cppuhelper/test/testimplhelper.cxx index b3c2638739c3..6a5e741c4975 100644 --- a/cppuhelper/test/testimplhelper.cxx +++ b/cppuhelper/test/testimplhelper.cxx @@ -81,12 +81,15 @@ #include <com/sun/star/lang/IllegalAccessException.hpp> using namespace test; -using namespace rtl; using namespace osl; using namespace cppu; using namespace com::sun::star; using namespace com::sun::star::uno; +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; + //================================================================================================== struct TestImpl : public ImplHelper4< CA, DBA, FE, G > { diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx index 7ae8cabc05bb..27231080b3a3 100644 --- a/cpputools/source/sp2bv/sp2bv.cxx +++ b/cpputools/source/sp2bv/sp2bv.cxx @@ -33,10 +33,6 @@ #include "rtl/ustring.hxx" #include "rtl/ustrbuf.h" - - -using namespace rtl; - static sal_Bool hasOption(char const * szOption, int argc, char** argv); diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 7d73bb15be77..fef9d5ff666a 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -74,7 +74,6 @@ #endif using namespace std; -using namespace rtl; using namespace osl; using namespace cppu; using namespace com::sun::star::uno; @@ -85,6 +84,11 @@ using namespace com::sun::star::connection; using namespace com::sun::star::bridge; using namespace com::sun::star::container; +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OUStringToOString; +using ::rtl::OUStringBuffer; + namespace unoexe { diff --git a/idlc/source/options.cxx b/idlc/source/options.cxx index fe02e3a6e169..36f6880460c0 100644 --- a/idlc/source/options.cxx +++ b/idlc/source/options.cxx @@ -33,8 +33,7 @@ #include /*MSVC trouble: <cstring>*/ <string.h> #include <idlc/options.hxx> -using namespace rtl; - +using ::rtl::OString; Options::Options(): m_stdin(false), m_verbose(false), m_quiet(false) { } diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 6de66aee9b17..38e54382c15d 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -104,11 +104,15 @@ #include <algorithm> #include <vector> -using namespace rtl; #define YYDEBUG 1 #define YYERROR_VERBOSE 1 +using ::rtl::OUString; +using ::rtl::OString; +using ::rtl::OStringToOUString; +using ::rtl::OStringBuffer; + extern int yylex(void); void yyerror(char const *); diff --git a/io/source/stm/opump.cxx b/io/source/stm/opump.cxx index 0d20908daae1..21f03b6169b5 100644 --- a/io/source/stm/opump.cxx +++ b/io/source/stm/opump.cxx @@ -53,13 +53,16 @@ using namespace osl; using namespace std; -using namespace rtl; using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::registry; using namespace com::sun::star::io; +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; + #include "factreg.hxx" namespace io_stm { diff --git a/jvmaccess/workbench/javainfo/javainfotest.cxx b/jvmaccess/workbench/javainfo/javainfotest.cxx index a87cffadfdaf..bb7c9875825d 100644 --- a/jvmaccess/workbench/javainfo/javainfotest.cxx +++ b/jvmaccess/workbench/javainfo/javainfotest.cxx @@ -35,12 +35,15 @@ #include <stdio.h> #include <vector> -using namespace rtl; using namespace std; using namespace osl; using jvmaccess::JavaInfo; +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; + #define OUSTR( x ) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) #define JAVA_VERSION "1.4.1_01" diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 2c13780ad421..395f386d1939 100644 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -39,8 +39,9 @@ #include "rtl/byteseq.hxx" #include "jvmfwk/framework.h" -using namespace rtl; - +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; #define OUSTR(x) OUString(RTL_CONSTASCII_USTRINGPARAM( x )) static sal_Bool hasOption(char const * szOption, int argc, char** argv); diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 822f2eb5f032..933e3d19e1d5 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -34,9 +34,10 @@ #include "gnujre.hxx" #include "util.hxx" -using namespace rtl; using namespace std; using namespace osl; +using ::rtl::OUString; +using ::rtl::Reference; namespace jfw_plugin { diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 9da3df2a2fdc..1fd28a18e603 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -32,10 +32,10 @@ #include "osl/thread.h" #include "otherjre.hxx" -using namespace rtl; using namespace std; - +using ::rtl::OUString; +using ::rtl::Reference; namespace jfw_plugin { diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index cfc729d42959..eaaaf3a35aff 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -66,10 +66,13 @@ #define SUN_MICRO "Sun Microsystems Inc." using namespace osl; -using namespace rtl; using namespace std; using namespace jfw_plugin; +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OString; + namespace { struct PluginMutex: public ::rtl::Static<osl::Mutex, PluginMutex> {}; diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index a2e0c1d997d1..56cb5c7bd7e7 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -34,9 +34,11 @@ #include "sunversion.hxx" #include "diagnostics.h" -using namespace rtl; using namespace std; +using ::rtl::OUString; +using ::rtl::Reference; + #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) namespace jfw_plugin { diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx index 53051c905d41..5bc76c26f421 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx @@ -36,12 +36,14 @@ #include <string.h> #include <ctype.h> #include "diagnostics.h" -using namespace rtl; using namespace osl; + +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; namespace jfw_plugin { //stoc_javadetect -//extern OUString ::Impl::usPathDelim(); #define OUSTR( x ) ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x )) #if OSL_DEBUG_LEVEL >= 2 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index c423fa7d60af..e208d43bb400 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -59,10 +59,15 @@ #include "sunjre.hxx" #include "vendorlist.hxx" #include "diagnostics.h" -using namespace rtl; using namespace osl; using namespace std; +using ::rtl::OUString; +using ::rtl::Reference; +using ::rtl::OString; +using ::rtl::OUStringBuffer; +using ::rtl::OUStringToOString; + #define CHAR_POINTER(oustr) ::rtl::OUStringToOString(oustr,RTL_TEXTENCODING_UTF8).pData->buffer #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) #ifdef WNT diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index f4e6ecfa9735..9025266571fd 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -36,9 +36,10 @@ #include "sunjre.hxx" using namespace std; -using namespace rtl; using namespace osl; +using ::rtl::OUString; + namespace jfw_plugin { rtl::Reference<VendorBase> createInstance(createInstance_func pFunc, diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx index 44bfeed7c9bc..f24b6ff166e4 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx @@ -37,7 +37,11 @@ #include <stdio.h> using namespace com::sun::star::uno; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; +using ::rtl::OString; namespace jfw_plugin { diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx index aab2201ee07d..e6856747f348 100644 --- a/jvmfwk/source/fwkbase.cxx +++ b/jvmfwk/source/fwkbase.cxx @@ -42,7 +42,12 @@ #include "fwkbase.hxx" using namespace osl; -using namespace rtl; + +using ::rtl::OUString; +using ::rtl::OUStringBuffer; +using ::rtl::OString; +using ::rtl::OUStringToOString; +using ::rtl::OStringToOUString; #define JAVASETTINGS "javasettings" #define JAVASETTINGS_XML "javasettings.xml" #define VENDORSETTINGS "javavendors.xml" diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index 63402bef98d4..3b73534e129e 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -58,9 +58,12 @@ #include "framework.hxx" #include "fwkutil.hxx" -using namespace rtl; using namespace osl; +using ::rtl::OUString; +using ::rtl::OUStringToOString; +using ::rtl::OString; + namespace jfw { |