cli_ure/source/native/native_bootstrap.cxx | 14 cppuhelper/source/findsofficepath.c | 11 instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt | 12 instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt | 12 odk/cfgWin.js | 4 odk/examples/cpp/DocumentLoader/DocumentLoader.cxx | 2 odk/setsdkenv_windows.template | 4 odk/settings/std.mk | 4 odk/source/com/sun/star/lib/loader/InstallationFinder.java | 27 + scp2/source/ooo/registryitem_ooo.scp | 142 +++++----- 10 files changed, 139 insertions(+), 93 deletions(-)
New commits: commit d3f2b4f596643cc1dee3de8bd7ac4d0bc0d0592f Author: Jürgen Schmidt <j...@apache.org> Date: Thu Jun 27 13:29:31 2013 +0000 #122478# adapt search in registry diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx index 678cb72..3255d91 100644 --- a/cli_ure/source/native/native_bootstrap.cxx +++ b/cli_ure/source/native/native_bootstrap.cxx @@ -55,6 +55,7 @@ namespace cli_ure { // INSTALL_PATH value needs to correspond to the Windows registry subkey // in main\scp2\source\ooo\registryitem_ooo.scp #define INSTALL_PATH L"Software\\OpenOffice\\UNO\\InstallPath" +#define INSTALL_PATH_64 L"Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath" #define BASIS_LINK L"\\basis-link" #define URE_LINK L"\\ure-link" #define URE_BIN L"\\bin" @@ -156,9 +157,19 @@ WCHAR * getInstallPath() szInstallPath = getPathFromRegistryKey( HKEY_CURRENT_USER, INSTALL_PATH ); if ( szInstallPath == NULL ) { + /* read the key's default value from HKEY_LOCAL_USER */ + szInstallPath = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, INSTALL_PATH_64 ); + } + else if ( szInstallPath == NULL ) + { /* read the key's default value from HKEY_LOCAL_MACHINE */ szInstallPath = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, INSTALL_PATH ); } + else if ( szInstallPath == NULL ) + { + /* read the key's default value from HKEY_LOCAL_MACHINE */ + szInstallPath = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, INSTALL_PATH_64 ); + } } return szInstallPath; } @@ -269,7 +280,8 @@ HMODULE loadFromPath(LPCWSTR sLibName) if (sLibName == NULL) return NULL; - WCHAR * szUreBinPath = getUnoPath(); +// WCHAR * szUreBinPath = getUnoPath(); + WCHAR * szUreBinPath = getInstallPath(); if (!szUreBinPath) return NULL; diff --git a/cppuhelper/source/findsofficepath.c b/cppuhelper/source/findsofficepath.c index f3f7b58..b0481ea 100644 --- a/cppuhelper/source/findsofficepath.c +++ b/cppuhelper/source/findsofficepath.c @@ -87,6 +87,7 @@ static char* getPathFromRegistryKey( HKEY hroot, const char* subKeyName ) static char* platformSpecific() { const char* SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath"; + const char* SUBKEYNAME64 = "Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath"; char* path = NULL; @@ -95,9 +96,19 @@ static char* platformSpecific() if ( path == NULL ) { + /* read the key's default value from HKEY_LOCAL_USER 64 */ + path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 ); + } + else if ( path == NULL ) + { /* read the key's default value from HKEY_LOCAL_MACHINE */ path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME ); } + else if ( path == NULL ) + { + /* read the key's default value from HKEY_LOCAL_MACHINE 64*/ + path = getPathFromRegistryKey( HKEY_LOCAL_MACHINE, SUBKEYNAME64 ); + } return path; } commit ee27910c87b64c681d68df900b57e0730e78e381 Author: Jürgen Schmidt <j...@apache.org> Date: Thu Jun 27 13:27:29 2013 +0000 #122478# cleanup registry diff --git a/scp2/source/ooo/registryitem_ooo.scp b/scp2/source/ooo/registryitem_ooo.scp index 1be7727..b36c6b9 100644 --- a/scp2/source/ooo/registryitem_ooo.scp +++ b/scp2/source/ooo/registryitem_ooo.scp @@ -325,77 +325,77 @@ RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall Styles = (ALWAYS_REQUIRED); End -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE"; - ModuleID = gid_Module_Root; - Name = "BASISINSTALLLOCATION"; - Value = "[INSTALLLOCATION]Basis\\"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE"; - ModuleID = gid_Module_Root; - Name = "BASISINSTALLLOCATION"; - Value = "[INSTALLLOCATION]Basis\\"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); -End - -RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION"; - ModuleID = gid_Module_Root; - Name = "BASISINSTALLLOCATION"; - Value = "[INSTALLLOCATION]Basis\\"; - Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION); -End - -RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; - ModuleID = gid_Module_Root; - Name = "BASISINSTALLLOCATION"; - Value = "[INSTALLLOCATION]Basis\\"; - Styles = (ALWAYS_REQUIRED); -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE"; - ModuleID = gid_Module_Root; - Name = "UREINSTALLLOCATION"; - Value = "[INSTALLLOCATION]URE\\"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); -End - -RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE"; - ModuleID = gid_Module_Root; - Name = "UREINSTALLLOCATION"; - Value = "[INSTALLLOCATION]URE\\"; - Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); -End - -RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION"; - ModuleID = gid_Module_Root; - Name = "UREINSTALLLOCATION"; - Value = "[INSTALLLOCATION]URE\\"; - Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION); -End - -RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall - ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; - Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; - ModuleID = gid_Module_Root; - Name = "UREINSTALLLOCATION"; - Value = "[INSTALLLOCATION]URE\\"; - Styles = (ALWAYS_REQUIRED); -End +//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall +// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; +// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE"; +// ModuleID = gid_Module_Root; +// Name = "BASISINSTALLLOCATION"; +// Value = "[INSTALLLOCATION]Basis\\"; +// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); +//End + +//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall +// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; +// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE"; +// ModuleID = gid_Module_Root; +// Name = "BASISINSTALLLOCATION"; +// Value = "[INSTALLLOCATION]Basis\\"; +// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); +//End + +//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall +// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; +// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION"; +// ModuleID = gid_Module_Root; +// Name = "BASISINSTALLLOCATION"; +// Value = "[INSTALLLOCATION]Basis\\"; +// Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION); +//End + +//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall +// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; +// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; +// ModuleID = gid_Module_Root; +// Name = "BASISINSTALLLOCATION"; +// Value = "[INSTALLLOCATION]Basis\\"; +// Styles = (ALWAYS_REQUIRED); +//End + +//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall +// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; +// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE"; +// ModuleID = gid_Module_Root; +// Name = "UREINSTALLLOCATION"; +// Value = "[INSTALLLOCATION]URE\\"; +// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); +//End + +//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall +// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; +// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE"; +// ModuleID = gid_Module_Root; +// Name = "UREINSTALLLOCATION"; +// Value = "[INSTALLLOCATION]URE\\"; +// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED); +//End + +//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall +// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; +// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION"; +// ModuleID = gid_Module_Root; +// Name = "UREINSTALLLOCATION"; +// Value = "[INSTALLLOCATION]URE\\"; +// Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION); +//End + +//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall +// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; +// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION"; +// ModuleID = gid_Module_Root; +// Name = "UREINSTALLLOCATION"; +// Value = "[INSTALLLOCATION]URE\\"; +// Styles = (ALWAYS_REQUIRED); +//End RegistryItem gid_Regitem_Sog ParentID = PREDEFINED_HKEY_CLASSES_ROOT; commit 3219ba5205b2541e2ff9b3c7e9d108556ad2a6f9 Author: Jürgen Schmidt <j...@apache.org> Date: Thu Jun 27 13:26:14 2013 +0000 #122478# adapt search in registry diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt index 9a3dac5..15a06ac 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/AppSearc.idt @@ -1,7 +1,11 @@ Property Signature_ s72 s72 AppSearch Property Signature_ -INSTALLLOCATION basisinstalluser -INSTALLLOCATION basisinstalluser_ -INSTALLLOCATION basisinstallmachine -INSTALLLOCATION basisinstallmachine_ +INSTALLLOCATION installuser +INSTALLLOCATION installuser_ +INSTALLLOCATION installuser64 +INSTALLLOCATION installuser64_ +INSTALLLOCATION installmachine +INSTALLLOCATION installmachine_ +INSTALLLOCATION installmachine64 +INSTALLLOCATION installmachine64_ diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt index 42bcc93..320833e 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/RegLocat.idt @@ -1,7 +1,11 @@ Signature_ Root Key Name Type s72 i2 s255 S255 I2 RegLocator Signature_ -basisinstalluser 1 Software\OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstalluser_ 1 Software\OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstallmachine 2 Software\OpenOffice\Layers\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 -basisinstallmachine_ 2 Software\OpenOffice\Layers_\Basis\[OOOBASEVERSION] BASISINSTALLLOCATION 2 +installuser 1 Software\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installuser_ 1 Software\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installuser64 1 Software\Wow6432Node\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installuser64_ 1 Software\Wow6432Node\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine 2 Software\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine_ 2 Software\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine64 2 Software\Wow6432Node\OpenOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 +installmachine64_ 2 Software\Wow6432Node\OpenOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] INSTALLLOCATION 2 \ No newline at end of file commit 7b9903580a48c9b5cbe555b7b1e574fd5fd51cc2 Author: Jürgen Schmidt <j...@apache.org> Date: Thu Jun 27 13:23:06 2013 +0000 #122478# adapt search in registry diff --git a/odk/source/com/sun/star/lib/loader/InstallationFinder.java b/odk/source/com/sun/star/lib/loader/InstallationFinder.java index 32e7329..c3c161d 100644 --- a/odk/source/com/sun/star/lib/loader/InstallationFinder.java +++ b/odk/source/com/sun/star/lib/loader/InstallationFinder.java @@ -189,6 +189,7 @@ final class InstallationFinder { private static String getPathFromWindowsRegistry() { final String SUBKEYNAME = "Software\\OpenOffice\\UNO\\InstallPath"; + final String SUBKEYNAME64 = "Software\\Wow6432Node\\OpenOffice\\UNO\\InstallPath"; String path = null; @@ -199,13 +200,27 @@ final class InstallationFinder { } catch ( WinRegKeyException e ) { try { // read the key's default value from HKEY_LOCAL_MACHINE - WinRegKey key = new WinRegKey( "HKEY_LOCAL_MACHINE", - SUBKEYNAME ); + WinRegKey key = new WinRegKey( "HKEY_LOCAL_USER", + SUBKEYNAME64 ); path = key.getStringValue( "" ); // default - } catch ( WinRegKeyException we ) { - System.err.println( "com.sun.star.lib.loader." + - "InstallationFinder::getPathFromWindowsRegistry: " + - "reading key from Windows Registry failed: " + we ); + } catch ( WinRegKeyException e64 ) { + try { + // read the key's default value from HKEY_LOCAL_MACHINE + WinRegKey key = new WinRegKey( "HKEY_LOCAL_MACHINE", + SUBKEYNAME ); + path = key.getStringValue( "" ); // default + } catch ( WinRegKeyException we ) { + try { + // read the key's default value from HKEY_LOCAL_MACHINE + WinRegKey key = new WinRegKey( "HKEY_LOCAL_MACHINE", + SUBKEYNAME64 ); + path = key.getStringValue( "" ); // default + } catch ( WinRegKeyException we64 ) { + System.err.println( "com.sun.star.lib.loader." + + "InstallationFinder::getPathFromWindowsRegistry: " + + "reading key from Windows Registry failed: " + we64 ); + } + } } } commit 65ef7b5de4d5fa7b8b440a73329b088917f77957 Author: Jürgen Schmidt <j...@apache.org> Date: Thu Jun 27 13:21:43 2013 +0000 #122356# quote rdb path, windows spaces in paths diff --git a/odk/settings/std.mk b/odk/settings/std.mk index ecf70ae..a5b3b2b 100644 --- a/odk/settings/std.mk +++ b/odk/settings/std.mk @@ -47,10 +47,10 @@ COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN)) SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag URE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)" -URE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb) +URE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)" OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)types.rdb)" -OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb) +OFFICE_SERVICES="$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)" OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)" commit 3690a5c0d058781ea3244155874898e250dcd936 Author: Jürgen Schmidt <j...@apache.org> Date: Thu Jun 27 13:20:20 2013 +0000 #122356# correct used variable name diff --git a/odk/cfgWin.js b/odk/cfgWin.js index f574fe3..dd36d8f 100644 --- a/odk/cfgWin.js +++ b/odk/cfgWin.js @@ -1020,8 +1020,8 @@ function writeBatFile(fdir, file) " )\n" + "\n\n" + "@set \"OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%\"\n" + - "@set \"OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%\"\n" + - "@set \"OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\\classes\"\n" + + "@set \"OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH%\"\n" + + "@set \"OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\\classes\"\n" + "\n" + "REM Set classpath\n" + "@set \"CLASSPATH=%OO_SDK_OFFICE_JAVA_DIR%\\juh.jar;%OO_SDK_OFFICE_JAVA_DIR%\\jurt.jar;%OO_SDK_OFFICE_JAVA_DIR%\\ridl.jar;%OO_SDK_OFFICE_JAVA_DIR%\\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\\unoil.jar\"\n" + diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template index 631d9c9..ffbdf79 100644 --- a/odk/setsdkenv_windows.template +++ b/odk/setsdkenv_windows.template @@ -122,8 +122,8 @@ if defined OFFICE_HOME ( @set "OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%" -@set "OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%" -@set "OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\classes" +@set "OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH%" +@set "OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes" REM Set classpath @set "CLASSPATH=%OO_SDK_OFFICE_JAVA_DIR%\juh.jar;%OO_SDK_OFFICE_JAVA_DIR%\jurt.jar;%OO_SDK_OFFICE_JAVA_DIR%\ridl.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoloader.jar;%OO_SDK_OFFICE_JAVA_DIR%\unoil.jar" commit e12dc2fe3e556f9554700362eac39bc04c710864 Author: Jürgen Schmidt <j...@apache.org> Date: Thu Jun 27 13:18:54 2013 +0000 #122482# adapt cmd help to reflect removed 3layer diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx index 604bc65..3ccfe6d 100644 --- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx +++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx @@ -67,7 +67,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) if (nCount < 1) { printf("using: DocumentLoader -env:URE_MORE_TYPES=<office_types_rdb_url> <file_url> [<uno_connection_url>]\n\n" - "example: DocumentLoader -env:URE_MORE_TYPES=\"file:///.../basis-link/program/offapi.rdb\" \"file:///e:/temp/test.odt\" \"uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager\"\n"); + "example: DocumentLoader -env:URE_MORE_TYPES=\"file:///.../OpenOffice%204/program/types.rdb\" \"file:///e:/temp/test.odt\" \"uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager\"\n"); exit(1); } if (nCount == 2)
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits