svn commit: r1565258 - in /openoffice/trunk/main/vcl: aqua/source/a11y/aqua11ywrapper.mm aqua/source/window/salframeview.mm inc/aqua/aqua11ywrapper.h

[hdu]

Author: hdu
Date: Thu Feb  6 14:07:50 2014
New Revision: 1565258

URL: http://svn.apache.org/r1565258
Log:
#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.

Modified:
    openoffice/trunk/main/vcl/aqua/source/a11y/aqua11ywrapper.mm
    openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm
    openoffice/trunk/main/vcl/inc/aqua/aqua11ywrapper.h

Modified: openoffice/trunk/main/vcl/aqua/source/a11y/aqua11ywrapper.mm
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/a11y/aqua11ywrapper.mm?rev=1565258&r1=1565257&r2=1565258&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/a11y/aqua11ywrapper.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/a11y/aqua11ywrapper.mm Thu Feb  6 
14:07:50 2014
@@ -380,8 +380,8 @@ static BOOL isPopupMenuOpen = NO;
         [ aWrapper autorelease ];
     }
     // get associated NSWindow
-    NSView * theView = [ aWrapper viewElementForParent ];
-    return theView;
+    NSWindow* theWindow = [ aWrapper windowForParent ];
+    return theWindow;
 }
 
 -(id)topLevelUIElementAttribute {
@@ -1101,8 +1101,8 @@ Reference < XAccessibleContext > hitTest
     return mpReferenceWrapper -> rAccessibleMultiLineText.get();
 }
 
--(NSView *)viewElementForParent {
-    return self;
+-(NSWindow*)windowForParent {
+    return [self window];
 }
 
 // These four are for AXTextAreas only. They are needed, because bold and 
italic

Modified: openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm?rev=1565258&r1=1565257&r2=1565258&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm Thu Feb  6 
14:07:50 2014
@@ -1716,9 +1716,9 @@ private:
     return [ super accessibleContext ];
 }
 
--(NSView*)viewElementForParent
-{
-    return mpFrame->getNSView();
+-(NSWindow*)windowForParent
+ {
+    return mpFrame->getNSWindow();
 }
 
 -(void)registerMouseEventListener: (id)theListener

Modified: openoffice/trunk/main/vcl/inc/aqua/aqua11ywrapper.h
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/aqua/aqua11ywrapper.h?rev=1565258&r1=1565257&r2=1565258&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/aqua/aqua11ywrapper.h (original)
+++ openoffice/trunk/main/vcl/inc/aqua/aqua11ywrapper.h Thu Feb  6 14:07:50 2014
@@ -90,7 +90,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;