mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cppcheck reduce scope of var in setup_native/...regactivex.cxx

Browse Source
This commit is contained in:
Pierre-André Jacquod
2011-10-02 17:42:35 +02:00
parent 69cc1ee085
commit 3251b31319
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
setup_native/source/win32/customactions/regactivex/regactivex.cxx
View File

@@ -305,15 +305,14 @@ BOOL MakeInstallFor64Bit( MSIHANDLE hMSI )
//---------------------------------------------------------- //----------------------------------------------------------
extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI ) extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
{ {
int nOldInstallMode = 0;
int nInstallMode = 0;
int nDeinstallMode = 0;
INSTALLSTATE current_state; INSTALLSTATE current_state;
INSTALLSTATE future_state; INSTALLSTATE future_state;
if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_o_Activexcontrol", &current_state, &future_state ) ) if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_o_Activexcontrol", &current_state, &future_state ) )
{ {
int nOldInstallMode = 0;
int nInstallMode = 0;
int nDeinstallMode = 0;
BOOL bInstallForAllUser = MakeInstallForAllUsers( hMSI ); BOOL bInstallForAllUser = MakeInstallForAllUsers( hMSI );
BOOL bInstallFor64Bit = MakeInstallFor64Bit( hMSI ); BOOL bInstallFor64Bit = MakeInstallFor64Bit( hMSI );