diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-09-26 11:13:29 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-09-26 11:13:29 +0200 |
| commit | 80d135922d5a5d0fd0d7178935653870cecf58ea (patch) | |
| tree | fff58fc1b1f1c3039e13c22dc87560cf2ad6a120 /sw/qa/core | |
| parent | 56a695fddb915bcba13b088b5b2b4e0841d4acbc (diff) | |
Blind fix for Xcode 9
...which started to run into the same undefined reference issue as
5a55bef38b047b9c60d1b219c572287938265610 "Temporary fix for Clang on F26".
(Unfortunately, Apple's Xcode Clang uses version numbers that can be confused
with upstream Clang version numbers, so this patch will also affect users of
upstream Clang 9.0 on macOS, when that eventually gets released.)
Change-Id: I721f01f76d93c044fdbc02e68002b60b17b5e9fb
Diffstat (limited to 'sw/qa/core')
| -rw-r--r-- | sw/qa/core/uwriter.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx index f2c0fa9e170d..dd20d3fbceac 100644 --- a/sw/qa/core/uwriter.cxx +++ b/sw/qa/core/uwriter.cxx @@ -1411,7 +1411,10 @@ void SwDocTest::testTableAutoFormats() CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).m_aLinebreak == aLBreak ) ); //Get m_aRotateAngle CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).m_aRotateAngle == aRAngle ) ); -#if !(defined(__clang__) && __clang_major__ == 4 && __clang_minor__ == 0) // Temporary fix for mysterious problem with Clang on F26 +#if !((defined(__clang__) && __clang_major__ == 4 && __clang_minor__ == 0) \ + || (defined __APPLE__ && defined __clang__ && __clang_major__ == 9 \ + && __clang_minor__ == 0)) + // Temporary fix for mysterious problem with Clang in F26 and Xcode 9 //Get m_aRotateMode SvxRotateModeItem aRMode = aBoxAF.m_aRotateMode; CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).m_aRotateMode == aRMode ) ); |