summaryrefslogtreecommitdiff
path: root/sfx2/source/appl
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-05-20 12:48:01 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-05-20 12:47:33 +0100
commite58b0ce9ccb531b01298bfb18cbeb042892efc92 (patch)
treee0b5f6e883627efb3b1b3b674fa6d2a6dc06e1b2 /sfx2/source/appl
parentbee150931d4913edbc0f8cdc3854c2699ebdde46 (diff)
fdo#48775 - presumed fix for missing bibliography database exception crash.
Diffstat (limited to 'sfx2/source/appl')
-rw-r--r--sfx2/source/appl/appserv.cxx19
1 files changed, 14 insertions, 5 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c80b4d4a2df4..80a380ff0552 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -171,7 +171,7 @@ namespace
SolarMutexGuard aGuard;
executeRestartDialog(comphelper::getProcessComponentContext(), NULL, RESTART_REASON_BIBLIOGRAPHY_INSTALL);
}
- catch (Exception & e)
+ catch (const Exception & e)
{
SAL_INFO(
"sfx2.appl",
@@ -179,10 +179,19 @@ namespace
}
return;
}
- SfxStringItem aURL(SID_FILE_NAME, OUString(".component:Bibliography/View1"));
- SfxStringItem aRef(SID_REFERER, OUString("private:user"));
- SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank"));
- SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aURL, &aRef, &aTarget, 0L);
+
+ try // fdo#48775
+ {
+ SfxStringItem aURL(SID_FILE_NAME, OUString(".component:Bibliography/View1"));
+ SfxStringItem aRef(SID_REFERER, OUString("private:user"));
+ SfxStringItem aTarget(SID_TARGETNAME, OUString("_blank"));
+ SfxViewFrame::Current()->GetDispatcher()->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON, &aURL, &aRef, &aTarget, 0L);
+ }
+ catch (const Exception & e)
+ {
+ SAL_INFO( "sfx2.appl",
+ "trying to load bibliography database, caught " << e.Message);
+ }
}
}
/// Find the correct location of the document (LICENSE.odt, etc.), and return