xmloff/source/draw/sdpropls.cxx | 15 +++++++++++++++
1 file changed, 15 insertions(+)
New commits:
commit 9b9e6de5c4f6fe3eb9b02e91f7dd7e482ecac5fe
Author: Ilhan Yesil <ilhanye...@gmx.de>
AuthorDate: Tue Aug 21 16:55:07 2018 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Mon Sep 10 10:54:35 2018 +0200
tdf#114400 Import drawoo:fontwork-xyz attributes
Either the document has attributes in the old namespace or in the
new, both will be imported. But export is still in the old
namespace.
Change-Id: I9f4d1ca0d8af37c13b513f99cc7d254c68867bb2
Reviewed-on: https://gerrit.libreoffice.org/59405
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
(cherry picked from commit 278e66488135c8fa2714520d056573c64ea803cf)
Reviewed-on: https://gerrit.libreoffice.org/60207
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index e90c0b7eee76..7540e7375a6a 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -244,6 +244,21 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
GMAP( "FontWorkHideForm", XML_NAMESPACE_DRAW,
XML_FONTWORK_HIDE_FORM, XML_TYPE_BOOL,
CTF_FONTWORK_HIDEFORM ),
GMAP( "FontWorkShadowTransparence", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW_TRANSPARENCE, XML_TYPE_PERCENT,
CTF_FONTWORK_SHADOWTRANSPARENCE ),
+ // #FontWork# attributes
+ GMAP( "FontWorkStyle", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_STYLE, XML_SD_TYPE_FONTWORK_STYLE |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_STYLE ),
+ GMAP( "FontWorkAdjust", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_ADJUST, XML_SD_TYPE_FONTWORK_ADJUST |
MID_FLAG_ELEMENT_ITEM_EXPORT,CTF_FONTWORK_ADJUST ),
+ GMAP( "FontWorkDistance", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_DISTANCE, XML_TYPE_MEASURE |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_DISTANCE ),
+ GMAP( "FontWorkStart", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_START, XML_TYPE_MEASURE |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_START ),
+ GMAP( "FontWorkMirror", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_MIRROR, XML_TYPE_BOOL |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_MIRROR ),
+ GMAP( "FontWorkOutline", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_OUTLINE, XML_TYPE_BOOL |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_OUTLINE ),
+ GMAP( "FontWorkShadow", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW, XML_SD_TYPE_FONTWORK_SHADOW |
MID_FLAG_ELEMENT_ITEM_EXPORT,CTF_FONTWORK_SHADOW ),
+ GMAP( "FontWorkShadowColor", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW_COLOR, XML_TYPE_COLOR |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_SHADOWCOLOR ),
+ GMAP( "FontWorkShadowOffsetX", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW_OFFSET_X, XML_TYPE_MEASURE |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_SHADOWOFFSETX ),
+ GMAP( "FontWorkShadowOffsetY", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW_OFFSET_Y, XML_TYPE_MEASURE |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_SHADOWOFFSETY ),
+ GMAP( "FontWorkForm", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_FORM, XML_SD_TYPE_FONTWORK_FORM |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_FORM ),
+ GMAP( "FontWorkHideForm", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_HIDE_FORM, XML_TYPE_BOOL |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_HIDEFORM ),
+ GMAP( "FontWorkShadowTransparence", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW_TRANSPARENCE, XML_TYPE_PERCENT |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_SHADOWTRANSPARENCE ),
+
// control attributes (border exists one more time for the text additions
of shapes)
GMAP( "ControlSymbolColor", XML_NAMESPACE_DRAW,
XML_SYMBOL_COLOR, XML_TYPE_COLOR, 0 ),
GMAP( "ControlBackground", XML_NAMESPACE_FO,
XML_BACKGROUND_COLOR, XML_TYPE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
