diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-11-13 10:42:43 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-11-13 10:43:38 +0200 |
| commit | 9d9b3a61b1233fa6e1f399dcfba1e79f65f56caf (patch) | |
| tree | 492e4139610ce634bcba879d6caefd05ccc849ba /vcl | |
| parent | 791ab22556e7926f87dc2345ab49738ae6e67a24 (diff) | |
MACOSX_SDK_VERSION is always at least 1090
Change-Id: I802d9aae2220ae6b8f67e3387c3b329f6b02163c
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/a11ytextattributeswrapper.mm | 12 | ||||
| -rw-r--r-- | vcl/osx/salprn.cxx | 5 |
2 files changed, 0 insertions, 17 deletions
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(); |