diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-03-24 12:02:44 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-03-24 12:02:44 +0000 |
| commit | c837875a1b4e786d3b7a4c19688c97455ca9a621 (patch) | |
| tree | 736319877e69a3b5686b4e4983e5fbc152ba8680 /setup_native/source/win32/customactions/regactivex | |
| parent | 9ff2537de1440eb72e58488b78bbf93370817dca (diff) | |
INTEGRATION: CWS fwk33 (1.8.50); FILE MERGED
2006/03/09 13:31:53 mav 1.8.50.2: RESYNC: (1.8-1.9); FILE MERGED
2006/02/27 08:14:54 mav 1.8.50.1: #i57734# do not do the checks that should be done by installation
Diffstat (limited to 'setup_native/source/win32/customactions/regactivex')
| -rw-r--r-- | setup_native/source/win32/customactions/regactivex/regactivex.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index f0b6086c6..cc4ee8537 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -4,9 +4,9 @@ * * $RCSfile: regactivex.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2006-02-07 10:20:02 $ + * last change: $Author: obo $ $Date: 2006-03-24 13:02:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -331,8 +331,9 @@ extern "C" __stdcall UINT DeinstallActiveXControl( MSIHANDLE hMSI ) { BOOL bInstallForAllUser = MakeInstallForAllUsers( hMSI ); - wchar_t* rm = NULL; - if ( GetMsiProp( hMSI, L"REMOVE", &rm ) && rm && UnicodeEquals( rm, L"ALL" ) ) + // the following condition is checked by installation itself + // wchar_t* rm = NULL; + // if ( GetMsiProp( hMSI, L"REMOVE", &rm ) && rm && UnicodeEquals( rm, L"ALL" ) ) { UnregisterActiveXNative( pActiveXPath, CHART_COMPONENT @@ -344,8 +345,8 @@ extern "C" __stdcall UINT DeinstallActiveXControl( MSIHANDLE hMSI ) bInstallForAllUser ); } - if ( rm ) - free( rm ); + // if ( rm ) + // free( rm ); free( pActiveXPath ); } |