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

[Herbert Dürr]

 vcl/inc/osx/a11ywrapper.h  |    2 +-
 vcl/inc/osx/salframeview.h |    2 +-
 vcl/osx/a11ywrapper.mm     |    8 ++++----
 vcl/osx/salframeview.mm    |    6 ++----
 4 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 3c7530411e8f466d9949d998ec40773e4e9a762e
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Feb 6 14:07:50 2014 +0000

    Related: #i123795# add a windowForParent() method for AquaA11yWrapper
    
    for getting the parent window of an A11y enabled NSView. The method
    viewElementForParent() was abused for that purpose, but it was mis-named
    and mis-typed. The new method cleans this up and the now unused
    viewElementForParent() method can be retired.
    
    (cherry picked from commit 96cd47d49a3aa5b1e3b96b649f40e516ca568d4b)
    
    Conflicts:
    	vcl/osx/a11ywrapper.mm
    	vcl/osx/salframeview.mm
    
    Change-Id: Ib88aa1ad442d3b8fb3adbf7a76b3ed8ca268fa87
    
    (cherry picked from commit a7d6569fdecc36bd5ca093442a9b7aec093637d5)

diff --git a/vcl/inc/osx/a11ywrapper.h b/vcl/inc/osx/a11ywrapper.h
index 7f291b4..a49230b 100644
--- a/vcl/inc/osx/a11ywrapper.h
+++ b/vcl/inc/osx/a11ywrapper.h
@@ -86,7 +86,7 @@ struct ReferenceWrapper
 // Wrapper-specific
 -(void)setActsAsRadioGroup:(BOOL)actsAsRadioGroup;
 -(BOOL)actsAsRadioGroup;
--(NSView *)viewElementForParent;
+-(NSWindow*)windowForParent;
 -(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;
 -(void) dealloc;
diff --git a/vcl/inc/osx/salframeview.h b/vcl/inc/osx/salframeview.h
index db3d588..fa3222e 100644
--- a/vcl/inc/osx/salframeview.h
+++ b/vcl/inc/osx/salframeview.h
@@ -174,7 +174,7 @@
 -(void)resetCursorRects;
 -(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext;
 -(id)parentAttribute;
--(NSView *)viewElementForParent;
+-(NSWindow*)windowForParent;
 /*
   Event hook for D&D service.
 
diff --git a/vcl/osx/a11ywrapper.mm b/vcl/osx/a11ywrapper.mm
index 85ee3ff..da7f202 100644
--- a/vcl/osx/a11ywrapper.mm
+++ b/vcl/osx/a11ywrapper.mm
@@ -397,8 +397,8 @@ static std::ostream &operator<<(std::ostream &s, NSPoint point) {
         [ aWrapper autorelease ];
     }
     // get associated NSWindow
-    NSView * theView = [ aWrapper viewElementForParent ];
-    return theView;
+    NSWindow* theWindow = [ aWrapper windowForParent ];
+    return theWindow;
 }
 
 -(id)topLevelUIElementAttribute {
@@ -1125,8 +1125,8 @@ Reference < XAccessibleContext > hitTestRunner ( com::sun::star::awt::Point poin
     return mpReferenceWrapper -> rAccessibleTextMarkup.get();
 }
 
--(NSView *)viewElementForParent {
-    return self;
+-(NSWindow*)windowForParent {
+    return [self window];
 }
 
 // These four are for AXTextAreas only. They are needed, because bold and italic
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 3fc5124..a8fda42 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1740,11 +1740,9 @@ private:
     return [ super accessibleContext ];
 }
 
--(NSView*)viewElementForParent
+-(NSWindow*)windowForParent
 {
-    // Interestingly enough, despite being declared as returning a NSView*, what this method actually
-    // does return is a NSWindow*, and that is what the caller expects. Go figure.
-    return (NSView*) mpFrame->getNSWindow();
+    return mpFrame->getNSWindow();
 }
 
 -(void)registerMouseEventListener: (id)theListener