diff options
author | Umesh Kadam <umesh.kadam@synerzip.com> | 2014-06-13 17:26:19 +0530 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-06-20 08:48:36 +0000 |
commit | 75fc9e669f209472ec6a282848166d96d02d84d9 (patch) | |
tree | aa9bd65024a2da28bdcac3d554dbd200b3b2ea59 /sw/qa/extras/ooxmlimport | |
parent | 9f8785074512d6442fd97d67860fd625ac4d6bb1 (diff) |
fdo#78904 : LO hangs while saving the document.
- In case of framePr attributes being omitted in original xml, LO defaults
such attributes to incorrect values.
- Correcting these values in this fix.
- This fix stops LO from getting hang while saving the document, the actual
fix needs to be somewhere in the table layout. We need to restrict the
frame from being considered as part of the table as MSO does not allow
frame to be part of a table.
Change-Id: I4c35f7eff6ca1122901f5667fc26b849df527f60
Reviewed-on: https://gerrit.libreoffice.org/9774
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/qa/extras/ooxmlimport')
-rw-r--r-- | sw/qa/extras/ooxmlimport/data/fdo78904.docx | bin | 0 -> 14388 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 |
2 files changed, 11 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/fdo78904.docx b/sw/qa/extras/ooxmlimport/data/fdo78904.docx Binary files differnew file mode 100644 index 000000000000..c171ae2ca813 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/fdo78904.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index a2c499774ad4..d1b7730b840e 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1175,6 +1175,17 @@ DECLARE_OOXMLIMPORT_TEST(testToolsLineNumbering, "tools-line-numbering.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nValue); } +DECLARE_OOXMLIMPORT_TEST(testfdo78904, "fdo78904.docx") +{ + uno::Reference<text::XTextFramesSupplier> xTextFramesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xIndexAccess(xTextFramesSupplier->getTextFrames(), uno::UNO_QUERY); + if (xIndexAccess->getCount()) + { + uno::Reference<beans::XPropertySet> xFrame(xIndexAccess->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(EMU_TO_MM100(0)), getProperty<sal_Int32>(xFrame, "HoriOrientPosition")); + } +} + DECLARE_OOXMLIMPORT_TEST(testFdo60922, "fdo60922.docx") { // This was 0, not 100, due to wrong import of w:position w:val="0" |