diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-24 17:33:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-24 17:33:37 +0000 |
| commit | f3309edfa5db4612e30adb95ce20631766173237 (patch) | |
| tree | 10b61ce4e4536cbc87018e7810ec3435841d8948 /desktop | |
| parent | 0c5ca67a1df95eb84cbb20211469fcc9fe2411f3 (diff) | |
INTEGRATION: CWS lo8 (1.26.166); FILE MERGED
2005/10/18 16:36:54 lo 1.26.166.2: RESYNC: (1.26-1.27); FILE MERGED
2005/06/06 14:54:37 lo 1.26.166.1: #i18970# exit cleanly when possible
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/inc/app.hxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index b5f9fbb8c65d..423b0d0ddad2 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -4,9 +4,9 @@ * * $RCSfile: app.hxx,v $ * - * $Revision: 1.28 $ + * $Revision: 1.29 $ * - * last change: $Author: rt $ $Date: 2005-10-19 12:19:51 $ + * last change: $Author: hr $ $Date: 2005-10-24 18:33:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -102,6 +102,11 @@ class Desktop : public Application BE_USERINSTALL_FAILED, BE_LANGUAGE_MISSING }; + enum BootstrapStatus + { + BS_OK, + BS_TERMINATE + }; Desktop(); ~Desktop(); @@ -135,6 +140,15 @@ class Desktop : public Application return m_aBootstrapError; } + void SetBootstrapStatus( BootstrapStatus nStatus ) + { + m_aBootstrapStatus = nStatus; + } + BootstrapStatus GetBootstrapStatus() const + { + return m_aBootstrapStatus; + } + DECL_STATIC_LINK( Desktop, AsyncTerminate, void*); static sal_Bool CheckOEM(); @@ -198,6 +212,7 @@ class Desktop : public Application USHORT m_nAppEvents; IntroWindow_Impl* m_pIntro; BootstrapError m_aBootstrapError; + BootstrapStatus m_aBootstrapStatus; Lockfile *m_pLockfile; Timer m_firstRunTimer; |