From ec147012340219c8bb5eaf8fe3d41be7836bc261 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@collabora.com>
Date: Wed, 1 Oct 2014 10:55:14 +0300
Subject: We require OS X SDK 10.8 or newer now

Change-Id: I68eee76c8710c89af8e3c1e1006345f908923ece
---
 bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 24 ------------------------
 filter/qa/cppunit/xslt-test.cxx                |  2 --
 sal/qa/osl/process/osl_process.cxx             |  2 +-
 vcl/osx/salframe.cxx                           |  4 ----
 4 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
index aa9cf6cb4e98..838743a51c1f 100644
--- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx
@@ -20,9 +20,6 @@
 #include <typeinfo>
 
 #include <dlfcn.h>
-#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070
-#include <cxxabi.h>
-#endif
 
 #include <boost/static_assert.hpp>
 #include <boost/unordered_map.hpp>
@@ -58,31 +55,15 @@ BOOST_STATIC_ASSERT(
 
 struct Fake_class_type_info: Fake_type_info {};
 
-#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070
-BOOST_STATIC_ASSERT(
-    sizeof (Fake_class_type_info) == sizeof (__cxxabiv1::__class_type_info));
-#endif
-
 struct Fake_si_class_type_info: Fake_class_type_info {
     void const * base;
 };
 
-#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070
-BOOST_STATIC_ASSERT(
-    sizeof (Fake_si_class_type_info)
-    == sizeof (__cxxabiv1::__si_class_type_info));
-#endif
-
 struct Base {};
 struct Derived: Base {};
 
 std::type_info * createFake_class_type_info(char const * name) {
     char * buf = new char[sizeof (Fake_class_type_info)];
-#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070
-    assert(
-        dynamic_cast<__cxxabiv1::__class_type_info const *>(&typeid(Base))
-        != 0);
-#endif
     *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>(
         &typeid(Base));
         // copy __cxxabiv1::__class_type_info vtable into place
@@ -99,11 +80,6 @@ std::type_info * createFake_si_class_type_info(
     char const * name, std::type_info const * base)
 {
     char * buf = new char[sizeof (Fake_si_class_type_info)];
-#if defined(MACOSX) && MACOSX_SDK_VERSION < 1070
-    assert(
-        dynamic_cast<__cxxabiv1::__si_class_type_info const *>(&typeid(Derived))
-        != 0);
-#endif
     *reinterpret_cast<void **>(buf) = *reinterpret_cast<void * const *>(
         &typeid(Derived));
         // copy __cxxabiv1::__si_class_type_info vtable into place
diff --git a/filter/qa/cppunit/xslt-test.cxx b/filter/qa/cppunit/xslt-test.cxx
index d96e68d4c454..1a580d0b36a2 100644
--- a/filter/qa/cppunit/xslt-test.cxx
+++ b/filter/qa/cppunit/xslt-test.cxx
@@ -46,10 +46,8 @@ public:
     void testXsltCopyNew();
 
     CPPUNIT_TEST_SUITE(XsltFilterTest);
-#if !(defined(MACOSX) && (MACOSX_SDK_VERSION < 1060))
     CPPUNIT_TEST(testXsltCopyOld);
     CPPUNIT_TEST(testXsltCopyNew);
-#endif
     CPPUNIT_TEST_SUITE_END();
 };
 
diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 14c7bf581ef1..4713e5f48a98 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -466,7 +466,7 @@ public:
 
     CPPUNIT_TEST_SUITE(Test_osl_executeProcess);
     //TODO: Repair these (at least under Windows)
-#if !defined(WNT) && !(defined(MACOSX) && (MACOSX_SDK_VERSION < 1060))
+#if !defined(WNT)
     CPPUNIT_TEST(osl_execProc_parent_equals_child_environment);
     CPPUNIT_TEST(osl_execProc_merged_child_environment);
 #endif
diff --git a/vcl/osx/salframe.cxx b/vcl/osx/salframe.cxx
index 9e00d4054b45..43a0674da8da 100644
--- a/vcl/osx/salframe.cxx
+++ b/vcl/osx/salframe.cxx
@@ -1246,11 +1246,7 @@ void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
     getAppleScrollBarVariant(aStyleSettings);
 
     // set scrollbar size
-#if MACOSX_SDK_VERSION >= 1070
     aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidthForControlSize:NSRegularControlSize scrollerStyle:NSScrollerStyleLegacy]) );
-#else
-    aStyleSettings.SetScrollBarSize( static_cast<long int>([NSScroller scrollerWidth]) );
-#endif
     // images in menus false for MacOSX
     aStyleSettings.SetPreferredUseImagesInMenus( false );
     aStyleSettings.SetHideDisabledMenuItems( true );
-- 
cgit