diff options
| author | Boris DuĊĦek <me@dusek.me> | 2013-08-11 16:34:07 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-20 13:31:47 +0000 |
| commit | 5e920d03b1cfdd8c7714fc9f5c1d484d4de656c8 (patch) | |
| tree | a074b676ba6e93868bd823449bbe624aac96f536 | |
| parent | a6edddefab9f46defc0cee262c38bb8eae32916a (diff) | |
Add XAccessibleTextMarkup to AquaA11yWrapper
Change-Id: Ic15aeb46b384531c4d64d6ec8a103f3e44068cf1
Reviewed-on: https://gerrit.libreoffice.org/5350
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Reviewed-on: https://gerrit.libreoffice.org/5496
| -rw-r--r-- | vcl/aqua/source/a11y/aqua11ywrapper.mm | 6 | ||||
| -rw-r--r-- | vcl/inc/aqua/aqua11ywrapper.h | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm index fe1ba6dcab8b..4cff69e14c91 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm @@ -101,6 +101,8 @@ static BOOL isPopupMenuOpen = NO; mpReferenceWrapper -> rAccessibleTextAttributes = Reference < XAccessibleTextAttributes > ( rxAccessibleContext, UNO_QUERY ); // XAccessibleMultiLineText mpReferenceWrapper -> rAccessibleMultiLineText = Reference < XAccessibleMultiLineText > ( rxAccessibleContext, UNO_QUERY ); + // XAccessibleTextMarkup + mpReferenceWrapper -> rAccessibleTextMarkup = Reference < XAccessibleTextMarkup > ( rxAccessibleContext, UNO_QUERY ); // XAccessibleEventBroadcaster #if 0 /* #i102033# NSAccessibility does not seemt to know an equivalent for transient children. @@ -1097,6 +1099,10 @@ Reference < XAccessibleContext > hitTestRunner ( com::sun::star::awt::Point poin return mpReferenceWrapper -> rAccessibleMultiLineText.get(); } +-(XAccessibleTextMarkup *)accessibleTextMarkup { + return mpReferenceWrapper -> rAccessibleTextMarkup.get(); +} + -(NSView *)viewElementForParent { return self; } diff --git a/vcl/inc/aqua/aqua11ywrapper.h b/vcl/inc/aqua/aqua11ywrapper.h index 185536adbb25..a35aa84e1df5 100644 --- a/vcl/inc/aqua/aqua11ywrapper.h +++ b/vcl/inc/aqua/aqua11ywrapper.h @@ -32,6 +32,7 @@ #include <com/sun/star/accessibility/XAccessibleEditableText.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <com/sun/star/accessibility/XAccessibleMultiLineText.hpp> +#include <com/sun/star/accessibility/XAccessibleTextMarkup.hpp> // rAccessibleXYZ as a field in an Objective-C-Class would not call Con-/Destructor, so use a struct instead struct ReferenceWrapper @@ -47,6 +48,7 @@ struct ReferenceWrapper ::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; + ::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleTextMarkup > rAccessibleTextMarkup; }; @interface AquaA11yWrapper : NSView @@ -109,6 +111,7 @@ struct ReferenceWrapper -(::com::sun::star::accessibility::XAccessibleValue *)accessibleValue; -(::com::sun::star::accessibility::XAccessibleTextAttributes *)accessibleTextAttributes; -(::com::sun::star::accessibility::XAccessibleMultiLineText *)accessibleMultiLineText; +-(::com::sun::star::accessibility::XAccessibleTextMarkup *)accessibleTextMarkup; @end #endif // _SV_AQUA11WRAPPER_H |