sfx2/source/appl/appserv.cxx | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
New commits:
commit e58b0ce9ccb531b01298bfb18cbeb042892efc92
Author: Michael Meeks <michael.me...@suse.com>
Date: Mon May 20 12:48:01 2013 +0100
fdo#48775 - presumed fix for missing bibliography database exception crash.
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c80b4d4..80a380f 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
