summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Johansson <sleeping.pillow@gmail.com>2014-02-04 08:36:40 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-02-04 11:44:40 +0000
commit37ee9b402c2264daa7f8a8bc96443d380a054cf5 (patch)
tree808bdcfbeb0a89d4256a90e58ed55588cb9196d5
parent20c207905f5e9a38f9e06488ab5488c5c21c24e4 (diff)
fdo#74121 - Accessibility broken on Mac OS X (master)
The commit 461e0f9eaf9895ecd0eba67b35a4d2cec8a5e5c5 broke accessibility on Mac. This patch tweeks two changes in the original commit and at least removes the accessibility warnings about the wrong window being reported as parent. Change-Id: I0faa631d22376adc08a191ba5937363d1dee059e Reviewed-on: https://gerrit.libreoffice.org/7837 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
-rw-r--r--vcl/osx/salframeview.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index cc4b76868078..f599575447c8 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1722,7 +1722,7 @@ private:
}
-(id)parentAttribute {
- return mpFrame->getNSWindow();
+ return (NSView*) mpFrame->getNSWindow();
}
-(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext
@@ -1742,7 +1742,7 @@ private:
-(NSView*)viewElementForParent
{
- return mpFrame->getNSView();
+ return (NSView*) mpFrame->getNSWindow();
}
-(void)registerMouseEventListener: (id)theListener