diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-01-25 00:13:36 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-01-25 06:47:05 +0100 |
| commit | ba697931a74e047206739c1935dc06a0890c5661 (patch) | |
| tree | 043e32966e2a251d0873c025c66f0eaedb332289 /sw | |
| parent | 9808306875fff4b97db6acb1182a153c874f15c5 (diff) | |
drawingML import: parse shape text run inside w:sdt and s:sdtContent
Change-Id: I6dc5939ae66967785cdc5dab318024b8cb17d1cd
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/dml-groupshape-sdt.docx | bin | 0 -> 19727 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 7 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/dml-groupshape-sdt.docx b/sw/qa/extras/ooxmlimport/data/dml-groupshape-sdt.docx Binary files differnew file mode 100644 index 000000000000..7314d876a45c --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/dml-groupshape-sdt.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 4dabefed6acf..ab69ced00697 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1727,6 +1727,13 @@ DECLARE_OOXMLIMPORT_TEST(testFdo73389,"fdo73389.docx") // This was 9340, i.e. the width of the inner table was too large. CPPUNIT_ASSERT_EQUAL(sal_Int32(2842), getProperty<sal_Int32>(xTables->getByIndex(0), "Width")); } + +DECLARE_OOXMLIMPORT_TEST(testDMLGroupshapeSdt, "dml-groupshape-sdt.docx") +{ + uno::Reference<drawing::XShapes> xGroupShape(getShape(1), uno::UNO_QUERY); + // The text in the groupshape was missing due to the w:sdt and w:sdtContent wrapper around it. + CPPUNIT_ASSERT_EQUAL(OUString("sdt and sdtContent inside groupshape"), uno::Reference<text::XTextRange>(xGroupShape->getByIndex(1), uno::UNO_QUERY)->getString()); +} #endif |