This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch odf-devel in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ef0a8aeea9ce5fa8ec7002c4ce0affe00859693d Author: Jim Jagielski <[email protected]> AuthorDate: Fri Oct 23 08:51:36 2026 -0400 xmloff: don't write draw:fill* in paragraph styles in ODF 1.2 mode --- main/xmloff/source/text/txtprmap.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/main/xmloff/source/text/txtprmap.cxx b/main/xmloff/source/text/txtprmap.cxx index 2b427b6394..729c83071f 100644 --- a/main/xmloff/source/text/txtprmap.cxx +++ b/main/xmloff/source/text/txtprmap.cxx @@ -82,6 +82,7 @@ using namespace ::xmloff::token; //UUUU #define _MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 } #define GMAP(name,prefix,token,type,context) _MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context) +#define GMAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC), context, SvtSaveOptions::ODFVER_LATEST } XMLPropertyMapEntry aXMLParaPropMap[] = { @@ -91,6 +92,9 @@ XMLPropertyMapEntry aXMLParaPropMap[] = //UUUU fill attributes for paragraph backgrounds // #125045# moved to the front to be able to exclude these in lcl_txtprmap_getMap // for TEXT_PROP_MAP_SHAPE_PARA to not have these double for Shapes (which already have these) +// not ODF 1.2: strict export keeps only fo:background-color and style:background-image +#undef GMAP +#define GMAP GMAP_EXT GMAP( "FillStyle", XML_NAMESPACE_DRAW, XML_FILL, XML_SW_TYPE_FILLSTYLE, 0 ), GMAP( "FillColor", XML_NAMESPACE_DRAW, XML_FILL_COLOR, XML_TYPE_COLOR, 0 ), GMAP( "FillColor2", XML_NAMESPACE_DRAW, XML_SECONDARY_FILL_COLOR, XML_TYPE_COLOR, 0 ), @@ -111,6 +115,8 @@ XMLPropertyMapEntry aXMLParaPropMap[] = GMAP( "FillBitmapRectanglePoint", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT, XML_SW_TYPE_BITMAP_REFPOINT, 0 ), GMAP( "FillBitmapOffsetX", XML_NAMESPACE_DRAW, XML_TILE_REPEAT_OFFSET, XML_SW_TYPE_BITMAPREPOFFSETX|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_X ), GMAP( "FillBitmapOffsetY", XML_NAMESPACE_DRAW, XML_TILE_REPEAT_OFFSET, XML_SW_TYPE_BITMAPREPOFFSETY|MID_FLAG_MULTI_PROPERTY, CTF_REPEAT_OFFSET_Y ), +#undef GMAP +#define GMAP(name,prefix,token,type,context) _MAP(name,prefix,token,static_cast<sal_Int32>(type|XML_TYPE_PROP_GRAPHIC),context) // RES_LR_SPACE // !!! DO NOT REORDER THE MARGINS !!!
