diff options
author | Tushar Bende <tushar.bende@synerzip.com> | 2014-03-17 22:40:19 +0530 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-03-18 15:42:24 +0100 |
commit | 5e44328c4a2ca748e1254c008ff6d84a58601cde (patch) | |
tree | bc91d584e3094cf35195b252bc21b08a8992ed1a /sw/qa | |
parent | afe84a3dbbe02b12b113400499a0967e8a2ffab7 (diff) |
fdo#72775 : LibreOffice hang while opening some documents
Description: There was a problem for some documents, when opened in LibreOffice
there was continuous increase in page numbers.And this was the reason for LO getting hang.
The wrap property "NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_auto" was not handled in DomainMapper::lcl_attribute() and hence paragraph's wrap property was getting set to
"text::WrapTextMode_NONE" this was the reason for increasing number of pages while opening doc in LO.
added condition to handle NS_ooxml::LN_Value_wordprocessingml_ST_Wrap_auto.
*added test case to verify that the document is opening properly and checking it's page count.
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Reviewed on:
https://gerrit.libreoffice.org/8632
Change-Id: Id24ebc8409e7fd53915e5130beb9ad6f8bb8571f
Diffstat (limited to 'sw/qa')
-rw-r--r-- | sw/qa/extras/ooxmlimport/data/frame-wrap-auto.docx | bin | 0 -> 10348 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/frame-wrap-auto.docx b/sw/qa/extras/ooxmlimport/data/frame-wrap-auto.docx Binary files differnew file mode 100644 index 000000000000..6ad7fe059449 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/frame-wrap-auto.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 1492cd9aaa62..e47a20820dfb 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1976,6 +1976,13 @@ DECLARE_OOXMLIMPORT_TEST(testSmartartStrict, "strict-smartart.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(6), xGroup->getCount()); // 3 ellipses + 3 arrows } +DECLARE_OOXMLIMPORT_TEST(testLibreOfficeHang, "frame-wrap-auto.docx") +{ + // fdo#72775 + // This was text::WrapTextMode_NONE. + CPPUNIT_ASSERT_EQUAL(text::WrapTextMode_DYNAMIC, getProperty<text::WrapTextMode>(getShape(1), "Surround")); +} + DECLARE_OOXMLIMPORT_TEST(testI124106, "i124106.docx") { // This was 2. |