[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-4-10-g2823d69
The following commit has been merged in the master branch:
commit 2823d6987cfdea76c18353b3e0c290a2c85e62c4
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 6 22:33:22 2012 +0100
backport fix from libreoffice-3-5 to not crash Tools -> Bibliography
if -base isn't installed (closes: #602953, #598809)
diff --git a/changelog b/changelog
index 718a0fd..01b3e4a 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,9 @@ libreoffice (1:3.4.5-5) UNRELEASED; urgency=low
instance (closes: #661747)
* debian/patches/fix-debian-opt.diff: fix to actually make test and grep
work
+ * debian/patches/bibliography-no-crash-if-no-base.diff: backport fix
+ from libreoffice-3-5 to not crash Tools -> Bibliography if -base isn't
+ installed (closes: #602953, #598809)
* debian/control.in: build-conflict against
libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64]
@@ -15,7 +18,7 @@ libreoffice (1:3.4.5-5) UNRELEASED; urgency=low
the respetive extensions. Run sync_extensions after rm -rf'ing the
dir already in preinst (upgrade) (closes: #658646)
- -- Rene Engelhard <rene@debian.org> Sun, 04 Mar 2012 13:21:41 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 06 Mar 2012 22:30:46 +0100
libreoffice (1:3.4.5-4) unstable; urgency=low
diff --git a/patches/bibliography-no-crash-if-no-base.diff b/patches/bibliography-no-crash-if-no-base.diff
new file mode 100644
index 0000000..2a2dc9f
--- /dev/null
+++ b/patches/bibliography-no-crash-if-no-base.diff
@@ -0,0 +1,53 @@
+--- /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 @@
++From 33ef1ffbd15994ec71be99d38c0d5171c63344a2 Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++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 <michael.meeks@suse.com>
++---
++diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx
++index c80c81e..9159124 100644
++--- extensions/source/bibliography/bibload.cxx
+++++ extensions/source/bibliography/bibload.cxx
++@@ -54,6 +54,7 @@
++ #include <com/sun/star/text/BibliographyDataField.hpp>
++ #include <com/sun/star/form/XLoadListener.hpp>
++ #include <com/sun/star/frame/XLayoutManager.hpp>
+++#include <com/sun/star/uno/XAggregation.hpp>
++ #include <toolkit/awt/vclxwindow.hxx>
++ #include <vcl/window.hxx>
++ #include <vcl/edit.hxx>
++@@ -243,13 +244,27 @@ void BibliographyLoader::cancel(void) throw (::com::sun::star::uno::RuntimeExcep
++ }
++
++ // -----------------------------------------------------------------------
+++namespace
+++{
+++ // lp#527938, debian#602953, fdo#33266, i#105408
+++ static bool lcl_isBaseAvailable()
+++ {
+++ Reference< XMultiServiceFactory > xMgr = comphelper::getProcessServiceFactory();
+++ Reference< XAggregation > xAggregate = Reference< XAggregation >( xMgr->createInstance(C2U("com.sun.star.sbd.RowSet")), UNO_QUERY);
+++ return xAggregate.is();
+++ }
+++}
++ void BibliographyLoader::load(const Reference< XFrame > & rFrame, const rtl::OUString& rURL,
++ const Sequence< PropertyValue >& rArgs,
++ const Reference< XLoadEventListener > & rListener) throw (::com::sun::star::uno::RuntimeException)
++ {
++- //!
+++ // lp#527938, debian#602953, fdo#33266, i#105408
+++ // make sure we actually can instanciate services from base first
+++ if(!lcl_isBaseAvailable())
+++ return;
++
++ SolarMutexGuard aGuard;
+++
++ m_pBibMod = OpenBibModul();
++
++ String aURLStr( rURL );
++--
++cgit v0.9.0.2-2-gbebe
diff --git a/patches/series b/patches/series
index 7b4905e..be01140 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
armhf-bridges-doubles.diff
nsplugin-fix-SimpleFileAccess-instance.diff
+bibliography-no-crash-if-no-base.diff
--
LibreOffice packaging repository
Reply to: