summaryrefslogtreecommitdiff
path: root/desktop/inc
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2001-08-07 10:25:00 +0000
committerCarsten Driesner <cd@openoffice.org>2001-08-07 10:25:00 +0000
commit3bf1731d0dbb0bb371e54c4253df5481119a26b7 (patch)
tree29a7b630e798da67e4facb79e660e16ee6e2a479 /desktop/inc
parentea03cb56b31b53df2588711231b07355d83d91f9 (diff)
#81412# error handling during startup changed
Diffstat (limited to 'desktop/inc')
-rw-r--r--desktop/inc/app.hxx17
1 files changed, 15 insertions, 2 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 70e4de094419..98dd819cd5d4 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: app.hxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: jl $ $Date: 2001-08-02 12:24:24 $
+ * last change: $Author: cd $ $Date: 2001-08-07 11:24:59 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -76,6 +76,14 @@ class IntroWindow_Impl;
class Desktop : public Application //public SfxApplicationClass
{
public:
+ enum BootstrapError
+ {
+ BE_OK,
+ BE_UNO_SERVICEMANAGER,
+ BE_UNO_SERVICE_CONFIG_MISSING,
+ BE_PATHINFO_MISSING
+ };
+
Desktop();
virtual void Main( );
virtual void Init();
@@ -92,7 +100,11 @@ class Desktop : public Application //public SfxApplicationClass
static void HandleAppEvent( const ApplicationEvent& rAppEvent );
static ResMgr* GetDesktopResManager();
+ void HandleBootstrapErrors( BootstrapError );
+
private:
+ void StartSetup( const ::rtl::OUString& aParameters );
+
void OpenStartupScreen();
void CloseStartupScreen();
void EnableOleAutomation();
@@ -111,6 +123,7 @@ class Desktop : public Application //public SfxApplicationClass
sal_Bool m_bInvisible;
USHORT m_nAppEvents;
IntroWindow_Impl* m_pIntro;
+ BootstrapError m_aBootstrapError;
static ResMgr* pResMgr;
};