wizards/com/sun/star/wizards/ui/AggregateComponent.java | 4 +--
wizards/source/formwizard/dbwizres.src | 17 ----------------
2 files changed, 3 insertions(+), 18 deletions(-)
New commits:
commit c3867083a7904ab1a67403185d90dddab01f99eb
Author: Damjan Jovanovic <dam...@apache.org>
Date: Sun Nov 8 15:55:59 2015 +0000
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
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 2b4646d..2233753 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 5fc33b3..ad34d85 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
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
