[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - xmloff/source

[Julien Nabet (via logerrit)]

 xmloff/source/chart/SchXMLExport.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 07da4d775c7fa4a2d3bef5f71995317c9feb91f6
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Apr 9 00:08:09 2020 +0200
Commit:     Michael Stahl <michael.stahl at cib.de>
CommitDate: Fri Apr 10 18:23:12 2020 +0200

    tdf#131966: chart legend attribs width and height unknown for ODF 1.2 (strict)
    
    Change-Id: Ie4cb7d2c9e5fb7bca88287fcaff03d5c9ca04b8b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91899
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.stahl at cib.de>

diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 202ecf970fd3..efa8a6873973 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1383,7 +1383,9 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >
                             if( nLegendExpansion == chart::ChartLegendExpansion_CUSTOM)
                             {
                                 awt::Size aSize( xLegendShape->getSize() );
-                                addSize( aSize, true );
+                                // tdf#131966: chart legend attributes width and height shouldn't be exported to ODF 1.2 (strict)
+                                if (nCurrentODFVersion > SvtSaveOptions::ODFVER_012)
+                                    addSize( aSize, true );
                                 OUStringBuffer aAspectRatioString;
                                 ::sax::Converter::convertDouble(
                                     aAspectRatioString,