[Libreoffice-commits] .: salhelper/test stoc/source stoc/test
Julien Nabet
serval2412 at kemper.freedesktop.org
Thu Mar 3 13:49:07 PST 2011
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
31 files changed, 121 insertions(+), 93 deletions(-)
New commits:
commit bad26f75443cab64c21327584628989b114d5861
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()
{
More information about the Libreoffice-commits
mailing list