From 415436ad27b4522102d3fbbb6003935871029fc6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Sat, 28 Jul 2018 20:44:20 +0200 Subject: more windows tinderbox fix Change-Id: Ie17b27f89c3c6d2fb43b869985febd18921a99f0 Reviewed-on: https://gerrit.libreoffice.org/58259 Tested-by: Jenkins Reviewed-by: Noel Grandin --- vcl/qa/cppunit/complextext.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'vcl') diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 28a282ab3d17..96332585673b 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -85,16 +85,14 @@ void VclComplexTextTest::testArabic() #if !defined(_WIN32) std::vector aRefCharWidths {6, 9, 16, 16, 22, 22, 26, 29, 32, 32, 36, 40, 49, 53, 56, 63, 63, 66, 72, 72}; -#endif std::vector aCharWidths(aOneTwoThree.getLength(), 0); long nTextWidth = pOutDev->GetTextArray(aOneTwoThree, aCharWidths.data()); -#if !defined(_WIN32) CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths); - // this sporadically returns 75 on some of the windows tinderboxes eg. tb73 + // this sporadically returns 75 or 74 on some of the windows tinderboxes eg. tb73 CPPUNIT_ASSERT_EQUAL(72L, nTextWidth); -#endif CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back()); +#endif // text advance width and line height CPPUNIT_ASSERT_EQUAL(72L, pOutDev->GetTextWidth(aOneTwoThree)); -- cgit