diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-02 11:58:57 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-02 12:09:22 +0100 |
| commit | 3a45a4e80257d8737df4dda0b2d85f602196a70d (patch) | |
| tree | 8fa80e3d7e3058b48e862b44a0b5fd1f20aa94b4 /sw | |
| parent | affcea4185ffa95385cfb74ca68fa31361d6784b (diff) | |
oox: fix export of TextShapes in DOCX
This was the last shape type that unconditionally wrote XML_sp for the
shape element, which is invalid for DOCX.
Change-Id: I3a6f8e6fd8ebbe663dce9ed4453396c3ec91c38a
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/bezier.odt | bin | 0 -> 12174 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/bezier.odt b/sw/qa/extras/ooxmlexport/data/bezier.odt Binary files differnew file mode 100644 index 000000000000..c73ed3e98f85 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/bezier.odt diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 187cf4f62bf8..54042d4493d8 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2175,6 +2175,14 @@ DECLARE_OOXMLEXPORT_TEST(testRelorientation, "relorientation.docx") CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GroupShape"), xShapeDescriptor->getShapeType()); } +DECLARE_OOXMLEXPORT_TEST(testBezier, "bezier.odt") +{ + uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); + // Check that no shape got lost: a bezier, a line and a text shape. + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xDraws->getCount()); +} + DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, "testTrackChangesDeletedParagraphMark.docx") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); |