diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-06 15:54:12 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2013-12-06 16:02:38 +0100 |
| commit | c8e9a953636524ff3ac79859f3698491f775e10a (patch) | |
| tree | 79eda09187514d4025ebf3cd6381d5b12c9bc49a /sw | |
| parent | 6b713bafe4d8f7fc4f5dfe2b794c07fb713a3462 (diff) | |
DOCX import: fix import of wpg shapes after a wps textframe
Change-Id: I30844062bf4d4f15ca70d9f441f0505fa4f26bb7
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/mce-nested.docx | bin | 28318 -> 33233 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/mce-nested.docx b/sw/qa/extras/ooxmlimport/data/mce-nested.docx Binary files differindex c110f63dae40..6804fc2bebc6 100644 --- a/sw/qa/extras/ooxmlimport/data/mce-nested.docx +++ b/sw/qa/extras/ooxmlimport/data/mce-nested.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index a1a0d43572d5..9c6510d94ece 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1603,6 +1603,10 @@ DECLARE_OOXMLIMPORT_TEST(testMceNested, "mce-nested.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(2514600)), getProperty<sal_Int32>(xFrame, "VertOrientPosition")); // This was -1 (default), make sure the background color is set. CPPUNIT_ASSERT_EQUAL(sal_Int32(0x4f81bd), getProperty<sal_Int32>(xFrame, "BackColor")); + + uno::Reference<drawing::XShapeDescriptor> xShapeDescriptor(getShape(2), uno::UNO_QUERY); + // This was a com.sun.star.drawing.CustomShape, due to incorrect handling of wpg elements after a wps textbox. + CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.GroupShape"), xShapeDescriptor->getShapeType()); } DECLARE_OOXMLIMPORT_TEST(testFdo70457, "fdo70457.docx") |