diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-09-18 12:40:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-09-18 15:08:56 +0200 |
| commit | cccc6bcfa095121c91e8bbc396f5bcf7e95424b9 (patch) | |
| tree | f94a97a9698e3376405a36decc7612a2c523c9fd /vcl/inc/generic | |
| parent | a0659cc41d7764dd104bce82f8c5b3f0b8073173 (diff) | |
Don't access broken service mgr during bootstrap failure
...so that displaying a (non-translated) error box upon BE_UNO_SERVICEMANAGER
works after all. Augment the error text with an exception message where
appropriate. This allows to revert fdfb7a3c4b3a89b73ab5546b9620348bc4984d8f
"Related fdo#51252: Report uncaught exceptions with MessageBox on Windows" as
that was to catch and display failures from instantiating the service mgr.
Change-Id: I049a38e95342634796eb0e940e2ee8e55193c9d3
Diffstat (limited to 'vcl/inc/generic')
| -rw-r--r-- | vcl/inc/generic/gensys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h index abe7fee3648a..eb80beaef650 100644 --- a/vcl/inc/generic/gensys.h +++ b/vcl/inc/generic/gensys.h @@ -50,7 +50,7 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem virtual int ShowNativeMessageBox( const rtl::OUString& rTitle, const rtl::OUString& rMessage, int nButtonCombination, - int nDefaultButton); + int nDefaultButton, bool bUseResources); // simple helpers primarily for X Windowing W_CLASS hints static const char *getFrameResName(); |