summaryrefslogtreecommitdiff
path: root/desktop/inc
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2004-11-09 14:14:48 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2004-11-09 14:14:48 +0000
commita5db4ad9d9b8a4e89831afb8ec4337c2512a115a (patch)
tree17477c9de8ab017b41b54cd56f9abf6f2cc0b3f4 /desktop/inc
parent00fdf87052fc511422fe97742f50ff38a182e95a (diff)
INTEGRATION: CWS fwkpp2fix01 (1.25.64); FILE MERGED
2004/10/27 15:49:20 kso 1.25.64.1: #i34453# - No more crash during startup in case language cannot be determined.
Diffstat (limited to 'desktop/inc')
-rw-r--r--desktop/inc/app.hxx11
1 files changed, 8 insertions, 3 deletions
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 58baa590f61e..6cb5b454db49 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: app.hxx,v $
*
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
*
- * last change: $Author: hjs $ $Date: 2004-06-25 17:29:50 $
+ * last change: $Author: rt $ $Date: 2004-11-09 15:14:48 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -125,7 +125,8 @@ class Desktop : public Application
BE_UNO_SERVICEMANAGER,
BE_UNO_SERVICE_CONFIG_MISSING,
BE_PATHINFO_MISSING,
- BE_USERINSTALL_FAILED
+ BE_USERINSTALL_FAILED,
+ BE_LANGUAGE_MISSING
};
Desktop();
@@ -155,6 +156,10 @@ class Desktop : public Application
if ( m_aBootstrapError == BE_OK )
m_aBootstrapError = nError;
}
+ BootstrapError GetBootstrapError() const
+ {
+ return m_aBootstrapError;
+ }
DECL_STATIC_LINK( Desktop, AsyncTerminate, void*);
static sal_Bool CheckOEM();