#123283# check places where registry is check for office installation

cppuhelper/source/findsofficepath.c

@@ -97,14 +97,14 @@ static char* platformSpecific()
     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 );

odk/source/com/sun/star/lib/loader/InstallationFinder.java

@@ -200,7 +200,7 @@ final class InstallationFinder {
         } 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 ) {