[Libreoffice-commits] .: bridges/source cli_ure/source codemaker/source cppuhelper/source cppuhelper/test cppu/source cpputools/source idlc/source io/source jvmaccess/workbench jvmfwk/plugins jvmfwk/source
Julien Nabet
serval2412 at kemper.freedesktop.org
Wed Mar 2 12:53:27 PST 2011
bridges/source/cpp_uno/cc50_solaris_intel/except.cxx | 7 +++++--
bridges/source/cpp_uno/cc50_solaris_intel/uno2cpp.cxx | 3 ++-
bridges/source/cpp_uno/cc50_solaris_sparc/except.cxx | 8 ++++++--
bridges/source/cpp_uno/cc50_solaris_sparc/uno2cpp.cxx | 3 ++-
bridges/source/cpp_uno/gcc3_linux_sparc/uno2cpp.cxx | 5 ++++-
bridges/source/cpp_uno/gcc3_solaris_sparc/uno2cpp.cxx | 5 ++++-
bridges/source/remote/urp/urp_threadid.cxx | 3 ++-
cli_ure/source/uno_bridge/cli_bridge.cxx | 4 +++-
cli_ure/source/uno_bridge/cli_data.cxx | 4 +++-
cli_ure/source/uno_bridge/cli_proxy.cxx | 6 +++++-
cli_ure/source/uno_bridge/cli_uno.cxx | 3 ++-
codemaker/source/codemaker/options.cxx | 2 +-
codemaker/source/codemaker/typemanager.cxx | 5 ++++-
codemaker/source/cppumaker/cppumaker.cxx | 3 ++-
codemaker/source/cppumaker/cppuoptions.cxx | 5 +++--
codemaker/source/cppumaker/cpputype.cxx | 5 ++++-
codemaker/source/javamaker/javamaker.cxx | 4 ++--
codemaker/source/javamaker/javaoptions.cxx | 5 +++--
cppu/source/typelib/static_types.cxx | 4 +++-
cppu/source/typelib/typelib.cxx | 5 ++++-
cppu/source/uno/lbmap.cxx | 6 ++++--
cppuhelper/source/component.cxx | 4 +++-
cppuhelper/source/factory.cxx | 3 ++-
cppuhelper/source/propshlp.cxx | 4 +++-
cppuhelper/source/stdidlclass.cxx | 3 ++-
cppuhelper/test/testhelper.cxx | 5 ++++-
cppuhelper/test/testimplhelper.cxx | 5 ++++-
cpputools/source/sp2bv/sp2bv.cxx | 4 ----
cpputools/source/unoexe/unoexe.cxx | 6 +++++-
idlc/source/options.cxx | 3 +--
idlc/source/parser.y | 6 +++++-
io/source/stm/opump.cxx | 5 ++++-
jvmaccess/workbench/javainfo/javainfotest.cxx | 5 ++++-
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 5 +++--
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 3 ++-
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 4 ++--
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 5 ++++-
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 4 +++-
jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx | 6 ++++--
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 7 ++++++-
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 3 ++-
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 6 +++++-
jvmfwk/source/fwkbase.cxx | 7 ++++++-
jvmfwk/source/fwkutil.cxx | 5 ++++-
44 files changed, 146 insertions(+), 57 deletions(-)
New commits:
commit fdc03569ba14198aef950594242c7e088649dc33
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Mar 2 21:53:12 2011 +0100
Remove "using namespace ::rtl"
diff --git a/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx b/bridges/source/cpp_uno/cc50_solaris_intel/except.cxx
index bf40835..8d8f20d 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 a4c4baa..af34b49 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 1e261d2..756dc6b 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 5bb52af..15da8c2 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 9d5c2d1..6cd22a8 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 22a483a..6a824da 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 4554057..543ba7b 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 040366d..461d92e 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 ec82d58..26f317c 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 c1604ec..ef9e614 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 20fd608..33e68c9 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 27ebb14..1909dd4 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 a3a4530..0b28e4d 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 0d6048a..a58e9db 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 302a7ea..c44c99f 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 f31384a..5994a08 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 6a25bc7..700dcd9 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 105357c..62abb3c 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 5cb19e2..31653fd 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 488e98f..13232a5 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 a701e1a..2a6266f 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 2add135..3d6bc3c 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 187da68..d37f069 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 507a90f..bbf1671 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 512913c..c915c7d 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 b998580..85b7b46 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 703c44e..c70c933 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 752d0b9..f25da52 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 83afad1..32aaa3e 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 ec9315c..b78afe8 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 6de66ae..38e5438 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 d0b78f9..84ef394 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 2d23871..0ebb59e 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 3f9fb9f..2619f6a 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 1cc5ae3..f02028e 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 152d443..9277b31 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 02cc1ac..faa699e 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 1af7c5e..b46d527 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 5f71afb..1862d27 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 9d55a8e..5f766ce 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 487eacf..0f5263f 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 2d976b3..059d8a0 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 ecc60eb..ed55703 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 eee75cd..ed38b57 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
{
More information about the Libreoffice-commits
mailing list