summaryrefslogtreecommitdiff
path: root/xmloff/source/core
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-03-07 15:17:03 +0000
committerKurt Zenker <kz@openoffice.org>2008-03-07 15:17:03 +0000
commit4dcc88680aaf369c5c781893e82ffc5ba3ecc293 (patch)
treeedfb443daad396c47bbc7e65ecb7d25c8d4e3cb9 /xmloff/source/core
parent67a0b2fa184be8af822a3ae0c9e703d3d76e1209 (diff)
INTEGRATION: CWS cjksp1_DEV300 (1.103.14); FILE MERGED
2007/12/17 02:47:20 pflin 1.103.14.6: RESYNC: (1.112-1.115); FILE MERGED 2007/11/11 03:10:31 pflin 1.103.14.5: not write layout-grid-standard-mode inside the <style:page-layout> 2007/09/27 04:28:18 pflin 1.103.14.4: RESYNC: (1.105-1.112); FILE MERGED 2007/07/03 04:39:37 pflin 1.103.14.3: RESYNC: (1.104-1.105); FILE MERGED 2007/05/08 10:13:28 pflin 1.103.14.2: RESYNC: (1.103-1.104); FILE MERGED 2007/04/23 07:58:07 pflin 1.103.14.1: Text grid enhancement: support xml filter
Diffstat (limited to 'xmloff/source/core')
-rw-r--r--xmloff/source/core/xmltoken.cxx10
1 files changed, 8 insertions, 2 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 029b5c8d8216..4bcd7e83d0b8 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: xmltoken.cxx,v $
*
- * $Revision: 1.121 $
+ * $Revision: 1.122 $
*
- * last change: $Author: kz $ $Date: 2008-03-06 17:15:08 $
+ * last change: $Author: kz $ $Date: 2008-03-07 16:17:03 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -2087,6 +2087,12 @@ namespace xmloff { namespace token {
TOKEN( "layout-grid-print", XML_LAYOUT_GRID_PRINT ),
TOKEN( "layout-grid-display", XML_LAYOUT_GRID_DISPLAY ),
+ //text grid enhancement for better CJK support
+ TOKEN( "default-page-layout", XML_DEFAULT_PAGE_LAYOUT ),
+ TOKEN( "layout-grid-standard-mode", XML_LAYOUT_GRID_STANDARD_MODE ),
+ TOKEN( "layout-grid-base-width", XML_LAYOUT_GRID_BASE_WIDTH ),
+ TOKEN( "layout-grid-snap-to-characters", XML_LAYOUT_GRID_SNAP_TO_CHARS ),
+
TOKEN( "snap-to-layout-grid", XML_SNAP_TO_LAYOUT_GRID ),
TOKEN( "dont-balance-text-columns", XML_DONT_BALANCE_TEXT_COLUMNS ),