diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2017-06-03 12:31:32 +0200 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2017-06-04 04:29:10 +0200 |
| commit | 4e547d147d6df7042db58bfa3060140c849493f4 (patch) | |
| tree | f0fc0e63e72ec872eaf2d4e2007dca3500c6fd30 | |
| parent | bb9b6cb4e6cfc5fbb4733abb8e9f5758987c197a (diff) | |
tdf#73873 Fix missing embeddings in word/embeddings directory
In commit:
https://cgit.freedesktop.org/libreoffice/core/commit/?id=ad90e22f1970d019e1f2a1e8ba8020c0f0cb36c4
the refactor was made. Unorfunately due to mistake
the embedding was always resetting.
As a result only one embedding document was added.
Change-Id: Ie268b1bf8906ac7b8e061526a9186b3b4b46bef6
Reviewed-on: https://gerrit.libreoffice.org/38369
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/ooxml/OOXMLDocumentImpl.hxx | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx index 550820be018e..5eb517810957 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx @@ -724,7 +724,6 @@ void OOXMLDocumentImpl::resolveEmbeddingsStream(const OOXMLStream::Pointer_t& pS { uno::Reference<embed::XRelationshipAccess> xRelationshipAccess; xRelationshipAccess.set((dynamic_cast<OOXMLStreamImpl&>(*pStream.get())).accessDocumentStream(), uno::UNO_QUERY); - std::vector<css::beans::PropertyValue> aEmbeddings; if (xRelationshipAccess.is()) { OUString sChartType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"); diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx index c4245cae7b02..1922e225e168 100644 --- a/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx +++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.hxx @@ -53,6 +53,7 @@ class OOXMLDocumentImpl : public OOXMLDocument css::uno::Reference<css::io::XInputStream> mxActiveXBin; css::uno::Reference<css::io::XInputStream> mxEmbeddings; css::uno::Sequence < css::beans::PropertyValue > mxEmbeddingsList; + std::vector<css::beans::PropertyValue> aEmbeddings; /// List of VBA-related streams. css::uno::Sequence<css::beans::PropertyValue> maVBA; bool mbIsSubstream; |