[PATCH] Change in core[libreoffice-3-6]: Don't access broken service mgr during bootstrap failure

Stephan Bergmann (via Code Review) gerrit at gerrit.libreoffice.org
Thu Sep 20 03:17:35 PDT 2012


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/654

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/654/1

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.

(cherry picked from commit cccc6bcfa095121c91e8bbc396f5bcf7e95424b9)

Change-Id: I049a38e95342634796eb0e940e2ee8e55193c9d3
---
M desktop/inc/app.hxx
M desktop/source/app/app.cxx
M desktop/source/app/desktop.hrc
M desktop/source/app/desktop.src
M desktop/source/app/sofficemain.cxx
M vcl/aqua/source/app/salsys.cxx
M vcl/generic/app/gensys.cxx
M vcl/inc/aqua/salsys.h
M vcl/inc/generic/gensys.h
M vcl/inc/ios/salsys.h
M vcl/inc/salsys.hxx
M vcl/inc/win/salsys.h
M vcl/ios/source/app/salsys.cxx
M vcl/source/app/svapp.cxx
M vcl/source/app/svdata.cxx
M vcl/win/source/app/salinfo.cxx
16 files changed, 172 insertions(+), 142 deletions(-)


--
To view, visit https://gerrit.libreoffice.org/654
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I049a38e95342634796eb0e940e2ee8e55193c9d3
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-3-6
Gerrit-Owner: Stephan Bergmann <sbergman at redhat.com>



More information about the LibreOffice mailing list