[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-115-ge038aea
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 1015fe173b84c4d5fe7ffdbb7a3aa06951677e25
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Mon Apr 23 11:56:13 2012 +0200
lp#527938: another update
diff --git a/patches/lp-527938-triple-paperbag-fix-service-name-again.diff b/patches/lp-527938-triple-paperbag-fix-service-name-again.diff
index 8cd2913..d0efee7 100644
--- a/patches/lp-527938-triple-paperbag-fix-service-name-again.diff
+++ b/patches/lp-527938-triple-paperbag-fix-service-name-again.diff
@@ -1,25 +1,36 @@
-From 394f2410f7f2e137f1801d255c99d366eb38adfa Mon Sep 17 00:00:00 2001
+From ee62fb9b05f736710d674c3946c9ec042a94878a Mon Sep 17 00:00:00 2001
From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Sat, 21 Apr 2012 03:13:12 +0200
-Subject: [PATCH] lp#527938: triple paperbag -- fix service name (again)
+Subject: [PATCH] lp#527938: triple paperbag -- tweak bibloader again
---
- extensions/source/bibliography/bibload.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ extensions/source/bibliography/bibload.cxx | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
-index 8b581fd..301e908 100644
+index 9c84cdb..c5d3b13 100644
--- a/extensions/source/bibliography/bibload.cxx
+++ b/extensions/source/bibliography/bibload.cxx
-@@ -250,7 +250,7 @@ namespace
+@@ -248,9 +248,16 @@ namespace
+ // lp#527938, debian#602953, fdo#33266, i#105408
static bool lcl_isBaseAvailable()
{
- Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
+- Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
- Reference< XAggregation > xAggregate = Reference< XAggregation >( xMgr->createInstance(C2U("com.sun.star.sdbc.RowSet")), UNO_QUERY);
-+ Reference< XAggregation > xAggregate = Reference< XAggregation >( xMgr->createInstance(C2U("com.sun.star.sdb.RowSet")), UNO_QUERY);
- return xAggregate.is();
+- return xAggregate.is();
++ try
++ {
++ Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
++ Reference< XAggregation > xAggregate = Reference< XAggregation >( xMgr->createInstance(C2U("com.sun.star.sdb.RowSet")), UNO_QUERY);
++ return xAggregate.is();
++ }
++ catch(...)
++ {
++ return false;
++ }
}
}
+ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUString& rURL,
--
1.7.9.5
--
LibreOffice packaging repository
Reply to: