diff options
| author | Umesh Kadam <umesh.kadam@synerzip.com> | 2014-06-13 17:26:19 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-08-21 21:24:25 +0200 |
| commit | cdefbd73ab0247bac0b0dd3d2db0b13f6967e900 (patch) | |
| tree | e7bd12ff7f3ef5b2372d3250f68a82ada22f903c /sw | |
| parent | 15b190d8b8da08de57a9e6f8e5e06f4dc8bcafc4 (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.
Reviewed-on: https://gerrit.libreoffice.org/9774
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 75fc9e669f209472ec6a282848166d96d02d84d9)
This also fixes fdo#79391, but not compeletely on this branch.
Change-Id: I4c35f7eff6ca1122901f5667fc26b849df527f60
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx | bin | 0 -> 74704 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/data/fdo78904.docx | bin | 0 -> 14388 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 11 |
3 files changed, 11 insertions, 0 deletions
diff --git a/sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx b/sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx Binary files differnew file mode 100644 index 000000000000..dce50f3dce1a --- /dev/null +++ b/sw/qa/core/data/ooxml/pass/fdo78904_fileHang.docx 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 26e0e36d0f12..0035e7b660f9 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1131,6 +1131,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" |