diff options
| author | Attila Bakos (NISZ) <bakos.attilakaroly@nisz.hu> | 2022-01-19 17:43:54 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2022-02-03 09:12:20 +0100 |
| commit | 4a38ca4035ac03571925e72cb47e0beb8da2003a (patch) | |
| tree | 6c472f1efe01827320bfd3ae35404f38ee18ba9a /sw/qa/extras | |
| parent | b8925251e48534706c6960a54c320d3879317321 (diff) | |
tdf#146802 OOXML import: fix embedded VML in grouped textbox
E.g. OLE formulas inside them broke document load.
Regression from 121cbc250b36290f0f8c7265fea57256dad69553
"tdf#66039 DOCX: import textboxes (with tables, images etc.)
in group shapes".
Note: now embedded VML OLE is loaded in WPG shapes, thanks to
that the ShapeHandler in oox/ has a stack having the start
token inside for each shape.
Change-Id: I973d78ed88c5c83efffd9629061e2a2c6fdd25e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128627
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf146802.docx | bin | 0 -> 72360 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport17.cxx | 13 |
2 files changed, 13 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf146802.docx b/sw/qa/extras/ooxmlexport/data/tdf146802.docx Binary files differnew file mode 100644 index 000000000000..80d2ee17a0bc --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf146802.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx index 6feb92b15149..ee7b37dfc151 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx @@ -51,6 +51,19 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf135906) // just test round-tripping. The document was exported as corrupt and didn't re-load. } +CPPUNIT_TEST_FIXTURE(Test, TestTdf146802) +{ + load(DATA_DIRECTORY, "tdf146802.docx"); + + // First check if the load failed, as before the fix. + CPPUNIT_ASSERT(mxComponent); + + // There is a group shape with text box inside having an embedded VML formula, + // check if something missing. + CPPUNIT_ASSERT_EQUAL_MESSAGE("Where is the formula?", 2, getShapes()); + // Before the fix the bugdoc failed to load or the formula was missing. +} + CPPUNIT_TEST_FIXTURE(Test, testParaStyleNumLevel) { loadAndSave("para-style-num-level.docx"); |