[Libreoffice-commits] core.git: sw/qa

[Stephan Bergmann]

 sw/qa/core/uwriter.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 80d135922d5a5d0fd0d7178935653870cecf58ea
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 26 11:13:29 2017 +0200

    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

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 ) );