sw/qa/extras/ooxmlimport/data/tdf95775.docx |binary sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 5 +++++ sw/source/core/doc/textboxhelper.cxx | 6 ++++++ 3 files changed, 11 insertions(+)
New commits: commit 5ed074d40e0bd7646304c066fb98c74848a33eb5 Author: Mike Kaganski <mike.kagan...@collabora.com> Date: Sat Nov 14 14:04:20 2015 +1000 tdf#95775: Allow zero shape width/height; fix setting width/height relation Conflicts: sw/qa/extras/ooxmlimport/ooxmlimport.cxx Reviewed on: https://gerrit.libreoffice.org/19962 (cherry picked from commit ca80f73c3a330c38493e5e358bfa887adbe21db2) Change-Id: Ic91ebf4a18a77704dc1ccd1e1180b42d0bc84c74 diff --git a/sw/qa/extras/ooxmlimport/data/tdf95775.docx b/sw/qa/extras/ooxmlimport/data/tdf95775.docx new file mode 100644 index 0000000..a4c1293 Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/tdf95775.docx differ diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index caf4a55..6ba7953 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -2879,6 +2879,11 @@ DECLARE_OOXMLIMPORT_TEST(testTdf85232, "tdf85232.docx") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2267), xShape->getPosition().X); } +DECLARE_OOXMLIMPORT_TEST(testTdf95775, "tdf95775.docx") +{ + // This must not fail in layout +} + DECLARE_OOXMLIMPORT_TEST(testTdf78902, "tdf78902.docx") { // This hung in layout. diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx index e50c238..96ba5e4 100644 --- a/sw/source/core/doc/textboxhelper.cxx +++ b/sw/source/core/doc/textboxhelper.cxx @@ -496,6 +496,12 @@ void SwTextBoxHelper::syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_u case MID_FRMSIZE_IS_AUTO_HEIGHT: aPropertyName = UNO_NAME_FRAME_ISAUTOMATIC_HEIGHT; break; + case MID_FRMSIZE_REL_HEIGHT_RELATION: + aPropertyName = UNO_NAME_RELATIVE_HEIGHT_RELATION; + break; + case MID_FRMSIZE_REL_WIDTH_RELATION: + aPropertyName = UNO_NAME_RELATIVE_WIDTH_RELATION; + break; default: aPropertyName = UNO_NAME_SIZE; bAdjustSize = true; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits