[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - wizards/com

[Caolán McNamara]

 wizards/com/sun/star/wizards/report/ReportTextImplementation.java |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit abf647fe0cf4bca8c049d04ba249dcca4b285e33
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Tue Jun 5 18:14:52 2012 -0500

    fix bug in commit 32c943e161117e4362ac9246baac2c0fb54e7c79
    
    Change-Id: I684fb4adb68d372914ea42cc4e7bd4459a08b150

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 291e2b7..33f3cf0 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -291,6 +291,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
                     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()))
                         {
commit 0b2bafa35699240d51270576370c7700eb277289
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jun 5 21:30:40 2012 +0200

    fdo#47473 try to set new order only after field columns are available
    
    Change-Id: If8ba8f4e12aaebadec86a7f445a6d32bd363106d

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9b1e1e2..291e2b7 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;
                 }