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/salsys.hxx | |
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/salsys.hxx')
-rw-r--r-- | vcl/inc/salsys.hxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/vcl/inc/salsys.hxx b/vcl/inc/salsys.hxx index 6c9eb37ae011..60b89ad917f6 100644 --- a/vcl/inc/salsys.hxx +++ b/vcl/inc/salsys.hxx @@ -133,6 +133,10 @@ public: The effect of specifying a button that doesn't belong to the specified button combination is undefined. + @param bUseResources + If false, assume initialization of the application failed early and do + not try to access any resources. + @returns the identifier of the button that was pressed by the user. See button identifier above. If the function fails the return value is 0. @@ -140,7 +144,8 @@ public: virtual int ShowNativeMessageBox( const rtl::OUString& rTitle, const rtl::OUString& rMessage, int nButtonCombination, - int nDefaultButton) = 0; + int nDefaultButton, + bool bUseResources ) = 0; }; SalSystem* ImplGetSalSystem(); |