diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:05:58 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-10-01 08:05:58 +0000 |
| commit | 4ca5c503bc36f0300bb3f3ec1577ed41df098ab2 (patch) | |
| tree | 0e6a4a4fddafd0cafd18601f5345e371c7fe1f99 /stoc/test/testregistry.cxx | |
| parent | c490a9f0684dd5cc7efd897afbf70e2f73444f72 (diff) | |
CWS-TOOLING: integrate CWS jsc311
Diffstat (limited to 'stoc/test/testregistry.cxx')
| -rw-r--r-- | stoc/test/testregistry.cxx | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx index 978f3618fdab..d04e6facf71d 100644 --- a/stoc/test/testregistry.cxx +++ b/stoc/test/testregistry.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: testregistry.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.16.2 $ * * This file is part of OpenOffice.org. * @@ -105,6 +105,7 @@ static void mergeKeys( xDestKey->closeKey(); } + OString userRegEnv("STAR_USER_REGISTRY="); OUString getExePath() @@ -121,16 +122,7 @@ OUString getExePath() void setStarUserRegistry() { - RegistryLoader* pLoader = new RegistryLoader(); - - if (!pLoader->isLoaded()) - { - delete pLoader; - return; - } - - Registry *myRegistry = new Registry(*pLoader); - delete pLoader; + Registry *myRegistry = new Registry(); RegistryKey rootKey, rKey, rKey2; @@ -150,16 +142,7 @@ void setStarUserRegistry() void setLinkInDefaultRegistry(const OUString& linkName, const OUString& linkTarget) { - RegistryLoader* pLoader = new RegistryLoader(); - - if (!pLoader->isLoaded()) - { - delete pLoader; - return; - } - - Registry *myRegistry = new Registry(*pLoader); - delete pLoader; + Registry *myRegistry = new Registry(); RegistryKey rootKey; @@ -687,9 +670,9 @@ void test_DefaultRegistry( SAL_IMPLEMENT_MAIN() { - setStarUserRegistry(); - setLinkInDefaultRegistry(OUString::createFromAscii("/Test/DefaultLink"), - OUString::createFromAscii("/Test/FifthKey/MyFirstLink")); +// setStarUserRegistry(); + setLinkInDefaultRegistry(OUString::createFromAscii("/Test/DefaultLink"), + OUString::createFromAscii("/Test/FifthKey/MyFirstLink")); OUString reg1( RTL_CONSTASCII_USTRINGPARAM("testreg1.rdb") ); OUString reg2( RTL_CONSTASCII_USTRINGPARAM("testreg2.rdb") ); |