sw/qa/extras/ooxmlimport/data/hello.docx |binary
sw/qa/extras/ooxmlimport/data/tdf94374.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 30 ++++++++++++++++++++++++++++
writerfilter/source/filter/WriterFilter.cxx | 3 +-
4 files changed, 32 insertions(+), 1 deletion(-)
New commits:
commit 36fa2b8cf538baee272bf91da3d6cda2da6a392c
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Oct 19 09:21:02 2015 +0200
tdf#94374 DOCX import: allow insert -> object -> document
(cherry picked from commit 50d48709af3406eb270e5357f5d2cc6a218337a9)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: I977930d59ef1ae9ae8bd2dfa9a7f3816c46d982c
Reviewed-on: https://gerrit.libreoffice.org/19758
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/qa/extras/ooxmlimport/data/hello.docx
b/sw/qa/extras/ooxmlimport/data/hello.docx
new file mode 100644
index 0000000..d5d8d43
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/hello.docx differ
diff --git a/sw/qa/extras/ooxmlimport/data/tdf94374.docx
b/sw/qa/extras/ooxmlimport/data/tdf94374.docx
new file mode 100644
index 0000000..d5d8d43
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf94374.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 1668def..8a186ef 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -66,6 +66,8 @@
#include <com/sun/star/style/PageStyleLayout.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/document/XFilter.hpp>
+#include <com/sun/star/document/XImporter.hpp>
#include <vcl/bmpacc.hxx>
#include <vcl/svapp.hxx>
#include <unotest/assertion_traits.hxx>
@@ -75,6 +77,7 @@
#include <swtypes.hxx>
#include <tools/datetimeutils.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
+#include <unotools/streamwrap.hxx>
#include <bordertest.hxx>
@@ -96,6 +99,24 @@ public:
if (OString(filename) == "smartart.docx" || OString(filename) ==
"strict-smartart.docx" || OString(filename) == "fdo87488.docx")
SvtFilterOptions::Get().SetSmartArt2Shape(false);
}
+protected:
+ /// Copy&paste helper.
+ bool paste(const OUString& rFilename, const
uno::Reference<text::XTextRange>& xTextRange)
+ {
+ uno::Reference<document::XFilter>
xFilter(m_xSFactory->createInstance("com.sun.star.comp.Writer.WriterFilter"),
uno::UNO_QUERY_THROW);
+ uno::Reference<document::XImporter> xImporter(xFilter,
uno::UNO_QUERY_THROW);
+ xImporter->setTargetDocument(mxComponent);
+ uno::Sequence<beans::PropertyValue> aDescriptor(3);
+ aDescriptor[0].Name = "InputStream";
+ SvStream* pStream =
utl::UcbStreamHelper::CreateStream(getURLFromSrc("/sw/qa/extras/ooxmlimport/data/")
+ rFilename, StreamMode::READ);
+ uno::Reference<io::XStream> xStream(new utl::OStreamWrapper(*pStream));
+ aDescriptor[0].Value <<= xStream;
+ aDescriptor[1].Name = "InsertMode";
+ aDescriptor[1].Value <<= sal_True;
+ aDescriptor[2].Name = "TextInsertModeRange";
+ aDescriptor[2].Value <<= xTextRange;
+ return xFilter->filter(aDescriptor);
+ }
};
class FailTest : public Test
@@ -2806,6 +2827,15 @@ DECLARE_OOXMLIMPORT_TEST(testTdf89165, "tdf89165.docx")
// This must not hang in layout
}
+DECLARE_OOXMLIMPORT_TEST(testTdf94374, "hello.docx")
+{
+ uno::Reference<text::XTextDocument> xTextDocument(mxComponent,
uno::UNO_QUERY);
+ uno::Reference<text::XTextRange> xText(xTextDocument->getText(),
uno::UNO_QUERY);
+ uno::Reference<text::XTextRange> xEnd = xText->getEnd();
+ // This failed: it wasn't possible to insert a DOCX document into an
existing Writer one.
+ CPPUNIT_ASSERT(paste("tdf94374.docx", xEnd));
+}
+
#endif
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/filter/WriterFilter.cxx
b/writerfilter/source/filter/WriterFilter.cxx
index a2f289a..546b852 100644
--- a/writerfilter/source/filter/WriterFilter.cxx
+++ b/writerfilter/source/filter/WriterFilter.cxx
@@ -171,8 +171,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>());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
