[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - vcl/osx

[rbuj]

 vcl/osx/a11ytextattributeswrapper.mm |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit f3c81c8352185079670e90f85094bdbcce069b5f
Author: rbuj <robert.buj at gmail.com>
Date:   Wed Jun 11 19:56:21 2014 +0200

    'NSNoUnderlineStyle' & ‘NSSingleUnderlineStyle’: Deprecated in OS X 10.9
    
    Change-Id: Id25d27f77c43c5fa11ff03aa38edcaec762caf61
    Reviewed-on: https://gerrit.libreoffice.org/9739
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/osx/a11ytextattributeswrapper.mm b/vcl/osx/a11ytextattributeswrapper.mm
index e129ac92..12497bb 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 ) ) {