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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Feb 20 22:18:30 UTC 2020


 sw/qa/core/uwriter.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 023ec0495e93deb1303f02ba53617b666b8c0687
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Feb 20 18:24:52 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Feb 20 23:17:50 2020 +0100

    Remove dead conditional
    
    Clang 4 is no longer supported on Linux since
    685aca47da835e80f34b295c5d6389df03d1a8c2 "Bump (Linux) Clang baseline to 5.0.2"
    and Xcode 9 is no longer supported on macOS since
    358146bbbd1b9775c12770fb5e497b6ec5adfc51 "Bump macOS build baseline to
    Xcode 11.3 and macOS 10.14.4".
    
    Change-Id: I7f82b703f6a1f1dcd2ae322363b1813a8c3be948
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89161
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 1d7c131c4d5a..079f7e311245 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -1462,16 +1462,9 @@ void SwDocTest::testTableAutoFormats()
     CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).GetLinebreak() == aLBreak ) );
     //Get m_aRotateAngle
     CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).GetRotateAngle() == aRAngle ) );
-#if !((defined(__clang__) && __clang_major__ == 4 && __clang_minor__ == 0) \
-      || (defined __APPLE__ && defined __clang__ \
-          && defined __apple_build_version__ \
-          && __apple_build_version__ >= 9000000 \
-          && __apple_build_version__ <= 9000099))
-        // Temporary fix for mysterious problem with Clang in F26 and Xcode 9
     //Get m_aRotateMode
     //SvxRotateModeItem aRMode = aBoxAF.m_aRotateMode;GetRotateMode
     CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).GetRotateMode() == aSvxRotateModeItem ) );
-#endif
     //Get m_sNumFormatString
     CPPUNIT_ASSERT( bool( pLoadAF->GetBoxFormat(0).GetNumFormatString() == aNFString ) );
     //Get m_eSysLanguage


More information about the Libreoffice-commits mailing list