summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/ui/AggregateComponent.java4
-rw-r--r--wizards/source/formwizard/dbwizres.src17
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