mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

legacy reports: unify treatment of query and table

Browse Source 
In *both* cases, the value of hidden control "Sorting" (if non-empty)
decides the columns being sorted on.

Change-Id: I7f4b50c3af8c12e48e5dedd36b5877ad7a9e1b66
This commit is contained in:
Lionel Elie Mamane
2012-06-06 14:28:50 +02:00
parent e08b4b98c3
commit b679dd69c0
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
wizards/com/sun/star/wizards/report/ReportTextImplementation.java
View File

@@ -264,7 +264,8 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
} }
getRecordParser().setRecordFieldNames(sNewList); getRecordParser().setRecordFieldNames(sNewList);
getRecordParser().GroupFieldNames = JavaTools.ArrayoutofString(sGroupFieldNames, PropertyNames.SEMI_COLON); getRecordParser().GroupFieldNames = JavaTools.ArrayoutofString(sGroupFieldNames, PropertyNames.SEMI_COLON);
getRecordParser().setCommandType(Integer.valueOf(sCommandType).intValue()); int nOrigCommandType = Integer.valueOf(sCommandType).intValue();
getRecordParser().setCommandType(nOrigCommandType);
sMsgQueryCreationImpossible = JavaTools.replaceSubString(sMsgQueryCreationImpossible, getRecordParser().Command, "<STATEMENT>"); sMsgQueryCreationImpossible = JavaTools.replaceSubString(sMsgQueryCreationImpossible, getRecordParser().Command, "<STATEMENT>");
bgetConnection = getRecordParser().getConnection(_properties); bgetConnection = getRecordParser().getConnection(_properties);
@@ -278,8 +279,6 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
if (getRecordParser().hasEscapeProcessing(oCommand.getPropertySet())) if (getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
{ {
getRecordParser().Command = (String) oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND); getRecordParser().Command = (String) oCommand.getPropertySet().getPropertyValue(PropertyNames.COMMAND);
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery();
} }
else else
{ {
@@ -291,14 +290,24 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
bexecute = getRecordParser().executeCommand(nCommandType); //sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, true); bexecute = getRecordParser().executeCommand(nCommandType); //sMsgQueryCreationImpossible + (char) 13 + sMsgEndAutopilot, sFieldNameList, true);
if (bexecute) if (bexecute)
{ {
DBMetaData.CommandObject oCommand = getRecordParser().getQueryByName(sQueryName);
bexecute = getRecordParser().getFields(sFieldNameList, true); bexecute = getRecordParser().getFields(sFieldNameList, true);
if (bexecute && getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
boolean addSort = true;
if ( (nOrigCommandType == CommandType.QUERY) && !sQueryName.equals(PropertyNames.EMPTY_STRING) )
{ {
getRecordParser().getSQLQueryComposer().prependSortingCriteria(); DBMetaData.CommandObject oCommand = getRecordParser().getQueryByName(sQueryName);
getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery(); if (!getRecordParser().hasEscapeProcessing(oCommand.getPropertySet()))
bexecute = getRecordParser().executeCommand(nCommandType); addSort = false;
} }
if ( !(addSort && bexecute) )
{
return bexecute;
}
getRecordParser().getSQLQueryComposer().m_xQueryAnalyzer.setQuery(getRecordParser().Command);
getRecordParser().getSQLQueryComposer().prependSortingCriteria();
getRecordParser().Command = getRecordParser().getSQLQueryComposer().getQuery();
bexecute = getRecordParser().executeCommand(nCommandType);
} }
return bexecute; return bexecute;
} }