From a9946452d8fc6b807db0a38d5663433bde3760ec Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Fri, 25 Jul 2008 08:04:22 +0000 Subject: INTEGRATION: CWS aqua11y02 (1.2.30); FILE MERGED 2008/06/19 12:29:51 fne 1.2.30.4: #i90525# resolved conflict with another issue 2008/06/11 09:15:55 fne 1.2.30.3: #i90575# guard NSAccessibility API against unwanted access from NSPopUp 2008/06/05 08:21:49 fne 1.2.30.2: #i85851# attributes are now supported 2008/05/21 08:33:59 fne 1.2.30.1: #i88045# support grouping of radio buttons --- vcl/aqua/inc/aqua11ywrapper.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'vcl') diff --git a/vcl/aqua/inc/aqua11ywrapper.h b/vcl/aqua/inc/aqua11ywrapper.h index 7aeb0dc75898..f77adb396213 100644 --- a/vcl/aqua/inc/aqua11ywrapper.h +++ b/vcl/aqua/inc/aqua11ywrapper.h @@ -8,7 +8,7 @@ * * $RCSfile: aqua11ywrapper.h,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * * This file is part of OpenOffice.org. * @@ -43,6 +43,7 @@ #include #include #include +#include // rAccessibleXYZ as a field in an Objective-C-Class would not call Con-/Destructor, so use a struct instead struct ReferenceWrapper @@ -57,6 +58,7 @@ struct ReferenceWrapper ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleEditableText > rAccessibleEditableText; ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleValue > rAccessibleValue; ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleTextAttributes > rAccessibleTextAttributes; + ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleMultiLineText > rAccessibleMultiLineText; }; @interface AquaA11yWrapper : NSView @@ -64,6 +66,8 @@ struct ReferenceWrapper ReferenceWrapper * mpReferenceWrapper; NSString * mpDefaultFontname; float mDefaultFontsize; + MacOSBOOL mActsAsRadioGroup; + MacOSBOOL mIsTableCell; } // NSAccessibility Protocol -(id)accessibilityAttributeValue:(NSString *)attribute; @@ -92,6 +96,8 @@ struct ReferenceWrapper -(id)orientationAttribute; -(id)windowAttribute; // Wrapper-specific +-(void)setActsAsRadioGroup:(MacOSBOOL)actsAsRadioGroup; +-(MacOSBOOL)actsAsRadioGroup; -(NSView *)viewElementForParent; -(id)initWithAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) anAccessibleContext; -(void) setDefaults: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext; @@ -100,6 +106,7 @@ struct ReferenceWrapper -(NSString *)defaultFontname; -(void)setDefaultFontsize:(float)fontsize; -(float)defaultFontsize; ++(void)setPopupMenuOpen:(MacOSBOOL)popupMenuOpen; -(::com::sun::star::accessibility::XAccessibleAction *)accessibleAction; -(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext; -(::com::sun::star::accessibility::XAccessibleComponent *)accessibleComponent; @@ -110,6 +117,7 @@ struct ReferenceWrapper -(::com::sun::star::accessibility::XAccessibleEditableText *)accessibleEditableText; -(::com::sun::star::accessibility::XAccessibleValue *)accessibleValue; -(::com::sun::star::accessibility::XAccessibleTextAttributes *)accessibleTextAttributes; +-(::com::sun::star::accessibility::XAccessibleMultiLineText *)accessibleMultiLineText; @end #endif // _SV_AQUA11WRAPPER_H -- cgit