MACOSX_SDK_VERSION is always at least 1090

Desktop / LibreOffice - Tor Lillqvist [collabora.com] - 13 November 2017 08:43 EST



###

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index a4083c3625b5..4965ea11830b 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -41,14 +41,10 @@
#ifdef MACOSX
#include
#include
- #if MACOSX_SDK_VERSION == 1080
- #import
- #else
- #import
- #import
- #import
- #import
- #endif
+ #import
+ #import
+ #import
+ #import
#include
#import "OSXBluetooth.h"
#include "OSXBluetoothWrapper.hxx"
diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm
index 425534a8f898..34408ba0af6e 100644
--- a/vcl/osx/a11ytextattributeswrapper.mm
+++ b/vcl/osx/a11ytextattributeswrapper.mm
@@ -108,20 +108,12 @@ using namespace ::com::sun::star::uno;
@implementation AquaA11yTextAttributesWrapper : NSObject

+(int)convertUnderlineStyle:(PropertyValue)property {
-#if MACOSX_SDK_VERSION >= 1090
int underlineStyle = NSUnderlineStyleNone;
-#else
- int underlineStyle = NSNoUnderlineStyle;
-#endif
sal_Int16 value = 0;
property.Value >>= value;
if ( value != ::css_awt::FontUnderline::NONE
&& value != ::css_awt::FontUnderline::DONTKNOW) {
-#if MACOSX_SDK_VERSION >= 1090
underlineStyle = NSUnderlineStyleSingle;
-#else
- underlineStyle = NSSingleUnderlineStyle;
-#endif
}
return underlineStyle;
}
@@ -227,11 +219,7 @@ using namespace ::com::sun::star::uno;
if ( property.Value.hasValue() ) {
if ( property.Name.equals ( attrUnderline ) ) {
int style = [ AquaA11yTextAttributesWrapper convertUnderlineStyle: property ];
-#if MACOSX_SDK_VERSION >= 1090
if ( style != NSUnderlineStyleNone ) {
-#else
- if ( style != NSNoUnderlineStyle ) {
-#endif
[ string addAttribute: NSAccessibilityUnderlineTextAttribute value: [ NSNumber numberWithInt: style ] range: range ];
}
} else if ( property.Name.equals ( attrFontname ) ) {
diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx
index 4285d418da84..d103ba99e5b2 100644
--- a/vcl/osx/salprn.cxx
+++ b/vcl/osx/salprn.cxx
@@ -64,13 +64,8 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
{
mpPrintInfo = [pShared copy];
[mpPrintInfo setPrinter: mpPrinter];
-#if MACOSX_SDK_VERSION >= 1090
mePageOrientation = ([mpPrintInfo orientation] == NSPaperOrientationPortrait) ? Orientation::Landscape : Orientation::Portrait;
[mpPrintInfo setOrientation: NSPaperOrientationPortrait];
-#else
- mePageOrientation = ([mpPrintInfo orientation] == NSLandscapeOrientation) ? Orientation::Landscape : Orientation::Portrait;
- [mpPrintInfo setOrientation: NSPortraitOrientation];
-#endif
}

mpGraphics = new AquaSalGraphics();

9d9b3a61b123 MACOSX_SDK_VERSION is always at least 1090
sd/source/ui/remotecontrol/BluetoothServer.cxx | 12 ++++--------
vcl/osx/a11ytextattributeswrapper.mm | 12 ------------
vcl/osx/salprn.cxx | 5 -----
3 files changed, 4 insertions(+), 25 deletions(-)

Upstream: cgit.freedesktop.org


  • Share