The following commit has been merged in the master branch:
commit fc5d6952fb3d416991aab2ae3c6ff1dcbdef3326
Author: Rene Engelhard <[email protected]>
Date: Fri Mar 9 16:02:13 2012 +0100
backport tools->bibliography fix from libreoffice-3-5, fixing up
bibliography-no-crash-if-no-base.diff
diff --git a/changelog b/changelog
index 949488c..55df002 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.4.5-6) UNRELEASED; urgency=low
+
+ * debian/patches/bibliography-no-crash-if-no-base.diff: add fixup from
+ libreoffice-3-5 to make it actually work again...
+
+ -- Rene Engelhard <[email protected]> Fri, 09 Mar 2012 15:59:06 +0100
+
libreoffice (1:3.4.5-5) unstable; urgency=medium
* debian/patches/nsplugin-fix-SimpleFileAccess-instance.diff:
diff --git a/patches/bibliography-no-crash-if-no-base.diff
b/patches/bibliography-no-crash-if-no-base.diff
index 2a2dc9f..5961245 100644
--- a/patches/bibliography-no-crash-if-no-base.diff
+++ b/patches/bibliography-no-crash-if-no-base.diff
@@ -1,12 +1,21 @@
--- /dev/null 2012-03-01 23:57:10.294450749 +0100
+++
libreoffice-3.4.5/libreoffice-build/patches/hotfixes/bibliography-no-crash-if-no-base.diff
2012-03-06 22:25:52.000000000 +0100
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,59 @@
+From 33ef1ffbd15994ec71be99d38c0d5171c63344a2 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <[email protected]>
+Date: Tue, 06 Mar 2012 17:16:35 +0000
+Subject: lp#527938, debian#602953, fdo#33266, i#105408: do not crash on
clicking bibliography when base isnt installed
+
+Signed-off-by: Michael Meeks <[email protected]>
++
++From 285b3a4fe0b5b21abe061dfb664800b7e537471e Mon Sep 17 00:00:00 2001
++From: Caolán McNamara <[email protected]>
++Date: Fri, 09 Mar 2012 14:09:30 +0000
++Subject: Fix tools->bibliography database, brown paper bag over head commit
:-)
++
++(cherry picked from commit bd1088567bafa6293ffecf5331a9016b6d0438e3)
++
++Signed-off-by: Miklos Vajna <[email protected]>
+---
+diff --git a/extensions/source/bibliography/bibload.cxx
b/extensions/source/bibliography/bibload.cxx
+index c80c81e..9159124 100644
@@ -30,7 +39,7 @@
++ static bool lcl_isBaseAvailable()
++ {
++ Reference< XMultiServiceFactory > xMgr =
comphelper::getProcessServiceFactory();
-++ Reference< XAggregation > xAggregate = Reference< XAggregation >(
xMgr->createInstance(C2U("com.sun.star.sbd.RowSet")), UNO_QUERY);
+++ Reference< XAggregation > xAggregate = Reference< XAggregation >(
xMgr->createInstance(C2U("com.sun.star.sdbc.RowSet")), UNO_QUERY);
++ return xAggregate.is();
++ }
++}
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
