diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-11 10:59:17 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-11 11:22:25 +0100 |
| commit | 00d1c2800c10d542673ab6f5a5baa26aa1cbb20e (patch) | |
| tree | 1c5f288f00bc9accc1d17c1bde56d58f78cf9969 /oox | |
| parent | 9a64d7f8ddbd27020c1e9eb3866efbfaa62c8be5 (diff) | |
oox: deterministic oleObject stream numbering
... like in sw.
Change-Id: I4ba5d404c4160e907330832b7710c1d96430badf
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/shapes.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 95d1d7765276..654b11f4e256 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -359,11 +359,9 @@ bool URLTransformer::isExternalURL(const OUString& /*rURL*/) const if ( GETA(propName) ) \ mAny >>= variable; -// not thread safe -int ShapeExport::mnEmbeddeDocumentCounter = 1; - ShapeExport::ShapeExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, ShapeHashMap* pShapeMap, XmlFilterBase* pFB, DocumentType eDocumentType, DMLTextExport* pTextExport ) : DrawingML( pFS, pFB, eDocumentType, pTextExport ) + , m_nEmbeddedObjects(0) , mnShapeIdMax( 1 ) , mnPictureIdMax( 1 ) , mnXmlNamespace( nXmlNamespace ) @@ -1683,7 +1681,7 @@ ShapeExport& ShapeExport::WriteOLE2Shape( Reference< XShape > xShape ) assert(!sRelationType.isEmpty()); assert(!sSuffix.isEmpty()); - OUString sFileName = "embeddings/oleObject" + OUString::number(mnEmbeddeDocumentCounter++) + "." + sSuffix; + OUString sFileName = "embeddings/oleObject" + OUString::number(++m_nEmbeddedObjects) + "." + sSuffix; uno::Reference<io::XOutputStream> const xOutStream( mpFB->openFragmentStream( OUString::createFromAscii(GetComponentDir()) + "/" + sFileName, |