summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2009-10-30 11:31:28 +0100
committerVladimir Glazunov <vg@openoffice.org>2009-10-30 11:31:28 +0100
commita1b78c3bb9e0f0a36bdb4554c806b40d8fe201a0 (patch)
treedefe56f1a1554cefe66e8791810a8cce9686537b
parent96695e2db7301fbe1ba667e30d37cc1a337c46ec (diff)
parent576f2ad346b04cd078ee22b1575b715c7d41193c (diff)
CWS-TOOLING: integrate CWS installer11_DEV300
-rwxr-xr-xsetup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
index 1fe1d2335b88..70c0d9fef1e6 100755
--- a/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx
@@ -257,6 +257,9 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
// When there is no program folder, there could be no running office
if ( dwError == ERROR_FILE_NOT_FOUND )
return ERROR_SUCCESS;
+ if ( dwError == ERROR_PATH_NOT_FOUND )
+ return ERROR_SUCCESS;
+
// The destination folder should never exist, don't know what to do here
if ( dwError == ERROR_ALREADY_EXISTS )
return ERROR_SUCCESS;