1 files changed, 45 insertions, 49 deletions

diff --git a/stoc/test/testregistry.cxx b/stoc/test/testregistry.cxx
index dfeeff42189e..b2dd4dd7051e 100644
--- a/stoc/test/testregistry.cxx
+++ b/stoc/test/testregistry.cxx
@@ -55,36 +55,33 @@ using namespace osl;
 namespace stoc_impreg
 {
 void SAL_CALL mergeKeys(
-    Reference< registry::XRegistryKey > const & xDest,
-    Reference< registry::XRegistryKey > const & xSource );
+Reference< registry::XRegistryKey > const & xDest,
+Reference< registry::XRegistryKey > const & xSource );
 }
-
 static void mergeKeys(
-    Reference< registry::XSimpleRegistry > const & xDest,
-    OUString const & rBaseNode,
-    OUString const & rURL )
+Reference< registry::XSimpleRegistry > const & xDest,
+OUString const & rBaseNode,
+OUString const & rURL )
 {
-    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 );
-    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();
 }
 
 
@@ -92,34 +89,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)
-    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();
-
-    RegistryKey rootKey, rKey, rKey2;
+Registry *myRegistry = new Registry();
 
-    OUString userReg = getExePath();
-    userReg += "user.rdb";
+RegistryKey rootKey, rKey, rKey2;
 
-    if(myRegistry->open(userReg, RegAccessMode::READWRITE))
-    {
-        OSL_VERIFY(!myRegistry->create(userReg));
-    }
+OUString userReg = getExePath();
+userReg += "user.rdb";
+if(myRegistry->open(userReg, RegAccessMode::READWRITE))
+{
+OSL_VERIFY(!myRegistry->create(userReg));
+}
 
-    OSL_VERIFY(!myRegistry->close());
-    delete myRegistry;
+OSL_VERIFY(!myRegistry->close());
+delete myRegistry;
 
-    userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
+userRegEnv += OUStringToOString(userReg, RTL_TEXTENCODING_ASCII_US);
     putenv((char *)userRegEnv.getStr());
 }
 
@@ -650,7 +646,7 @@ void test_DefaultRegistry(
 SAL_IMPLEMENT_MAIN()
 {
 //  setStarUserRegistry();
-    setLinkInDefaultRegistry(OUString("/Test/DefaultLink"),
+     setLinkInDefaultRegistry(OUString("/Test/DefaultLink"),
                               OUString("/Test/FifthKey/MyFirstLink"));
 
     OUString reg1( "testreg1.rdb" );
@@ -658,10 +654,10 @@ SAL_IMPLEMENT_MAIN()
     OUString areg1( "atestreg1.rdb" );
     OUString areg2( "atestreg2.rdb" );
 
-    test_SimpleRegistry( reg1, reg2 );
-    test_DefaultRegistry( reg1, reg2 );
-    test_SimpleRegistry( areg1, areg2, true ); // use different merge
-    test_DefaultRegistry( areg1, areg2, true );
+      test_SimpleRegistry( reg1, reg2 );
+      test_DefaultRegistry( reg1, reg2 );
+      test_SimpleRegistry( areg1, areg2, true ); // use different merge
+      test_DefaultRegistry( areg1, areg2, true );
 
     Reference< XSimpleRegistry > xSimReg( ::cppu::createSimpleRegistry() );
     xSimReg->open( reg1, sal_False, sal_True );