Kaydet (Commit) 9d9b3a61 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

MACOSX_SDK_VERSION is always at least 1090

Change-Id: I802d9aae2220ae6b8f67e3387c3b329f6b02163c
üst 791ab225
...@@ -41,14 +41,10 @@ ...@@ -41,14 +41,10 @@
#ifdef MACOSX #ifdef MACOSX
#include <osl/conditn.hxx> #include <osl/conditn.hxx>
#include <premac.h> #include <premac.h>
#if MACOSX_SDK_VERSION == 1080 #import <CoreFoundation/CoreFoundation.h>
#import <IOBluetooth/IOBluetooth.h> #import <IOBluetooth/IOBluetoothUtilities.h>
#else #import <IOBluetooth/objc/IOBluetoothSDPUUID.h>
#import <CoreFoundation/CoreFoundation.h> #import <IOBluetooth/objc/IOBluetoothSDPServiceRecord.h>
#import <IOBluetooth/IOBluetoothUtilities.h>
#import <IOBluetooth/objc/IOBluetoothSDPUUID.h>
#import <IOBluetooth/objc/IOBluetoothSDPServiceRecord.h>
#endif
#include <postmac.h> #include <postmac.h>
#import "OSXBluetooth.h" #import "OSXBluetooth.h"
#include "OSXBluetoothWrapper.hxx" #include "OSXBluetoothWrapper.hxx"
......
...@@ -108,20 +108,12 @@ using namespace ::com::sun::star::uno; ...@@ -108,20 +108,12 @@ using namespace ::com::sun::star::uno;
@implementation AquaA11yTextAttributesWrapper : NSObject @implementation AquaA11yTextAttributesWrapper : NSObject
+(int)convertUnderlineStyle:(PropertyValue)property { +(int)convertUnderlineStyle:(PropertyValue)property {
#if MACOSX_SDK_VERSION >= 1090
int underlineStyle = NSUnderlineStyleNone; int underlineStyle = NSUnderlineStyleNone;
#else
int underlineStyle = NSNoUnderlineStyle;
#endif
sal_Int16 value = 0; sal_Int16 value = 0;
property.Value >>= value; property.Value >>= value;
if ( value != ::css_awt::FontUnderline::NONE if ( value != ::css_awt::FontUnderline::NONE
&& value != ::css_awt::FontUnderline::DONTKNOW) { && value != ::css_awt::FontUnderline::DONTKNOW) {
#if MACOSX_SDK_VERSION >= 1090
underlineStyle = NSUnderlineStyleSingle; underlineStyle = NSUnderlineStyleSingle;
#else
underlineStyle = NSSingleUnderlineStyle;
#endif
} }
return underlineStyle; return underlineStyle;
} }
...@@ -227,11 +219,7 @@ using namespace ::com::sun::star::uno; ...@@ -227,11 +219,7 @@ using namespace ::com::sun::star::uno;
if ( property.Value.hasValue() ) { if ( property.Value.hasValue() ) {
if ( property.Name.equals ( attrUnderline ) ) { if ( property.Name.equals ( attrUnderline ) ) {
int style = [ AquaA11yTextAttributesWrapper convertUnderlineStyle: property ]; int style = [ AquaA11yTextAttributesWrapper convertUnderlineStyle: property ];
#if MACOSX_SDK_VERSION >= 1090
if ( style != NSUnderlineStyleNone ) { if ( style != NSUnderlineStyleNone ) {
#else
if ( style != NSNoUnderlineStyle ) {
#endif
[ string addAttribute: NSAccessibilityUnderlineTextAttribute value: [ NSNumber numberWithInt: style ] range: range ]; [ string addAttribute: NSAccessibilityUnderlineTextAttribute value: [ NSNumber numberWithInt: style ] range: range ];
} }
} else if ( property.Name.equals ( attrFontname ) ) { } else if ( property.Name.equals ( attrFontname ) ) {
......
...@@ -64,13 +64,8 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) : ...@@ -64,13 +64,8 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
{ {
mpPrintInfo = [pShared copy]; mpPrintInfo = [pShared copy];
[mpPrintInfo setPrinter: mpPrinter]; [mpPrintInfo setPrinter: mpPrinter];
#if MACOSX_SDK_VERSION >= 1090
mePageOrientation = ([mpPrintInfo orientation] == NSPaperOrientationPortrait) ? Orientation::Landscape : Orientation::Portrait; mePageOrientation = ([mpPrintInfo orientation] == NSPaperOrientationPortrait) ? Orientation::Landscape : Orientation::Portrait;
[mpPrintInfo setOrientation: NSPaperOrientationPortrait]; [mpPrintInfo setOrientation: NSPaperOrientationPortrait];
#else
mePageOrientation = ([mpPrintInfo orientation] == NSLandscapeOrientation) ? Orientation::Landscape : Orientation::Portrait;
[mpPrintInfo setOrientation: NSPortraitOrientation];
#endif
} }
mpGraphics = new AquaSalGraphics(); mpGraphics = new AquaSalGraphics();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment