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

[Libreoffice Gerrit user]

 xmloff/source/chart/SchXMLExport.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6aa9f0980612d5c7dcc02cfe11babb73605be4ca
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Dec 30 13:10:30 2018 +0100
Commit:     Michael Stahl <michael.st...@cib.de>
CommitDate: Tue Jan 15 18:13:04 2019 +0100

    tdf#112782: data-pilot-source is invalid in odf1.2 strict
    
    Change-Id: Ie24c416cb9ba8de904bf6e725a60b62ce7787596
    Reviewed-on: https://gerrit.libreoffice.org/65742
    (cherry picked from commit 18b9f23f13fd503e94d669ab80b5d2354d1817a1)
    Reviewed-on: https://gerrit.libreoffice.org/65885
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <michael.st...@cib.de>

diff --git a/xmloff/source/chart/SchXMLExport.cxx 
b/xmloff/source/chart/SchXMLExport.cxx
index 848416b8a2fe..9d160d7164f6 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -1203,7 +1203,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< 
chart::XChartDocument >
         }
 
         Reference<chart2::data::XPivotTableDataProvider> 
xPivotTableDataProvider(xNewDoc->getDataProvider(), uno::UNO_QUERY);
-        if (xPivotTableDataProvider.is())
+        if (xPivotTableDataProvider.is() && nCurrentODFVersion > 
SvtSaveOptions::ODFVER_012)
         {
             OUString sPivotTableName = 
xPivotTableDataProvider->getPivotTableName();
             mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_DATA_PILOT_SOURCE, 
sPivotTableName);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits