vcl/qa/cppunit/complextext.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 01806eb7b96a79e3265e6ef8172e427226884574 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Apr 25 11:06:35 2019 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Apr 29 11:50:50 2019 +0200 test unreliable under windows Change-Id: I1f46c6043b3263ef983991ffa4aa0418006d55a7 Reviewed-on: https://gerrit.libreoffice.org/71292 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 3e898d3ce8f12c6f4b4f3a8202812fe8871e0a7f) Reviewed-on: https://gerrit.libreoffice.org/71419 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 96332585673b..0ff5234a2ff5 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -92,11 +92,11 @@ void VclComplexTextTest::testArabic() // this sporadically returns 75 or 74 on some of the windows tinderboxes eg. tb73 CPPUNIT_ASSERT_EQUAL(72L, nTextWidth); CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back()); -#endif // text advance width and line height CPPUNIT_ASSERT_EQUAL(72L, pOutDev->GetTextWidth(aOneTwoThree)); CPPUNIT_ASSERT_EQUAL(14L, pOutDev->GetTextHeight()); +#endif // exact bounding rectangle, not essentially the same as text width/height #if defined(MACOSX) || defined(_WIN32) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
