[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - cppuhelper/source instsetoo_native/util odk/source

[Oliver-Rainer Wittmann]

 cppuhelper/source/findsofficepath.c                        |    6 +++---
 instsetoo_native/util/openoffice.lst                       |    6 +++---
 odk/source/com/sun/star/lib/loader/InstallationFinder.java |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 59f1fc72a3b32899c8378a6d10a6f875c8636101
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date:   Fri Sep 20 10:03:52 2013 +0000

    123305: provide own UpdateURL for AOO 4.1.0

diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst
index 815d657..fcee3e1 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -72,7 +72,7 @@ Apache_OpenOffice
             ABOUTBOXPRODUCTVERSION 4.0.0
             BASEPRODUCTVERSION 4.0
             PCPFILENAME openoffice.pcp
-            UPDATEURL https://ooo-updates.apache.org/aoo40/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt,version.lst
             REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
             ADDSYSTEMINTEGRATION 1
@@ -131,7 +131,7 @@ Apache_OpenOffice_wJRE
             USERDIRPRODUCTVERSION 4
             ABOUTBOXPRODUCTVERSION 4.0.0
             BASEPRODUCTVERSION 4.0
-            UPDATEURL https://ooo-site.apache.org/projects/update/aoo40/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
             REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt
             ADDSYSTEMINTEGRATION 1
@@ -198,7 +198,7 @@ Apache_OpenOffice_Dev
             UREPACKAGEPREFIX aoodev
             SOLSUREPACKAGEPREFIX aoodev
             REGISTRYLAYERNAME LayerDev
-            UPDATEURL https://ooo-site.apache.org/projects/update/aoo40/check.Update
+            UPDATEURL https://ooo-updates.apache.org/aoo410/check.Update
             ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt,version.lst
             EVAL
             PACKAGEVERSION 4.0.0
commit 7580eebebb9a10a7abe54ac654c334f727fc3f42
Author: Jürgen Schmidt <jsc at apache.org>
Date:   Fri Sep 20 09:01:45 2013 +0000

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

diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c
index 341a06b..8c13676 100644
--- a/cppuhelper/source/findsofficepath.c
+++ b/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 );
diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java
index c3c161d..3ccc2f0 100644
--- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java
+++ b/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 ) {