summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorMikhail Voitenko <mav@openoffice.org>2004-05-25 15:17:29 +0000
committerMikhail Voitenko <mav@openoffice.org>2004-05-25 15:17:29 +0000
commit1829f62f407dfc74763e09a1af5697840366d232 (patch)
treedfdb807c005383658aa0632157d8a2d9db6abc3b /setup_native
parentff9ed5583ed4cf0e6b837cf8bb022a7d2c6196c9 (diff)
#i28277# remove assertions
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/regactivex/regactivex.cxx15
1 files changed, 7 insertions, 8 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index 9ebb005daa27..c94dfbc7ad31 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.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: mav $ $Date: 2004-05-25 15:44:42 $
+ * last change: $Author: mav $ $Date: 2004-05-25 16:17:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -65,7 +65,6 @@
#include <msiquery.h>
#include <string.h>
#include <malloc.h>
-#include <assert.h>
#define CHART_COMPONENT 1
#define DRAW_COMPONENT 2
@@ -199,7 +198,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe
}
else
{
- assert( FALSE );
+ // assert( FALSE );
}
if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_p_Calc_Bin", &current_state, &future_state ) )
@@ -215,7 +214,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe
}
else
{
- assert( FALSE );
+ // assert( FALSE );
}
if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_p_Draw_Bin", &current_state, &future_state ) )
@@ -231,7 +230,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe
}
else
{
- assert( FALSE );
+ // assert( FALSE );
}
if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_p_Impress_Bin", &current_state, &future_state ) )
@@ -247,7 +246,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe
}
else
{
- assert( FALSE );
+ // assert( FALSE );
}
return TRUE;
@@ -308,7 +307,7 @@ extern "C" UINT InstallActiveXControl( MSIHANDLE hMSI )
}
else
{
- assert( FALSE );
+ // assert( FALSE );
}
return ERROR_SUCCESS;