[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-4-3-gdf40342
The following commit has been merged in the master branch:
commit df403426bbfc950f14135d75b4647423c05c9c52
Author: Rene Engelhard <rene@debian.org>
Date: Wed Feb 29 23:36:56 2012 +0100
fix nsplugin to create a correct com.sun.star.ucb.SimpleFileAccess instance
diff --git a/changelog b/changelog
index 4e25f09..8695b00 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,13 @@
libreoffice (1:3.4.5-5) UNRELEASED; urgency=low
+ * debian/patches/nsplugin-fix-SimpleFileAccess-instance.diff:
+ fix nsplugin to create a correct com.sun.star.ucb.SimpleFileAccess
+ instance
+
* debian/control.in: build-conflict against
libc0.1-dev (= 2.13-26) [kfreebsd-i386 kfreebsd-amd64]
- -- Rene Engelhard <rene@debian.org> Tue, 28 Feb 2012 19:49:27 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 29 Feb 2012 22:31:02 +0000
libreoffice (1:3.4.5-4) unstable; urgency=low
diff --git a/patches/nsplugin-fix-SimpleFileAccess-instance.diff b/patches/nsplugin-fix-SimpleFileAccess-instance.diff
new file mode 100644
index 0000000..8aa0ac9
--- /dev/null
+++ b/patches/nsplugin-fix-SimpleFileAccess-instance.diff
@@ -0,0 +1,28 @@
+--- /dev/null 2012-02-23 23:30:09.346169274 +0000
++++ libreoffice-3.4.5/libreoffice-build/patches/hotfixes/nsplugin-fix-SimpleFileAccess-instance.diff 2012-02-29 22:19:19.000000000 +0000
+@@ -0,0 +1,25 @@
++From 3d22544462e4fde4440d383c8792936df5f57990 Mon Sep 17 00:00:00 2001
++From: Rene Engelhard <rene@debian.org>
++Date: Wed, 29 Feb 2012 23:19:00 +0100
++Subject: [PATCH] fix nsplugin to create correct com.sun.star.ucb.SimpleFileAccess instance
++
++---
++ extensions/source/nsplugin/source/so_instance.cxx | 2 +-
++ 1 files changed, 1 insertions(+), 1 deletions(-)
++
++diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx
++index b87b83f..8b243ae 100644
++--- extensions/source/nsplugin/source/so_instance.cxx
+++++ extensions/source/nsplugin/source/so_instance.cxx
++@@ -239,7 +239,7 @@ sal_Bool SoPluginInstance::LoadDocument(NSP_HWND hParent)
++
++ //create stream for the document
++ Reference< ::com::sun::star::ucb::XSimpleFileAccess > xSimpleFileAccess(
++- mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccessw")) ),
+++ mxRemoteMSF->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")) ),
++ uno::UNO_QUERY );
++ if(!xSimpleFileAccess.is())
++ {
++--
++1.7.2.5
++
diff --git a/patches/series b/patches/series
index eb9def8..7b4905e 100644
--- a/patches/series
+++ b/patches/series
@@ -28,3 +28,4 @@ mediwiki-oor-replace.diff
armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
armhf-bridges-doubles.diff
+nsplugin-fix-SimpleFileAccess-instance.diff
--
LibreOffice packaging repository
Reply to: