diff options
| author | rbuj <robert.buj@gmail.com> | 2014-06-11 21:44:52 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-06-12 13:06:49 +0000 |
| commit | 7b832d545acb91cc343d26e8bf26e6a844040183 (patch) | |
| tree | a26f616bd04e01d381644c9d2d983bf974ff22ff /vcl | |
| parent | 202dac6e20f75e87edab3368bb0882d59494d864 (diff) | |
'NSNoUnderlineStyle' & ‘NSSingleUnderlineStyle’: Deprecated in OS X 10.9
Change-Id: If18df0c06a1bdec5ea54307f9c452a1edf533e15
Reviewed-on: https://gerrit.libreoffice.org/9740
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/a11ytextattributeswrapper.mm | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm index e129ac927f4e..12497bb9a775 100644 --- a/vcl/osx/a11ytextattributeswrapper.mm +++ b/vcl/osx/a11ytextattributeswrapper.mm @@ -107,12 +107,20 @@ using namespace ::rtl; @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; } @@ -218,7 +226,11 @@ using namespace ::rtl; 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 ) ) { |