diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:31:25 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-06-25 13:31:25 +0000 |
commit | 50f2f8579187d6855672dd43f5c0dab89b205dd2 (patch) | |
tree | 740919f8f15dcd42b284844fb7e6f4f33aee2818 /wizards/com/sun/star/wizards/query | |
parent | 9bfddfd4da670c86a3e31480a679037c9284ee1c (diff) |
INTEGRATION: CWS rptwizard01 (1.6.104); FILE MERGED
2008/05/21 10:14:16 lla 1.6.104.2: RESYNC: (1.6-1.7); FILE MERGED
2008/02/14 13:14:58 lla 1.6.104.1: #i86092# cleanups
Diffstat (limited to 'wizards/com/sun/star/wizards/query')
-rw-r--r-- | wizards/com/sun/star/wizards/query/QuerySummary.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java index 20cf14856f43..1251ad71fb22 100644 --- a/wizards/com/sun/star/wizards/query/QuerySummary.java +++ b/wizards/com/sun/star/wizards/query/QuerySummary.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: QuerySummary.java,v $ - * $Revision: 1.7 $ + * $Revision: 1.8 $ * * This file is part of OpenOffice.org. * @@ -76,7 +76,7 @@ public class QuerySummary extends QueryMetaData { String sGroupByFraction = ""; String sHavingFraction = ""; sFieldNamesFraction = combineFieldNameFraction() + sReturnChar; - sSortingFraction = combinePartString(RID_QUERY + 51, SortFieldNames, RID_QUERY + 52, RID_QUERY + 93, new String[] { "<FIELDNAME>", "<SORTMODE>" }) + sReturnChar; + sSortingFraction = combinePartString(RID_QUERY + 51, getSortFieldNames(), RID_QUERY + 52, RID_QUERY + 93, new String[] { "<FIELDNAME>", "<SORTMODE>" }) + sReturnChar; sFilterFraction = combineFilterNameFraction(this.getFilterConditions(), RID_QUERY + 53, RID_QUERY + 54) + sReturnChar; // if (xDBMetaData.getNumericFunctions().length() > 0) // sAggregateFraction = combinePartString(RID_QUERY + 55, AggregateFieldNames, RID_QUERY + 56, RID_QUERY + 95, new String[]{ "<CALCULATEDFUNCTION>", "<FIELDNAME>"}) + sReturnChar; |