Author: jsc
Date: Fri Sep 20 09:06:52 2013
New Revision: 1524955
URL: http://svn.apache.org/r1524955
Log:
#123283# merge fix from trunk
Modified:
openoffice/branches/AOO401/main/cppuhelper/source/findsofficepath.c
openoffice/branches/AOO401/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
Modified: openoffice/branches/AOO401/main/cppuhelper/source/findsofficepath.c
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/cppuhelper/source/findsofficepath.c?rev=1524955&r1=1524954&r2=1524955&view=diff
==============================================================================
--- openoffice/branches/AOO401/main/cppuhelper/source/findsofficepath.c
(original)
+++ openoffice/branches/AOO401/main/cppuhelper/source/findsofficepath.c Fri Sep
20 09:06:52 2013
@@ -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 );
Modified:
openoffice/branches/AOO401/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO401/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java?rev=1524955&r1=1524954&r2=1524955&view=diff
==============================================================================
---
openoffice/branches/AOO401/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
(original)
+++
openoffice/branches/AOO401/main/odk/source/com/sun/star/lib/loader/InstallationFinder.java
Fri Sep 20 09:06:52 2013
@@ -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 ) {
