sw/qa/extras/uiwriter/uiwriter.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit af47b54d49355a003deda722b5d0112a7b746485
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Jan 5 12:31:50 2016 +0100
CppunitTest_sw_uiwriter: tolerate lower than 276 in testTdf96536()
Seen on an OS X tinderbox from time to time, but not always.
Change-Id: Ie6796de5095a6d3b583fa8494444f4d662db8b12
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 03534e8..af882f1 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -2964,8 +2964,9 @@ void SwUiWriterTest::testTdf96536()
calcLayout();
// This was 552, page did not shrink after deleting the second paragraph.
- // 276 is 12pt font size + default line spacing (15%).
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(276),
parseDump("/root/infos/bounds", "height").toInt32());
+ // Expected 276, which is 12pt font size + default line spacing (15%), but
+ // tolerate some difference to that.
+ CPPUNIT_ASSERT(parseDump("/root/infos/bounds", "height").toInt32() <= 276);
}
void SwUiWriterTest::testTdf96479()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
