#123283# merge fix from trunk
git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO401@1524955 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/cppuhelper/source/findsofficepath.c b/main/cppuhelper/source/findsofficepath.c
index 8fc035e..faaa169 100644
--- a/main/cppuhelper/source/findsofficepath.c
+++ b/main/cppuhelper/source/findsofficepath.c
@@ -97,14 +97,14 @@
if ( path == NULL )
{
/* read the key's default value from HKEY_LOCAL_USER 64 */
- path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 );
+ path = getPathFromRegistryKey( HKEY_CURRENT_USER, SUBKEYNAME64 );
}
- else if ( path == NULL )
+ if ( path == NULL )
{
/* read the key's default value from HKEY_LOCAL_MACHINE */
path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME );
}
- else if ( path == NULL )
+ if ( path == NULL )
{
/* read the key's default value from HKEY_LOCAL_MACHINE 64*/
path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 );
diff --git a/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index 2c6593e..80729a8 100644
--- a/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
@@ -200,7 +200,7 @@
} catch ( WinRegKeyException e ) {
try {
// read the key's default value from HKEY_LOCAL_MACHINE
- WinRegKey key = new WinRegKey( "HKEY_LOCAL_USER",
+ WinRegKey key = new WinRegKey( "HKEY_CURRENT_USER",
SUBKEYNAME64 );
path = key.getStringValue( "" ); // default
} catch ( WinRegKeyException e64 ) {
