From c7d111b5b238035360b3a866125175f9e285c289 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 15 Dec 2015 22:45:41 +0100 Subject: [PATCH 2/6] sw: DOCX export: eliminate chart numbering non-determinism ... that was causing test failures on some but not all platforms. (cherry picked from commit c56e0858b081b4dfe78745cf80c829f6c3c2e7b8) (cherry picked from commit 2263a59aaf6bc1548046fdda422518a6365ffd17) Change-Id: I0d04cd6e540ea2693a3ec8511d615a9b0fecf456 Reviewed-on: https://gerrit.libreoffice.org/20757 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- sw/source/filter/ww8/docxattributeoutput.cxx | 6 +++--- sw/source/filter/ww8/docxattributeoutput.hxx | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index c728769..049d280 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4411,10 +4411,9 @@ void DocxAttributeOutput::WritePostponedChart() FSEND ); OString aRelId; - static sal_Int32 nChartCount = 0; - nChartCount++; + m_nChartCount++; uno::Reference< frame::XModel > xModel( xChartDoc, uno::UNO_QUERY ); - aRelId = m_rExport.OutputChart( xModel, nChartCount, m_pSerializer ); + aRelId = m_rExport.OutputChart( xModel, m_nChartCount, m_pSerializer ); m_pSerializer->singleElementNS( XML_c, XML_chart, FSNS( XML_xmlns, XML_c ), "http://schemas.openxmlformats.org/drawingml/2006/chart", @@ -8410,6 +8409,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri m_startedHyperlink( false ), m_nHyperLinkCount(0), m_nFieldsInHyperlink( 0 ), + m_nChartCount(0), m_postponedChart( NULL ), pendingPlaceholder( NULL ), m_postitFieldsMaxId( 0 ), diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index e4c68e9..1ae2835 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -861,6 +861,8 @@ private: std::unique_ptr< std::list > m_pPostponedOLEs; std::vector m_aPostponedMaths; + /// count charts consistently for unit tests + unsigned int m_nChartCount; const SdrObject* m_postponedChart; Size m_postponedChartSize; std::vector m_aPostponedFormControls; -- 2.5.0