diff options
| author | Cédric Bosdonnat <cedric.bosdonnat.ooo@free.fr> | 2011-05-20 17:29:08 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-05-24 14:22:32 +0200 |
| commit | 97c995a22c1602679a3e386f994a20b23d07f429 (patch) | |
| tree | 5260d445cb38c31ead62eb44970ac5a7eb26660a | |
| parent | 8d2ed714ce8379ec2908deb060aa50e51d851373 (diff) | |
fdo#37390, make style:layout-grid-snap-to-characters fit to ODF spec.
Signed-off-by: Petr Mladek <pmladek@suse.cz>
| -rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 1 | ||||
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/style/PageMasterStyleMap.cxx | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index d361c38ac9..932daebdd1 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -2105,6 +2105,7 @@ namespace xmloff { namespace token { XML_LAYOUT_GRID_STANDARD_MODE, XML_LAYOUT_GRID_BASE_WIDTH, XML_LAYOUT_GRID_SNAP_TO_CHARS, + XML_LAYOUT_GRID_SNAP_TO, XML_SNAP_TO_LAYOUT_GRID, XML_DONT_BALANCE_TEXT_COLUMNS, diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 0a11903eb0..ef00f9bce3 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -2113,7 +2113,8 @@ namespace xmloff { namespace token { 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( "layout-grid-snap-to-characters", XML_LAYOUT_GRID_SNAP_TO_CHARS ), + TOKEN( "layout-grid-snap-to", XML_LAYOUT_GRID_SNAP_TO ), TOKEN( "snap-to-layout-grid", XML_SNAP_TO_LAYOUT_GRID ), diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 61449e776f..7dafe3a766 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -110,6 +110,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = //text grid enhancement for better CJK support PLMAP( "GridBaseWidth", XML_NAMESPACE_STYLE, XML_LAYOUT_GRID_BASE_WIDTH, XML_TYPE_MEASURE, CTP_PM_GRID_BASE_WIDTH ), + PLMAP( "GridSnapToChars", XML_NAMESPACE_STYLE, XML_LAYOUT_GRID_SNAP_TO, XML_TYPE_BOOL, CTP_PM_GRID_SNAP_TO_CHARS ), PLMAP( "GridSnapToChars", XML_NAMESPACE_STYLE, XML_LAYOUT_GRID_SNAP_TO_CHARS, XML_TYPE_BOOL, CTP_PM_GRID_SNAP_TO_CHARS ), //export as a default attribute PLMAP( "StandardPageMode", XML_NAMESPACE_STYLE, XML_LAYOUT_GRID_STANDARD_MODE, XML_TYPE_BOOL|MID_FLAG_DEFAULT_ITEM_EXPORT, CTF_PM_STANDARD_MODE ), |