[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - writerfilter/source
Oliver Specht
oliver.specht at cib.de
Tue Nov 17 00:45:48 PST 2015
writerfilter/source/ooxml/OOXMLDocumentImpl.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit aac3a50a392c95532a85e4c558d2eb1d1a89cdff
Author: Oliver Specht <oliver.specht at cib.de>
Date: Fri Nov 13 12:36:04 2015 +0100
tdf#95188: enable import of shapes in footnotes in .docx
substreams require a Model and a DrawPage
Change-Id: I701cf6e2283f84f18b9a0c06a4ce0aa8be934bf3
Reviewed-on: https://gerrit.libreoffice.org/19951
Reviewed-by: Oliver Specht <oliver.specht at cib.de>
Tested-by: Oliver Specht <oliver.specht at cib.de>
(cherry picked from commit f47bd0561cdf4c2b4fbe2c7e396533cf85408cb7)
Reviewed-on: https://gerrit.libreoffice.org/19954
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index d15d59e..7e0782a 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -286,6 +286,8 @@ OOXMLDocumentImpl::getXNoteStream(OOXMLStream::StreamType_t nType, const Id & rT
OOXMLDocumentImpl * pDocument = new OOXMLDocumentImpl(pStream, uno::Reference<task::XStatusIndicator>(), mbSkipImages);
pDocument->setXNoteId(nId);
pDocument->setXNoteType(rType);
+ pDocument->setModel(getModel());
+ pDocument->setDrawPage(getDrawPage());
return writerfilter::Reference<Stream>::Pointer_t(pDocument);
}
More information about the Libreoffice-commits
mailing list