diff options
author | Michael Meeks <michael.meeks@suse.com> | 2012-01-23 21:16:37 +0000 |
---|---|---|
committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-23 22:03:43 +0000 |
commit | 6ce3dc5165cdc1328ae0dd877d183fc688b43299 (patch) | |
tree | dea694b6e68870e13982f0f148b34a51066275bc | |
parent | d83eb4b9ff792080f3c0012f7e0b59ed3c8639ce (diff) |
vcl: early crash => no ucb => no images.zip => unhandled exception, caught.
-rw-r--r-- | vcl/source/window/msgbox.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 042c629b03ed..b42136c97cc0 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -573,7 +573,13 @@ ErrorBox::ErrorBox( Window* pParent, const ResId& rResId ) : Image ErrorBox::GetStandardImage() { - ImplInitMsgBoxImageList(); + try { + ImplInitMsgBoxImageList(); + } catch (const ::com::sun::star::uno::Exception &e) { + // During early bootstrap we can have no initialized + // ucb and hence no ability to get this image, so nop. + return Image(); + } return ImplGetSVData()->maWinData.mpMsgBoxImgList->GetImage( 1 ); } |