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

[Lionel Elie Mamane]

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

New commits:
commit 183ac99a1ceebd08f750963dce6170656a201626
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 c45d282..94b4e40 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;
                 }
commit f2cd676ee4c5b9137f517b4e69e7dd0baf81b0f4
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Tue Jun 5 21:27:25 2012 +0200

    untabify
    
    Change-Id: Ic51b50a5b06f2a96750a945754e44a302b070f77

diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 9b1e1e2..c45d282 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -241,7 +241,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
                 }
                 catch (UnknownHiddenControlException exception)
                 {
-		    sorting = "";
+                    sorting = "";
                 }
                 String sRecordFieldNames = getDoc().oFormHandler.getValueofHiddenControl(xNamedForm, "RecordFieldNames", sMsg);
                 if (xNamedForm.hasByName("QueryName"))