diff options
| author | Caolán McNamara <cmc@openoffice.org> | 2009-11-10 10:56:47 +0000 |
|---|---|---|
| committer | Caolán McNamara <cmc@openoffice.org> | 2009-11-10 10:56:47 +0000 |
| commit | ad82f3632d986351f60f1f979c769b8a26ebabd9 (patch) | |
| tree | 8e086cde28ab689fab40f248dc3fee9b159b8dae /setup_native | |
| parent | 3abde8a5f1a5fd9636589ad13e4e034a11e6647b (diff) | |
| parent | e76dcc39bd144789124272efc41d4823a672e284 (diff) | |
cmcfixes66: merge with DEV300 m64
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/prj/build.lst | 2 | ||||
| -rwxr-xr-x | setup_native/source/win32/customactions/shellextensions/checkrunningoffice.cxx | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst index 8835ff0d6ad2..05200fdf938a 100644 --- a/setup_native/prj/build.lst +++ b/setup_native/prj/build.lst @@ -1,4 +1,4 @@ -pk setup_native : transex3 soltools sal xml2cmp NULL +pk setup_native : l10n transex3 soltools sal xml2cmp NULL pk setup_native usr1 - all sn_mkout NULL pk setup_native\scripts\source nmake - u sn_source NULL pk setup_native\scripts nmake - u sn_scripts sn_source.u NULL 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; |