diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-11 10:59:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-12 09:01:02 +0000 |
| commit | 434b7dd17befbad3c24df8cf3fedbdc1372670d6 (patch) | |
| tree | 4933ee76ef4af2a6d947d0fdfc3e3f0c51ec00b8 | |
| parent | 6a1f52054fefdcf5905a5ba3616b20fee7e5e26f (diff) | |
oox: deterministic oleObject stream numbering
... like in sw.
Change-Id: I4ba5d404c4160e907330832b7710c1d96430badf
(cherry picked from commit 00d1c2800c10d542673ab6f5a5baa26aa1cbb20e)
Reviewed-on: https://gerrit.libreoffice.org/21355
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | include/oox/export/shapes.hxx | 2 | ||||
| -rw-r--r-- | oox/source/export/shapes.cxx | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/oox/export/shapes.hxx b/include/oox/export/shapes.hxx index 3269df1af917..29f597f4a3e6 100644 --- a/include/oox/export/shapes.hxx +++ b/include/oox/export/shapes.hxx @@ -69,7 +69,7 @@ public: class OOX_DLLPUBLIC ShapeExport : public DrawingML { private: - static int mnEmbeddeDocumentCounter; + int m_nEmbeddedObjects; struct ShapeCheck { bool operator()( const css::uno::Reference< css::drawing::XShape>& s1, const css::uno::Reference< css::drawing::XShape>& s2 ) const diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 9f028e6e48ca..64944af61b50 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 ) @@ -1684,7 +1682,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, |