Drop workarounds for Mac OS X SDKs 10.4 and 10.5

Change-Id: Ifa07f9b5613b4a75c5b72178cb276b9c0b495a62

4 files changed, 0 insertions, 39 deletions

diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
index e3abc2fb8a0b..339c36cdcf63 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.m
@@ -26,16 +26,8 @@
  *
  ************************************************************************/
 
-#import <Foundation/NSObjCRuntime.h>
-#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-@class CALayer;
-@class NSViewController;
-typedef int NSColorRenderingIntent;
-#endif
-
 #import "OGLTrans_Shaders.h"
 
-
 @implementation OGLShaders
 
 - (id) init
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
index 0d7fcbb5a514..a0c195b514ff 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.mm
@@ -26,13 +26,6 @@
  *
  ************************************************************************/
 
-#import <Foundation/NSObjCRuntime.h>
-#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-@class CALayer;
-@class NSViewController;
-typedef int NSColorRenderingIntent;
-#endif
-
 #include "OGLTrans_TransitionImpl.hxx"
 #include "OGLTrans_Shaders.h"
 #include <OpenGL/gl.h>
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index 1a55e41b4050..d2421a359f12 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -205,19 +205,11 @@ private:
     
     /** OpenGL handle to the leaving slide's texture
     */
-#if defined(MAC_OS_X_VERSION_10_5) || defined(MAC_OS_X_VERSION_10_6)
     GLuint GLleavingSlide;
-#else /* build target 10.4 */ 
-    unsigned long int GLleavingSlide;
-#endif
 
     /** OpenGL handle to the entering slide's texture
     */
-#if defined(MAC_OS_X_VERSION_10_5) || defined(MAC_OS_X_VERSION_10_6)
     GLuint GLenteringSlide;
-#else /* build target 10.4 */ 
-    unsigned long int GLenteringSlide;
-#endif 
     
     /** pointer to our window which we MIGHT create.
     */
@@ -782,11 +774,7 @@ void SAL_CALL OGLTransitionerImpl::update( double nTime ) throw (uno::RuntimeExc
                               static_cast<double>(GLWin.Height) );
 */
     // works but not mandatory
-#if defined(MAC_OS_X_VERSION_10_5)
     GLint swapInt = 1;
-#else /* build target 10.4 */ 
-    long swapInt = 1;
-#endif
     [[GLWin.pAquaOpenGLView openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync
 
     NSOpenGLContext* context = [GLWin.pAquaOpenGLView openGLContext];
diff --git a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
index 3dd2fa00082d..afdfc9b23e30 100644
--- a/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
+++ b/slideshow/source/engine/OGLTrans/mac/aquaOpenGLView.m
@@ -3,13 +3,6 @@
  *  aquaOpenGLView.m
  */
 
-#import <Foundation/NSObjCRuntime.h>
-#if defined (NSFoundationVersionNumber10_5) &&  MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-@class CALayer;
-@class NSViewController;
-typedef int NSColorRenderingIntent;
-#endif
-
 #include <Cocoa/Cocoa.h>
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
@@ -81,12 +74,7 @@ typedef int NSColorRenderingIntent;
 - (void)prepareOpenGL
 {
     // for overriding to initialize OpenGL state, occurs after context creation
-#if MACOSX_SDK_VERSION < 1050
-    long swapInt = 1;
-#else
     GLint swapInt = 1;
-#endif
-
 
     [[self openGLContext] setValues:&swapInt forParameter:NSOpenGLCPSwapInterval]; // set to vbl sync