sw/qa/extras/layout/layout.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
New commits: commit 5583ee37101a748d901fae1da315aeb453278ecd Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Wed Jul 10 14:28:13 2019 +1000 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Wed Jul 10 15:15:11 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 <glo...@fbihome.de> Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> Tested-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index b1e11c05e754..d13cda44b1b9 100644 --- a/sw/qa/extras/layout/layout.cxx +++ b/sw/qa/extras/layout/layout.cxx @@ -2865,7 +2865,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testBtlrCell) // doc model). assertXPath(pXmlDoc, "//font[1]", "orientation", "900"); -#ifndef MACOSX // macOS fails with x == 2662 for some reason. +#if !defined(MACOSX) && !defined(_WIN32) // macOS fails with x == 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. _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits