xmloff/source/draw/sdpropls.cxx | 52 ++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 561dd7ba983a0f40bff46169eb17358f73f6ff41
Author: Ilhan Yesil <ilhanye...@gmx.de>
AuthorDate: Tue Aug 21 18:14:33 2018 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Fri May 8 21:05:34 2020 +0200
tdf#114400 Export drawoo:fontwork-xyz attributes
The attributes can be read in the old and the new namespace,
but will be exported only in the new namespace.
Change-Id: Ia79aad425105d94d460a819eaa3e4a35ac4c73e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/59411
Reviewed-by: Michael Stahl <michael.st...@cib.de>
Tested-by: Jenkins
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
index 5f8c72307e33..e2b4c5e91a2d 100644
--- a/xmloff/source/draw/sdpropls.cxx
+++ b/xmloff/source/draw/sdpropls.cxx
@@ -235,34 +235,34 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
GMAP( "D3DShadow3D", XML_NAMESPACE_DR3D,
XML_SHADOW, XML_SD_TYPE_SHADOW, 0 ),
// #FontWork# attributes
- GMAP( "FontWorkStyle", XML_NAMESPACE_DRAW,
XML_FONTWORK_STYLE, XML_SD_TYPE_FONTWORK_STYLE, CTF_FONTWORK_STYLE
),
- GMAP( "FontWorkAdjust", XML_NAMESPACE_DRAW,
XML_FONTWORK_ADJUST,
XML_SD_TYPE_FONTWORK_ADJUST,CTF_FONTWORK_ADJUST ),
- GMAP( "FontWorkDistance", XML_NAMESPACE_DRAW,
XML_FONTWORK_DISTANCE, XML_TYPE_MEASURE,
CTF_FONTWORK_DISTANCE ),
- GMAP( "FontWorkStart", XML_NAMESPACE_DRAW,
XML_FONTWORK_START, XML_TYPE_MEASURE,
CTF_FONTWORK_START ),
- GMAP( "FontWorkMirror", XML_NAMESPACE_DRAW,
XML_FONTWORK_MIRROR, XML_TYPE_BOOL,
CTF_FONTWORK_MIRROR ),
- GMAP( "FontWorkOutline", XML_NAMESPACE_DRAW,
XML_FONTWORK_OUTLINE, XML_TYPE_BOOL,
CTF_FONTWORK_OUTLINE ),
- GMAP( "FontWorkShadow", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW,
XML_SD_TYPE_FONTWORK_SHADOW,CTF_FONTWORK_SHADOW ),
- GMAP( "FontWorkShadowColor", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW_COLOR, XML_TYPE_COLOR,
CTF_FONTWORK_SHADOWCOLOR ),
- GMAP( "FontWorkShadowOffsetX", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW_OFFSET_X, XML_TYPE_MEASURE,
CTF_FONTWORK_SHADOWOFFSETX ),
- GMAP( "FontWorkShadowOffsetY", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW_OFFSET_Y, XML_TYPE_MEASURE,
CTF_FONTWORK_SHADOWOFFSETY ),
- GMAP( "FontWorkForm", XML_NAMESPACE_DRAW,
XML_FONTWORK_FORM, XML_SD_TYPE_FONTWORK_FORM,
CTF_FONTWORK_FORM ),
- 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 ),
+ GMAP( "FontWorkStyle", XML_NAMESPACE_DRAW,
XML_FONTWORK_STYLE, XML_SD_TYPE_FONTWORK_STYLE|
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_STYLE ),
+ GMAP( "FontWorkAdjust", XML_NAMESPACE_DRAW,
XML_FONTWORK_ADJUST, XML_SD_TYPE_FONTWORK_ADJUST |
MID_FLAG_ELEMENT_ITEM_EXPORT,CTF_FONTWORK_ADJUST ),
+ GMAP( "FontWorkDistance", XML_NAMESPACE_DRAW,
XML_FONTWORK_DISTANCE, XML_TYPE_MEASURE |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_DISTANCE ),
+ GMAP( "FontWorkStart", XML_NAMESPACE_DRAW,
XML_FONTWORK_START, XML_TYPE_MEASURE |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_START ),
+ GMAP( "FontWorkMirror", XML_NAMESPACE_DRAW,
XML_FONTWORK_MIRROR, XML_TYPE_BOOL |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_MIRROR ),
+ GMAP( "FontWorkOutline", XML_NAMESPACE_DRAW,
XML_FONTWORK_OUTLINE, XML_TYPE_BOOL |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_OUTLINE ),
+ GMAP( "FontWorkShadow", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW, XML_SD_TYPE_FONTWORK_SHADOW |
MID_FLAG_ELEMENT_ITEM_EXPORT,CTF_FONTWORK_SHADOW ),
+ GMAP( "FontWorkShadowColor", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW_COLOR, XML_TYPE_COLOR |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_SHADOWCOLOR ),
+ GMAP( "FontWorkShadowOffsetX", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW_OFFSET_X, XML_TYPE_MEASURE |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_SHADOWOFFSETX ),
+ GMAP( "FontWorkShadowOffsetY", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW_OFFSET_Y, XML_TYPE_MEASURE |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_SHADOWOFFSETY ),
+ GMAP( "FontWorkForm", XML_NAMESPACE_DRAW,
XML_FONTWORK_FORM, XML_SD_TYPE_FONTWORK_FORM |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_FORM ),
+ GMAP( "FontWorkHideForm", XML_NAMESPACE_DRAW,
XML_FONTWORK_HIDE_FORM, XML_TYPE_BOOL |
MID_FLAG_ELEMENT_ITEM_EXPORT, CTF_FONTWORK_HIDEFORM ),
+ GMAP( "FontWorkShadowTransparence", XML_NAMESPACE_DRAW,
XML_FONTWORK_SHADOW_TRANSPARENCE, XML_TYPE_PERCENT |
MID_FLAG_ELEMENT_ITEM_EXPORT, 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 ),
+ GMAP( "FontWorkStyle", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_STYLE, XML_SD_TYPE_FONTWORK_STYLE,
CTF_FONTWORK_STYLE ),
+ GMAP( "FontWorkAdjust", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_ADJUST,
XML_SD_TYPE_FONTWORK_ADJUST,CTF_FONTWORK_ADJUST ),
+ GMAP( "FontWorkDistance", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_DISTANCE, XML_TYPE_MEASURE,
CTF_FONTWORK_DISTANCE ),
+ GMAP( "FontWorkStart", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_START, XML_TYPE_MEASURE,
CTF_FONTWORK_START ),
+ GMAP( "FontWorkMirror", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_MIRROR, XML_TYPE_BOOL,
CTF_FONTWORK_MIRROR ),
+ GMAP( "FontWorkOutline", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_OUTLINE, XML_TYPE_BOOL,
CTF_FONTWORK_OUTLINE ),
+ GMAP( "FontWorkShadow", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW,
XML_SD_TYPE_FONTWORK_SHADOW,CTF_FONTWORK_SHADOW ),
+ GMAP( "FontWorkShadowColor", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW_COLOR, XML_TYPE_COLOR,
CTF_FONTWORK_SHADOWCOLOR ),
+ GMAP( "FontWorkShadowOffsetX", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW_OFFSET_X, XML_TYPE_MEASURE,
CTF_FONTWORK_SHADOWOFFSETX ),
+ GMAP( "FontWorkShadowOffsetY", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW_OFFSET_Y, XML_TYPE_MEASURE,
CTF_FONTWORK_SHADOWOFFSETY ),
+ GMAP( "FontWorkForm", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_FORM, XML_SD_TYPE_FONTWORK_FORM,
CTF_FONTWORK_FORM ),
+ GMAP( "FontWorkHideForm", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_HIDE_FORM, XML_TYPE_BOOL,
CTF_FONTWORK_HIDEFORM ),
+ GMAP( "FontWorkShadowTransparence", XML_NAMESPACE_DRAW_EXT,
XML_FONTWORK_SHADOW_TRANSPARENCE, XML_TYPE_PERCENT,
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 ),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
