summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-03-12 17:35:16 +0100
committerMiklos Vajna <vmiklos@suse.cz>2012-03-12 18:42:34 +0100
commit9f4bb5bd4f55b4a80544413efde26391849b1d7f (patch)
tree9f97a60d023893ab35cebf920c5d6a910d282ce9 /xmloff
parent8631dbf85fb5ed56d225e32ea5a9c36c96b0d649 (diff)
xmloff: implement contextual spacing import/export
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/xmloff/xmltoken.hxx1
-rw-r--r--xmloff/source/core/xmltoken.cxx1
-rw-r--r--xmloff/source/text/txtprmap.cxx1
3 files changed, 3 insertions, 0 deletions
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx
index 3a07e309c999..f24102376e8e 100644
--- a/xmloff/inc/xmloff/xmltoken.hxx
+++ b/xmloff/inc/xmloff/xmltoken.hxx
@@ -467,6 +467,7 @@ namespace xmloff { namespace token {
XML_CONTENT_VALIDATION,
XML_CONTENT_VALIDATION_NAME,
XML_CONTENT_VALIDATIONS,
+ XML_CONTEXTUAL_SPACING,
XML_CONTINUE,
XML_CONTINUE_NUMBERING,
XML_CONTOUR_PATH,
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 9ccc67fe94ae..7c560377eb21 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -471,6 +471,7 @@ namespace xmloff { namespace token {
TOKEN( "content-validation", XML_CONTENT_VALIDATION ),
TOKEN( "content-validation-name", XML_CONTENT_VALIDATION_NAME ),
TOKEN( "content-validations", XML_CONTENT_VALIDATIONS ),
+ TOKEN( "contextual-spacing", XML_CONTEXTUAL_SPACING ),
TOKEN( "continue", XML_CONTINUE ),
TOKEN( "continue-numbering", XML_CONTINUE_NUMBERING ),
TOKEN( "contour-path", XML_CONTOUR_PATH ),
diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index ba5c89963f2b..c1ec7e0f08c4 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -101,6 +101,7 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
MP_E( "ParaTopMarginRelative", FO, MARGIN_TOP, XML_TYPE_PERCENT16, CTF_PARATOPMARGIN_REL ),
MP_E( "ParaBottomMargin", FO, MARGIN_BOTTOM, XML_TYPE_MEASURE|MID_FLAG_MULTI_PROPERTY, CTF_PARABOTTOMMARGIN ),
MP_E( "ParaBottomMarginRelative",FO, MARGIN_BOTTOM, XML_TYPE_PERCENT16, CTF_PARABOTTOMMARGIN_REL ),
+ { "ParaContextMargin", sizeof("ParaContextMargin")-1, XML_NAMESPACE_STYLE, XML_CONTEXTUAL_SPACING, XML_TYPE_BOOL|XML_TYPE_PROP_PARAGRAPH, 0, SvtSaveOptions::ODFVER_LATEST },
// RES_CHRATR_CASEMAP
MT_E( "CharCaseMap", FO, FONT_VARIANT, XML_TYPE_TEXT_CASEMAP_VAR, 0 ),
MT_E( "CharCaseMap", FO, TEXT_TRANSFORM, XML_TYPE_TEXT_CASEMAP, 0 ),