diff options
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 6 | ||||
-rw-r--r-- | 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 d65d9dbd6f83..2b9fdedc9ba5 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4488,10 +4488,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", @@ -8432,6 +8431,7 @@ DocxAttributeOutput::DocxAttributeOutput( DocxExport &rExport, FSHelperPtr pSeri m_startedHyperlink( false ), m_nHyperLinkCount(0), m_nFieldsInHyperlink( 0 ), + m_nChartCount(0), m_postponedChart( nullptr ), pendingPlaceholder( nullptr ), m_postitFieldsMaxId( 0 ), diff --git a/sw/source/filter/ww8/docxattributeoutput.hxx b/sw/source/filter/ww8/docxattributeoutput.hxx index 73abf8217fb0..d046ffb33cf9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.hxx +++ b/sw/source/filter/ww8/docxattributeoutput.hxx @@ -862,6 +862,8 @@ private: std::unique_ptr< std::list<PostponedOLE> > m_pPostponedOLEs; std::vector<const SwOLENode*> m_aPostponedMaths; + /// count charts consistently for unit tests + unsigned int m_nChartCount; const SdrObject* m_postponedChart; Size m_postponedChartSize; std::vector<const SdrObject*> m_aPostponedFormControls; |