diff options
| author | Regényi Balázs <regenyi.balazs@nisz.hu> | 2020-12-01 12:16:12 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-12-10 10:27:33 +0100 |
| commit | bda05ba17362222b74727872579b65b3fa14e3d8 (patch) | |
| tree | 60d9448754f1a992e7e9695c8f458b55cfb62d69 /oox/qa | |
| parent | 7720f8cf22718415adb3db2304916581f864f884 (diff) | |
tdf#41466 DOCX import: fix VML v:shape/v:textbox
VML v:shape/v:textbox element was imported only as
a text frame, losing (otherwise recognized) preset
shape geometry, i.e. replacing a callout bubble
(wedgeRectCallout) and other special shapes with a
plain rectangle.
Thanks to Attila Bakos for the initial help.
Change-Id: I03a608822ed54a20ed07406a08c3539e72958f5b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105299
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'oox/qa')
| -rw-r--r-- | oox/qa/unit/data/layout-flow-alt-alone.docx | bin | 7669 -> 0 bytes | |||
| -rw-r--r-- | oox/qa/unit/vml.cxx | 19 |
2 files changed, 0 insertions, 19 deletions
diff --git a/oox/qa/unit/data/layout-flow-alt-alone.docx b/oox/qa/unit/data/layout-flow-alt-alone.docx Binary files differdeleted file mode 100644 index 59c2db23d588..000000000000 --- a/oox/qa/unit/data/layout-flow-alt-alone.docx +++ /dev/null diff --git a/oox/qa/unit/vml.cxx b/oox/qa/unit/vml.cxx index d43d2d5645ae..ec64a08c3fcf 100644 --- a/oox/qa/unit/vml.cxx +++ b/oox/qa/unit/vml.cxx @@ -55,25 +55,6 @@ void OoxVmlTest::load(const OUString& rFileName) mxComponent = loadFromDesktop(aURL); } -CPPUNIT_TEST_FIXTURE(OoxVmlTest, testLayoutFlowAltAlone) -{ - // mso-layout-flow-alt:bottom-to-top without a matching layout-flow:vertical. - load("layout-flow-alt-alone.docx"); - - uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(getComponent(), uno::UNO_QUERY); - uno::Reference<drawing::XDrawPage> xDrawPage(xDrawPagesSupplier->getDrawPages()->getByIndex(0), - uno::UNO_QUERY); - uno::Reference<beans::XPropertySet> xShape(xDrawPage->getByIndex(0), uno::UNO_QUERY); - sal_Int16 nWritingMode = 0; - xShape->getPropertyValue("WritingMode") >>= nWritingMode; - - // Without the accompanying fix in place, this test would have failed with: - // - Expected: 5 [ BTLR ] - // - Actual : 4 [ PAGE ] - // i.e. in case layout-flow:vertical was missing, the text was not vertical. - CPPUNIT_ASSERT_EQUAL(text::WritingMode2::BT_LR, nWritingMode); -} - CPPUNIT_TEST_FIXTURE(OoxVmlTest, testSpt202ShapeType) { // Load a document with a groupshape, 2nd child is a <v:shape>, its type has o:spt set to 202 |