diff options
| author | Gerd Weiss <gm@openoffice.org> | 2007-05-10 10:08:54 +0000 |
|---|---|---|
| committer | Gerd Weiss <gm@openoffice.org> | 2007-05-10 10:08:54 +0000 |
| commit | 4ad63d26cab4a47f21e10bd76d849ae69836f9d8 (patch) | |
| tree | 00a68a6a6b6e6a47b819fdaf8834ddc93f84ac83 /desktop/win32/source/setup | |
| parent | f48b11d19c6280bdb076f93ed154af8ff80df228 (diff) | |
INTEGRATION: CWS native82 (1.4.364); FILE MERGED
2007/03/29 12:00:34 is 1.4.364.2: RESYNC: (1.4-1.5); FILE MERGED
2007/03/27 07:31:53 dv 1.4.364.1: #i75394# Use memory mapped file to transfer error codes from msi to setup loader
Diffstat (limited to 'desktop/win32/source/setup')
| -rw-r--r-- | desktop/win32/source/setup/setup_main.hxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx index 618398f77a..0d1e63bd45 100644 --- a/desktop/win32/source/setup/setup_main.hxx +++ b/desktop/win32/source/setup/setup_main.hxx @@ -4,9 +4,9 @@ * * $RCSfile: setup_main.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: vg $ $Date: 2007-03-26 14:32:08 $ + * last change: $Author: gm $ $Date: 2007-05-10 11:08:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,13 +39,14 @@ class SetupApp { - UINT m_uiRet; DWORD m_nOSVersion; DWORD m_nMinorVersion; boolean m_bIsWin9x : 1; boolean m_bNeedReboot : 1; public: + UINT m_uiRet; + SetupApp(); virtual ~SetupApp(); @@ -56,9 +57,9 @@ public: virtual boolean CheckVersion() = 0; virtual boolean Install( long nLanguage ) = 0; - virtual void DisplayError( UINT nErr ) const = 0; + virtual UINT GetError() const = NULL; + virtual void DisplayError( UINT nErr ) const = NULL; - UINT GetError() const { return m_uiRet; } void SetError( UINT nErr ) { m_uiRet = nErr; } boolean IsWin9x() const { return m_bIsWin9x; } DWORD GetOSVersion() const { return m_nOSVersion; } |