diff options
| author | László Németh <nemeth@numbertext.org> | 2021-02-10 00:12:52 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2021-02-12 18:27:31 +0100 |
| commit | 9b39ce0e66acfe812e1d50e530dc2ccdef3e1357 (patch) | |
| tree | f1bb0d9c24dbe6a40e82837f0ff5632a90799530 /sw/qa | |
| parent | 3380163bc0fb9dab7f289cc36b0eeb0c9b3ddaa9 (diff) | |
tdf#76260 DOCX import: fix slow footnote import
by parsing footnotes.xml only once instead
of parsing again and again for every footnotes.
This was a serious performance problem for
documents with hundreds of footnotes, where the
footnote import took minutes instead of seconds.
Note: switch off CHECK_NOTMERGED in a debug build
to measure realistic speed-up, e.g. with the
reported document: 2 min 36 sec -> 22 sec, and
not 1 min 40 sec, as with CHECK_NOTMERGED.
Revert commit 60dbe21f59a45889c433727d0862c9a4274d94d2
("tdf#88126: sw_ooxmlexport15: Add unittest"), because
it was a fragile table layout test, worked only by accident.
Change-Id: I9460442cf0c30f2bc5ff393c947a008ca7bba6df
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110811
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'sw/qa')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf88126.docx | bin | 40642 -> 0 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport15.cxx | 6 |
2 files changed, 0 insertions, 6 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf88126.docx b/sw/qa/extras/ooxmlexport/data/tdf88126.docx Binary files differdeleted file mode 100644 index 9d4d2d5d0f8c..000000000000 --- a/sw/qa/extras/ooxmlexport/data/tdf88126.docx +++ /dev/null diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx index 574b925a07aa..31426770648a 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport15.cxx @@ -130,12 +130,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf137850_compat15ZOrder, "tdf137850_compat15ZOrder CPPUNIT_ASSERT_EQUAL_MESSAGE("Textbox is in the foreground", true, getProperty<bool>(xShape, "Opaque")); } -DECLARE_OOXMLEXPORT_TEST(testTdf88126, "tdf88126.docx") -{ - // Without the fix in place, this test would have hung - CPPUNIT_ASSERT_EQUAL(11, getPages()); -} - DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf118701, "tdf118701.docx") { // This was 6, related to moving inline images after the page breaks |