[Libreoffice-commits] core.git: vcl/aqua vcl/inc

[Boris Dušek]

 vcl/aqua/source/a11y/aqua11ywrapper.mm |    6 ++++++
 vcl/inc/aqua/aqua11ywrapper.h          |    3 +++
 2 files changed, 9 insertions(+)

New commits:
commit 487d9ffe0480470fb7c03fe71e466e8bcc700c33
Author: Boris Dušek <me at dusek.me>
Date:   Sun Aug 11 16:34:07 2013 +0200

    Add XAccessibleTextMarkup to AquaA11yWrapper
    
    Change-Id: Ic15aeb46b384531c4d64d6ec8a103f3e44068cf1
    Reviewed-on: https://gerrit.libreoffice.org/5350
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index aee6360..e5dde15 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -107,6 +107,8 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
         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.
@@ -1113,6 +1115,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 83b5a77..d7767c1 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
@@ -100,6 +102,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