summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2012-06-05 18:40:13 +0200
committerMichael Stahl <mstahl@redhat.com>2012-06-05 20:49:40 +0200
commitbcf7425c7222e6c1e343c5e9a45d5fdf66dac53d (patch)
treea8338b089084fd1d3ad2d83b19414df7aa132b7a
parent41bb183bfb366d04817b4c2522e12936d473d99c (diff)
fdo#47325 legacy reports: survive absence of Sorting hidden control
Reports created in 3.4 and earlier lack it. Change-Id: I2cf1cad75fff59f23ad98299c4f94253adf7355b (cherry picked from commit 3533328aae5f38d6d21c2baee782abc4511bb649) Signed-off-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextImplementation.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9e73038e14f6..9b1e1e2debf2 100644
--- a/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"))
{