[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4-3-6-g8bc00d9
The following commit has been merged in the master branch:
commit cdf18293788a2564342f8f6be5e849090ffaabf9
Author: Rene Engelhard <rene@debian.org>
Date: Thu Jun 7 13:27:20 2012 +0200
also add fix for 3.4 legacy reports
diff --git a/changelog b/changelog
index d4da62b..c756388 100644
--- a/changelog
+++ b/changelog
@@ -2,7 +2,7 @@ libreoffice (1:3.5.4-4) UNRELEASED; urgency=low
* debian/patches/make-shortcuts-in-menus-localized-again.diff:
backport from libreoffice-3-5; as name says, regression from 3.5.3
- * debian/patches/fix-legacy-report-opening.diff: backport fix from
+ * debian/patches/fix-legacy-report-opening.diff: backport fixes from
libreoffice-3-5; as name says
* debian/rules:
diff --git a/patches/fix-legacy-report-opening.diff b/patches/fix-legacy-report-opening.diff
index 4c970c2..2e980a6 100644
--- a/patches/fix-legacy-report-opening.diff
+++ b/patches/fix-legacy-report-opening.diff
@@ -1,6 +1,54 @@
-diff -u b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+From 3533328aae5f38d6d21c2baee782abc4511bb649 Mon Sep 17 00:00:00 2001
+From: Lionel Elie Mamane <lionel@mamane.lu>
+Date: Tue, 5 Jun 2012 18:40:13 +0200
+Subject: [PATCH] fdo#47325 legacy reports: survive absence of Sorting hidden
+ control
+
+Reports created in 3.4 and earlier lack it.
+
+Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b
+---
+ .../wizards/report/ReportTextImplementation.java | 11 ++++++++++-
+ 1 files changed, 10 insertions(+), 1 deletions(-)
+
+From 183ac99a1ceebd08f750963dce6170656a201626 Mon Sep 17 00:00:00 2001
+From: Lionel Elie Mamane <lionel@mamane.lu>
+Date: Tue, 5 Jun 2012 21:30:40 +0200
+Subject: [PATCH] fdo#47473 try to set new order only after field columns are
+ available
+
+Change-Id: If8ba8f4e12aaebadec86a7f445a6d32bd363106d
+---
+ .../wizards/report/ReportTextImplementation.java | 7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
--- b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+@@ -57,6 +57,7 @@ import com.sun.star.wizards.common.PropertyNames;
+ import com.sun.star.wizards.common.SystemDialog;
+ import com.sun.star.wizards.db.DBMetaData;
+ import com.sun.star.wizards.document.OfficeDocument;
++import com.sun.star.wizards.document.FormHandler.UnknownHiddenControlException;
+ import com.sun.star.wizards.ui.UIConsts;
+ import java.util.ArrayList;
+ import java.util.Vector;
+@@ -233,7 +234,15 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
+ String sCommandType = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, PropertyNames.COMMAND_TYPE, sMsg);
+ String sGroupFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "GroupFieldNames", sMsg);
+ String sFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "FieldNames", sMsg);
+- final String sorting = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
++ String sorting;
++ try
++ {
++ sorting = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "Sorting", sMsg);
++ }
++ catch (UnknownHiddenControlException exception)
++ {
++ sorting = "";
++ }
+ String sRecordFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", sMsg);
+ if (xNamedForm.hasByName("QueryName"))
+ {
@@ -279,7 +279,6 @@
{
getRecordParser().Command = (String) oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
--
LibreOffice packaging repository
Reply to: