sw/qa/extras/inc/swmodeltestbase.hxx | 4 +++-
sw/qa/extras/ooxmlimport/data/mce-wpg.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 +++++++++
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 1 +
4 files changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 8c73b16f5f18f3bc1dbf9ff6c1475db56b44d304
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Dec 5 14:00:52 2013 +0100
DOCX import: declare wpg as a supported feature
This is the same as wps, just for group shapes.
Change-Id: I321b19ed538a6cb8f9068c7de6fbe9a8eb0bd82f
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx
b/sw/qa/extras/inc/swmodeltestbase.hxx
index 57d40c6..0a5418a 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -351,9 +351,11 @@ protected:
return xParagraph;
}
- uno::Reference<text::XTextRange> getParagraphOfText(int number,
uno::Reference<text::XText> xText) const
+ uno::Reference<text::XTextRange> getParagraphOfText(int number,
uno::Reference<text::XText> xText, OUString content = OUString()) const
{
uno::Reference<text::XTextRange> const
xParagraph(getParagraphOrTable(number, xText), uno::UNO_QUERY_THROW);
+ if (!content.isEmpty())
+ CPPUNIT_ASSERT_EQUAL(content, xParagraph->getString());
return xParagraph;
}
diff --git a/sw/qa/extras/ooxmlimport/data/mce-wpg.docx
b/sw/qa/extras/ooxmlimport/data/mce-wpg.docx
new file mode 100755
index 0000000..bd0d846
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/mce-wpg.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6d9837e..bd7b180 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1574,6 +1574,15 @@ DECLARE_OOXMLIMPORT_TEST(textboxWpgOnly,
"textbox-wpg-only.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(100),
getProperty<sal_Int32>(getRun(getParagraphOfText(1, xText), 1),
"CharEscapementHeight"));
}
+DECLARE_OOXMLIMPORT_TEST(testMceWpg, "mce-wpg.docx")
+{
+ // Make sure that we read the primary branch, if wpg is requested as a
feature.
+ uno::Reference<container::XIndexAccess> xGroup(getShape(1),
uno::UNO_QUERY);
+ uno::Reference<text::XText> xText =
uno::Reference<text::XTextRange>(xGroup->getByIndex(0),
uno::UNO_QUERY)->getText();
+ // This was VML1.
+ getParagraphOfText(1, xText, "DML1");
+}
+
DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx")
{
// The document contains a rotated bitmap
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 78a4460..ed1ae17 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -198,6 +198,7 @@ bool OOXMLFastContextHandler::prepareMceContext(Token_t
nElement, const uno::Ref
OUString aRequires = rAttribs->getOptionalValue(OOXML_Requires);
static const char* aFeatures[] = {
"wps",
+ "wpg",
};
for (size_t i = 0; i < SAL_N_ELEMENTS(aFeatures); ++i)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
