From 3533328aae5f38d6d21c2baee782abc4511bb649 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane 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 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); getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command); - getRecordParser().getSQLQueryComposer().prependSortingCriteria(); getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery(); } else @@ -292,7 +291,14 @@ bexecute = getRecordParser().executeCommand(nCommandType); //sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, true); if (bexecute) { + DBMetaData.CommandObject oCommand = getRecordParser().getQueryByName(sQueryName); bexecute = getRecordParser().getFields(sFieldNameList, true); + if (bexecute && getRecordParser().hasEscapeProcessing(oCommand.getPropertySet())) + { + getRecordParser().getSQLQueryComposer().prependSortingCriteria(); + getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery(); + bexecute = getRecordParser().executeCommand(nCommandType); + } } return bexecute; }