summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Elie Mamane <lionel@mamane.lu>2012-06-05 21:30:40 +0200
committerCaolán McNamara <caolanm@redhat.com>2012-06-06 11:49:15 +0100
commit0b2bafa35699240d51270576370c7700eb277289 (patch)
tree232b34061016b2b5f305b6bad2f78bf0e4b97e73
parentae6dbb573e4cd992b1ad92325203c721b3c8e8ab (diff)
fdo#47473 try to set new order only after field columns are available
Change-Id: If8ba8f4e12aaebadec86a7f445a6d32bd363106d
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextImplementation.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9b1e1e2debf2..291e2b75bc77 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -279,7 +279,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
{
getRecordParser().Command = (String) oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
- getRecordParser().getSQLQueryComposer().prependSortingCriteria();
getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery();
}
else
@@ -293,6 +292,12 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
if (bexecute)
{
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;
}