diff options
| author | Gerd Weiss <gm@openoffice.org> | 2007-05-10 10:03:07 +0000 |
|---|---|---|
| committer | Gerd Weiss <gm@openoffice.org> | 2007-05-10 10:03:07 +0000 |
| commit | 1a6169b0605945a69449c6fd61bf621d6fe76d6b (patch) | |
| tree | cdfbcac53898a70456f052e3acc58cb5b3aa9cd7 /setup_native | |
| parent | a899e2c45b1ecab2907c9861b2632ea5b4562848 (diff) | |
INTEGRATION: CWS native82 (1.14.32); FILE MERGED
2007/03/29 11:54:54 is 1.14.32.2: RESYNC: (1.14-1.15); FILE MERGED
2007/03/28 07:26:34 dv 1.14.32.1: #i75394# Use only one function definition of SetMSIErrorCode
Diffstat (limited to 'setup_native')
| -rwxr-xr-x | setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx index d53d7bed0188..aae00f4d52cc 100755 --- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx +++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx @@ -4,9 +4,9 @@ * * $RCSfile: swappatchfiles.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: vg $ $Date: 2007-03-26 14:08:40 $ + * last change: $Author: gm $ $Date: 2007-05-10 11:03:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,6 +58,7 @@ #endif #include <systools/win32/uwinapi.h> +#include <../tools/seterror.hxx> #define WININIT_FILENAME "wininit.ini" #define RENAME_SECTION "rename" @@ -329,6 +330,7 @@ static bool SwapFiles( const std::_tstring& sFileName1, const std::_tstring& sFi } else OutputDebugStringFormat( TEXT("Error Code %d: Unknown"), dwError ); + SetMsiErrorCode( dwError ); } return fSuccess; @@ -709,7 +711,10 @@ extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle ) } while ( fSuccess && fRenameSucceeded ); if ( !fRenameSucceeded ) + { MsiSetProperty(handle, TEXT("OFFICERUNS"), TEXT("1")); + SetMsiErrorCode( MSI_ERROR_OFFICE_IS_RUNNING ); + } FindClose( hFind ); } |