diff options
Diffstat (limited to 'vcl/aqua/source/a11y/aqua11ywrapper.mm')
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapper.mm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm index 1f6f2d53cf81..ce2db7745c30 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm @@ -64,7 +64,7 @@ using namespace ::com::sun::star::uno; -(Reference<XAccessibleContext>)accessibleContext; @end -static MacOSBOOL isPopupMenuOpen = NO; +static BOOL isPopupMenuOpen = NO; @implementation AquaA11yWrapper : NSView @@ -155,7 +155,7 @@ static MacOSBOOL isPopupMenuOpen = NO; // (getter without parameter) attributeNameHereAttribute // (getter with parameter) attributeNameHereAttributeForParameter: // (setter) setAttributeNameHereAttributeForElement:to: --(SEL)selectorForAttribute:(NSString *)attribute asGetter:(MacOSBOOL)asGetter withGetterParameter:(MacOSBOOL)withGetterParameter { +-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter withGetterParameter:(BOOL)withGetterParameter { SEL selector = nil; NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ]; @try { @@ -198,7 +198,7 @@ static MacOSBOOL isPopupMenuOpen = NO; return Reference < XAccessible > (); } --(MacOSBOOL)isFirstRadioButtonInGroup { +-(BOOL)isFirstRadioButtonInGroup { Reference < XAccessible > rFirstMateAccessible = [ self getFirstRadioButtonInGroup ]; if ( rFirstMateAccessible.is() && rFirstMateAccessible -> getAccessibleContext().get() == [ self accessibleContext ] ) { return YES; @@ -694,12 +694,12 @@ static MacOSBOOL isPopupMenuOpen = NO; return value; } --(MacOSBOOL)accessibilityIsIgnored { +-(BOOL)accessibilityIsIgnored { // #i90575# guard NSAccessibility protocol against unwanted access if ( isPopupMenuOpen ) { return nil; } - MacOSBOOL ignored = NO; + BOOL ignored = NO; sal_Int16 nRole = [ self accessibleContext ] -> getAccessibleRole(); switch ( nRole ) { case AccessibleRole::PANEL: @@ -797,8 +797,8 @@ static MacOSBOOL isPopupMenuOpen = NO; } } --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute { - MacOSBOOL isSettable = NO; +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute { + BOOL isSettable = NO; if ( [ self accessibleText ] != nil ) { isSettable = [ AquaA11yTextWrapper isAttributeSettable: attribute forElement: self ]; } @@ -831,7 +831,7 @@ static MacOSBOOL isPopupMenuOpen = NO; return nil; // TODO: to be completed } --(MacOSBOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute { +-(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute { return NO; // TODO } @@ -905,7 +905,7 @@ static MacOSBOOL isPopupMenuOpen = NO; // get some information NSString * role = (NSString *) [ self accessibilityAttributeValue: NSAccessibilityRoleAttribute ]; id enabledAttr = [ self enabledAttribute ]; - MacOSBOOL enabled = [ enabledAttr boolValue ]; + BOOL enabled = [ enabledAttr boolValue ]; NSView * parent = (NSView *) [ self accessibilityAttributeValue: NSAccessibilityParentAttribute ]; AquaA11yWrapper * parentAsWrapper = nil; if ( [ parent isKindOfClass: [ AquaA11yWrapper class ] ] ) { @@ -948,8 +948,8 @@ static MacOSBOOL isPopupMenuOpen = NO; #pragma mark - #pragma mark Hit Test --(MacOSBOOL)isViewElement:(NSObject *)viewElement hitByPoint:(NSPoint)point { - MacOSBOOL hit = NO; +-(BOOL)isViewElement:(NSObject *)viewElement hitByPoint:(NSPoint)point { + BOOL hit = NO; NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ]; NSValue * position = [ viewElement accessibilityAttributeValue: NSAccessibilityPositionAttribute ]; NSValue * size = [ viewElement accessibilityAttributeValue: NSAccessibilitySizeAttribute ]; @@ -1128,15 +1128,15 @@ Reference < XAccessibleContext > hitTestRunner ( com::sun::star::awt::Point poin return mDefaultFontsize; } --(void)setActsAsRadioGroup:(MacOSBOOL)actsAsRadioGroup { +-(void)setActsAsRadioGroup:(BOOL)actsAsRadioGroup { mActsAsRadioGroup = actsAsRadioGroup; } --(MacOSBOOL)actsAsRadioGroup { +-(BOOL)actsAsRadioGroup { return mActsAsRadioGroup; } -+(void)setPopupMenuOpen:(MacOSBOOL)popupMenuOpen { ++(void)setPopupMenuOpen:(BOOL)popupMenuOpen { isPopupMenuOpen = popupMenuOpen; } |