vcl/qa/cppunit/complextext.cxx | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
New commits:
commit 536666539ce999cfe97378671a7186e38c32bdfc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu May 16 11:45:48 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Thu May 16 14:53:05 2019 +0200
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 <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
