diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-08-14 22:52:20 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-08-28 12:43:53 +0200 |
| commit | 422636d405f8071d791d1540a353d6f5bbaac5d8 (patch) | |
| tree | 4b6dea66b0dea2b928ca5dc433a14dd0672d05ab /xmloff/source | |
| parent | 593d97ff8b071a4966c6b083340e5a8144ff9a93 (diff) | |
xmloff: support stroke/line complex color import/export + test
Change-Id: I4ed901fd5b23e58aafa781e2b07f460f034fbba3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155685
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 9d1140cb745613625bbd8af251c778a7c789e6d0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156162
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'xmloff/source')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/draw/sdpropls.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/token/tokens.txt | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 7ad8558ff69c..2aac3fa4cfde 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -1901,6 +1901,7 @@ namespace xmloff::token { TOKEN( "stripes", XML_STRIPES ), TOKEN( "stroke", XML_STROKE ), TOKEN( "stroke-color", XML_STROKE_COLOR ), + TOKEN( "stroke-complex-color", XML_STROKE_COMPLEX_COLOR ), TOKEN( "stroke-dash", XML_STROKE_DASH ), TOKEN( "stroke-linecap", XML_STROKE_LINECAP ), TOKEN( "stroke-linejoin", XML_STROKE_LINEJOIN ), diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 25b5f57d32ff..570c9b1d4fae 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -95,6 +95,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] = GMAP( PROP_LineDashName, XML_NAMESPACE_DRAW, XML_STROKE_DASH, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT , CTF_DASHNAME ), GMAP( PROP_LineWidth, XML_NAMESPACE_SVG, XML_STROKE_WIDTH, XML_TYPE_MEASURE, 0 ), GMAP_D( PROP_LineColor, XML_NAMESPACE_SVG, XML_STROKE_COLOR, XML_TYPE_COLOR, 0), + GMAPV( PROP_LineComplexColor, XML_NAMESPACE_LO_EXT, XML_STROKE_COMPLEX_COLOR, XML_TYPE_COMPLEX_COLOR|MID_FLAG_ELEMENT_ITEM, CTF_COMPLEX_COLOR, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED), GMAP( PROP_LineStartName, XML_NAMESPACE_DRAW, XML_MARKER_START, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_LINESTARTNAME ), GMAP( PROP_LineStartWidth, XML_NAMESPACE_DRAW, XML_MARKER_START_WIDTH, XML_TYPE_MEASURE, 0 ), GMAP( PROP_LineStartCenter, XML_NAMESPACE_DRAW, XML_MARKER_START_CENTER, XML_TYPE_BOOL, 0 ), diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt index 1ce6407483f5..ff4fbfddb1f5 100644 --- a/xmloff/source/token/tokens.txt +++ b/xmloff/source/token/tokens.txt @@ -1801,6 +1801,7 @@ string-value-if-true stripes stroke stroke-color +stroke-complex-color stroke-dash stroke-linecap stroke-linejoin |