[Libreoffice-commits] .: Branch 'gr2' - 13 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 rdbmaker/source registry/source registry/test registry/workben remotebridges/source salhelper/test sal/inc sal/osl sal/qa sal/rtl stoc/source stoc/test
Martin Hosken
mhosken at kemper.freedesktop.org
Thu Mar 10 00:16:32 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 | 5
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 | 6 -
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 | 8 -
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 12 +-
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx | 3
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx | 6 -
jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx | 9 -
jvmfwk/source/elements.cxx | 7 -
jvmfwk/source/framework.cxx | 6 -
jvmfwk/source/framework.hxx | 1
jvmfwk/source/fwkbase.cxx | 7 +
jvmfwk/source/fwkutil.cxx | 5
jvmfwk/source/fwkutil.hxx | 4
jvmfwk/source/libxmlutil.hxx | 18 ---
rdbmaker/source/codemaker/dependency.cxx | 4
rdbmaker/source/codemaker/options.cxx | 3
rdbmaker/source/codemaker/typemanager.cxx | 5
rdbmaker/source/rdbmaker/rdbmaker.cxx | 7 +
rdbmaker/source/rdbmaker/rdboptions.cxx | 3
rdbmaker/source/rdbmaker/rdbtype.cxx | 35 -----
rdbmaker/source/rdbmaker/specialtypemanager.cxx | 3
rdbmaker/source/rdbmaker/typeblop.cxx | 3
registry/source/reflwrit.cxx | 4
registry/source/regimpl.cxx | 6 -
registry/source/regimpl.hxx | 3
registry/test/testmerge.cxx | 3
registry/test/testregcpp.cxx | 5
registry/workben/regspeed.cxx | 3
registry/workben/regtest.cxx | 4
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 3
sal/inc/rtl/allocator.hxx | 1
sal/osl/unx/interlck.c | 10 +
sal/osl/w32/MAKEFILE.MK | 1
sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 4
sal/qa/OStringBuffer/rtl_String_Utils.cxx | 3
sal/qa/osl/file/osl_File.cxx | 6 -
sal/qa/osl/file/osl_old_test_file.cxx | 5
sal/qa/osl/file/test_cpy_wrt_file.cxx | 5
sal/qa/osl/module/osl_Module.cxx | 5
sal/qa/osl/pipe/osl_Pipe.cxx | 5
sal/qa/osl/process/osl_Thread.cxx | 3
sal/qa/osl/process/osl_process.cxx | 5
sal/qa/osl/socket/osl_AcceptorSocket.cxx | 2
sal/qa/osl/socket/osl_ConnectorSocket.cxx | 2
sal/qa/osl/socket/osl_DatagramSocket.cxx | 3
sal/qa/osl/socket/osl_Socket.cxx | 5
sal/qa/osl/socket/osl_Socket2.cxx | 2
sal/qa/osl/socket/osl_SocketAddr.cxx | 5
sal/qa/osl/socket/osl_StreamSocket.cxx | 81 -------------
sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx | 6 -
sal/qa/rtl/process/rtl_Process.cxx | 5
sal/qa/rtl/uuid/rtl_Uuid.cxx | 5
sal/qa/rtl_strings/rtl_OString.cxx | 3
sal/qa/rtl_strings/rtl_OUString.cxx | 4
sal/qa/rtl_strings/rtl_OUStringBuffer.cxx | 4
sal/qa/rtl_strings/rtl_String_Utils.cxx | 3
sal/qa/rtl_strings/rtl_old_testostring.cxx | 5
sal/qa/rtl_strings/rtl_old_testowstring.cxx | 5
sal/qa/rtl_strings/rtl_old_teststrbuf.cxx | 6 -
sal/rtl/source/logfile.cxx | 4
salhelper/test/Symbols/loader.cxx | 3
salhelper/test/dynamicloader/loader.cxx | 3
stoc/source/bootstrap/services.cxx | 1
stoc/source/corereflection/base.hxx | 2
stoc/source/corereflection/crefl.cxx | 5
stoc/source/defaultregistry/defaultregistry.cxx | 3
stoc/source/implementationregistration/implreg.cxx | 4
stoc/source/inspect/introspection.cxx | 19 ---
stoc/source/invocation/invocation.cxx | 3
stoc/source/javavm/jvmargs.cxx | 3
stoc/source/loader/dllcomponentloader.cxx | 3
stoc/source/namingservice/namingservice.cxx | 3
stoc/source/registry_tdprovider/base.hxx | 3
stoc/source/registry_tdprovider/tdservice.cxx | 1
stoc/source/servicemanager/servicemanager.cxx | 6 -
stoc/source/simpleregistry/simpleregistry.cxx | 7 +
stoc/source/stocservices/stocservices.cxx | 1
stoc/source/tdmanager/tdmgr.cxx | 4
stoc/source/typeconv/convert.cxx | 3
stoc/test/excomp/excomp.cxx | 4
stoc/test/excomp/excomp1.cxx | 3
stoc/test/excomp/excomp2.cxx | 3
stoc/test/javavm/jvm_interaction/interactionhandler.cxx | 5
stoc/test/javavm/testjavavm.cxx | 5
stoc/test/testconv.cxx | 4
stoc/test/testcorefl.cxx | 5
stoc/test/testiadapter.cxx | 5
stoc/test/testintrosp.cxx | 6 -
stoc/test/testloader.cxx | 3
stoc/test/testregistry.cxx | 89 +++++++--------
stoc/test/testsmgr_cpnt.cxx | 5
127 files changed, 392 insertions(+), 376 deletions(-)
New commits:
commit 4eadde89c60525d4165893c5ca86320afeb602d6
Author: Jani Monoses <jani.monoses at canonical.com>
Date: Wed Mar 9 10:06:16 2011 +0100
lp#726529: using the Linaro gcc 4.5 generated code instead
* this adds memory barriers to the asm code block making it SMP-safe
diff --git a/sal/osl/unx/interlck.c b/sal/osl/unx/interlck.c
index 7cf09b9..826592a 100644
--- a/sal/osl/unx/interlck.c
+++ b/sal/osl/unx/interlck.c
@@ -40,6 +40,8 @@
#elif defined ( ARM ) && (( __GNUC__ < 4 ) || (( __GNUC__ == 4) && ( __GNUC_MINOR__ < 6 ))) && ( __ARM_ARCH__ >= 6)
// assembler implementation for gcc <4.6 on arm
// originally contributed by Eric Bachard / OOo4Kids
+// replaced with the asm code generated by Linaro gcc 4.5
+// which includes memory barriers to make it SMP-safe
// #i117017# and lp#726529
oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount* pCount)
{
@@ -47,11 +49,13 @@ oslInterlockedCount SAL_CALL osl_incrementInterlockedCount(oslInterlockedCount*
int nResult;
__asm__ __volatile__ (
+" dmb\n"
"1: ldrex %0, [%3]\n"
" add %0, %0, #1\n"
" strex %1, %0, [%3]\n"
" teq %1, #0\n"
-" bne 1b"
+" bne 1b\n"
+" dmb\n"
: "=&r" (nCount), "=&r" (nResult), "=m" (*pCount)
: "r" (pCount)
: "memory");
@@ -65,11 +69,13 @@ oslInterlockedCount SAL_CALL osl_decrementInterlockedCount(oslInterlockedCount*
int nResult;
__asm__ __volatile__ (
+" dmb\n"
"0: ldrex %0, [%3]\n"
" sub %0, %0, #1\n"
" strex %1, %0, [%3]\n"
" teq %1, #0\n"
-" bne 0b"
+" bne 0b\n"
+" dmb\n"
: "=&r" (nCount), "=&r" (nResult), "=m" (*pCount)
: "r" (pCount)
: "memory");
commit dbd113582d748582429d09e8dcf44e281ff5d6dc
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 6 20:39:05 2011 +0000
WaE: silence this annoying warning
diff --git a/sal/inc/rtl/allocator.hxx b/sal/inc/rtl/allocator.hxx
index a9040f4..ffad205 100644
--- a/sal/inc/rtl/allocator.hxx
+++ b/sal/inc/rtl/allocator.hxx
@@ -148,6 +148,7 @@ public:
void destroy (pointer p)
{
p->~T();
+ (void)p; //MSVC2005 annoyingly warns this is unused
}
};
commit b4c6118501a1a42d3c5b10818038e5acfc904a18
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Mar 6 20:35:41 2011 +0000
build these cxx files with exceptions enabled
diff --git a/sal/osl/w32/MAKEFILE.MK b/sal/osl/w32/MAKEFILE.MK
index 9dd1d0c..08e8745 100644
--- a/sal/osl/w32/MAKEFILE.MK
+++ b/sal/osl/w32/MAKEFILE.MK
@@ -29,6 +29,7 @@ PRJ=..$/..
PRJNAME=sal
TARGET=cpposl
+ENABLE_EXCEPTIONS=TRUE
USE_LDUMP2=TRUE
PROJECTPCH4DLL=TRUE
commit a5b803821c22fbdfaff8220114286fccf0773d1b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Mar 4 09:26:02 2011 +0000
duplicate mkdir
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index 2d58ac1..ca55d38 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -1,4 +1,3 @@
-mkdir: %_DEST%\bin%_EXT%\cppunit
mkdir: %_DEST%\inc%_EXT%\sal
mkdir: %_DEST%\inc%_EXT%\osl
mkdir: %_DEST%\inc%_EXT%\rtl
commit 8f611ce047d6619f8a59952680dd308f36a549c0
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu Mar 3 22:48:57 2011 +0100
Remove "using namespace ::rtl"
diff --git a/salhelper/test/Symbols/loader.cxx b/salhelper/test/Symbols/loader.cxx
index 97e4a22..900b097 100644
--- a/salhelper/test/Symbols/loader.cxx
+++ b/salhelper/test/Symbols/loader.cxx
@@ -7,7 +7,8 @@
using namespace salhelper;
-using namespace rtl;
+
+using ::rtl::OUString;
class SampleLibLoader
diff --git a/salhelper/test/dynamicloader/loader.cxx b/salhelper/test/dynamicloader/loader.cxx
index 97e4a22..900b097 100644
--- a/salhelper/test/dynamicloader/loader.cxx
+++ b/salhelper/test/dynamicloader/loader.cxx
@@ -7,7 +7,8 @@
using namespace salhelper;
-using namespace rtl;
+
+using ::rtl::OUString;
class SampleLibLoader
diff --git a/stoc/source/bootstrap/services.cxx b/stoc/source/bootstrap/services.cxx
index daf1d10..762cebd 100644
--- a/stoc/source/bootstrap/services.cxx
+++ b/stoc/source/bootstrap/services.cxx
@@ -43,7 +43,6 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace cppu;
using namespace osl;
-using namespace rtl;
extern rtl_StandardModuleCount g_moduleCount;
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index ff93374..0116bbf 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -61,12 +61,12 @@
using namespace std;
using namespace osl;
-using namespace rtl;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::reflection;
using namespace com::sun::star::container;
+using ::rtl::OUString;
namespace stoc_corefl
diff --git a/stoc/source/corereflection/crefl.cxx b/stoc/source/corereflection/crefl.cxx
index b56a255..8949d41 100644
--- a/stoc/source/corereflection/crefl.cxx
+++ b/stoc/source/corereflection/crefl.cxx
@@ -41,7 +41,10 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
using namespace cppu;
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
#include "base.hxx"
diff --git a/stoc/source/defaultregistry/defaultregistry.cxx b/stoc/source/defaultregistry/defaultregistry.cxx
index 0e11ae2..6bb9028 100644
--- a/stoc/source/defaultregistry/defaultregistry.cxx
+++ b/stoc/source/defaultregistry/defaultregistry.cxx
@@ -55,8 +55,7 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace cppu;
using namespace osl;
-using namespace rtl;
-
+using ::rtl::OUString;
#define SERVICENAME "com.sun.star.registry.NestedRegistry"
#define IMPLNAME "com.sun.star.comp.stoc.NestedRegistry"
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 30c22d1..cae2922 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -73,10 +73,10 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
using namespace cppu;
-using namespace rtl;
using namespace osl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
#define IMPLNAME "com.sun.star.comp.stoc.ImplementationRegistration"
#define SERVICENAME "com.sun.star.registry.ImplementationRegistration"
namespace stoc_impreg
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index 240693e..24a78a8 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -89,7 +89,10 @@ using namespace com::sun::star::beans::PropertyConcept;
using namespace com::sun::star::beans::MethodConcept;
using namespace cppu;
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
#define IMPLEMENTATION_NAME "com.sun.star.comp.stoc.Introspection"
#define SERVICE_NAME "com.sun.star.beans.Introspection"
@@ -1318,20 +1321,6 @@ Sequence< Property > ImplIntrospectionAccess::getProperties(sal_Int32 PropertyCo
sal_Int32 nConcept = pConcepts[ i ];
if( nConcept & PropertyConcepts )
pDestProps[ iDest++ ] = pSourceProps[ i ];
-
- /*
- // Property mit Concepts ausgeben
- OUString aPropName = pSourceProps[ i ].Name;
- String aNameStr = OOUStringToString(aPropName, CHARSET_SYSTEM);
- String ConceptStr;
- if( nConcept & PROPERTYSET )
- ConceptStr += "PROPERTYSET";
- if( nConcept & ATTRIBUTES )
- ConceptStr += "ATTRIBUTES";
- if( nConcept & METHODS )
- ConceptStr += "METHODS";
- printf( "Property %ld: %s, Concept = %s\n", i, aNameStr.GetStr(), ConceptStr.GetStr() );
- */
}
// PropertyConcept merken, dies entspricht maLastPropertySeq
diff --git a/stoc/source/invocation/invocation.cxx b/stoc/source/invocation/invocation.cxx
index b3f5ab6..f97f19f 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -73,9 +73,8 @@ using namespace com::sun::star::beans;
using namespace com::sun::star::registry;
using namespace com::sun::star::container;
using namespace cppu;
-using namespace rtl;
using namespace osl;
-
+using ::rtl::OUString;
namespace stoc_inv
{
diff --git a/stoc/source/javavm/jvmargs.cxx b/stoc/source/javavm/jvmargs.cxx
index 88000f2..323ffa8 100644
--- a/stoc/source/javavm/jvmargs.cxx
+++ b/stoc/source/javavm/jvmargs.cxx
@@ -35,8 +35,7 @@
#define OUSTR(x) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
-using namespace rtl;
-
+using ::rtl::OUString;
namespace stoc_javavm {
JVM::JVM() throw()//: _enabled(sal_False)
diff --git a/stoc/source/loader/dllcomponentloader.cxx b/stoc/source/loader/dllcomponentloader.cxx
index 944f0cc..b700247 100644
--- a/stoc/source/loader/dllcomponentloader.cxx
+++ b/stoc/source/loader/dllcomponentloader.cxx
@@ -65,9 +65,8 @@ using namespace com::sun::star::loader;
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
using namespace cppu;
-using namespace rtl;
using namespace osl;
-
+using ::rtl::OUString;
extern rtl_StandardModuleCount g_moduleCount;
namespace stoc_bootstrap
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index 81670a8..c993b89 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -45,7 +45,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
using namespace cppu;
-using namespace rtl;
using namespace osl;
using namespace std;
@@ -53,6 +52,8 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
+using ::rtl::OUString;
+
#define SERVICENAME "com.sun.star.uno.NamingService"
#define IMPLNAME "com.sun.star.comp.stoc.NamingService"
diff --git a/stoc/source/registry_tdprovider/base.hxx b/stoc/source/registry_tdprovider/base.hxx
index 23c420b..59c59a3 100644
--- a/stoc/source/registry_tdprovider/base.hxx
+++ b/stoc/source/registry_tdprovider/base.hxx
@@ -62,7 +62,6 @@
#include <com/sun/star/registry/XRegistryKey.hpp>
using namespace std;
-using namespace rtl;
using namespace osl;
using namespace cppu;
using namespace com::sun::star::uno;
@@ -70,6 +69,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace com::sun::star::reflection;
+using ::rtl::OUString;
+
//--------------------------------------------------------------------------------------------------
extern rtl_StandardModuleCount g_moduleCount;
diff --git a/stoc/source/registry_tdprovider/tdservice.cxx b/stoc/source/registry_tdprovider/tdservice.cxx
index 3aa93d1..458b1f1 100644
--- a/stoc/source/registry_tdprovider/tdservice.cxx
+++ b/stoc/source/registry_tdprovider/tdservice.cxx
@@ -41,6 +41,7 @@
#include <memory>
using namespace com::sun::star;
+using ::rtl::OUStringBuffer;
namespace {
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index f7304a1..1a5d8ae 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -82,9 +82,13 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace cppu;
using namespace osl;
-using namespace rtl;
using namespace std;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+
rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
namespace stoc_bootstrap
diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx
index 4925478..123ed41 100644
--- a/stoc/source/simpleregistry/simpleregistry.cxx
+++ b/stoc/source/simpleregistry/simpleregistry.cxx
@@ -50,7 +50,12 @@ using namespace com::sun::star::registry;
using namespace com::sun::star::lang;
using namespace cppu;
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
+using ::rtl::OUStringToOString;
#define SERVICENAME "com.sun.star.registry.SimpleRegistry"
#define IMPLNAME "com.sun.star.comp.stoc.SimpleRegistry"
diff --git a/stoc/source/stocservices/stocservices.cxx b/stoc/source/stocservices/stocservices.cxx
index ccb80fb..d66f896 100644
--- a/stoc/source/stocservices/stocservices.cxx
+++ b/stoc/source/stocservices/stocservices.cxx
@@ -41,7 +41,6 @@ using namespace com::sun::star;
using namespace com::sun::star::uno;
using namespace cppu;
using namespace osl;
-using namespace rtl;
using namespace stoc_services;
rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
diff --git a/stoc/source/tdmanager/tdmgr.cxx b/stoc/source/tdmanager/tdmgr.cxx
index b31d9f5..2351751 100644
--- a/stoc/source/tdmanager/tdmgr.cxx
+++ b/stoc/source/tdmanager/tdmgr.cxx
@@ -62,7 +62,6 @@
using namespace std;
using namespace cppu;
-using namespace rtl;
using namespace osl;
using namespace com::sun::star;
using namespace com::sun::star::uno;
@@ -71,7 +70,8 @@ using namespace com::sun::star::reflection;
using namespace com::sun::star::container;
using namespace com::sun::star::registry;
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
static const sal_Int32 CACHE_SIZE = 512;
diff --git a/stoc/source/typeconv/convert.cxx b/stoc/source/typeconv/convert.cxx
index ce4dc22..b572086 100644
--- a/stoc/source/typeconv/convert.cxx
+++ b/stoc/source/typeconv/convert.cxx
@@ -56,9 +56,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::script;
using namespace com::sun::star::registry;
using namespace cppu;
-using namespace rtl;
using namespace osl;
-
+using ::rtl::OUString;
#define SERVICENAME "com.sun.star.script.Converter"
#define IMPLNAME "com.sun.star.comp.stoc.TypeConverter"
diff --git a/stoc/test/excomp/excomp.cxx b/stoc/test/excomp/excomp.cxx
index e9bba8a..12706dd 100644
--- a/stoc/test/excomp/excomp.cxx
+++ b/stoc/test/excomp/excomp.cxx
@@ -51,7 +51,9 @@ using namespace com::sun::star::registry;
using namespace com::sun::star::lang;
using namespace example;
using namespace cppu;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
#if OSL_DEBUG_LEVEL > 0
#define TEST_ENSHURE(c, m) OSL_ENSURE(c, m)
diff --git a/stoc/test/excomp/excomp1.cxx b/stoc/test/excomp/excomp1.cxx
index d45b176..05d4a21 100644
--- a/stoc/test/excomp/excomp1.cxx
+++ b/stoc/test/excomp/excomp1.cxx
@@ -46,7 +46,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
using namespace cppu;
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
#define SERVICENAME1 "example.ExampleComponent1"
#define IMPLNAME1 "example.ExampleComponent1.Impl"
diff --git a/stoc/test/excomp/excomp2.cxx b/stoc/test/excomp/excomp2.cxx
index fdece1d..b059f67 100644
--- a/stoc/test/excomp/excomp2.cxx
+++ b/stoc/test/excomp/excomp2.cxx
@@ -49,7 +49,8 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
using namespace cppu;
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
#define SERVICENAME2 "example.ExampleComponent2"
#define IMPLNAME2 "example.ExampleComponent2.Impl"
diff --git a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
index cae4e22..e875b0d 100644
--- a/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
+++ b/stoc/test/javavm/jvm_interaction/interactionhandler.cxx
@@ -61,7 +61,6 @@
#include <uno/current_context.hxx>
using namespace std;
-using namespace rtl;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -70,6 +69,10 @@ using namespace com::sun::star::registry;
using namespace com::sun::star::java;
using namespace com::sun::star::task;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
#define OUSTR( x ) OUString(RTL_CONSTASCII_USTRINGPARAM( x ))
#define INTERACTION_HANDLER_NAME "java-vm.interaction-handler"
diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index c54b3f1..8114e99 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -47,7 +47,6 @@
#include <com/sun/star/java/XJavaThreadRegister_11.hpp>
using namespace std;
-using namespace rtl;
using namespace cppu;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -55,6 +54,10 @@ using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
using namespace com::sun::star::java;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
{
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index b49fcd9..a3d108c 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -44,7 +44,6 @@
#include <stdio.h>
-using namespace rtl;
using namespace cppu;
using namespace osl;
using namespace com::sun::star::uno;
@@ -53,6 +52,9 @@ using namespace com::sun::star::script;
using namespace com::sun::star::reflection;
using namespace com::sun::star::registry;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+
const double MIN_DOUBLE = -DBL_MAX;
const double MAX_DOUBLE = DBL_MAX;
const double MIN_FLOAT = -FLT_MAX;
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 4736293..a2ff243 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -60,7 +60,6 @@
#include <stdio.h>
-using namespace rtl;
using namespace cppu;
using namespace osl;
using namespace ModuleA;
@@ -75,6 +74,10 @@ using namespace com::sun::star::registry;
using namespace com::sun::star::reflection;
using namespace com::sun::star::container;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
//==================================================================================================
class OInterfaceA : public WeakImplHelper1< XInterfaceA >
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index dbf819f..8813a2f 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -50,7 +50,6 @@
using namespace test;
-using namespace rtl;
using namespace cppu;
using namespace osl;
using namespace com::sun::star::uno;
@@ -61,6 +60,10 @@ using namespace com::sun::star::reflection;
using namespace com::sun::star::lang;
using namespace com::sun::star::registry;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+
//==================================================================================================
sal_Bool equals( const test::TestElement & rData1, const test::TestElement & rData2 )
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index f3eb7df..ebc2b27 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -53,7 +53,6 @@
#include <stdio.h>
#include <string.h>
-using namespace rtl;
using namespace cppu;
using namespace ModuleA;
using namespace com::sun::star::uno;
@@ -64,6 +63,11 @@ using namespace com::sun::star::reflection;
using namespace com::sun::star::container;
using namespace com::sun::star::beans::PropertyAttribute;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
typedef WeakImplHelper4< XIntroTest, XPropertySet, XNameAccess, XIndexAccess > ImplIntroTestHelper;
typedef WeakImplHelper1< XPropertySetInfo > ImplPropertySetInfoHelper;
diff --git a/stoc/test/testloader.cxx b/stoc/test/testloader.cxx
index 627f2fb..15a99c8 100644
--- a/stoc/test/testloader.cxx
+++ b/stoc/test/testloader.cxx
@@ -52,9 +52,10 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::loader;
using namespace com::sun::star::lang;
using namespace osl;
-using namespace rtl;
using namespace cppu;
+using ::rtl::OUString;
+
#if OSL_DEBUG_LEVEL > 0
#define TEST_ENSHURE(c, m) OSL_ENSURE(c, m)
#else
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index 32af575..bb74c4a 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -60,9 +60,12 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::registry;
using namespace com::sun::star::lang;
using namespace com::sun::star::beans;
-using namespace rtl;
using namespace osl;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
#if OSL_DEBUG_LEVEL > 0
#define TEST_ENSHURE(c, m) OSL_ENSURE(c, m)
#else
@@ -72,35 +75,35 @@ using namespace osl;
namespace stoc_impreg
{
void SAL_CALL mergeKeys(
- Reference< registry::XRegistryKey > const & xDest,
- Reference< registry::XRegistryKey > const & xSource )
- SAL_THROW( (registry::InvalidRegistryException, registry::MergeConflictException) );
+Reference< registry::XRegistryKey > const & xDest,
+Reference< registry::XRegistryKey > const & xSource )
+SAL_THROW( (registry::InvalidRegistryException, registry::MergeConflictException) );
}
static void mergeKeys(
- Reference< registry::XSimpleRegistry > const & xDest,
- OUString const & rBaseNode,
- OUString const & rURL )
- SAL_THROW( (registry::InvalidRegistryException, registry::MergeConflictException) )
+Reference< registry::XSimpleRegistry > const & xDest,
+OUString const & rBaseNode,
+OUString const & rURL )
+SAL_THROW( (registry::InvalidRegistryException, registry::MergeConflictException) )
{
- Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() );
- Reference< registry::XRegistryKey > xDestKey;
- if (rBaseNode.getLength())
- {
- xDestKey = xDestRoot->createKey( rBaseNode );
- xDestRoot->closeKey();
- }
- else
- {
- xDestKey = xDestRoot;
- }
- Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
- xSimReg->open( rURL, sal_True, sal_False );
- OSL_ASSERT( xSimReg->isValid() );
- Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() );
- ::stoc_impreg::mergeKeys( xDestKey, xSourceKey );
- xSourceKey->closeKey();
- xSimReg->close();
- xDestKey->closeKey();
+Reference< registry::XRegistryKey > xDestRoot( xDest->getRootKey() );
+Reference< registry::XRegistryKey > xDestKey;
+if (rBaseNode.getLength())
+{
+xDestKey = xDestRoot->createKey( rBaseNode );
+xDestRoot->closeKey();
+}
+else
+{
+xDestKey = xDestRoot;
+}
+Reference< registry::XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
+xSimReg->open( rURL, sal_True, sal_False );
+OSL_ASSERT( xSimReg->isValid() );
+Reference< registry::XRegistryKey > xSourceKey( xSimReg->getRootKey() );
+::stoc_impreg::mergeKeys( xDestKey, xSourceKey );
+xSourceKey->closeKey();
+xSimReg->close();
+xDestKey->closeKey();
}
@@ -108,33 +111,33 @@ OString userRegEnv("STAR_USER_REGISTRY=");
OUString getExePath()
{
- OUString exe;
- OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
+OUString exe;
+OSL_VERIFY( osl_getExecutableFile( &exe.pData ) == osl_Process_E_None);
#if defined(WIN32) || defined(__OS2__) || defined(WNT)
- exe = exe.copy(0, exe.getLength() - 16);
+exe = exe.copy(0, exe.getLength() - 16);
#else
- exe = exe.copy(0, exe.getLength() - 12);
+exe = exe.copy(0, exe.getLength() - 12);
#endif
- return exe;
+return exe;
}
void setStarUserRegistry()
{
- Registry *myRegistry = new Registry();
+Registry *myRegistry = new Registry();
- RegistryKey rootKey, rKey, rKey2;
+RegistryKey rootKey, rKey, rKey2;
- OUString userReg = getExePath();
- userReg += OUString(RTL_CONSTASCII_USTRINGPARAM("user.rdb"));
- if(myRegistry->open(userReg, REG_READWRITE))
- {
- TEST_ENSHURE(!myRegistry->create(userReg), "setStarUserRegistry error 1");
- }
+OUString userReg = getExePath();
+userReg += OUString(RTL_CONSTASCII_USTRINGPARAM("user.rdb"));
+if(myRegistry->open(userReg, REG_READWRITE))
+{
+TEST_ENSHURE(!myRegistry->create(userReg), "setStarUserRegistry error 1");
+}
- TEST_ENSHURE(!myRegistry->close(), "setStarUserRegistry error 9");
- delete myRegistry;
+TEST_ENSHURE(!myRegistry->close(), "setStarUserRegistry error 9");
+delete myRegistry;
- userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
+userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
putenv((char *)userRegEnv.getStr());
}
diff --git a/stoc/test/testsmgr_cpnt.cxx b/stoc/test/testsmgr_cpnt.cxx
index 4933ff5..d8b800b 100644
--- a/stoc/test/testsmgr_cpnt.cxx
+++ b/stoc/test/testsmgr_cpnt.cxx
@@ -75,9 +75,12 @@ using namespace com::sun::star::registry;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace osl;
-using namespace rtl;
using namespace cppu;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+
Reference<XMultiServiceFactory> getProcessServiceManager()
{
commit f3128dc70f604d2ea7b4d09439e72e2699940461
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu Mar 3 22:26:57 2011 +0100
Remove "using namespace ::rtl"
diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
index 0fb611c..5b00ba4 100644
--- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
+++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx
@@ -40,8 +40,8 @@
#include "cppunit/plugin/TestPlugIn.h"
#include <string.h>
-using namespace rtl;
-
+using ::rtl::OStringBuffer;
+using ::rtl::OString;
// This file contains cppunit tests for the
// OString and OStringBuffer classes
diff --git a/sal/qa/OStringBuffer/rtl_String_Utils.cxx b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
index 0713133..e072991 100644
--- a/sal/qa/OStringBuffer/rtl_String_Utils.cxx
+++ b/sal/qa/OStringBuffer/rtl_String_Utils.cxx
@@ -48,8 +48,7 @@
#include <rtl_String_Utils_Const.h>
#endif
-using namespace rtl;
-
+using ::rtl::OString;
sal_uInt32 AStringLen( const sal_Char *pAStr )
{
sal_uInt32 nStrLen = 0;
diff --git a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
index f250dfa..c7161d5 100644
--- a/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
+++ b/sal/qa/rtl/bootstrap/rtl_Bootstrap.cxx
@@ -51,8 +51,10 @@
#include <osl/thread.hxx>
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
#define TESTSHL2_INI "testshl2"
#define PSEUDO_INI "pseudo"
diff --git a/sal/qa/rtl/process/rtl_Process.cxx b/sal/qa/rtl/process/rtl_Process.cxx
index c4a762f..81627c3 100644
--- a/sal/qa/rtl/process/rtl_Process.cxx
+++ b/sal/qa/rtl/process/rtl_Process.cxx
@@ -44,7 +44,10 @@
#include "rtl_Process_Const.h"
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringToOString;
/** print a UNI_CODE String. And also print some comments of the string.
*/
diff --git a/sal/qa/rtl/uuid/rtl_Uuid.cxx b/sal/qa/rtl/uuid/rtl_Uuid.cxx
index 201dfb5..ccf4588 100644
--- a/sal/qa/rtl/uuid/rtl_Uuid.cxx
+++ b/sal/qa/rtl/uuid/rtl_Uuid.cxx
@@ -42,8 +42,9 @@
#include <time.h>
#endif
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
/** print a UNI_CODE String. And also print some comments of the string.
*/
inline void printUString( const ::rtl::OUString & str, const sal_Char * msg = "" )
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx b/sal/qa/rtl_strings/rtl_OString.cxx
index 19532e5..7fdd1ef 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -49,8 +49,7 @@
#endif
#include <rtl/ustring.h>
-using namespace rtl;
-
+using ::rtl::OString;
//------------------------------------------------------------------------
// test classes
//------------------------------------------------------------------------
diff --git a/sal/qa/rtl_strings/rtl_OUString.cxx b/sal/qa/rtl_strings/rtl_OUString.cxx
index 5eb38fb..4e5dc49 100644
--- a/sal/qa/rtl_strings/rtl_OUString.cxx
+++ b/sal/qa/rtl_strings/rtl_OUString.cxx
@@ -42,8 +42,8 @@
#include <rtl_String_Utils.hxx>
-
- using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OString;
//------------------------------------------------------------------------
// test classes
diff --git a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
index 988a53e..165d30c 100644
--- a/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
+++ b/sal/qa/rtl_strings/rtl_OUStringBuffer.cxx
@@ -68,7 +68,9 @@
#endif
#include "stdio.h"
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
//------------------------------------------------------------------------
// test classes
diff --git a/sal/qa/rtl_strings/rtl_String_Utils.cxx b/sal/qa/rtl_strings/rtl_String_Utils.cxx
index f138c7c..2250d98 100644
--- a/sal/qa/rtl_strings/rtl_String_Utils.cxx
+++ b/sal/qa/rtl_strings/rtl_String_Utils.cxx
@@ -48,8 +48,7 @@
#include <rtl_String_Utils_Const.h>
#endif
-using namespace rtl;
-
+using ::rtl::OString;
sal_uInt32 AStringLen( const sal_Char *pAStr )
{
sal_uInt32 nStrLen = 0;
diff --git a/sal/qa/rtl_strings/rtl_old_testostring.cxx b/sal/qa/rtl_strings/rtl_old_testostring.cxx
index 8b04de2..ee0e8d7 100644
--- a/sal/qa/rtl_strings/rtl_old_testostring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testostring.cxx
@@ -41,10 +41,7 @@
#include <testshl/simpleheader.hxx>
#define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
-
-
-using namespace rtl;
-
+using ::rtl::OString;
namespace rtl_OString
{
class oldtests : public CppUnit::TestFixture
diff --git a/sal/qa/rtl_strings/rtl_old_testowstring.cxx b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
index 15861dd..4afeb04 100644
--- a/sal/qa/rtl_strings/rtl_old_testowstring.cxx
+++ b/sal/qa/rtl_strings/rtl_old_testowstring.cxx
@@ -53,8 +53,9 @@
#define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
-
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
namespace rtl_OUString
{
diff --git a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
index a3df89a..9efc997 100644
--- a/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
+++ b/sal/qa/rtl_strings/rtl_old_teststrbuf.cxx
@@ -42,8 +42,10 @@
#include <testshl/simpleheader.hxx>
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OStringBuffer;
#define TEST_ENSURE(c, m) CPPUNIT_ASSERT_MESSAGE((m), (c))
commit 00244d548fc2066e3183a331616b68bb548f9484
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Thu Mar 3 22:09:48 2011 +0100
Remove "using namespace ::rtl"
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index d7486c9..830c517 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -45,7 +45,6 @@
#include <com/sun/star/bridge/XUnoUrlResolver.hpp>
using namespace cppu;
-using namespace rtl;
using namespace osl;
using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
@@ -53,6 +52,8 @@ using namespace com::sun::star::connection;
using namespace com::sun::star::bridge;
using namespace com::sun::star::registry;
+using ::rtl::OUString;
+
#define SERVICENAME "com.sun.star.bridge.UnoUrlResolver"
#define IMPLNAME "com.sun.star.comp.bridge.UnoUrlResolver"
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 4d89063..1c6379b 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -47,7 +47,11 @@
#include <cppunit/plugin/TestPlugIn.h>
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
//------------------------------------------------------------------------
// helper functions
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx b/sal/qa/osl/file/osl_old_test_file.cxx
index d645f08..659a3a3 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -110,8 +110,9 @@ const char * const aSource3[ ] =
0,0
};
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
void oldtestfile::test_file_001()
{
#ifdef WIN32
diff --git a/sal/qa/osl/file/test_cpy_wrt_file.cxx b/sal/qa/osl/file/test_cpy_wrt_file.cxx
index cfa7246..8911631 100644
--- a/sal/qa/osl/file/test_cpy_wrt_file.cxx
+++ b/sal/qa/osl/file/test_cpy_wrt_file.cxx
@@ -37,7 +37,10 @@
#include <rtl/ustring.hxx>
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
//Use to silence OSL_ warnings for a deliberate error
extern "C" void SAL_CALL suppressOslDebugMessage( const sal_Char *, sal_Int32, const sal_Char * )
diff --git a/sal/qa/osl/socket/osl_AcceptorSocket.cxx b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
index 0c8adf3..b75be16 100644
--- a/sal/qa/osl/socket/osl_AcceptorSocket.cxx
+++ b/sal/qa/osl/socket/osl_AcceptorSocket.cxx
@@ -65,7 +65,7 @@
#include "sockethelper.hxx"
using namespace osl;
-using namespace rtl;
+using ::rtl::OUString;
#define IP_PORT_FTP 21
#define IP_PORT_MYPORT9 8897
diff --git a/sal/qa/osl/socket/osl_ConnectorSocket.cxx b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
index 74fdb3f..8129d71 100644
--- a/sal/qa/osl/socket/osl_ConnectorSocket.cxx
+++ b/sal/qa/osl/socket/osl_ConnectorSocket.cxx
@@ -65,7 +65,7 @@
#include "sockethelper.hxx"
using namespace osl;
-using namespace rtl;
+using ::rtl::OUString;
#define IP_PORT_MYPORT2 8883
#define IP_PORT_FTP 21
diff --git a/sal/qa/osl/socket/osl_DatagramSocket.cxx b/sal/qa/osl/socket/osl_DatagramSocket.cxx
index 948fe50..12df2a5 100644
--- a/sal/qa/osl/socket/osl_DatagramSocket.cxx
+++ b/sal/qa/osl/socket/osl_DatagramSocket.cxx
@@ -60,7 +60,8 @@
#include "sockethelper.hxx"
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
#define IP_PORT_MYPORT9 8897
#define IP_PORT_MYPORT10 8898
diff --git a/sal/qa/osl/socket/osl_Socket2.cxx b/sal/qa/osl/socket/osl_Socket2.cxx
index 4984ac3..e9cc8d7 100644
--- a/sal/qa/osl/socket/osl_Socket2.cxx
+++ b/sal/qa/osl/socket/osl_Socket2.cxx
@@ -60,7 +60,7 @@
#include "sockethelper.hxx"
using namespace osl;
-using namespace rtl;
+using ::rtl::OUString;
#define IP_PORT_FTP 21
#define IP_PORT_TELNET 23
diff --git a/sal/qa/osl/socket/osl_SocketAddr.cxx b/sal/qa/osl/socket/osl_SocketAddr.cxx
index f52b3bd..46cd9d5 100644
--- a/sal/qa/osl/socket/osl_SocketAddr.cxx
+++ b/sal/qa/osl/socket/osl_SocketAddr.cxx
@@ -60,7 +60,10 @@
#include "sockethelper.hxx"
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
#define IP_PORT_ZERO 0
#define IP_PORT_FTP 21
diff --git a/sal/qa/osl/socket/osl_StreamSocket.cxx b/sal/qa/osl/socket/osl_StreamSocket.cxx
index 3978d8c..4315f24 100644
--- a/sal/qa/osl/socket/osl_StreamSocket.cxx
+++ b/sal/qa/osl/socket/osl_StreamSocket.cxx
@@ -61,7 +61,9 @@
#include <osl/conditn.hxx>
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OString;
#define IP_PORT_MYPORT9 8897
#define IP_PORT_MYPORT10 18900
@@ -456,31 +458,6 @@ protected:
else
{
-// LLA: removed, due to the fact, this is to error prone
-// LLA: char * pSrcRoot = getenv("SOURCE_ROOT");
-// LLA: // LLA: This is absolute wrong!
-// LLA: // strcat( pSrcRoot, "/sal/inc/osl/file.hxx");
-// LLA: rtl::OString sSrcRoot(pSrcRoot);
-// LLA: sSrcRoot += "/sal/inc/osl/file.hxx";
-// LLA:
-// LLA: ::rtl::OUString sFilePath = ::rtl::OUString::createFromAscii( sSrcRoot.getStr() );
-// LLA: #ifdef WNT
-// LLA: while (sFilePath.lastIndexOf('/') != -1)
-// LLA: sFilePath = sFilePath.replace('/',(sal_Unicode)'\\');
-// LLA: #endif
-// LLA: FILE *stream;
-// LLA: sal_uInt64 nCount_read;
-// LLA: sal_Char buffer_read[FILE_READ];
-// LLA:
-// LLA: if( (stream = fopen( oustring2char( sFilePath ), "r+t" )) != NULL )
-// LLA: {
-// LLA: /* Attempt to read in 25 characters */
-// LLA: nCount_read = fread( buffer_read, sizeof( char ), FILE_READ, stream );
-// LLA: fclose( stream );
-// LLA: }
-// LLA: else
-// LLA: t_print("# File $SRC_ROOT/sal/inc/osl/file.hxx could not be opened\n" );
-
t_print("write()\n");
ssStreamConnection.write( m_aValues.getBuffer(), m_aValues.getBufferSize() );
@@ -925,58 +902,6 @@ namespace osl_StreamSocket
}; // class isExceptionPending
// -----------------------------------------------------------------------------
-/** Server Socket Thread, write a file which is large
- */
-// LLA: class WriteSocketThread : public Thread
-// LLA: {
-// LLA: ValueCheckProvider m_aValues;
-// LLA:
-// LLA: protected:
-// LLA: oslThreadIdentifier m_id;
-// LLA:
-// LLA: void SAL_CALL run( )
-// LLA: {
-// LLA: ::osl::AcceptorSocket asAcceptorSocket( osl_Socket_FamilyInet, osl_Socket_ProtocolIp, osl_Socket_TypeStream );
-// LLA: ::osl::SocketAddr saLocalSocketAddr( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("10.16.66.252")), 8888 );
-// LLA: ::osl::StreamSocket ssStreamConnection;
-// LLA:
-// LLA: //if has not set this option, socket addr can not be binded in some time(maybe 2 minutes) by another socket
-// LLA: asAcceptorSocket.setOption( osl_Socket_OptionReuseAddr, 1 ); //sal_True);
-// LLA:
-// LLA: /// if the thread should terminate, schedule return false
-// LLA: while ( schedule( ) == sal_True )
-// LLA: {
-// LLA: sal_Bool bOK1 = asAcceptorSocket.bind( saLocalSocketAddr );
-// LLA: if ( sal_True != bOK1 )
-// LLA: {
-// LLA: t_print("# WriteSocketThread: AcceptorSocket bind address failed. \n" ) ;
-// LLA: break;
-// LLA: }
-// LLA: sal_Bool bOK2 = asAcceptorSocket.listen( 1 );
-// LLA: if ( sal_True != bOK2 )
-// LLA: {
-// LLA: t_print("# WriteSocketThread: AcceptorSocket listen address failed. \n" ) ;
-// LLA: break;
-// LLA: }
-// LLA: // blocking mode, if read/recv failed, block until success
-// LLA: asAcceptorSocket.enableNonBlockingMode( sal_False);
-// LLA:
-// LLA: oslSocketResult eResult = asAcceptorSocket.acceptConnection( ssStreamConnection );
-// LLA: if (eResult != osl_Socket_Ok )
-// LLA: {
-// LLA: t_print("WriteSocketThread: acceptConnection failed! \n");
-// LLA: break;
-// LLA: }
-// LLA:
-// LLA:
-// LLA: sal_Int32 nReadNumber1 = ssStreamConnection.write( m_aValues.getBuffer(), m_aValues.getBufferSize() );
-// LLA: break;
-// LLA: }
-// LLA: ssStreamConnection.close();
-// LLA: asAcceptorSocket.close();
-// LLA: }
-// LLA: }
-
/** Client Socket Thread, served as a temp little client to communicate with server.
*/
commit 3341e25a6ea071d1e7b0299b0e0e1ff6f0c0bace
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Mar 4 01:41:18 2011 +0900
removed dead code; fix a comment
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 2619f6a..c95a82f 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -47,7 +47,6 @@ using ::rtl::OString;
static sal_Bool hasOption(char const * szOption, int argc, char** argv);
static rtl::OString getLD_LIBRARY_PATH(const rtl::ByteSequence & vendorData);
static bool findAndSelect(JavaInfo**);
-//static sal_Bool printPaths(const OUString& sPathFile);
#define HELP_TEXT \
"\njavaldx is necessary to make Java work on some UNIX platforms." \
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
index 1862d27..fa7d35d 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx
@@ -128,7 +128,7 @@ bool SunVersion::init(const char *szVersion)
//check next character
if (! ( (pCur < pEnd)
- && ( (nPart < 3) && isdigit(*pCur)))) //(*pCur >= 48 && *pCur <=57))))
+ && ( (nPart < 3) && isdigit(*pCur))))
return false;
}
else
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 5f766ce..c339c8c 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -157,7 +157,6 @@ namespace
{
OUString const & operator()()
{
- // osl::Guard<osl::Mutex> g(osl::GetGlobalMutex());
static OUString sIni;
rtl::OUStringBuffer buf( 255);
buf.append( getLibraryLocation());
@@ -456,8 +455,6 @@ bool getJavaProps(const OUString & exePath,
rs = stdoutReader.readLine( & aLine);
if (rs != FileHandleReader::RESULT_OK)
break;
-// JFW_TRACE2(OString("[Java framework] line:\" ")
-// + aLine + OString(" \".\n"));
OUString sLine;
if (!decodeOutput(aLine, &sLine))
continue;
@@ -515,7 +512,6 @@ bool decodeOutput(const rtl::OString& s, rtl::OUString* out)
} while (nIndex >= 0);
*out = buff.makeStringAndClear();
-// JFW_TRACE2(*out);
return true;
}
@@ -559,7 +555,6 @@ bool getJavaInfoFromRegistry(const wchar_t* szRegKey,
DWORD dwIndex = 0;
const DWORD BUFFSIZE = 1024;
wchar_t bufVersion[BUFFSIZE];
-// char bufVersion[BUFFSIZE];
DWORD nNameLen = BUFFSIZE;
FILETIME fileTime;
nNameLen = sizeof(bufVersion);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index dd021ad..cdd22ce 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -35,18 +35,9 @@
namespace jfw_plugin
{
-//extern VendorSupportMapEntry gVendorMap[];
-
typedef char const * const * (* getJavaExePaths_func)(int*);
typedef rtl::Reference<VendorBase> (* createInstance_func) ();
-// struct Blas
-// {
-// char const * sVendorName;
-// getJavaExePaths_func getJavaFunc;
-// createInstance_func createFunc;
-// };
-
struct VendorSupportMapEntry
{
char const * sVendorName;
diff --git a/jvmfwk/source/elements.cxx b/jvmfwk/source/elements.cxx
index 20aaa4d..6ef51d5 100644
--- a/jvmfwk/source/elements.cxx
+++ b/jvmfwk/source/elements.cxx
@@ -44,8 +44,6 @@
#include "rtl/bootstrap.hxx"
#include "boost/optional.hpp"
#include <string.h>
-// #define NS_JAVA_FRAMEWORK "http://openoffice.org/2004/java/framework/1.0"
-// #define NS_SCHEMA_INSTANCE "http://www.w3.org/2001/XMLSchema-instance"
using namespace osl;
@@ -154,13 +152,12 @@ void createSettingsStructure(xmlDoc * document, bool * bNeedsSave)
nodeCrLf = xmlNewText((xmlChar*) "\n");
xmlAddChild(root, nodeCrLf);
- //<javaInfo xsi:nil="true" autoSelect="true">
+ //<javaInfo xsi:nil="true">
xmlNode * nodeJava = xmlNewTextChild(
root,NULL, (xmlChar*) "javaInfo", (xmlChar*) "");
if (nodeJava == NULL)
throw FrameworkException(JFW_E_ERROR, sExcMsg);
xmlSetNsProp(nodeJava,nsXsi,(xmlChar*) "nil",(xmlChar*) "true");
-// xmlSetProp(nodeJava,(xmlChar*) "autoSelect",(xmlChar*) "true");
//add a new line
nodeCrLf = xmlNewText((xmlChar*) "\n");
xmlAddChild(root, nodeCrLf);
@@ -733,7 +730,6 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const
//that after removing the file and shortly later creating it again
//did not change the creation time. That is the newly created file
//had the creation time of the former file.
-// ::TimeValue time = stat.getCreationTime();
::TimeValue modTime = stat.getModifyTime();
::TimeValue curTime = {0,0};
if (sal_True == ::osl_getSystemTime(& curTime))
@@ -746,7 +742,6 @@ jfw::FileStatus NodeJava::checkSettingsFileStatus() const
fprintf(stderr, "[Java framework] Deleting settings file at \n%s\n", s.getStr());
#endif
//delete file
-// File::RC rc_rem = File::remove(sURL);
File f(sURL);
if (File::E_None == f.open(osl_File_OpenFlag_Write | osl_File_OpenFlag_Read)
&& File::E_None == f.setPos(0, 0)
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 4631530..3692eed 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -162,8 +162,6 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo ***pparInfo, sal_Int32 *pSi
for (citLoc ii = vecJRELocations.begin();
ii != vecJRELocations.end(); ++ii)
{
-// rtl::OUString sLocation =
-// rtl::OStringToOUString(*ii, RTL_TEXTENCODING_UTF8);
jfw::CJavaInfo aInfo;
plerr = (*jfw_plugin_getJavaInfoByPathFunc)(
ii->pData,
@@ -1256,10 +1254,6 @@ CJavaInfo::operator JavaInfo const * () const
{
return pInfo;
}
-// ::JavaInfo** CJavaInfo::operator & ()
-// {
-// return & pInfo;
-// }
rtl::OUString CJavaInfo::getVendor() const
{
diff --git a/jvmfwk/source/framework.hxx b/jvmfwk/source/framework.hxx
index 0869062..f769826 100644
--- a/jvmfwk/source/framework.hxx
+++ b/jvmfwk/source/framework.hxx
@@ -104,7 +104,6 @@ public:
void attach(::JavaInfo* pInfo);
::JavaInfo * detach();
const ::JavaInfo* operator ->() const;
-// ::JavaInfo** operator & ();
operator ::JavaInfo* ();
operator ::JavaInfo const * () const;
::JavaInfo* cloneJavaInfo() const;
diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx
index b2ecf51..0b594de 100644
--- a/jvmfwk/source/fwkutil.hxx
+++ b/jvmfwk/source/fwkutil.hxx
@@ -69,15 +69,11 @@ struct Bootstrap :
struct FwkMutex: public ::rtl::Static<osl::Mutex, FwkMutex> {};
-//osl::Mutex * getFwkMutex();
-
rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData);
rtl::ByteSequence decodeBase16(const rtl::ByteSequence& data);
rtl::OUString getPlatform();
-//const rtl::Bootstrap& getBootstrap();
-
rtl::OUString getDirFromFile(const rtl::OUString& usFilePath);
diff --git a/jvmfwk/source/libxmlutil.hxx b/jvmfwk/source/libxmlutil.hxx
index 0a6a50a..c102d6b 100644
--- a/jvmfwk/source/libxmlutil.hxx
+++ b/jvmfwk/source/libxmlutil.hxx
@@ -88,24 +88,6 @@ public:
};
//===========================================================
-// class CXmlNsPtr
-// {
-// xmlNs* _object;
-
-// CXmlNsPtr(const CXmlNsPtr&);
-// CXmlNsPtr & operator = (const CXmlNsPtr&);
-// public:
-// CXmlNsPtr();
-// CXmlNsPtr(xmlNs* aDoc);
-// /** Takes ownership of xmlDoc
-// */
-// CXmlNsPtr & operator = (xmlNs* pObj);
-// ~CXmlNsPtr();
-// xmlNs* operator -> ();
-// operator xmlNs* ();
-// };
-
-//===========================================================
class CXmlCharPtr
{
xmlChar* _object;
commit 6bf0c2d0c31e0ba04c25f1edc62d3850d4e21d88
Author: Michael Meeks <michael.meeks at novell.com>
Date: Mon Feb 28 12:50:44 2011 +0000
install unit tester in sub-directory to help windows.
diff --git a/sal/prj/d.lst b/sal/prj/d.lst
index ca55d38..2d58ac1 100644
--- a/sal/prj/d.lst
+++ b/sal/prj/d.lst
@@ -1,3 +1,4 @@
+mkdir: %_DEST%\bin%_EXT%\cppunit
mkdir: %_DEST%\inc%_EXT%\sal
mkdir: %_DEST%\inc%_EXT%\osl
mkdir: %_DEST%\inc%_EXT%\rtl
commit 08252f94eaabd9c7c043ddf68ad86b6e420c192d
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Thu Mar 3 08:12:56 2011 +0100
Added using OString - debug code needs it
diff --git a/cppuhelper/source/component.cxx b/cppuhelper/source/component.cxx
index 3d6bc3c..0530965 100644
--- a/cppuhelper/source/component.cxx
+++ b/cppuhelper/source/component.cxx
@@ -41,6 +41,7 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::lang;
using ::rtl::OUString;
+using ::rtl::OString;
using ::rtl::OUStringToOString;
namespace cppu
commit d64df4fb0c8ee76b69a220d476b0a772e8e89a86
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Mar 2 22:24:11 2011 +0100
Remove "using namespace ::rtl"
diff --git a/sal/qa/osl/module/osl_Module.cxx b/sal/qa/osl/module/osl_Module.cxx
index 914d678..85af98a 100644
--- a/sal/qa/osl/module/osl_Module.cxx
+++ b/sal/qa/osl/module/osl_Module.cxx
@@ -35,9 +35,10 @@
#include <osl_Module_Const.h>
using namespace osl;
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
//------------------------------------------------------------------------
// helper functions and classes
//------------------------------------------------------------------------
diff --git a/sal/qa/osl/pipe/osl_Pipe.cxx b/sal/qa/osl/pipe/osl_Pipe.cxx
index 53d8a62..a495b5a 100644
--- a/sal/qa/osl/pipe/osl_Pipe.cxx
+++ b/sal/qa/osl/pipe/osl_Pipe.cxx
@@ -53,7 +53,10 @@
#include <string.h>
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
//------------------------------------------------------------------------
// helper functions
diff --git a/sal/qa/osl/process/osl_Thread.cxx b/sal/qa/osl/process/osl_Thread.cxx
index ec4bd7b..724cdbe 100644
--- a/sal/qa/osl/process/osl_Thread.cxx
+++ b/sal/qa/osl/process/osl_Thread.cxx
@@ -60,7 +60,8 @@
#define t_print printf
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OString;
// -----------------------------------------------------------------------------
// Kleine Stopuhr
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 155817c..2ab0396 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -87,7 +87,10 @@ std::string OUString_to_std_string(const rtl::OUString& oustr)
//########################################
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
/** print a UNI_CODE String.
*/
diff --git a/sal/qa/osl/socket/osl_Socket.cxx b/sal/qa/osl/socket/osl_Socket.cxx
index bdefd90..bb4a04f 100644
--- a/sal/qa/osl/socket/osl_Socket.cxx
+++ b/sal/qa/osl/socket/osl_Socket.cxx
@@ -65,7 +65,10 @@
#include <testshl/simpleheader.hxx>
using namespace osl;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
//------------------------------------------------------------------------
// helper functions
diff --git a/sal/rtl/source/logfile.cxx b/sal/rtl/source/logfile.cxx
index c00ba76..51fdcdc 100644
--- a/sal/rtl/source/logfile.cxx
+++ b/sal/rtl/source/logfile.cxx
@@ -50,10 +50,12 @@
#define vsnprintf _vsnprintf
#endif
-using namespace rtl;
using namespace osl;
using namespace std;
+using ::rtl::OUString;
+using ::rtl::OUStringBuffer;
+
namespace {
static oslFileHandle g_aFile = 0;
commit 4dc9bfa523c60a1694af6499105ea96dfd362767
Author: Julien Nabet <serval2412 at yahoo.fr>
Date: Wed Mar 2 22:15:02 2011 +0100
Remove "using namespace ::rtl"
diff --git a/rdbmaker/source/codemaker/dependency.cxx b/rdbmaker/source/codemaker/dependency.cxx
index cf31c5f..b1c6032 100644
--- a/rdbmaker/source/codemaker/dependency.cxx
+++ b/rdbmaker/source/codemaker/dependency.cxx
@@ -30,8 +30,8 @@
#include <rtl/alloc.h>
#include <codemaker/dependency.hxx>
-using namespace rtl;
-
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
TypeDependency::TypeDependency()
{
m_pImpl = new TypeDependencyImpl();
diff --git a/rdbmaker/source/codemaker/options.cxx b/rdbmaker/source/codemaker/options.cxx
index 587dcf3..c302f27 100644
--- a/rdbmaker/source/codemaker/options.cxx
+++ b/rdbmaker/source/codemaker/options.cxx
@@ -28,8 +28,7 @@
#include <codemaker/options.hxx>
-using namespace rtl;
-
+using ::rtl::OString;
Options::Options()
{
}
diff --git a/rdbmaker/source/codemaker/typemanager.cxx b/rdbmaker/source/codemaker/typemanager.cxx
index 60ced47..1c4c511 100644
--- a/rdbmaker/source/codemaker/typemanager.cxx
+++ b/rdbmaker/source/codemaker/typemanager.cxx
@@ -30,8 +30,9 @@
#include <osl/file.hxx>
#include <codemaker/typemanager.hxx>
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
TypeManager::TypeManager()
{
m_pImpl = new TypeManagerImpl();
diff --git a/rdbmaker/source/rdbmaker/rdbmaker.cxx b/rdbmaker/source/rdbmaker/rdbmaker.cxx
index ed708c7..d6b1c8d 100644
--- a/rdbmaker/source/rdbmaker/rdbmaker.cxx
+++ b/rdbmaker/source/rdbmaker/rdbmaker.cxx
@@ -53,9 +53,14 @@
#define PATH_DELEMITTER '/'
-using namespace rtl;
using namespace osl;
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringBuffer;
+using ::rtl::OUStringToOString;
+using ::rtl::OStringToOUString;
+
FileStream listFile;
RegistryKey rootKey;
Registry regFile;
diff --git a/rdbmaker/source/rdbmaker/rdboptions.cxx b/rdbmaker/source/rdbmaker/rdboptions.cxx
index b451b7b..0ad473e 100644
--- a/rdbmaker/source/rdbmaker/rdboptions.cxx
+++ b/rdbmaker/source/rdbmaker/rdboptions.cxx
@@ -30,8 +30,7 @@
#include "rdboptions.hxx"
-using namespace rtl;
-
+using ::rtl::OString;
sal_Bool RdbOptions::initOptions(int ac, char* av[], sal_Bool bCmdFile)
throw( IllegalArgument )
{
diff --git a/rdbmaker/source/rdbmaker/rdbtype.cxx b/rdbmaker/source/rdbmaker/rdbtype.cxx
index 8910731..01f0388 100644
--- a/rdbmaker/source/rdbmaker/rdbtype.cxx
+++ b/rdbmaker/source/rdbmaker/rdbtype.cxx
@@ -34,8 +34,9 @@
#include "rdbtype.hxx"
#include "rdboptions.hxx"
-using namespace rtl;
-
+using ::rtl::OUString;
+using ::rtl::OString;
+using ::rtl::OStringToOUString;
sal_Bool isBaseType(const OString& type)
{
if ( type.equals("long") ||
@@ -119,12 +120,6 @@ sal_Bool produceType(const OString& typeName,
{
if (typeDependencies.isGenerated(typeName) )
return sal_True;
-/*
- RegistryKey typeKey = typeMgr.getTypeKey(typeName);
-
- if (!typeKey.isValid())
- return sal_False;
-*/
if( !checkTypeDependencies(typeMgr, typeDependencies, typeName, bDepend))
return sal_False;
@@ -135,26 +130,6 @@ sal_Bool produceType(const OString& typeName,
o << typeName.getStr() << "\n";
} else
{
-/*
- RegValueType valueType;
- sal_uInt32 valueSize;
-
- if (typeKey.getValueInfo(OUString(), &valueType, &valueSize))
- {
- if (typeName.equals("/"))
- return sal_True;
- else
- return sal_False;
- }
-
- sal_uInt8* pBuffer = (sal_uInt8*)rtl_allocateMemory(valueSize);
-
- if (typeKey.getValue(OUString(), pBuffer))
- {
- rtl_freeMemory(pBuffer);
- return sal_False;
- }
-*/
TypeReader reader = typeMgr.getTypeReader(typeName);
if (!reader.isValid())
@@ -170,18 +145,14 @@ sal_Bool produceType(const OString& typeName,
RegistryKey typeKey;
if ( regKey.createKey( OStringToOUString(typeName, RTL_TEXTENCODING_UTF8), typeKey) )
{
-// rtl_freeMemory(pBuffer);
return sal_False;
}
if ( typeKey.setValue(OUString(), RG_VALUETYPE_BINARY, (void*)reader.getBlop(), reader.getBlopSize()) )
-// if ( typeKey.setValue(OUString(), valueType, pBuffer, valueSize) )
{
-// rtl_freeMemory(pBuffer);
return sal_False;
}
-// rtl_freeMemory(pBuffer);
}
}
diff --git a/rdbmaker/source/rdbmaker/specialtypemanager.cxx b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
index 90bcb35..3d2acea 100644
--- a/rdbmaker/source/rdbmaker/specialtypemanager.cxx
+++ b/rdbmaker/source/rdbmaker/specialtypemanager.cxx
@@ -36,8 +36,7 @@ sal_Bool SAL_CALL initTypeMapper( const sal_Char* pRegName );
sal_uInt32 SAL_CALL getTypeBlop(const sal_Char* pTypeName, sal_uInt8** pBlop);
}
-using namespace rtl;
-
+using ::rtl::OString;
SpecialTypeManager::SpecialTypeManager()
{
m_pImpl = new SpecialTypeManagerImpl();
diff --git a/rdbmaker/source/rdbmaker/typeblop.cxx b/rdbmaker/source/rdbmaker/typeblop.cxx
index 7676118..505de92 100644
--- a/rdbmaker/source/rdbmaker/typeblop.cxx
+++ b/rdbmaker/source/rdbmaker/typeblop.cxx
@@ -50,7 +50,8 @@ using namespace com::sun::star::reflection;
using namespace com::sun::star::lang;
using namespace com::sun::star::container;
using namespace cppu;
-using namespace rtl;
+
+using ::rtl::OUString;
static Reference< XHierarchicalNameAccess > xNameAccess;
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 3e54ff6..99f084a 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -43,11 +43,11 @@
#include "reflcnst.hxx"
-using namespace rtl;
+using ::rtl::OString;
+
namespace {
-// Throws std::bad_alloc:
inline rtl::OString toByteString(rtl_uString const * str) {
return rtl::OString(
str->buffer, str->length, RTL_TEXTENCODING_UTF8,
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index a21f9ea..c210d7b 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -61,10 +61,14 @@
#include <rtl/ustrbuf.hxx>
#include <osl/file.hxx>
-using namespace rtl;
using namespace osl;
using namespace store;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OUStringBuffer;
+using ::rtl::OString;
+
namespace {
void printString(rtl::OUString const & s) {
diff --git a/registry/source/regimpl.hxx b/registry/source/regimpl.hxx
index 050158b..0259ca5 100644
--- a/registry/source/regimpl.hxx
+++ b/registry/source/regimpl.hxx
@@ -62,9 +62,6 @@
#define REG_GUARD(mutex) \
osl::Guard< osl::Mutex > aGuard( mutex );
-// @@@ using namespace rtl;
-// @@@ using namespace osl;
-
class ORegKey;
class RegistryTypeReader;
diff --git a/registry/test/testmerge.cxx b/registry/test/testmerge.cxx
index 2ea6d73..96387f4 100644
--- a/registry/test/testmerge.cxx
+++ b/registry/test/testmerge.cxx
@@ -42,7 +42,8 @@
using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
sal_Int32 lValue1 = 123456789;
sal_Int32 lValue2 = 54321;
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index 4fcc4bd..f012a45 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -41,7 +41,10 @@
#include <rtl/ustring.hxx>
using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
+using ::rtl::OString;
void test_coreReflection()
{
diff --git a/registry/workben/regspeed.cxx b/registry/workben/regspeed.cxx
index e52685e..85c76ac 100644
--- a/registry/workben/regspeed.cxx
+++ b/registry/workben/regspeed.cxx
@@ -103,7 +103,8 @@ protected:
};
#endif
-using namespace rtl;
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
#if (defined UNX) || (defined OS2)
int main( int argc, char * argv[] )
diff --git a/registry/workben/regtest.cxx b/registry/workben/regtest.cxx
index 2c2025c..97711e7 100644
--- a/registry/workben/regtest.cxx
+++ b/registry/workben/regtest.cxx
@@ -37,7 +37,9 @@
#include <rtl/alloc.h>
using namespace std;
-using namespace rtl;
+
+using ::rtl::OUString;
+using ::rtl::OUStringToOString;
#if (defined UNX) || (defined OS2)
int main()
commit 585e062389123ead0826c107481049790f179f17
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