summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-03-29 11:48:55 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-03-29 11:48:55 +0000
commitb85cb5681a3116f2081eb11abbdbe3a88d53989f (patch)
treea389b00929a7659d945274dc4073b9e2d2821efa /xmloff
parenta60712bbe07fbdd650d1f60fc2f303ecb73af7c5 (diff)
INTEGRATION: CWS groupingapi (1.68.16); FILE MERGED
2005/03/11 20:09:35 sab 1.68.16.6: RESYNC: (1.85-1.90); FILE MERGED 2005/01/27 13:22:56 sab 1.68.16.5: RESYNC: (1.84-1.85); FILE MERGED 2005/01/07 10:10:53 sab 1.68.16.4: #i33817#, solve merge conflicts 2005/01/06 11:27:25 sab 1.68.16.3: RESYNC: (1.69-1.84); FILE MERGED 2004/09/06 10:44:15 sab 1.68.16.2: RESYNC: (1.68-1.69); FILE MERGED 2004/09/03 18:03:11 sab 1.68.16.1: #i33817#; add grouping API
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmltoken.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 5aaf6312d1a0..409d6ce04c8d 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: xmltoken.cxx,v $
*
-* $Revision: 1.91 $
+* $Revision: 1.92 $
*
-* last change: $Author: vg $ $Date: 2005-03-23 11:24:34 $
+* last change: $Author: rt $ $Date: 2005-03-29 12:48:55 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -2516,7 +2516,7 @@ namespace xmloff { namespace token {
TOKEN( "show-filter-button", XML_SHOW_FILTER_BUTTON ),
TOKEN( "drill-down-on-double-click", XML_DRILL_DOWN_ON_DOUBLE_CLICK ),
- TOKEN( "group-part", XML_GROUP_PART ),
+ TOKEN( "grouped-by", XML_GROUPED_BY ),
TOKEN( "days", XML_DAYS ),
TOKEN( "months", XML_MONTHS ),
TOKEN( "quarters", XML_QUARTERS ),
@@ -2527,7 +2527,6 @@ namespace xmloff { namespace token {
TOKEN( "is-group-field", XML_IS_GROUP_FIELD ),
TOKEN( "data-pilot-groups", XML_DATA_PILOT_GROUPS ),
TOKEN( "data-pilot-group", XML_DATA_PILOT_GROUP ),
- TOKEN( "group-source-field-name", XML_GROUP_SOURCE_FIELD_NAME ),
TOKEN( "japanese-candle-stick", XML_JAPANESE_CANDLE_STICK ),
TOKEN( "named-symbol", XML_NAMED_SYMBOL ),
TOKEN( "diamond", XML_DIAMOND ),