summaryrefslogtreecommitdiff
path: root/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx')
-rwxr-xr-xsetup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index 09f60b7a66d5..9a028953fef1 100755
--- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -184,12 +184,12 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
// renaming the vcl resource doesn't work reliable with OS >= Windows Vista
if (osverinfo.dwMajorVersion < 6 )
{
- std::_tstring sInstDir = GetMsiProperty( handle, TEXT("BASISINSTALLLOCATION") );
+ std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
// Property empty -> no office installed
if ( sInstDir.length() == 0 )
return ERROR_SUCCESS;
- std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\");
+ std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
std::_tstring sPattern = sResourceDir + TEXT("vcl*.res");
// std::_tstring mystr;
@@ -233,7 +233,7 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
}
else
{
- std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("OFFICEINSTALLLOCATION"));
+ std::_tstring sOfficeInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
// Property empty -> no office installed
if ( sOfficeInstallPath.length() == 0 )
return ERROR_SUCCESS;