diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2023-07-28 12:10:24 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-08-28 12:40:10 +0200 |
| commit | 69b3d9be8d8781431f1901613d03de5e6b37c969 (patch) | |
| tree | 13cd8f8c3a1bd986337819a63a385f0eaf7d7da0 /xmloff | |
| parent | 5a3cb219f135e17fa4745811521c718b97f287c4 (diff) | |
sc: Add import/export ODF support for border complex colors
ODF Import and export support for border {left,right,top,bottom}
complex colors. In addition round-trip test was extended with the
border use case.
Change-Id: I1d14690272c06e8ffcfcd483eb7f688ca5bb1e5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155014
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
(cherry picked from commit 5e34a25aa7f58b37a2303aef9318bbe5a9af5d37)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156101
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 4 | ||||
| -rw-r--r-- | xmloff/source/token/tokens.txt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index 37d97b57b13d..a5c71365b0ea 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -366,15 +366,19 @@ namespace xmloff::token { TOKEN( "boolean-value", XML_BOOLEAN_VALUE ), TOKEN( "border", XML_BORDER ), TOKEN( "border-bottom", XML_BORDER_BOTTOM ), + TOKEN( "border-bottom-complex-color", XML_BORDER_BOTTOM_COMPLEX_COLOR ), TOKEN( "border-color", XML_BORDER_COLOR ), TOKEN( "border-left", XML_BORDER_LEFT ), + TOKEN( "border-left-complex-color", XML_BORDER_LEFT_COMPLEX_COLOR ), TOKEN( "border-line-width", XML_BORDER_LINE_WIDTH ), TOKEN( "border-line-width-bottom", XML_BORDER_LINE_WIDTH_BOTTOM ), TOKEN( "border-line-width-left", XML_BORDER_LINE_WIDTH_LEFT ), TOKEN( "border-line-width-right", XML_BORDER_LINE_WIDTH_RIGHT ), TOKEN( "border-line-width-top", XML_BORDER_LINE_WIDTH_TOP ), TOKEN( "border-right", XML_BORDER_RIGHT ), + TOKEN( "border-right-complex-color", XML_BORDER_RIGHT_COMPLEX_COLOR ), TOKEN( "border-top", XML_BORDER_TOP ), + TOKEN( "border-top-complex-color", XML_BORDER_TOP_COMPLEX_COLOR ), TOKEN( "both", XML_BOTH ), TOKEN( "bottom", XML_BOTTOM ), TOKEN( "bottom-left", XML_BOTTOM_LEFT ), diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt index 7a31802d8ad0..7d788bdb6c19 100644 --- a/xmloff/source/token/tokens.txt +++ b/xmloff/source/token/tokens.txt @@ -271,15 +271,19 @@ boolean-style boolean-value border border-bottom +border-bottom-complex-color border-color border-left +border-left-complex-color border-line-width border-line-width-bottom border-line-width-left border-line-width-right border-line-width-top border-right +border-right-complex-color border-top +border-top-complex-color both bottom bottom-left |