diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-06-14 10:35:04 +0200 |
|---|---|---|
| committer | Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de> | 2022-06-20 10:36:55 +0200 |
| commit | 9c2c48f14535e58cad0453fef584400ee703aecc (patch) | |
| tree | de8a74a980cd8f6fbe863f488fa3c4322c8c4323 /xmloff | |
| parent | 50394abcc36a73c0205e6cb69d925c66c25f81f2 (diff) | |
tdf#128150 xmloff: ODF import/export of fill-use-slide-background
This would be better as a value of draw:fill, but we can't add values as
an extension.
Change-Id: I05db879a8cb5018e0261f049ae91a5b9aaa760b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135814
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>
Diffstat (limited to 'xmloff')
| -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 efdd8a912cf8..a996c4e9fb54 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -3504,6 +3504,7 @@ namespace xmloff::token { TOKEN("date-format", XML_DATE_FORMAT), TOKEN("date-rfc-language-tag", XML_DATE_RFC_LANGUAGE_TAG), + TOKEN("fill-use-slide-background", XML_FILL_USE_SLIDE_BACKGROUND), #if OSL_DEBUG_LEVEL > 0 { 0, nullptr, std::nullopt, XML_TOKEN_END } diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index 343436f71960..5e68aa17599d 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -113,6 +113,7 @@ const XMLPropertyMapEntry aXMLSDProperties[] = GMAP( "FillGradientStepCount", XML_NAMESPACE_DRAW, XML_GRADIENT_STEP_COUNT, XML_TYPE_NUMBER16, 0 ), GMAP( "FillHatchName", XML_NAMESPACE_DRAW, XML_FILL_HATCH_NAME, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_FILLHATCHNAME ), GMAP( "FillBackground", XML_NAMESPACE_DRAW, XML_FILL_HATCH_SOLID, XML_TYPE_BOOL, 0 ), + GMAPV( "FillUseSlideBackground", XML_NAMESPACE_LO_EXT, XML_FILL_USE_SLIDE_BACKGROUND, XML_TYPE_BOOL, 0, SvtSaveOptions::ODFSVER_FUTURE_EXTENDED), GMAP( "FillBitmapName", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_NAME, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_FILLBITMAPNAME ), GMAP( "FillTransparence", XML_NAMESPACE_DRAW, XML_OPACITY, XML_TYPE_NEG_PERCENT16|MID_FLAG_MULTI_PROPERTY, 0 ), // exists in SW, too GMAP( "FillTransparenceGradientName", XML_NAMESPACE_DRAW, XML_OPACITY_NAME, XML_TYPE_STYLENAME|MID_FLAG_NO_PROPERTY_IMPORT, CTF_FILLTRANSNAME ), diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt index aaf1442d1dc6..849802878614 100644 --- a/xmloff/source/token/tokens.txt +++ b/xmloff/source/token/tokens.txt @@ -3246,4 +3246,5 @@ display-text picture date-format date-rfc-language-tag +fill-use-slide-background TOKEN_END_DUMMY |