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