diff options
author | Carsten Driesner <cd@openoffice.org> | 2011-01-19 15:42:25 +0100 |
---|---|---|
committer | Carsten Driesner <cd@openoffice.org> | 2011-01-19 15:42:25 +0100 |
commit | 8a8205b575e8fda5aa30fa2352a28fb57c1e0f47 (patch) | |
tree | 1dd951474fa5b4646e2061cf05899b4b1286a99f /vcl/aqua/source/a11y | |
parent | a6813969c3f073cae588d43e502154d148b982a2 (diff) |
removetooltypes01: #i112600# Make changes for MacOSX to remove tools types inc VCL and other projects
Diffstat (limited to 'vcl/aqua/source/a11y')
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ycomponentwrapper.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yfactory.mm | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yselectionwrapper.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yselectionwrapper.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm | 10 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ytextwrapper.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ytextwrapper.mm | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yvaluewrapper.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11yvaluewrapper.mm | 4 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapper.mm | 28 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappercheckbox.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappercombobox.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrappercombobox.mm | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h | 2 | ||||
-rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm | 2 |
17 files changed, 38 insertions, 38 deletions
diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h index c1806054e253..6d44f62b5611 100644 --- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h @@ -38,7 +38,7 @@ +(id)positionAttributeForElement:(AquaA11yWrapper *)wrapper; +(id)descriptionAttributeForElement:(AquaA11yWrapper *)wrapper; +(void)addAttributeNamesTo:(NSMutableArray *)attributeNames; -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; +(void)setFocusedAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; @end diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm index a700b0b89ae9..c66e7c3d8515 100644 --- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm @@ -75,8 +75,8 @@ using namespace ::com::sun::star::uno; [ pool release ]; } -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { - MacOSBOOL isSettable = NO; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { + BOOL isSettable = NO; NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ]; if ( [ attribute isEqualToString: NSAccessibilityFocusedAttribute ] && ! [ [ AquaA11yRoleHelper getNativeRoleFrom: [ wrapper accessibleContext ] ] isEqualToString: NSAccessibilityScrollBarRole ] diff --git a/vcl/aqua/source/a11y/aqua11yfactory.mm b/vcl/aqua/source/a11y/aqua11yfactory.mm index 7732ce202cd2..5dcdf4bb9f61 100644 --- a/vcl/aqua/source/a11y/aqua11yfactory.mm +++ b/vcl/aqua/source/a11y/aqua11yfactory.mm @@ -95,11 +95,11 @@ static bool enabled = false; return [ AquaA11yFactory wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: YES asRadioGroup: NO ]; } -+(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(MacOSBOOL) bCreate { ++(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate { return [ AquaA11yFactory wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: bCreate asRadioGroup: NO ]; } -+(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(MacOSBOOL) bCreate asRadioGroup:(MacOSBOOL) asRadioGroup{ ++(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate asRadioGroup:(BOOL) asRadioGroup{ NSMutableDictionary * dAllWrapper = [ AquaA11yFactory allWrapper ]; NSValue * nKey = nil; if ( asRadioGroup ) { diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h index a88e6c71c04b..bf290990faa2 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h @@ -36,7 +36,7 @@ } +(id)selectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper; +(void)addAttributeNamesTo:(NSMutableArray *)attributeNames; -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; +(void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; @end diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm index 804cf108dba8..9368c599d131 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm @@ -65,7 +65,7 @@ using namespace ::com::sun::star::uno; [ attributeNames addObject: NSAccessibilitySelectedChildrenAttribute ]; } -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { if ( [ attribute isEqualToString: NSAccessibilitySelectedChildrenAttribute ] ) { diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm index 6577cebf295e..60b12c762b25 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm @@ -77,8 +77,8 @@ using namespace ::rtl; return italicStyle; } -+(MacOSBOOL)isStrikethrough:(PropertyValue)property { - MacOSBOOL strikethrough = NO; ++(BOOL)isStrikethrough:(PropertyValue)property { + BOOL strikethrough = NO; sal_Int16 value = 0; property.Value >>= value; if ( value != FontStrikeout::NONE @@ -88,8 +88,8 @@ using namespace ::rtl; return strikethrough; } -+(MacOSBOOL)convertBoolean:(PropertyValue)property { - MacOSBOOL myBoolean = NO; ++(BOOL)convertBoolean:(PropertyValue)property { + BOOL myBoolean = NO; bool value = sal_False; property.Value >>= value; if ( value ) { @@ -149,7 +149,7 @@ using namespace ::rtl; int fonttraits = 0; float fontsize = 0.0; sal_Int32 underlineColor = 0; - MacOSBOOL underlineHasColor = NO; + BOOL underlineHasColor = NO; // add attributes to string for ( int attrIndex = 0; attrIndex < attributes.getLength(); attrIndex++ ) { PropertyValue property = attributes [ attrIndex ]; diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h index dfdab349bafe..b132bdd0f12a 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h @@ -54,7 +54,7 @@ +(void)addParameterizedAttributeNamesTo:(NSMutableArray *)attributeNames; +(NSArray *)specialAttributeNames; +(NSArray *)specialParameterizedAttributeNames; -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; +(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; +(void)setSelectedTextRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; +(void)setSelectedTextAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm index 2033135564d8..89c164e5e0b9 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm @@ -273,8 +273,8 @@ using namespace ::rtl; return rtfData; } -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { - MacOSBOOL isSettable = NO; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { + BOOL isSettable = NO; if ( [ attribute isEqualToString: NSAccessibilityValueAttribute ] || [ attribute isEqualToString: NSAccessibilitySelectedTextAttribute ] || [ attribute isEqualToString: NSAccessibilitySelectedTextRangeAttribute ] diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h index d3afebf7f828..1dbafe33baea 100644 --- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h +++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h @@ -39,7 +39,7 @@ +(id)minValueAttributeForElement:(AquaA11yWrapper *)wrapper; +(id)maxValueAttributeForElement:(AquaA11yWrapper *)wrapper; +(void)addAttributeNamesTo:(NSMutableArray *)attributeNames; -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; +(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; @end diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm b/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm index 85ef0041da95..fb257921b13e 100644 --- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm +++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm @@ -82,8 +82,8 @@ using namespace ::com::sun::star::uno; [ attributeNames addObject: NSAccessibilityValueAttribute ]; } -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { - MacOSBOOL isSettable = NO; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { + BOOL isSettable = NO; if ( [ wrapper accessibleValue ] != nil && [ attribute isEqualToString: NSAccessibilityValueAttribute ] && ! [ wrapper isKindOfClass: [ AquaA11yWrapperStaticText class ] ] ) { diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm index e86676e725f2..c2724a372f9f 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm @@ -63,7 +63,7 @@ using namespace ::com::sun::star::uno; -(Reference<XAccessibleContext>)accessibleContext; @end -static MacOSBOOL isPopupMenuOpen = NO; +static BOOL isPopupMenuOpen = NO; @implementation AquaA11yWrapper : NSView @@ -154,7 +154,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 { @@ -197,7 +197,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; @@ -693,12 +693,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: @@ -796,8 +796,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 ]; } @@ -830,7 +830,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 } @@ -904,7 +904,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 ] ] ) { @@ -947,8 +947,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 ]; @@ -1127,15 +1127,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; } diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h index 95fee9a3ec4b..b1c5fc751e52 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h @@ -34,7 +34,7 @@ { } -(id)valueAttribute; --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute; +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute; -(NSArray *)accessibilityAttributeNames; @end diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm index c4ac34dc5bce..25f012e1163f 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm @@ -44,7 +44,7 @@ return [ NSNumber numberWithInt: 0 ]; } --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute { +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute { if ( [ attribute isEqualToString: NSAccessibilityValueAttribute ] ) { return NO; } diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h index 7ed76d607176..e18da11dd0ad 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h @@ -42,7 +42,7 @@ -(id)selectedTextRangeAttribute; -(id)visibleCharacterRangeAttribute; // Accessibility Protocol --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute; +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute; -(void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute; -(NSArray *)accessibilityAttributeNames; @end diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm index 85aed320e470..16fa1372fe4e 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm @@ -117,7 +117,7 @@ using namespace ::com::sun::star::uno; #pragma mark - #pragma mark Accessibility Protocol --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute { +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute { if ( [ self textArea ] != nil && ( [ attribute isEqualToString: NSAccessibilitySelectedTextAttribute ] || [ attribute isEqualToString: NSAccessibilitySelectedTextRangeAttribute ] diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h index 13ceee6f826f..3fc6558c633c 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h @@ -34,7 +34,7 @@ { } -(id)valueAttribute; --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute; +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute; -(NSArray *)accessibilityAttributeNames; @end diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm index 54d6edac619a..930f940c4971 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm @@ -44,7 +44,7 @@ return [ NSNumber numberWithInt: 0 ]; } --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute { +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute { if ( [ attribute isEqualToString: NSAccessibilityValueAttribute ] ) { return NO; } |