[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.0-2-57-gd596b0c
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 1321d1711e83926ab572568ada860d56051405a3
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Mar 1 12:49:07 2012 +0100
backport a6d65732f14e49be8ec61aac53a2a8b909d810f7 by Rene (LP: #882588), also fix distrel in changelog
diff --git a/changelog b/changelog
index fa4bb74..5f7e6f1 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,11 @@
-libreoffice (1:3.5.0-2ubuntu1) oneiric; urgency=low
+libreoffice (1:3.5.0-2ubuntu1) precise; urgency=low
* merge from debian-experimental-3.5 at
a9613a0cfaf22d4fa91652cbd135787cbf61e790
+ * backport a6d65732f14e49be8ec61aac53a2a8b909d810f7 by Rene
+ (LP: #882588)
- -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 01 Mar 2012 12:40:18 +0100
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Thu, 01 Mar 2012 12:44:20 +0100
libreoffice (1:3.5.0-2) experimental; urgency=low
diff --git a/patches/fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff b/patches/fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
new file mode 100644
index 0000000..ea02d28
--- /dev/null
+++ b/patches/fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
@@ -0,0 +1,26 @@
+From a6d65732f14e49be8ec61aac53a2a8b909d810f7 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
+--- a/extensions/source/nsplugin/source/so_instance.cxx
++++ b/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.5.4
+
diff --git a/patches/series b/patches/series
index 69e5e70..15b93c2 100644
--- a/patches/series
+++ b/patches/series
@@ -41,3 +41,4 @@ pkgconfig-mozilla-plugin.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
ubuntu-quicklists.diff
fix-quickstart-shutdown.diff
+fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
--
LibreOffice packaging repository
Reply to: