#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

wizards/com/sun/star/wizards/ui/AggregateComponent.java

@@ -39,7 +39,7 @@ public class AggregateComponent extends ControlScroller
     String[] sFunctions;
     String[] sFunctionOperators = new String[]
     {
-        "SUM", "AVG", "MIN", "MAX"
+        "SUM", "AVG", "MIN", "MAX", "COUNT"
     };
     QueryMetaData CurDBMetaData;
     XButton optDetailQuery;
@@ -204,7 +204,7 @@ public class AggregateComponent extends ControlScroller
             soptSummaryQuery = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 12);
             slblAggregate = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 16);
             slblFieldNames = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 17);
-            sFunctions = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_QUERY + 40, 4);
+            sFunctions = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_QUERY + 40, 5);
 
             sDuplicateAggregateFunction = CurUnoDialog.m_oResource.getResText(UIConsts.RID_QUERY + 90);
         }

wizards/source/formwizard/dbwizres.src

@@ -867,28 +867,11 @@ String RID_DB_QUERY_WIZARD_START + 43
     Text [ en-US] = "get the maximum of";
 };
 
-
 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>";
+    Text [ en-US] = "get the count of";
 };
 
-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>";
-};
-
-
 String RID_DB_QUERY_WIZARD_START + 48
 {
     Text [ en-US] = "(none)";