[libreoffice/f16] Backport nsplugin fix

[sbergmann]

commit 8332f249541800c26873ed55f1f54571cfa47eef
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Mar 1 09:55:52 2012 +0100

    Backport nsplugin fix

 ...n-to-create-correct-com.sun.star.ucb.Simp.patch |   29 ++++++++++++++++++++
 libreoffice.spec                                   |    3 ++
 2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch b/0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch
new file mode 100644
index 0000000..b527d92
--- /dev/null
+++ b/0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch
@@ -0,0 +1,29 @@
+From b975e59e7d5213f99ff22138a1065eb0f0a9cb07 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene at debian.org>
+Date: Thu, 1 Mar 2012 08:45:13 +0100
+Subject: [PATCH] fix nsplugin to create correct
+ com.sun.star.ucb.SimpleFileAccess instance
+
+Signed-off-by: Stephan Bergmann <sbergman at redhat.com>
+Signed-off-by: Michael Meeks <michael.meeks at suse.com>
+Signed-off-by: Tor Lillqvist <tml at iki.fi>
+---
+ 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 658d73a..f14b7b3 100644
+--- a/extensions/source/nsplugin/source/so_instance.cxx
++++ b/extensions/source/nsplugin/source/so_instance.cxx
+@@ -243,7 +243,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.7.6
+
diff --git a/libreoffice.spec b/libreoffice.spec
index dadd997..1e68107 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -223,6 +223,7 @@ Patch104: 0001-fdo-39657-fix-crash-when-parsing-XML-signatures.patch
 Patch105: 0001-rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch
 Patch106: 0001-fdo-31966-do-not-create-an-empty-slide-when-printing.patch
 Patch107: 0001-Correctly-calculate-leap-year.patch
+Patch108: 0001-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1129,6 +1130,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch105 -p1 -b .rhbz-794679-use-proper-Indian-Rupee-currency-symbol.patch
 %patch106 -p1 -b .fdo-31966-do-not-create-an-empty-slide-when-printing.patch
 %patch107 -p1 -b .Correctly-calculate-leap-year.patch
+%patch108 -p1 -b .fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2442,6 +2444,7 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 
 * Wed Feb 29 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-8.UNBUILT
 - Resolves: fdo#31966 do not create an empty slide when printing handouts
+- fixes nsplugin
 
 * Wed Feb 29 2012 Caolán McNamara <caolanm at redhat.com> - 3.4.5.2-7
 - Resolves: rhbz#788045 swriter --help wouldn't display help