[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - vcl/qa

[Mike Kaganski (via logerrit)]

 vcl/qa/cppunit/complextext.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf45c0f1826d93005826c71cd9baea504a4d9d6f
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Mar 31 09:43:01 2021 +0300
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Wed Mar 31 14:56:02 2021 +0200

    Fix the test in Windows RDP sessions
    
    Without the fix, this is failing there with
    
      Test name: VclComplexTextTest::testArabic
      equality assertion failed
      - Expected: 71x14@(0,1)
      - Actual  : 70x14@(1,1)
    
    See also commit 6f995da5a652d993ab253b3363188cd18e289728, that
    tried to address the same issue (it was reverted later in commit
    536666539ce999cfe97378671a7186e38c32bdfc).
    
    Change-Id: I708c22deb5f1f8a59e2e22cba14b298acaa81d5e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113396
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Signed-off-by: Xisco Fauli <xiscofauli at libreoffice.org>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113357
    Reviewed-by: Michael Stahl <michael.stahl at allotropia.de>

diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index ad8f645b3b6f..4d4c112638e4 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -91,7 +91,7 @@ void VclComplexTextTest::testArabic()
     CPPUNIT_ASSERT_EQUAL(tools::Long(14), pOutDev->GetTextHeight());
 
     // exact bounding rectangle, not essentially the same as text width/height
-    tools::Rectangle aBoundRect, aTestRect( 0, 1, 71, 15 );
+    tools::Rectangle aBoundRect, aTestRect(isWindowsRDP() ? 1 : 0, 1, 71, 15);
     pOutDev->GetTextBoundRect(aBoundRect, aOneTwoThree);
     CPPUNIT_ASSERT_EQUAL(aTestRect, aBoundRect);