[Libreoffice-commits] core.git: xmloff/source

[Julien Nabet (via logerrit)]

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

New commits:
commit 31de39108ce19c002ab4ef6ab369dd5bfa668634
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Thu Apr 9 00:08:09 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Apr 9 11:06:40 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/+/91942
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 9bf7d7baae3a..07226e89cda2 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1418,7 +1418,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,