summaryrefslogtreecommitdiff
path: root/setup_native/source/win32/customactions
diff options
context:
space:
mode:
authorAndras Timar <atimar@suse.com>2013-04-25 01:54:20 -0700
committerAndras Timar <atimar@suse.com>2013-04-30 01:23:35 -0700
commit5b77c93b28b7f7b705617839eb72798568ce9f15 (patch)
treea8326201b69f4374104894ed4ecade95d51e2c60 /setup_native/source/win32/customactions
parent0e881978998e9b17495a63de3bb9e22aa1474066 (diff)
remove unused product variables from Windows installer
OLDPRODUCT2 - it was a workaround for OOo 1.9, obsolete SAMEPRODUCTS - same product have the same ProductCode, so installer detect it anyway under normal circumstances. It is possible that a tester/developer tries to install the same version with different ProductCode over an existing installation (e.g. dailyes or RCs). Then we are in trouble. However, SAMEPRODUCTS was not in use. Moreover, Windows Installer uses only the first three fields of the product version. So we cannot make difference between e.g. 4.0.3.1 and 4.0.3.2, and this is the new versioning scheme. BETAPRODUCTS - LibreOffice have never used different upgrade code (BETAUPGRADECODE) for betas. OLDPRODUCTSPATCH, SAMEPRODUCTSPATCH, NEWPRODUCTSPATCH - related to old Star Division patching mechanism, they were commented out anyway. STUBPRODUCTS, STUBUPGRADECODE - these look useless Change-Id: I77d67b72e18fa6b3ba4182b99e198c42f247cea4
Diffstat (limited to 'setup_native/source/win32/customactions')
-rw-r--r--setup_native/source/win32/customactions/tools/checkversion.cxx40
-rw-r--r--setup_native/source/win32/customactions/tools/seterror.hxx10
2 files changed, 0 insertions, 50 deletions
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx
index dc42bfa63288..714894636bb2 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -86,14 +86,6 @@ extern "C" UINT __stdcall CheckVersions( MSIHANDLE hMSI )
free( pVal );
}
pVal = NULL;
- if ( GetMsiProp( hMSI, L"SAMEPRODUCTS", &pVal ) && pVal )
- {
- OutputDebugStringFormat( TEXT("DEBUG: SAMEPRODUCTS found [%s]"), pVal );
- if ( *pVal != 0 )
- SetMsiErrorCode( MSI_ERROR_SAME_VERSION_FOUND );
- free( pVal );
- }
- pVal = NULL;
if ( GetMsiProp( hMSI, L"OLDPRODUCTS", &pVal ) && pVal )
{
OutputDebugStringFormat( TEXT("DEBUG: OLDPRODUCTS found [%s]"), pVal );
@@ -102,38 +94,6 @@ extern "C" UINT __stdcall CheckVersions( MSIHANDLE hMSI )
free( pVal );
}
pVal = NULL;
- if ( GetMsiProp( hMSI, L"BETAPRODUCTS", &pVal ) && pVal )
- {
- OutputDebugStringFormat( TEXT("DEBUG: BETAPRODUCTS found [%s]"), pVal );
- if ( *pVal != 0 )
- SetMsiErrorCode( MSI_ERROR_OLD_VERSION_FOUND );
- free( pVal );
- }
-
- pVal = NULL;
- if ( GetMsiProp( hMSI, L"NEWPRODUCTSPATCH", &pVal ) && pVal )
- {
- OutputDebugStringFormat( TEXT("DEBUG: NEWPRODUCTSPATCH found [%s]"), pVal );
- if ( *pVal != 0 )
- SetMsiErrorCode( MSI_ERROR_NEW_PATCH_FOUND );
- free( pVal );
- }
- pVal = NULL;
- if ( GetMsiProp( hMSI, L"SAMEPRODUCTSPATCH", &pVal ) && pVal )
- {
- OutputDebugStringFormat( TEXT("DEBUG: SAMEPRODUCTSPATCH found [%s]"), pVal );
- if ( *pVal != 0 )
- SetMsiErrorCode( MSI_ERROR_SAME_PATCH_FOUND );
- free( pVal );
- }
- pVal = NULL;
- if ( GetMsiProp( hMSI, L"OLDPRODUCTSPATCH", &pVal ) && pVal )
- {
- OutputDebugStringFormat( TEXT("DEBUG: OLDPRODUCTSPATCH found [%s]"), pVal );
- if ( *pVal != 0 )
- SetMsiErrorCode( MSI_ERROR_OLD_PATCH_FOUND );
- free( pVal );
- }
return ERROR_SUCCESS;
}
diff --git a/setup_native/source/win32/customactions/tools/seterror.hxx b/setup_native/source/win32/customactions/tools/seterror.hxx
index 9adf3df8a653..f87aa5f2062b 100644
--- a/setup_native/source/win32/customactions/tools/seterror.hxx
+++ b/setup_native/source/win32/customactions/tools/seterror.hxx
@@ -23,18 +23,8 @@
//----------------------------------------------------------
// list of own error codes
-#define MSI_ERROR_INVALIDDIRECTORY 9001
-#define MSI_ERROR_ISWRONGPRODUCT 9002
-#define MSI_ERROR_PATCHISOLDER 9003
-
#define MSI_ERROR_NEW_VERSION_FOUND 9010
-#define MSI_ERROR_SAME_VERSION_FOUND 9011
#define MSI_ERROR_OLD_VERSION_FOUND 9012
-#define MSI_ERROR_NEW_PATCH_FOUND 9013
-#define MSI_ERROR_SAME_PATCH_FOUND 9014
-#define MSI_ERROR_OLD_PATCH_FOUND 9015
-
-#define MSI_ERROR_OFFICE_IS_RUNNING 9020
#define MSI_ERROR_DIRECTORY_NOT_EMPTY 9030