diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 14:03:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-09-08 14:03:37 +0000 |
| commit | 4617b7073ec344c227d1f86cacae3e58300ff8dc (patch) | |
| tree | 16e97fb8654ce001d3fb6f52ead5b944bbe8dbf9 /setup_native/source | |
| parent | 7a57c4c72f773cf2edfc2dc43ddb25172e044783 (diff) | |
INTEGRATION: CWS customizer (1.4.14); FILE MERGED
2004/08/24 15:52:40 is 1.4.14.1: #i33203# INSTALLLOCATION instead of OfficeFolder
Diffstat (limited to 'setup_native/source')
| -rw-r--r-- | setup_native/source/win32/customactions/regactivex/regactivex.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index 41e3f2ef807e..d7a810e46afe 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: regactivex.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: mav $ $Date: 2004-05-27 14:47:14 $ + * last change: $Author: hr $ $Date: 2004-09-08 15:03:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -152,7 +152,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue ) BOOL GetActiveXControlPath( MSIHANDLE hMSI, char** ppActiveXPath ) { wchar_t* pProgPath = NULL; - if ( GetMsiProp( hMSI, L"OfficeFolder", &pProgPath ) && pProgPath ) + if ( GetMsiProp( hMSI, L"INSTALLLOCATION", &pProgPath ) && pProgPath ) { char* pCharProgPath = UnicodeToAnsiString( pProgPath ); if ( pCharProgPath ) |