[Libreoffice-commits] core.git: vcl/osx

[Niklas Johansson]

 vcl/osx/salframeview.mm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 37ee9b402c2264daa7f8a8bc96443d380a054cf5
Author: Niklas Johansson <sleeping.pillow at gmail.com>
Date:   Tue Feb 4 08:36:40 2014 +0100

    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 at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index cc4b768..f599575 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