From 3cf17bcb76a8e23a7171bdaecdd86ae736eca958 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 4 Sep 2008 06:07:23 +0000 Subject: INTEGRATION: CWS native190_DEV300 (1.11.38); FILE MERGED 2008/09/01 14:19:38 dv 1.11.38.2: #i93250# DON'T look for *.msp files when doing an administrative install 2008/09/01 06:00:09 dv 1.11.38.1: #i93250# Look for *.msp files and prepare patch install --- desktop/win32/source/setup/setup.hxx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'desktop/win32') diff --git a/desktop/win32/source/setup/setup.hxx b/desktop/win32/source/setup/setup.hxx index e57f226c27..8a96f0d5f8 100644 --- a/desktop/win32/source/setup/setup.hxx +++ b/desktop/win32/source/setup/setup.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: setup.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.12 $ * * This file is part of OpenOffice.org. * @@ -83,10 +83,10 @@ class SetupAppX : public SetupApp LPTSTR m_pTmpName; LPTSTR m_pErrorText; LPTSTR m_pModuleFile; + LPTSTR m_pPatchFiles; int *m_pMSIErrorCode; boolean m_bQuiet : 1; - boolean m_bAdministrative : 1; boolean m_bIgnoreAlreadyRunning : 1; boolean m_bRegNoMsoTypes :1; boolean m_bRegAllMsoTypes :1; @@ -130,13 +130,14 @@ public: virtual boolean Initialize( HINSTANCE hInst ); virtual boolean AlreadyRunning() const; virtual boolean ReadProfile(); + virtual boolean GetPatches(); virtual boolean ChooseLanguage( long& rLanguage ); virtual boolean CheckVersion(); virtual boolean Install( long nLanguage ); virtual UINT GetError() const; virtual void DisplayError( UINT nErr ) const; - + void Log( LPCTSTR pMessage, LPCTSTR pText = NULL ) const; long GetLanguageCount() const { return m_nLanguageCount; } -- cgit v1.2.3