The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 32b534db788e7d4c8905c60ff6d6277cedf911dd
Author: Bjoern Michaelsen <[email protected]>
Date: Mon Mar 12 11:23:21 2012 +0100
also remove applied
fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
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
deleted file mode 100644
index eb67532..0000000
--- a/patches/fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-From a6d65732f14e49be8ec61aac53a2a8b909d810f7 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <[email protected]>
-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
-@@ -241,7 +241,7 @@
-
- //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 b749356..1583614 100644
--- a/patches/series
+++ b/patches/series
@@ -35,4 +35,3 @@ fix-quickstart-shutdown.diff
bibliography-no-crash-if-no-base.diff
pkgconfig-mozilla-plugin.diff
ubuntu-quicklists.diff
-fix-nsplugin-to-create-correct-com.sun.star.ucb.Simp.diff
--
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]
