[SCM] LibreOffice packaging repository branch, master, updated. b596e53f095f430baf2964d2729c7bd03b0eb5ac
The following commit has been merged in the master branch:
commit b596e53f095f430baf2964d2729c7bd03b0eb5ac
Author: Rene Engelhard <rene@debian.org>
Date: Sun May 29 22:15:31 2011 +0000
disable optional-outplace-ole.diff
diff --git a/changelog b/changelog
index 47d3e77..e46de29 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,12 @@
-libreoffice (1:3.3.2-5) unstable; urgency=low
+libreoffice (1:3.3.2-5) UNRELEASED; urgency=low
+
+ * debian/patches/disable-optional-outplace-ole.diff: as name says; makes
+ toolbars work in e.g. Base edit forms (closes: #617319)
* debian/rules:
- disable -sdbc-postgresql until fixed (closes: #620100)
- -- Rene Engelhard <rene@debian.org> Thu, 26 May 2011 13:07:57 +0000
+ -- Rene Engelhard <rene@debian.org> Sun, 29 May 2011 22:13:56 +0000
libreoffice (1:3.3.2-4) unstable; urgency=low
diff --git a/patches/disable-optional-outplace-ole.diff b/patches/disable-optional-outplace-ole.diff
new file mode 100644
index 0000000..dc516c7
--- /dev/null
+++ b/patches/disable-optional-outplace-ole.diff
@@ -0,0 +1,11 @@
+--- libreoffice-3.3.2/libreoffice-build/patches/dev300/apply-old 2011-05-30 00:09:10.000000000 +0200
++++ libreoffice-3.3.2/libreoffice-build/patches/dev300/apply 2011-05-30 00:09:42.000000000 +0200
+@@ -1946,7 +1946,7 @@
+ # fix problem with calling private and protected members in layout code
+ sfx2-privateprotectedpublic.diff
+ # UI + core to make OLE editing optionally outplace
+-optional-outplace-ole.diff, i#98970, thorsten
++#optional-outplace-ole.diff, i#98970, thorsten
+ # let ctrl-<keycode> stuff pass dlg keyboard handling, to permit
+ # global application-wide shortcuts also in open dialogs
+ vcl-permit-global-shortcuts.diff, i#105676, thorsten
diff --git a/patches/series b/patches/series
index 7130656..f1314d6 100644
--- a/patches/series
+++ b/patches/series
@@ -11,3 +11,4 @@ update-debian-opt.diff
fix-evolution-local.diff
gcc4.6.0.diff
odk-jni-include.diff
+disable-optional-outplace-ole.diff
--
LibreOffice packaging repository
Reply to: