[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/qa

[Mike Kaganski (via logerrit)]

 sw/qa/extras/layout/layout.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6c6975510a5148a17cf507cf825b63f137ddd14e
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Jul 10 14:28:13 2019 +1000
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Mon Sep 16 16:30:26 2019 +0200

    Disable (again) part of testBtlrCell on Windows
    
    This test fails on my system; the actual values likely depend on DPI
    scaling, but even with scale set to 100%, it fails. This is strange,
    considering that the test passes on Windows buildbots.
    
    After commit 3f7e8ddea89f6340cd18b5b34f5a7c5f503962be
    
    Change-Id: Ia8c2e695ed918c3145dcd472e1da52398c1a8f52
    Reviewed-on: https://gerrit.libreoffice.org/75335
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/79015

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 5548484c3874..f59b4b069ca4 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2768,7 +2768,7 @@ void SwLayoutWriter::testBtlrCell()
     // doc model).
     assertXPath(pXmlDoc, "//font[1]", "orientation", "900");
 
-#ifndef MACOSX // macOS fails with actual == 2662 for some reason.
+#if !defined(MACOSX) && !defined(_WIN32) // macOS fails with actual == 2662 for some reason.
     // Without the accompanying fix in place, this test would have failed with 'Expected: 1915;
     // Actual  : 1756', i.e. the AAA1 text was too close to the left cell border due to an ascent vs
     // descent mismatch when calculating the baseline offset of the text portion.