diff options
| author | Damjan Jovanovic <damjan@apache.org> | 2015-11-08 15:55:59 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-10 09:35:04 +0000 |
| commit | c3867083a7904ab1a67403185d90dddab01f99eb (patch) | |
| tree | 6f952790178048c1d1c2ac0da09fe83a21e6f1a8 /wizards | |
| parent | 3a2037b11c28fdf9409a336f8086790bc6f8f86f (diff) | |
Resolves: #i56289# no GROUP BY - COUNT from wizard
Implement the COUNT operator for GROUP BY in the Base Query Wizard,
and delete some unused resource strings to make space for it.
Found by: dtinazzi at easyasp dot it
Patch by: me
(cherry picked from commit 1f6546d6c0e6670d59e6beb05d15c80327634e6c)
Change-Id: I6395566275cea6a33cdc64968b3b31aa17d61554
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/ui/AggregateComponent.java | 4 | ||||
| -rw-r--r-- | wizards/source/formwizard/dbwizres.src | 17 |
2 files changed, 3 insertions, 18 deletions
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 2b4646dc2c68..2233753e601f 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -40,7 +40,7 @@ public class AggregateComponent extends ControlScroller private String[] sFunctions; private String[] sFunctionOperators = new String[] { - "SUM", "AVG", "MIN", "MAX" + "SUM", "AVG", "MIN", "MAX", "COUNT" }; private QueryMetaData CurDBMetaData; private String soptDetailQuery; @@ -185,7 +185,7 @@ public class AggregateComponent extends ControlScroller soptSummaryQuery = CurUnoDialog.m_oResource.getResText(BaseID + 12); slblAggregate = CurUnoDialog.m_oResource.getResText(BaseID + 16); slblFieldNames = CurUnoDialog.m_oResource.getResText(BaseID + 17); - sFunctions = CurUnoDialog.m_oResource.getResArray(BaseID + 40, 4); + sFunctions = CurUnoDialog.m_oResource.getResArray(BaseID + 40, 5); sDuplicateAggregateFunction = CurUnoDialog.m_oResource.getResText(BaseID + 90); } diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src index 5fc33b3bf8a3..ad34d855fd21 100644 --- a/wizards/source/formwizard/dbwizres.src +++ b/wizards/source/formwizard/dbwizres.src @@ -812,22 +812,7 @@ String RID_DB_QUERY_WIZARD_START + 43 String RID_DB_QUERY_WIZARD_START + 44 { - Text [ en-US] = "get the sum of <FIELD>"; -}; - -String RID_DB_QUERY_WIZARD_START + 45 -{ - Text [ en-US] = "get the average of <FIELD>"; -}; - -String RID_DB_QUERY_WIZARD_START + 46 -{ - Text [ en-US] = "get the minimum of <FIELD>"; -}; - -String RID_DB_QUERY_WIZARD_START + 47 -{ - Text [ en-US] = "get the maximum of <FIELD>"; + Text [ en-US] = "get the count of"; }; String RID_DB_QUERY_WIZARD_START + 48 |