diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-05-16 11:45:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-16 14:53:05 +0200 |
| commit | 536666539ce999cfe97378671a7186e38c32bdfc (patch) | |
| tree | 21899337dc921d98b3de8e3138f570ebe068b419 /vcl/qa | |
| parent | 4c4c5baaf017b2861daf039de179eaa7303b13b0 (diff) | |
vcl_complextext is still unreliable under windows
Change-Id: Ia6ecd04b81abb751bd7159ca8432c00f97ab5e2d
Reviewed-on: https://gerrit.libreoffice.org/72407
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/qa')
| -rw-r--r-- | vcl/qa/cppunit/complextext.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index eb2913b75ae9..c2a5aa4cba31 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -87,6 +87,7 @@ void VclComplexTextTest::testArabic() // absolute character widths AKA text array. #if !defined(_WIN32) + // FIXME: fails on some windows tinderboxes std::vector<long> aRefCharWidths {6, 9, 16, 16, 22, 22, 26, 29, 32, 32, 36, 40, 49, 53, 56, 63, 63, 66, 72, 72}; std::vector<long> aCharWidths(aOneTwoThree.getLength(), 0); @@ -100,23 +101,17 @@ void VclComplexTextTest::testArabic() // 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) +#if defined(MACOSX) // FIXME: fails on some Linux tinderboxes, might be a FreeType issue. tools::Rectangle aBoundRect, aTestRect( 0, 1, 71, 15 ); pOutDev->GetTextBoundRect(aBoundRect, aOneTwoThree); -#if defined(_WIN32) - // if run on Win7 KVM QXL / Spice GUI, we "miss" the first pixel column?! - if ( 1 == aBoundRect.Left() ) - { - aTestRect.AdjustLeft(1); - } -#endif CPPUNIT_ASSERT_EQUAL(aTestRect, aBoundRect); #endif +#endif + // normal orientation tools::Rectangle aInput; tools::Rectangle aRect = pOutDev->GetTextRect( aInput, aOneTwoThree ); |