[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - xmloff/source

Miklos Vajna Fri, 17 Apr 2015 12:20:23 -0700

 xmloff/source/text/txtprmap.cxx |   32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)


New commits:
commit c31adf195669875a778f911796acdbada428c3d2
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Tue Feb 3 18:20:43 2015 +0100

    xmloff: accept character borders in the extension namespace
    
    (partially cherry-pick of commit f1f6b6db730ae67a427c7974b59a5e19ab571984)
    
    Conflicts:
        sw/qa/extras/odfexport/odfexport.cxx
    
    Change-Id: Ia112cf626126149ea9cf09c5d6ff812d5d5ffec5
    Reviewed-on: https://gerrit.libreoffice.org/15352
    Reviewed-by: Markus Mohrhard <markus.mohrh...@googlemail.com>
    Tested-by: Markus Mohrhard <markus.mohrh...@googlemail.com>

diff --git a/xmloff/source/text/txtprmap.cxx b/xmloff/source/text/txtprmap.cxx
index 5b596cd..da7dc5d 100644
--- a/xmloff/source/text/txtprmap.cxx
+++ b/xmloff/source/text/txtprmap.cxx
@@ -263,20 +263,36 @@ XMLPropertyMapEntry aXMLParaPropMap[] =
     MT_EV( "CharRightBorder", STYLE, BORDER_LINE_WIDTH_RIGHT, 
XML_TYPE_BORDER_WIDTH, CTF_CHARRIGHTBORDERWIDTH, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharTopBorder", STYLE, BORDER_LINE_WIDTH_TOP, 
XML_TYPE_BORDER_WIDTH, CTF_CHARTOPBORDERWIDTH, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharBottomBorder", STYLE, BORDER_LINE_WIDTH_BOTTOM, 
XML_TYPE_BORDER_WIDTH, CTF_CHARBOTTOMBORDERWIDTH, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
+    MAP_EXT_I( "CharLeftBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_LINE_WIDTH, 
XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, CTF_CHARALLBORDERWIDTH ),
+    MAP_EXT_I( "CharLeftBorder", XML_NAMESPACE_LO_EXT, 
XML_BORDER_LINE_WIDTH_LEFT, XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, 
CTF_CHARLEFTBORDERWIDTH ),
+    MAP_EXT_I( "CharRightBorder", XML_NAMESPACE_LO_EXT, 
XML_BORDER_LINE_WIDTH_RIGHT, XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, 
CTF_CHARRIGHTBORDERWIDTH ),
+    MAP_EXT_I( "CharTopBorder", XML_NAMESPACE_LO_EXT, 
XML_BORDER_LINE_WIDTH_TOP, XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, 
CTF_CHARTOPBORDERWIDTH ),
+    MAP_EXT_I( "CharBottomBorder", XML_NAMESPACE_LO_EXT, 
XML_BORDER_LINE_WIDTH_BOTTOM, XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, 
CTF_CHARBOTTOMBORDERWIDTH ),
 
     MT_EV( "CharLeftBorderDistance", FO, PADDING, XML_TYPE_MEASURE, 
CTF_CHARALLBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharLeftBorderDistance", FO, PADDING_LEFT, XML_TYPE_MEASURE, 
CTF_CHARLEFTBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharRightBorderDistance", FO, PADDING_RIGHT, XML_TYPE_MEASURE, 
CTF_CHARRIGHTBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharTopBorderDistance",  FO, PADDING_TOP, XML_TYPE_MEASURE, 
CTF_CHARTOPBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharBottomBorderDistance",FO, PADDING_BOTTOM, XML_TYPE_MEASURE, 
CTF_CHARBOTTOMBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
+    MAP_EXT_I( "CharLeftBorderDistance", XML_NAMESPACE_LO_EXT, XML_PADDING, 
XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, CTF_CHARALLBORDERDISTANCE ),
+    MAP_EXT_I( "CharLeftBorderDistance", XML_NAMESPACE_LO_EXT, 
XML_PADDING_LEFT, XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, 
CTF_CHARLEFTBORDERDISTANCE ),
+    MAP_EXT_I( "CharRightBorderDistance", XML_NAMESPACE_LO_EXT, 
XML_PADDING_RIGHT, XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, 
CTF_CHARRIGHTBORDERDISTANCE ),
+    MAP_EXT_I( "CharTopBorderDistance",  XML_NAMESPACE_LO_EXT, 
XML_PADDING_TOP, XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, CTF_CHARTOPBORDERDISTANCE 
),
+    MAP_EXT_I( "CharBottomBorderDistance",XML_NAMESPACE_LO_EXT, 
XML_PADDING_BOTTOM, XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, 
CTF_CHARBOTTOMBORDERDISTANCE ),
 
     MT_EV( "CharLeftBorder", FO, BORDER, XML_TYPE_BORDER, CTF_CHARALLBORDER, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharLeftBorder", FO, BORDER_LEFT, XML_TYPE_BORDER, 
CTF_CHARLEFTBORDER, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharRightBorder", FO, BORDER_RIGHT, XML_TYPE_BORDER, 
CTF_CHARRIGHTBORDER, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharTopBorder", FO, BORDER_TOP, XML_TYPE_BORDER, 
CTF_CHARTOPBORDER, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharBottomBorder", FO, BORDER_BOTTOM, XML_TYPE_BORDER, 
CTF_CHARBOTTOMBORDER, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
+    MAP_EXT_I( "CharLeftBorder", XML_NAMESPACE_LO_EXT, XML_BORDER, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARALLBORDER ),
+    MAP_EXT_I( "CharLeftBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_LEFT, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARLEFTBORDER ),
+    MAP_EXT_I( "CharRightBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_RIGHT, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARRIGHTBORDER ),
+    MAP_EXT_I( "CharTopBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_TOP, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARTOPBORDER ),
+    MAP_EXT_I( "CharBottomBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_BOTTOM, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARBOTTOMBORDER ),
     // RES_CHRATR_SHADOW
     MT_EV( "CharShadowFormat", STYLE, SHADOW, XML_TYPE_TEXT_SHADOW, 0, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
+    MAP_EXT_I( "CharShadowFormat", XML_NAMESPACE_LO_EXT, XML_SHADOW, 
XML_TYPE_TEXT_SHADOW|XML_TYPE_PROP_TEXT, 0 ),
     // RES_TXTATR_INETFMT
     // TODO
     // RES_TXTATR_REFMARK
@@ -590,20 +606,36 @@ XMLPropertyMapEntry aXMLTextPropMap[] =
     MT_EV( "CharRightBorder", STYLE, BORDER_LINE_WIDTH_RIGHT, 
XML_TYPE_BORDER_WIDTH, CTF_CHARRIGHTBORDERWIDTH, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharTopBorder", STYLE, BORDER_LINE_WIDTH_TOP, 
XML_TYPE_BORDER_WIDTH, CTF_CHARTOPBORDERWIDTH, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharBottomBorder", STYLE, BORDER_LINE_WIDTH_BOTTOM, 
XML_TYPE_BORDER_WIDTH, CTF_CHARBOTTOMBORDERWIDTH, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
+    MAP_EXT_I( "CharLeftBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_LINE_WIDTH, 
XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, CTF_CHARALLBORDERWIDTH ),
+    MAP_EXT_I( "CharLeftBorder", XML_NAMESPACE_LO_EXT, 
XML_BORDER_LINE_WIDTH_LEFT, XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, 
CTF_CHARLEFTBORDERWIDTH ),
+    MAP_EXT_I( "CharRightBorder", XML_NAMESPACE_LO_EXT, 
XML_BORDER_LINE_WIDTH_RIGHT, XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, 
CTF_CHARRIGHTBORDERWIDTH ),
+    MAP_EXT_I( "CharTopBorder", XML_NAMESPACE_LO_EXT, 
XML_BORDER_LINE_WIDTH_TOP, XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, 
CTF_CHARTOPBORDERWIDTH ),
+    MAP_EXT_I( "CharBottomBorder", XML_NAMESPACE_LO_EXT, 
XML_BORDER_LINE_WIDTH_BOTTOM, XML_TYPE_BORDER_WIDTH|XML_TYPE_PROP_TEXT, 
CTF_CHARBOTTOMBORDERWIDTH ),
 
     MT_EV( "CharLeftBorderDistance", FO, PADDING, XML_TYPE_MEASURE, 
CTF_CHARALLBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharLeftBorderDistance", FO, PADDING_LEFT, XML_TYPE_MEASURE, 
CTF_CHARLEFTBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharRightBorderDistance", FO, PADDING_RIGHT, XML_TYPE_MEASURE, 
CTF_CHARRIGHTBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharTopBorderDistance", FO, PADDING_TOP, XML_TYPE_MEASURE, 
CTF_CHARTOPBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharBottomBorderDistance",FO, PADDING_BOTTOM, XML_TYPE_MEASURE, 
CTF_CHARBOTTOMBORDERDISTANCE, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
+    MAP_EXT_I( "CharLeftBorderDistance", XML_NAMESPACE_LO_EXT, XML_PADDING, 
XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, CTF_CHARALLBORDERDISTANCE ),
+    MAP_EXT_I( "CharLeftBorderDistance", XML_NAMESPACE_LO_EXT, 
XML_PADDING_LEFT, XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, 
CTF_CHARLEFTBORDERDISTANCE ),
+    MAP_EXT_I( "CharRightBorderDistance", XML_NAMESPACE_LO_EXT, 
XML_PADDING_RIGHT, XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, 
CTF_CHARRIGHTBORDERDISTANCE ),
+    MAP_EXT_I( "CharTopBorderDistance", XML_NAMESPACE_LO_EXT, XML_PADDING_TOP, 
XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, CTF_CHARTOPBORDERDISTANCE ),
+    MAP_EXT_I( "CharBottomBorderDistance",XML_NAMESPACE_LO_EXT, 
XML_PADDING_BOTTOM, XML_TYPE_MEASURE|XML_TYPE_PROP_TEXT, 
CTF_CHARBOTTOMBORDERDISTANCE ),
 
     MT_EV( "CharLeftBorder", FO, BORDER, XML_TYPE_BORDER, CTF_CHARALLBORDER, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharLeftBorder", FO, BORDER_LEFT, XML_TYPE_BORDER, 
CTF_CHARLEFTBORDER, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharRightBorder", FO, BORDER_RIGHT, XML_TYPE_BORDER, 
CTF_CHARRIGHTBORDER, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharTopBorder", FO, BORDER_TOP, XML_TYPE_BORDER, 
CTF_CHARTOPBORDER, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
     MT_EV( "CharBottomBorder", FO, BORDER_BOTTOM, XML_TYPE_BORDER, 
CTF_CHARBOTTOMBORDER, SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
+    MAP_EXT_I( "CharLeftBorder", XML_NAMESPACE_LO_EXT, XML_BORDER, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARALLBORDER ),
+    MAP_EXT_I( "CharLeftBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_LEFT, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARLEFTBORDER ),
+    MAP_EXT_I( "CharRightBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_RIGHT, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARRIGHTBORDER ),
+    MAP_EXT_I( "CharTopBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_TOP, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARTOPBORDER ),
+    MAP_EXT_I( "CharBottomBorder", XML_NAMESPACE_LO_EXT, XML_BORDER_BOTTOM, 
XML_TYPE_BORDER|XML_TYPE_PROP_TEXT, CTF_CHARBOTTOMBORDER ),
     // RES_CHRATR_SHADOW
     MT_EV( "CharShadowFormat", STYLE, SHADOW, XML_TYPE_TEXT_SHADOW, 0, 
SvtSaveOptions::ODFVER_012_EXT_COMPAT ),
+    MAP_EXT_I( "CharShadowFormat", XML_NAMESPACE_LO_EXT, XML_SHADOW, 
XML_TYPE_TEXT_SHADOW|XML_TYPE_PROP_TEXT, 0 ),
     // RES_TXTATR_INETFMT
     MT_E( "HyperLinkURL",           TEXT,       XMLNS,                      
XML_TYPE_STRING|MID_FLAG_NO_PROPERTY_IMPORT,    CTF_HYPERLINK_URL ),
     // RES_TXTATR_REFMARK
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - xmloff/source

Reply via email to