You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2015/11/08 16:55:59 UTC
svn commit: r1713240 - in /openoffice/trunk/main/wizards:
com/sun/star/wizards/ui/AggregateComponent.java
source/formwizard/dbwizres.src
Author: damjan
Date: Sun Nov 8 15:55:59 2015
New Revision: 1713240
URL: http://svn.apache.org/viewvc?rev=1713240&view=rev
Log:
#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
Modified:
openoffice/trunk/main/wizards/com/sun/star/wizards/ui/AggregateComponent.java
openoffice/trunk/main/wizards/source/formwizard/dbwizres.src
Modified: openoffice/trunk/main/wizards/com/sun/star/wizards/ui/AggregateComponent.java
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/com/sun/star/wizards/ui/AggregateComponent.java?rev=1713240&r1=1713239&r2=1713240&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/com/sun/star/wizards/ui/AggregateComponent.java (original)
+++ openoffice/trunk/main/wizards/com/sun/star/wizards/ui/AggregateComponent.java Sun Nov 8 15:55:59 2015
@@ -39,7 +39,7 @@ public class AggregateComponent extends
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
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);
}
Modified: openoffice/trunk/main/wizards/source/formwizard/dbwizres.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/source/formwizard/dbwizres.src?rev=1713240&r1=1713239&r2=1713240&view=diff
==============================================================================
--- openoffice/trunk/main/wizards/source/formwizard/dbwizres.src (original)
+++ openoffice/trunk/main/wizards/source/formwizard/dbwizres.src Sun Nov 8 15:55:59 2015
@@ -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)";