diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-17 17:25:08 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-01-17 17:39:07 +0100 |
| commit | 75934fc178ed90b56d77eb1efebed5bdac8427b6 (patch) | |
| tree | 70ae730b43faa0659391d9c2d314957c83c982da /sw | |
| parent | ce8010b482020145b8a8c8e15a61e1a6b5574d7c (diff) | |
VML import: handle shape with text inside groupshape as TextShape
This matches the behavior of the WW8 import and gives us the required
text wrapping when the shape text doesn't fit in a single line.
Change-Id: I32a13516503620344d313593834be29a3dc9f726
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx | bin | 15891 -> 15960 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/groupshape-child-rotation.docx b/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx Binary files differindex 74dd72a26a31..d401c1817345 100644 --- a/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx +++ b/sw/qa/extras/ooxmlimport/data/groupshape-child-rotation.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 2e9ff53e9b38..0f5de741e82d 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -975,6 +975,10 @@ DECLARE_OOXMLIMPORT_TEST(testGroupshapeChildRotation, "groupshape-child-rotation xShape.set(xGroupShape->getByIndex(4), uno::UNO_QUERY); // This was 887, i.e. border distances were included in the height. CPPUNIT_ASSERT_EQUAL(sal_Int32(686), xShape->getSize().Height); + + uno::Reference<drawing::XShapeDescriptor> xShapeDescriptor(xGroupShape->getByIndex(5), uno::UNO_QUERY); + // This was com.sun.star.drawing.RectangleShape, all shape text in a single line. + CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.TextShape"), xShapeDescriptor->getShapeType()); } DECLARE_OOXMLIMPORT_TEST(testN793262, "n793262.docx") |