summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-09-04 06:07:57 +0000
committerRüdiger Timm <rt@openoffice.org>2008-09-04 06:07:57 +0000
commit64c589f65fcc493d6619c1403e85eb48112f07e9 (patch)
treee36ac57feee8b27e2df8ad4015873296ad9d0d0c /desktop
parent14ad4b850127c11e53ba643aca3085ffe385d933 (diff)
INTEGRATION: CWS native190_DEV300 (1.8.130); FILE MERGED
2008/09/01 14:19:38 dv 1.8.130.2: #i93250# DON'T look for *.msp files when doing an administrative install 2008/09/01 06:00:09 dv 1.8.130.1: #i93250# Look for *.msp files and prepare patch install
Diffstat (limited to 'desktop')
-rw-r--r--desktop/win32/source/setup/setup_main.hxx7
1 files changed, 6 insertions, 1 deletions
diff --git a/desktop/win32/source/setup/setup_main.hxx b/desktop/win32/source/setup/setup_main.hxx
index 529d62b9ae9e..db2f90f77c97 100644
--- a/desktop/win32/source/setup/setup_main.hxx
+++ b/desktop/win32/source/setup/setup_main.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: setup_main.hxx,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
* This file is part of OpenOffice.org.
*
@@ -38,6 +38,7 @@ class SetupApp
DWORD m_nMinorVersion;
boolean m_bIsWin9x : 1;
boolean m_bNeedReboot : 1;
+ boolean m_bAdministrative : 1;
public:
UINT m_uiRet;
@@ -48,6 +49,7 @@ public:
virtual boolean Initialize( HINSTANCE hInst ) = 0;
virtual boolean AlreadyRunning() const = 0;
virtual boolean ReadProfile() = 0;
+ virtual boolean GetPatches() = 0;
virtual boolean ChooseLanguage( long& rLanguage ) = 0;
virtual boolean CheckVersion() = 0;
virtual boolean Install( long nLanguage ) = 0;
@@ -60,6 +62,9 @@ public:
DWORD GetOSVersion() const { return m_nOSVersion; }
DWORD GetMinorVersion() const { return m_nMinorVersion; }
+ boolean IsAdminInstall() { return m_bAdministrative; }
+ void SetAdminInstall( boolean bValue ) { m_bAdministrative = bValue; }
+
void SetRebootNeeded( boolean bNeedReboot ) { m_bNeedReboot = bNeedReboot; }
boolean NeedReboot() const { return m_bNeedReboot; }
};