summaryrefslogtreecommitdiff
path: root/sw/qa/extras/layout/layout.cxx
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2019-06-25 19:56:13 +0000
committerJan-Marek Glogowski <glogow@fbihome.de>2019-07-05 20:05:59 +0200
commit3f7e8ddea89f6340cd18b5b34f5a7c5f503962be (patch)
tree32b7a033e628e5493fb5e18a8593f442eed23389 /sw/qa/extras/layout/layout.cxx
parent368c996b24e09c427a30972b3405493328db6779 (diff)
Enable many more unit tests on all archs
This depends on commit "Make font-based unit test depend on instdir fonts, not that it's sure that this really fixes the problem, as its origin is really unknown. It especially enables all the font-based tests I could find on all archs. Same for many more test where I couldn't see any reason they don't work generally. To get rid of even more ifdefs, it moves these from the class to the functions, so there is actually just one needed for any test. As a result some few tests run but do nothing. There is still some problem with embedded fonts on MacOS and with delayed graphics loading on Windows, so these ifdefs are kept. Change-Id: I63f8424e9debda6cbf3e5777c93245e09f8eb0f2 Reviewed-on: https://gerrit.libreoffice.org/74719 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sw/qa/extras/layout/layout.cxx')
-rw-r--r--sw/qa/extras/layout/layout.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 325c0ef49e64..b1e11c05e754 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");
-#if !defined(MACOSX) && !defined(_WIN32) // macOS fails with actual == 2662 for some reason.
+#ifndef MACOSX // 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.