diff options
author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-19 09:21:02 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-10-19 09:21:03 +0200 |
commit | 50d48709af3406eb270e5357f5d2cc6a218337a9 (patch) | |
tree | 316c308832a870f163dc5d82ac3e23ed826d82bb /writerfilter | |
parent | 90cbb22f3fdb1302fac6a707adb9741508aa2f55 (diff) |
tdf#94374 DOCX import: allow insert -> object -> document
Change-Id: I977930d59ef1ae9ae8bd2dfa9a7f3816c46d982c
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index cae3d13e5941..354585b2f08c 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -170,8 +170,9 @@ sal_Bool WriterFilter::filter(const uno::Sequence< beans::PropertyValue >& aDesc return sal_False; writerfilter::dmapper::SourceDocumentType eType = writerfilter::dmapper::SourceDocumentType::OOXML; + uno::Reference<text::XTextRange> xInsertTextRange = aMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference<text::XTextRange>()); writerfilter::Stream::Pointer_t pStream( - writerfilter::dmapper::DomainMapperFactory::createMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, eType, uno::Reference<text::XTextRange>(), aMediaDesc)); + writerfilter::dmapper::DomainMapperFactory::createMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, eType, xInsertTextRange, aMediaDesc)); //create the tokenizer and domain mapper writerfilter::ooxml::OOXMLStream::Pointer_t pDocStream = writerfilter::ooxml::OOXMLDocumentFactory::createStream(m_xContext, xInputStream, bRepairStorage); uno::Reference<task::XStatusIndicator> xStatusIndicator = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(), uno::Reference<task::XStatusIndicator>()); |