openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1547078 - in /openoffice/trunk/main: toolkit/source/awt/ vcl/aqua/source/app/ vcl/aqua/source/gdi/ vcl/aqua/source/window/ vcl/inc/aqua/ vcl/inc/vcl/ vcl/source/window/
Date Mon, 02 Dec 2013 16:06:38 GMT
Author: hdu
Date: Mon Dec  2 16:06:37 2013
New Revision: 1547078

URL: http://svn.apache.org/r1547078
Log:
#i123795# variable names should not confuse vcl Window and cocoa NSWindow types

VCL's Window type and Cocoa's NSWindow type are quite different.
Naming variables as if they were the same introduces gratuitous
complexity especially when debugging stacks where both types are used.
The names of NSView type variables have been adjusted too.

Modified:
    openoffice/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx
    openoffice/trunk/main/toolkit/source/awt/vclxtopwindow.cxx
    openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm
    openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
    openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
    openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx
    openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx
    openoffice/trunk/main/vcl/aqua/source/gdi/salvd.cxx
    openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx
    openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm
    openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx
    openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx
    openoffice/trunk/main/vcl/inc/aqua/salframe.h
    openoffice/trunk/main/vcl/inc/vcl/sysdata.hxx
    openoffice/trunk/main/vcl/source/window/syschild.cxx
    openoffice/trunk/main/vcl/source/window/window.cxx

Modified: openoffice/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx (original)
+++ openoffice/trunk/main/toolkit/source/awt/vclxsystemdependentwindow.cxx Mon Dec  2 16:06:37 2013
@@ -100,7 +100,7 @@ IMPL_XTYPEPROVIDER_END
 #elif (defined QUARTZ)
 			if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC )
 			{
-				 aRet <<= (sal_IntPtr)pSysData->pView;
+				 aRet <<= (sal_IntPtr)pSysData->mpNSView;
 			}
 #elif (defined UNX)
 			if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW )

Modified: openoffice/trunk/main/toolkit/source/awt/vclxtopwindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/awt/vclxtopwindow.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/toolkit/source/awt/vclxtopwindow.cxx (original)
+++ openoffice/trunk/main/toolkit/source/awt/vclxtopwindow.cxx Mon Dec  2 16:06:37 2013
@@ -113,7 +113,7 @@ Sequence< Type > VCLXTopWindow_Base::get
 #elif (defined QUARTZ)
 			if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_MAC )
 			{
-				 aRet <<= (sal_IntPtr)pSysData->pView;
+				 aRet <<= (sal_IntPtr)pSysData->mpNSView;
 			}
 #elif (defined UNX)
 			if( SystemType == ::com::sun::star::lang::SystemDependent::SYSTEM_XWINDOW )

Modified: openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/app/vclnsapp.mm Mon Dec  2 16:06:37 2013
@@ -79,7 +79,7 @@
                 if( nModMask == NSCommandKeyMask
                     && [[pEvent charactersIgnoringModifiers] isEqualToString: @"w"] )
                 {
-                    [pFrame->getWindow() windowShouldClose: nil];
+                    [pFrame->getNSWindow() windowShouldClose: nil];
                     return;
                 }
             }
@@ -89,9 +89,9 @@
              */ 
             if( [[pEvent charactersIgnoringModifiers] isEqualToString: @"m"] )
             {
-                if ( nModMask == NSCommandKeyMask && ([pFrame->getWindow() styleMask] & NSMiniaturizableWindowMask) )
+                if ( nModMask == NSCommandKeyMask && ([pFrame->getNSWindow() styleMask] & NSMiniaturizableWindowMask) )
                 {
-                    [pFrame->getWindow() performMiniaturize: nil];
+                    [pFrame->getNSWindow() performMiniaturize: nil];
                     return;
                 }
 
@@ -220,7 +220,7 @@
                 if( (*it)->mpDockMenuEntry != NULL &&
                     (*it)->mbShown )
                 {
-                    [(*it)->getWindow() makeKeyAndOrderFront: NSApp];
+                    [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp];
                     return;
                 }
             }
@@ -232,7 +232,7 @@
             if( (*it)->mpDockMenuEntry != NULL &&
                 (*it)->mbShown )
             {
-                [(*it)->getWindow() makeKeyAndOrderFront: NSApp];
+                [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp];
                 return;
             }
             ++it;
@@ -260,7 +260,7 @@
                 if( (*it)->mpDockMenuEntry != NULL &&
                     (*it)->mbShown )
                 {
-                    [(*it)->getWindow() makeKeyAndOrderFront: NSApp];
+                    [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp];
                     return;
                 }
             }
@@ -272,7 +272,7 @@
             if( (*it)->mpDockMenuEntry != NULL &&
                 (*it)->mbShown )
             {
-                [(*it)->getWindow() makeKeyAndOrderFront: NSApp];
+                [(*it)->getNSWindow() makeKeyAndOrderFront: NSApp];
                 return;
             }
             ++it;
@@ -466,9 +466,10 @@
     for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin();
          it != pSalData->maPresentationFrames.end(); ++it )
     {
-        [(*it)->mpWindow setLevel: NSPopUpMenuWindowLevel];
-        if( [(*it)->mpWindow isVisible] )
-            [(*it)->mpWindow orderFront: NSApp];
+        NSWindow* pNSWindow = (*it)->getNSWindow();
+        [pNSWindow setLevel: NSPopUpMenuWindowLevel];
+        if( [pNSWindow isVisible] )
+            [pNSWindow orderFront: NSApp];
     }
 }
 
@@ -492,7 +493,7 @@
     for( std::list< AquaSalFrame* >::const_iterator it = pSalData->maPresentationFrames.begin();
          it != pSalData->maPresentationFrames.end(); ++it )
     {
-        [(*it)->mpWindow setLevel: NSNormalWindowLevel];
+        [(*it)->getNSWindow() setLevel: NSNormalWindowLevel];
     }
 }
 

Modified: openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/aquaprintaccessoryview.mm Mon Dec  2 16:06:37 2013
@@ -145,30 +145,14 @@ class ControllerProperties
         mnLastPageCount = nPages;
         if( mpState->bNeedRestart )
         {
-            #if 0
             // Warning: bad hack ahead
             // Apple does not give us a chance of changing the page count,
             // and they don't let us cancel the dialog either
             // hack: send a cancel message to the window displaying our views.
             // this is ugly.
-            for( std::vector< NSObject* >::iterator it = maViews.begin(); it != maViews.end(); ++it )
-            {
-                if( [*it isKindOfClass: [NSView class]] )
-                {
-                    NSView* pView = (NSView*)*it;
-                    NSWindow* pWindow = [pView window];
-                    if( pWindow )
-                    {
-                        [pWindow cancelOperation: nil];
-                        break;
-                    }
-                }
-            }
-            #else
-            NSWindow* pWindow = [NSApp modalWindow];
-            if( pWindow )
-                [pWindow cancelOperation: nil];
-            #endif
+            NSWindow* pNSWindow = [NSApp modalWindow];
+            if( pNSWindow )
+                [pNSWindow cancelOperation: nil];
             [[mpOp printInfo] setJobDisposition: NSPrintCancelJob];
         }
         else
@@ -597,7 +581,7 @@ struct ColumnItem
     }
 };
 
-static void adjustViewAndChildren( NSView* pView, NSSize& rMaxSize,
+static void adjustViewAndChildren( NSView* pNSView, NSSize& rMaxSize,
                                    std::vector< ColumnItem >& rLeftColumn,
                                    std::vector< ColumnItem >& rRightColumn
                                   )
@@ -657,7 +641,7 @@ static void adjustViewAndChildren( NSVie
         }
     }
     
-    NSArray* pSubViews = [pView subviews];
+    NSArray* pSubViews = [pNSView subviews];
     unsigned int nViews = [pSubViews count];
     NSRect aUnion = { { 0, 0 }, { 0, 0 } };
 
@@ -680,7 +664,7 @@ static void adjustViewAndChildren( NSVie
     // resize the view itself
     aUnion.size.height += 10;
     aUnion.size.width += 20;
-    [pView setFrameSize: aUnion.size];
+    [pNSView setFrameSize: aUnion.size];
     
     if( aUnion.size.width > rMaxSize.width )
         rMaxSize.width = aUnion.size.width;
@@ -696,15 +680,15 @@ static void adjustTabViews( NSTabView* p
     for( int i = 0; i < nViews; i++ )
     {
         NSTabViewItem* pItem = (NSTabViewItem*)[pTabbedViews objectAtIndex: i];
-        NSView* pView = [pItem view];
-        if( pView )
+        NSView* pNSView = [pItem view];
+        if( pNSView )
         {
-            NSRect aRect = [pView frame];
+            NSRect aRect = [pNSView frame];
             double nDiff = aTabSize.height - aRect.size.height;
             aRect.size = aTabSize;
-            [pView setFrame: aRect];
+            [pNSView setFrame: aRect];
             
-            NSArray* pSubViews = [pView subviews];
+            NSArray* pSubViews = [pNSView subviews];
             unsigned int nSubViews = [pSubViews count];
 
             // move everything up

Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salgdi.cxx Mon Dec  2 16:06:37 2013
@@ -338,7 +338,7 @@ void AquaSalGraphics::updateResolution()
 {
     DBG_ASSERT( mbWindow, "updateResolution on inappropriate graphics" );
 
-    initResolution( (mbWindow && mpFrame) ?  mpFrame->mpWindow : nil );
+    initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
 }
 
 void AquaSalGraphics::initResolution( NSWindow* )
@@ -433,7 +433,7 @@ void AquaSalGraphics::initResolution( NS
 void AquaSalGraphics::GetResolution( long& rDPIX, long& rDPIY )
 {
     if( !mnRealDPIY )
-        initResolution( (mbWindow && mpFrame) ? mpFrame->mpWindow : nil );
+        initResolution( (mbWindow && mpFrame) ? mpFrame->getNSWindow() : nil );
 
     rDPIX = static_cast<long>(mfFakeDPIScale * mnRealDPIX);
     rDPIY = static_cast<long>(mfFakeDPIScale * mnRealDPIY);
@@ -442,7 +442,7 @@ void AquaSalGraphics::GetResolution( lon
 void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics )
 {
 	if( !rGraphics.mnRealDPIY && rGraphics.mbWindow && rGraphics.mpFrame )
-		rGraphics.initResolution( rGraphics.mpFrame->mpWindow );
+		rGraphics.initResolution( rGraphics.mpFrame->getNSWindow() );
 
 	mnRealDPIX = rGraphics.mnRealDPIX;
 	mnRealDPIY = rGraphics.mnRealDPIY;

Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salgdiutils.cxx Mon Dec  2 16:06:37 2013
@@ -198,7 +198,7 @@ bool AquaSalGraphics::CheckContext()
         if( !mrContext )
         {
 	        const CGSize aLayerSize = CGSizeMake( nWidth, nHeight);
-	        NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getWindow()];
+	        NSGraphicsContext* pNSGContext = [NSGraphicsContext graphicsContextWithWindow: mpFrame->getNSWindow()];
 	        CGContextRef xCGContext = reinterpret_cast<CGContextRef>([pNSGContext graphicsPort]);
     	    mxLayer = CGLayerCreateWithContext( xCGContext, aLayerSize, NULL );
 			if( mxLayer )

Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salnativewidgets.cxx Mon Dec  2 16:06:37 2013
@@ -430,7 +430,7 @@ sal_Bool AquaSalGraphics::hitTestNativeC
 */
 UInt32 AquaSalGraphics::getState( ControlState nState )
 {
-    bool bDrawActive = mpFrame ? ([mpFrame->getWindow() isKeyWindow] ? true : false) : true;
+    const bool bDrawActive = mpFrame ? ([mpFrame->getNSWindow() isKeyWindow] ? true : false) : true;
     if( (nState & CTRL_STATE_ENABLED) == 0 || ! bDrawActive )
     {
         if( (nState & CTRL_STATE_HIDDEN) == 0 )
@@ -450,7 +450,7 @@ UInt32 AquaSalGraphics::getState( Contro
 
 UInt32 AquaSalGraphics::getTrackState( ControlState nState )
 {
-    bool bDrawActive = mpFrame ? ([mpFrame->getWindow() isKeyWindow] ? true : false) : true;
+    const bool bDrawActive = mpFrame ? ([mpFrame->getNSWindow() isKeyWindow] ? true : false) : true;
     if( (nState & CTRL_STATE_ENABLED) == 0 || ! bDrawActive )
             return kThemeTrackInactive;
 

Modified: openoffice/trunk/main/vcl/aqua/source/gdi/salvd.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/gdi/salvd.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/gdi/salvd.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/gdi/salvd.cxx Mon Dec  2 16:06:37 2013
@@ -203,10 +203,10 @@ sal_Bool AquaSalVirtualDevice::SetSize( 
         if( pSalFrame )
         {
             // #i91990#
-            NSWindow* pWindow = pSalFrame->getWindow();
-            if ( pWindow )
+            NSWindow* pNSWindow = pSalFrame->getNSWindow();
+            if ( pNSWindow )
             {
-                NSGraphicsContext* pNSContext = [NSGraphicsContext graphicsContextWithWindow: pWindow];
+                NSGraphicsContext* pNSContext = [NSGraphicsContext graphicsContextWithWindow: pNSWindow];
                 if( pNSContext )
                     xCGContext = reinterpret_cast<CGContextRef>([pNSContext graphicsPort]);                
             }

Modified: openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salframe.cxx Mon Dec  2 16:06:37 2013
@@ -61,8 +61,8 @@ AquaSalFrame* AquaSalFrame::s_pCaptureFr
 // =======================================================================
 
 AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) :
-    mpWindow(nil),
-    mpView(nil),
+    mpNSWindow(nil),
+    mpNSView(nil),
     mpDockMenuEntry(nil),
     mpGraphics(NULL),
     mpParent(NULL),
@@ -128,12 +128,12 @@ AquaSalFrame::~AquaSalFrame()
     if( mpDockMenuEntry )
         // life cycle comment: the menu has ownership of the item, so no release
         [AquaSalInstance::GetDynamicDockMenu() removeItem: mpDockMenuEntry];
-    if ( mpView ) {
-        [AquaA11yFactory revokeView: mpView];
-        [mpView release];
+    if ( mpNSView ) {
+        [AquaA11yFactory revokeView: mpNSView];
+        [mpNSView release];
     }
-    if ( mpWindow )
-        [mpWindow release];
+    if ( mpNSWindow )
+        [mpNSWindow release];
 }
 
 // -----------------------------------------------------------------------
@@ -142,13 +142,13 @@ void AquaSalFrame::initWindowAndView()
 {
     // initialize mirroring parameters
     // FIXME: screens changing
-    NSScreen * pScreen = [mpWindow screen];
-    if( pScreen == nil )
-        pScreen = [NSScreen mainScreen];
-    maScreenRect = [pScreen frame];
+    NSScreen* pNSScreen = [mpNSWindow screen];
+    if( pNSScreen == nil )
+        pNSScreen = [NSScreen mainScreen];
+    maScreenRect = [pNSScreen frame];
 
     // calculate some default geometry
-    NSRect aVisibleRect = [pScreen visibleFrame];
+    NSRect aVisibleRect = [pNSScreen visibleFrame];
     CocoaToVCL( aVisibleRect );
     
     maGeometry.nX = static_cast<int>(aVisibleRect.origin.x + aVisibleRect.size.width / 10);
@@ -194,8 +194,8 @@ void AquaSalFrame::initWindowAndView()
     // #i91990# support GUI-less (daemon) execution
     @try 
     {
-    mpWindow = [[SalFrameWindow alloc] initWithSalFrame: this];
-    mpView = [[SalFrameView alloc] initWithSalFrame: this];
+        mpNSWindow = [[SalFrameWindow alloc] initWithSalFrame: this];
+        mpNSView = [[SalFrameView alloc] initWithSalFrame: this];
     }
     @catch ( id exception )
     {
@@ -203,20 +203,20 @@ void AquaSalFrame::initWindowAndView()
     }
     
     if( (mnStyle & SAL_FRAME_STYLE_TOOLTIP) )
-        [mpWindow setIgnoresMouseEvents: YES];
+        [mpNSWindow setIgnoresMouseEvents: YES];
     else
-        [mpWindow setAcceptsMouseMovedEvents: YES];
-    [mpWindow setHasShadow: YES];
-    [mpWindow setDelegate: mpWindow];
+        [mpNSWindow setAcceptsMouseMovedEvents: YES];
+    [mpNSWindow setHasShadow: YES];
+    [mpNSWindow setDelegate: mpNSWindow];
     
     const NSRect aRect = NSMakeRect( 0,0, maGeometry.nWidth, maGeometry.nHeight );
-    mnTrackingRectTag = [mpView addTrackingRect: aRect owner: mpView userData: nil assumeInside: NO];
+    mnTrackingRectTag = [mpNSView addTrackingRect: aRect owner: mpNSView userData: nil assumeInside: NO];
     
-    maSysData.pView = mpView;
+    maSysData.mpNSView = mpNSView;
     
     UpdateFrameGeometry();
     
-    [mpWindow setContentView: mpView];
+    [mpNSWindow setContentView: mpNSView];
 }
 
 // -----------------------------------------------------------------------
@@ -301,14 +301,14 @@ sal_Bool AquaSalFrame::PostEvent( void *
 // -----------------------------------------------------------------------
 void AquaSalFrame::SetTitle(const XubString& rTitle)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
     
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
     NSString* pTitle = CreateNSString( rTitle );
-    [mpWindow setTitle: pTitle];
+    [mpNSWindow setTitle: pTitle];
     
     // create an entry in the dock menu
     const sal_uLong nAppWindowStyle = (SAL_FRAME_STYLE_CLOSEABLE | SAL_FRAME_STYLE_MOVEABLE);
@@ -322,7 +322,7 @@ void AquaSalFrame::SetTitle(const XubStr
                                      action: @selector(dockMenuItemTriggered:)
                                      keyEquivalent: @""
                                      atIndex: 0];
-            [mpDockMenuEntry setTarget: mpWindow];
+            [mpDockMenuEntry setTarget: mpNSWindow];
             
             // TODO: image (either the generic window image or an icon
             // check mark (for "main" window ?)
@@ -356,7 +356,7 @@ void AquaSalFrame::SetRepresentedURL( co
         if( pStr )
         {
             [pStr autorelease];
-            [mpWindow setRepresentedFilename: pStr];
+            [mpNSWindow setRepresentedFilename: pStr];
         }
     }
 }
@@ -397,7 +397,7 @@ void AquaSalFrame::initShow()
     }
     
     // make sure the view is present in the wrapper list before any children receive focus
-    [AquaA11yFactory registerView: mpView];
+    [AquaA11yFactory registerView: mpNSView];
 }
 
 void AquaSalFrame::SendPaintEvent( const Rectangle* pRect )
@@ -418,7 +418,7 @@ void AquaSalFrame::SendPaintEvent( const
 
 void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -434,10 +434,10 @@ void AquaSalFrame::Show(sal_Bool bVisibl
         // trigger filling our backbuffer
         SendPaintEvent();
         
-        if( bNoActivate || [mpWindow canBecomeKeyWindow] == NO )
-            [mpWindow orderFront: NSApp];
+        if( bNoActivate || [mpNSWindow canBecomeKeyWindow] == NO )
+            [mpNSWindow orderFront: NSApp];
         else
-            [mpWindow makeKeyAndOrderFront: NSApp];
+            [mpNSWindow makeKeyAndOrderFront: NSApp];
         
         if( mpParent )
         {
@@ -450,12 +450,12 @@ void AquaSalFrame::Show(sal_Bool bVisibl
             */
             if( mpParent->mbShown || (mnStyle & (SAL_FRAME_STYLE_OWNERDRAWDECORATION | SAL_FRAME_STYLE_FLOAT) ) )
             {
-                [mpParent->mpWindow addChildWindow: mpWindow ordered: NSWindowAbove];
+                [mpParent->mpNSWindow addChildWindow: mpNSWindow ordered: NSWindowAbove];
             }
         }
         
         if( mbPresentation )
-            [mpWindow makeMainWindow];
+            [mpNSWindow makeMainWindow];
     }
     else
     {
@@ -466,14 +466,14 @@ void AquaSalFrame::Show(sal_Bool bVisibl
 
         // #i90440# #i94443# work around the focus going back to some other window
         // if a child gets hidden for a parent window
-        if( mpParent && mpParent->mbShown && [mpWindow isKeyWindow] )
-            [mpParent->mpWindow makeKeyAndOrderFront: NSApp];
+        if( mpParent && mpParent->mbShown && [mpNSWindow isKeyWindow] )
+            [mpParent->mpNSWindow makeKeyAndOrderFront: NSApp];
         
         [SalFrameView unsetMouseFrame: this];
-        if( mpParent && [mpWindow parentWindow] == mpParent->mpWindow )
-            [mpParent->mpWindow removeChildWindow: mpWindow];
+        if( mpParent && [mpNSWindow parentWindow] == mpParent->mpNSWindow )
+            [mpParent->mpNSWindow removeChildWindow: mpNSWindow];
         
-        [mpWindow orderOut: NSApp];
+        [mpNSWindow orderOut: NSApp];
     }
 }
 
@@ -493,7 +493,7 @@ void AquaSalFrame::SetMinClientSize( lon
     mnMinWidth = nWidth;
     mnMinHeight = nHeight;
 
-    if( mpWindow )
+    if( mpNSWindow )
     {
         // Always add the decoration as the dimension concerns only
         // the content rectangle
@@ -504,7 +504,7 @@ void AquaSalFrame::SetMinClientSize( lon
 
         // Size of full window (content+structure) although we only
         // have the client size in arguments
-        [mpWindow setMinSize: aSize];
+        [mpNSWindow setMinSize: aSize];
     }
 }
 
@@ -518,7 +518,7 @@ void AquaSalFrame::SetMaxClientSize( lon
     mnMaxWidth = nWidth;
     mnMaxHeight = nHeight;
 
-    if( mpWindow )
+    if( mpNSWindow )
     {
         // Always add the decoration as the dimension concerns only
         // the content rectangle
@@ -533,7 +533,7 @@ void AquaSalFrame::SetMaxClientSize( lon
 
         // Size of full window (content+structure) although we only
         // have the client size in arguments
-        [mpWindow setMaxSize: aSize];
+        [mpNSWindow setMaxSize: aSize];
     }
 }
 
@@ -544,11 +544,11 @@ void AquaSalFrame::SetClientSize( long n
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
-    if( mpWindow )
+    if( mpNSWindow )
     {
         const NSSize aSize = NSMakeSize( nWidth, nHeight);
         
-        [mpWindow setContentSize: aSize];
+        [mpNSWindow setContentSize: aSize];
         UpdateFrameGeometry();
         if( mbShown )
             // trigger filling our backbuffer
@@ -579,10 +579,10 @@ void AquaSalFrame::SetWindowState( const
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
-    if ( mpWindow )
+    if ( mpNSWindow )
     {
     // set normal state
-    NSRect aStateRect = [mpWindow frame];
+    NSRect aStateRect = [mpNSWindow frame];
     aStateRect = [NSWindow contentRectForFrameRect: aStateRect styleMask: mnStyleMask];
     CocoaToVCL( aStateRect );
     if( pState->mnMask & SAL_FRAMESTATE_MASK_X )
@@ -596,11 +596,11 @@ void AquaSalFrame::SetWindowState( const
     VCLToCocoa( aStateRect );
     aStateRect = [NSWindow frameRectForContentRect: aStateRect styleMask: mnStyleMask];
     
-    [mpWindow setFrame: aStateRect display: NO];
+    [mpNSWindow setFrame: aStateRect display: NO];
     if( pState->mnState == SAL_FRAMESTATE_MINIMIZED )
-        [mpWindow miniaturize: NSApp];
-    else if( [mpWindow isMiniaturized] )
-        [mpWindow deminiaturize: NSApp];
+        [mpNSWindow miniaturize: NSApp];
+    else if( [mpNSWindow isMiniaturized] )
+        [mpNSWindow deminiaturize: NSApp];
         
 
     /* ZOOMED is not really maximized (actually it toggles between a user set size and
@@ -609,13 +609,13 @@ void AquaSalFrame::SetWindowState( const
     */
     if( pState->mnState == SAL_FRAMESTATE_MAXIMIZED )
     {
-        if(! [mpWindow isZoomed])
-            [mpWindow zoom: NSApp];
+        if(! [mpNSWindow isZoomed])
+            [mpNSWindow zoom: NSApp];
     }
     else
     {
-        if( [mpWindow isZoomed] )
-            [mpWindow zoom: NSApp];
+        if( [mpNSWindow isZoomed] )
+            [mpNSWindow zoom: NSApp];
     }
     }
 
@@ -638,13 +638,13 @@ void AquaSalFrame::SetWindowState( const
     if( nEvent )
         CallCallback( nEvent, NULL );
 
-    if( mbShown && mpWindow )
+    if( mbShown && mpNSWindow )
     {
         // trigger filling our backbuffer
         SendPaintEvent();
 
         // tell the system the views need to be updated
-        [mpWindow display];
+        [mpNSWindow display];
     }
 }
 
@@ -652,7 +652,7 @@ void AquaSalFrame::SetWindowState( const
 
 sal_Bool AquaSalFrame::GetWindowState( SalFrameState* pState )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return FALSE;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -670,7 +670,7 @@ sal_Bool AquaSalFrame::GetWindowState( S
                      #endif
                      SAL_FRAMESTATE_MASK_STATE;
 
-    NSRect aStateRect = [mpWindow frame];
+    NSRect aStateRect = [mpNSWindow frame];
     aStateRect = [NSWindow contentRectForFrameRect: aStateRect styleMask: mnStyleMask];
     CocoaToVCL( aStateRect );
     pState->mnX         = long(aStateRect.origin.x);
@@ -678,9 +678,9 @@ sal_Bool AquaSalFrame::GetWindowState( S
     pState->mnWidth     = long(aStateRect.size.width);
     pState->mnHeight    = long(aStateRect.size.height);
     
-    if( [mpWindow isMiniaturized] )
+    if( [mpNSWindow isMiniaturized] )
         pState->mnState = SAL_FRAMESTATE_MINIMIZED;
-    else if( ! [mpWindow isZoomed] )
+    else if( ! [mpNSWindow isZoomed] )
         pState->mnState = SAL_FRAMESTATE_NORMAL;
     else
         pState->mnState = SAL_FRAMESTATE_MAXIMIZED;
@@ -692,7 +692,7 @@ sal_Bool AquaSalFrame::GetWindowState( S
 
 void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -708,17 +708,17 @@ void AquaSalFrame::SetScreenNumber(unsig
         NSRect aNewScreen = [pScreen frame];
         
         // get current screen frame
-        pScreen = [mpWindow screen];
+        pScreen = [mpNSWindow screen];
         if( pScreen )
         {
             NSRect aCurScreen = [pScreen frame];
             if( aCurScreen.origin.x != aNewScreen.origin.x ||
                 aCurScreen.origin.y != aNewScreen.origin.y )
             {
-                NSRect aFrameRect = [mpWindow frame];
+                NSRect aFrameRect = [mpNSWindow frame];
                 aFrameRect.origin.x += aNewScreen.origin.x - aCurScreen.origin.x;
                 aFrameRect.origin.y += aNewScreen.origin.y - aCurScreen.origin.y;
-                [mpWindow setFrame: aFrameRect display: NO];
+                [mpNSWindow setFrame: aFrameRect display: NO];
                 UpdateFrameGeometry();
             }
         }
@@ -729,7 +729,7 @@ void AquaSalFrame::SetScreenNumber(unsig
 
 void AquaSalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -781,7 +781,7 @@ void AquaSalFrame::ShowFullScreen( sal_B
         if( aNewContentRect.size.width == 0 && aNewContentRect.size.height == 0 )
         {
             if( pScreen == nil )
-                pScreen = [mpWindow screen];
+                pScreen = [mpNSWindow screen];
             if( pScreen == nil )
                 pScreen = [NSScreen mainScreen];
             
@@ -791,9 +791,9 @@ void AquaSalFrame::ShowFullScreen( sal_B
         if( bHideMenu )
             [NSMenu setMenuBarVisible:NO];
 
-	    maFullScreenRect = [mpWindow frame];
+	    maFullScreenRect = [mpNSWindow frame];
         {
-            [mpWindow setFrame: [NSWindow frameRectForContentRect: aNewContentRect styleMask: mnStyleMask] display: mbShown ? YES : NO];
+            [mpNSWindow setFrame: [NSWindow frameRectForContentRect: aNewContentRect styleMask: mnStyleMask] display: mbShown ? YES : NO];
         }
 
 	    UpdateFrameGeometry();
@@ -804,7 +804,7 @@ void AquaSalFrame::ShowFullScreen( sal_B
 	else
 	{
         {
-            [mpWindow setFrame: maFullScreenRect display: mbShown ? YES : NO];
+            [mpNSWindow setFrame: maFullScreenRect display: mbShown ? YES : NO];
         }
 	    UpdateFrameGeometry();
 
@@ -842,7 +842,7 @@ public:
 
 void AquaSalFrame::StartPresentation( sal_Bool bStart )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -852,15 +852,15 @@ void AquaSalFrame::StartPresentation( sa
     {
         GetSalData()->maPresentationFrames.push_back( this );
         mpActivityTimer.reset( new PreventSleepTimer() );
-        [mpWindow setLevel: NSPopUpMenuWindowLevel];
+        [mpNSWindow setLevel: NSPopUpMenuWindowLevel];
         if( mbShown )
-            [mpWindow makeMainWindow];
+            [mpNSWindow makeMainWindow];
     }
     else
     {
         GetSalData()->maPresentationFrames.remove( this );
         mpActivityTimer.reset();
-        [mpWindow setLevel: NSNormalWindowLevel];
+        [mpNSWindow setLevel: NSNormalWindowLevel];
     }
 }
 
@@ -874,7 +874,7 @@ void AquaSalFrame::SetAlwaysOnTop( sal_B
 
 void AquaSalFrame::ToTop(sal_uInt16 nFlags)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -885,13 +885,13 @@ void AquaSalFrame::ToTop(sal_uInt16 nFla
     
     if( ! (nFlags & SAL_FRAME_TOTOP_RESTOREWHENMIN) )
     {
-        if( ! [mpWindow isVisible] || [mpWindow isMiniaturized] )
+        if( ! [mpNSWindow isVisible] || [mpNSWindow isMiniaturized] )
             return;
     }
     if( nFlags & SAL_FRAME_TOTOP_GRABFOCUS )
-        [mpWindow makeKeyAndOrderFront: NSApp];
+        [mpNSWindow makeKeyAndOrderFront: NSApp];
     else
-        [mpWindow orderFront: NSApp];
+        [mpNSWindow orderFront: NSApp];
 }
 
 // -----------------------------------------------------------------------
@@ -936,7 +936,7 @@ NSCursor* AquaSalFrame::getCurrentCursor
 
 void AquaSalFrame::SetPointer( PointerStyle ePointerStyle )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
         
     // #i113170# may not be the main thread if called from UNO API
@@ -946,7 +946,7 @@ void AquaSalFrame::SetPointer( PointerSt
         return;
     mePointerStyle = ePointerStyle;
     
-    [mpWindow invalidateCursorRectsForView: mpView];
+    [mpNSWindow invalidateCursorRectsForView: mpNSView];
 }
 
 // -----------------------------------------------------------------------
@@ -965,21 +965,21 @@ void AquaSalFrame::SetPointerPos( long n
 
 void AquaSalFrame::Flush( void )
 {
-    if( !(mbGraphics && mpGraphics && mpView && mbShown) )
+    if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
 
-    [mpView setNeedsDisplay: YES];
+    [mpNSView setNeedsDisplay: YES];
 
     // outside of the application's event loop (e.g. IntroWindow)
     // nothing would trigger paint event handling
     // => fall back to synchronous painting
     if( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
     {
-        [mpView display];
+        [mpNSView display];
     }
 }
 
@@ -987,7 +987,7 @@ void AquaSalFrame::Flush( void )
 
 void AquaSalFrame::Flush( const Rectangle& rRect )
 {
-    if( !(mbGraphics && mpGraphics && mpView && mbShown) )
+    if( !(mbGraphics && mpGraphics && mpNSView && mbShown) )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
@@ -995,14 +995,14 @@ void AquaSalFrame::Flush( const Rectangl
     
     NSRect aNSRect = NSMakeRect( rRect.Left(), rRect.Top(), rRect.GetWidth(), rRect.GetHeight());
     VCLToCocoa( aNSRect, false );
-    [mpView setNeedsDisplayInRect: aNSRect];
+    [mpNSView setNeedsDisplayInRect: aNSRect];
 
     // outside of the application's event loop (e.g. IntroWindow)
     // nothing would trigger paint event handling
     // => fall back to synchronous painting
     if( ImplGetSVData()->maAppData.mnDispatchLevel <= 0 )
     {
-        [mpView display];
+        [mpNSView display];
     }
 }
 
@@ -1010,13 +1010,13 @@ void AquaSalFrame::Flush( const Rectangl
 
 void AquaSalFrame::Sync()
 {
-    if( mbGraphics && mpGraphics && mpView && mbShown )
+    if( mbGraphics && mpGraphics && mpNSView && mbShown )
     {
         // #i113170# may not be the main thread if called from UNO API
         SalData::ensureThreadAutoreleasePool();
     
-        [mpView setNeedsDisplay: YES];
-        [mpView display];
+        [mpNSView setNeedsDisplay: YES];
+        [mpNSView display];
     }
 }
 
@@ -1237,13 +1237,13 @@ void AquaSalFrame::getResolution( long& 
 // doesn't make the anything cleaner for now
 void AquaSalFrame::UpdateSettings( AllSettings& rSettings )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
-    [mpView lockFocus];
+    [mpNSView lockFocus];
     
     StyleSettings aStyleSettings = rSettings.GetStyleSettings();
 
@@ -1291,22 +1291,22 @@ void AquaSalFrame::UpdateSettings( AllSe
 	aStyleSettings.SetIconFont( aLabelFont );
 
     Color aHighlightColor( getColor( [NSColor selectedTextBackgroundColor],
-                                      aStyleSettings.GetHighlightColor(), mpWindow ) );
+                                      aStyleSettings.GetHighlightColor(), mpNSWindow ) );
     aStyleSettings.SetHighlightColor( aHighlightColor );
     Color aHighlightTextColor( getColor( [NSColor selectedTextColor],
-                                         aStyleSettings.GetHighlightTextColor(), mpWindow ) );
+                                         aStyleSettings.GetHighlightTextColor(), mpNSWindow ) );
     aStyleSettings.SetHighlightTextColor( aHighlightTextColor );
     
     Color aMenuHighlightColor( getColor( [NSColor selectedMenuItemColor],
-                                         aStyleSettings.GetMenuHighlightColor(), mpWindow ) );
+                                         aStyleSettings.GetMenuHighlightColor(), mpNSWindow ) );
     aStyleSettings.SetMenuHighlightColor( aMenuHighlightColor );
     Color aMenuHighlightTextColor( getColor( [NSColor selectedMenuItemTextColor],
-                                             aStyleSettings.GetMenuHighlightTextColor(), mpWindow ) );
+                                             aStyleSettings.GetMenuHighlightTextColor(), mpNSWindow ) );
     aStyleSettings.SetMenuHighlightTextColor( aMenuHighlightTextColor );
     
     aStyleSettings.SetMenuColor( aBackgroundColor );
     Color aMenuTextColor( getColor( [NSColor textColor],
-                                    aStyleSettings.GetMenuTextColor(), mpWindow ) );
+                                    aStyleSettings.GetMenuTextColor(), mpNSWindow ) );
     aStyleSettings.SetMenuTextColor( aMenuTextColor );
     aStyleSettings.SetMenuBarTextColor( aMenuTextColor );
 
@@ -1325,7 +1325,7 @@ void AquaSalFrame::UpdateSettings( AllSe
     
     rSettings.SetStyleSettings( aStyleSettings );
 
-    [mpView unlockFocus];
+    [mpNSView unlockFocus];
 }
 
 // -----------------------------------------------------------------------
@@ -1354,7 +1354,7 @@ void AquaSalFrame::Beep( SoundType eSoun
 
 void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags)
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
@@ -1362,8 +1362,8 @@ void AquaSalFrame::SetPosSize(long nX, l
     
     sal_uInt16 nEvent = 0;
 
-    if( [mpWindow isMiniaturized] )
-        [mpWindow deminiaturize: NSApp]; // expand the window
+    if( [mpNSWindow isMiniaturized] )
+        [mpNSWindow deminiaturize: NSApp]; // expand the window
 
     if (nFlags & (SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y))
     {
@@ -1377,7 +1377,7 @@ void AquaSalFrame::SetPosSize(long nX, l
         nEvent = (nEvent == SALEVENT_MOVE) ? SALEVENT_MOVERESIZE : SALEVENT_RESIZE;
     }
 
-    NSRect aFrameRect = [mpWindow frame];
+    NSRect aFrameRect = [mpNSWindow frame];
     NSRect aContentRect = [NSWindow contentRectForFrameRect: aFrameRect styleMask: mnStyleMask];
     
     // position is always relative to parent frame
@@ -1392,7 +1392,7 @@ void AquaSalFrame::SetPosSize(long nX, l
             else
                 nX = mpParent->maGeometry.nWidth - static_cast<long int>( aContentRect.size.width-1) - nX;
         }
-        NSRect aParentFrameRect = [mpParent->mpWindow frame];
+        NSRect aParentFrameRect = [mpParent->mpNSWindow frame];
         aParentContentRect = [NSWindow contentRectForFrameRect: aParentFrameRect styleMask: mpParent->mnStyleMask];
     }
     else
@@ -1424,7 +1424,7 @@ void AquaSalFrame::SetPosSize(long nX, l
 
     // do not display yet, we need to update our backbuffer
     {
-        [mpWindow setFrame: [NSWindow frameRectForContentRect: aContentRect styleMask: mnStyleMask] display: NO];
+        [mpNSWindow setFrame: [NSWindow frameRectForContentRect: aContentRect styleMask: mnStyleMask] display: NO];
     }
     
     UpdateFrameGeometry();
@@ -1438,19 +1438,19 @@ void AquaSalFrame::SetPosSize(long nX, l
         SendPaintEvent();
 
         // now inform the system that the views need to be drawn
-        [mpWindow display];
+        [mpNSWindow display];
     }
 }
 
 void AquaSalFrame::GetWorkArea( Rectangle& rRect )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
         return;
 
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
-    NSScreen* pScreen = [mpWindow screen];
+    NSScreen* pScreen = [mpNSWindow screen];
     if( pScreen ==  nil )
         pScreen = [NSScreen mainScreen];
     NSRect aRect = [pScreen visibleFrame];
@@ -1470,7 +1470,7 @@ SalPointerState	AquaSalFrame::GetPointer
     state.mnState = 0;
     
     // get position
-    NSPoint aPt = [mpWindow mouseLocationOutsideOfEventStream];
+    NSPoint aPt = [mpNSWindow mouseLocationOutsideOfEventStream];
     CocoaToVCL( aPt, false );
     state.maPos = Point(static_cast<long>(aPt.x), static_cast<long>(aPt.y));
 
@@ -1585,13 +1585,13 @@ void AquaSalFrame::SetMenu( SalMenu* pSa
 
 void AquaSalFrame::SetExtendedFrameStyle( SalExtStyle nStyle )
 {
-    if ( mpWindow ) 
+    if ( mpNSWindow ) 
     {
     // #i113170# may not be the main thread if called from UNO API
     SalData::ensureThreadAutoreleasePool();
     
     if( (mnExtStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) != (nStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) )
-        [mpWindow setDocumentEdited: (nStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) ? YES : NO];
+        [mpNSWindow setDocumentEdited: (nStyle & SAL_FRAME_EXT_STYLE_DOCMODIFIED) ? YES : NO];
     }
     
     mnExtStyle = nStyle;
@@ -1624,7 +1624,7 @@ void AquaSalFrame::SetParent( SalFrame* 
 
 void AquaSalFrame::UpdateFrameGeometry()
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
     {
         return;
     }
@@ -1633,7 +1633,7 @@ void AquaSalFrame::UpdateFrameGeometry()
     // whereas vcl's are upper left
     
     // update screen rect
-    NSScreen * pScreen = [mpWindow screen];
+    NSScreen * pScreen = [mpNSWindow screen];
     if( pScreen )
     {
         maScreenRect = [pScreen frame];
@@ -1642,14 +1642,14 @@ void AquaSalFrame::UpdateFrameGeometry()
             maGeometry.nScreenNumber = [pScreens indexOfObject: pScreen];
     }
     
-    NSRect aFrameRect = [mpWindow frame];
+    NSRect aFrameRect = [mpNSWindow frame];
     NSRect aContentRect = [NSWindow contentRectForFrameRect: aFrameRect styleMask: mnStyleMask];
 
     // release old track rect
-    [mpView removeTrackingRect: mnTrackingRectTag];
+    [mpNSView removeTrackingRect: mnTrackingRectTag];
     // install the new track rect
     NSRect aTrackRect = { { 0, 0 }, aContentRect.size };
-    mnTrackingRectTag = [mpView addTrackingRect: aTrackRect owner: mpView userData: nil assumeInside: NO];
+    mnTrackingRectTag = [mpNSView addTrackingRect: aTrackRect owner: mpNSView userData: nil assumeInside: NO];
 
     // convert to vcl convention
     CocoaToVCL( aFrameRect );
@@ -1701,7 +1701,7 @@ void AquaSalFrame::CaptureMouse( sal_Boo
 
 void AquaSalFrame::ResetClipRegion()
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
     {
         return;
     }
@@ -1713,18 +1713,18 @@ void AquaSalFrame::ResetClipRegion()
     CGPathRelease( mrClippingPath );
     mrClippingPath = NULL;
     
-    if( mpView && mbShown )
-        [mpView setNeedsDisplay: YES];
-    if( mpWindow )
+    if( mpNSView && mbShown )
+        [mpNSView setNeedsDisplay: YES];
+    if( mpNSWindow )
     {
-        [mpWindow setOpaque: YES];
-        [mpWindow invalidateShadow];
+        [mpNSWindow setOpaque: YES];
+        [mpNSWindow invalidateShadow];
     }
 }
 
 void AquaSalFrame::BeginSetClipRegion( sal_uLong nRects )
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
     {
         return;
     }
@@ -1763,7 +1763,7 @@ void AquaSalFrame::UnionClipRegion( long
 
 void AquaSalFrame::EndSetClipRegion()
 {
-    if ( !mpWindow )
+    if ( !mpNSWindow )
     {
         return;
     }
@@ -1776,12 +1776,12 @@ void AquaSalFrame::EndSetClipRegion()
         mrClippingPath = CGPathCreateMutable();
         CGPathAddRects( mrClippingPath, NULL, &maClippingRects[0], maClippingRects.size() );
     }
-    if( mpView && mbShown )
-        [mpView setNeedsDisplay: YES];
-    if( mpWindow )
+    if( mpNSView && mbShown )
+        [mpNSView setNeedsDisplay: YES];
+    if( mpNSWindow )
     {
-        [mpWindow setOpaque: (mrClippingPath != NULL) ? NO : YES];
-        [mpWindow setBackgroundColor: [NSColor clearColor]];
+        [mpNSWindow setOpaque: (mrClippingPath != NULL) ? NO : YES];
+        [mpNSWindow setBackgroundColor: [NSColor clearColor]];
         // shadow is invalidated when view gets drawn again
     }
 }

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=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salframeview.mm Mon Dec  2 16:06:37 2013
@@ -436,7 +436,7 @@ static AquaSalFrame* getMouseContainerFr
 
 -(id)initWithSalFrame: (AquaSalFrame*)pFrame
 {
-    if ((self = [super initWithFrame: [NSWindow contentRectForFrameRect: [pFrame->getWindow() frame] styleMask: pFrame->mnStyleMask]]) != nil)
+    if ((self = [super initWithFrame: [NSWindow contentRectForFrameRect: [pFrame->getNSWindow() frame] styleMask: pFrame->mnStyleMask]]) != nil)
     {
         mDraggingDestinationHandler = nil;
         mpFrame = pFrame;
@@ -526,7 +526,7 @@ private:
         {
             mpFrame->mpGraphics->UpdateWindow( aRect );
             if( mpFrame->getClipPath() )
-                [mpFrame->getWindow() invalidateShadow];
+                [mpFrame->getNSWindow() invalidateShadow];
         }
     }
 }
@@ -559,7 +559,7 @@ private:
     {
         // is this event actually inside that NSWindow ?
         NSPoint aPt = [NSEvent mouseLocation];
-        NSRect aFrameRect = [pDispatchFrame->getWindow() frame];
+        NSRect aFrameRect = [pDispatchFrame->getNSWindow() frame];
         
 	if ( ! NSPointInRect( aPt, aFrameRect ) )
         {
@@ -1698,7 +1698,7 @@ private:
 }
 
 -(id)parentAttribute {
-    return (NSView *) mpFrame -> mpWindow;
+    return mpFrame->getNSWindow();
 }
 
 -(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext
@@ -1716,9 +1716,9 @@ private:
     return [ super accessibleContext ];
 }
 
--(NSView *)viewElementForParent
+-(NSView*)viewElementForParent
 {
-    return (NSView *) mpFrame -> mpWindow;
+    return mpFrame->getNSView();
 }
 
 -(void)registerMouseEventListener: (id)theListener

Modified: openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salmenu.cxx Mon Dec  2 16:06:37 2013
@@ -351,9 +351,9 @@ bool AquaSalMenu::ShowNativePopupMenu(Fl
 
     // get the pointers
     AquaSalFrame * pParentAquaSalFrame = (AquaSalFrame *) pWin->ImplGetWindowImpl()->mpRealParent->ImplGetFrame();
-    NSWindow * pParentNSWindow = pParentAquaSalFrame->mpWindow;
-    NSView * pParentNSView = [pParentNSWindow contentView];
-    NSView * pPopupNSView = ((AquaSalFrame *) pWin->ImplGetWindow()->ImplGetFrame())->mpView;
+    NSWindow* pParentNSWindow = pParentAquaSalFrame->mpNSWindow;
+    NSView* pParentNSView = [pParentNSWindow contentView];
+    NSView* pPopupNSView = ((AquaSalFrame *) pWin->ImplGetWindow()->ImplGetFrame())->mpNSView;
     NSRect popupFrame = [pPopupNSView frame];
     
     // since we manipulate the menu below (removing entries)
@@ -800,9 +800,9 @@ void AquaSalMenu::statusLayout()
 {
     if( GetSalData()->mpStatusItem )
     {
-        NSView* pView = [GetSalData()->mpStatusItem view];
-        if( [pView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is
-            [(OOStatusItemView*)pView layout];
+        NSView* pNSView = [GetSalData()->mpStatusItem view];
+        if( [pNSView isMemberOfClass: [OOStatusItemView class]] ) // well of course it is
+            [(OOStatusItemView*)pNSView layout];
         else
             DBG_ERROR( "someone stole our status view" );
     }
@@ -883,15 +883,15 @@ Rectangle AquaSalMenu::GetMenuBarButtonR
     if( ! pItem )
         return Rectangle();
     
-    NSView* pView = [pItem view];
-    if( ! pView )
+    NSView* pNSView = [pItem view];
+    if( ! pNSView )
         return Rectangle();
-    NSWindow* pWin = [pView window];
-    if( ! pWin )
+    NSWindow* pNSWin = [pNSView window];
+    if( ! pNSWin )
         return Rectangle();
 
-    NSRect aRect = [pWin frame];
-    aRect.origin = [pWin convertBaseToScreen: NSMakePoint( 0, 0 )];
+    NSRect aRect = [pNSWin frame];
+    aRect.origin = [pNSWin convertBaseToScreen: NSMakePoint( 0, 0 )];
     
     // make coordinates relative to reference frame
     static_cast<AquaSalFrame*>(i_pReferenceFrame)->CocoaToVCL( aRect.origin );

Modified: openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx (original)
+++ openoffice/trunk/main/vcl/aqua/source/window/salobj.cxx Mon Dec  2 16:06:37 2013
@@ -45,20 +45,20 @@ AquaSalObject::AquaSalObject( AquaSalFra
     mnHeight( 20 )
 {
     maSysData.nSize = sizeof( maSysData );
-    maSysData.pView = NULL;
+    maSysData.mpNSView = NULL;
     
     NSRect aInitFrame = { { 0, 0 }, { 20, 20 } };
     mpClipView = [[NSClipView alloc] initWithFrame: aInitFrame ];
     if( mpClipView )
     {
-        [mpFrame->getView() addSubview: mpClipView];
+        [mpFrame->getNSView() addSubview: mpClipView];
         [mpClipView setHidden: YES];
     }
-    maSysData.pView = [[NSView alloc] initWithFrame: aInitFrame];
-    if( maSysData.pView )
+    maSysData.mpNSView = [[NSView alloc] initWithFrame: aInitFrame];
+    if( maSysData.mpNSView )
     {
         if( mpClipView )
-            [mpClipView setDocumentView: maSysData.pView];
+            [mpClipView setDocumentView: maSysData.mpNSView];
     }
 }
 
@@ -66,9 +66,9 @@ AquaSalObject::AquaSalObject( AquaSalFra
 
 AquaSalObject::~AquaSalObject()
 {
-    if( maSysData.pView )
+    if( maSysData.mpNSView )
     {
-        NSView *pView = maSysData.pView;
+        NSView *pView = maSysData.mpNSView;
         [pView removeFromSuperview];
         [pView release];
     }
@@ -169,10 +169,10 @@ void AquaSalObject::SetPosSize( long nX,
 void AquaSalObject::setClippedPosSize()
 {
     NSRect aViewRect = NSMakeRect( 0, 0, mnWidth, mnHeight);
-    if( maSysData.pView )
+    if( maSysData.mpNSView )
     {
-        NSView *pView = maSysData.pView;
-        [pView setFrame: aViewRect];
+        NSView* pNSView = maSysData.mpNSView;
+        [pNSView setFrame: aViewRect];
     }
     
     NSRect aClipViewRect = NSMakeRect( mnX, mnY, mnWidth, mnHeight);

Modified: openoffice/trunk/main/vcl/inc/aqua/salframe.h
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/aqua/salframe.h?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/aqua/salframe.h (original)
+++ openoffice/trunk/main/vcl/inc/aqua/salframe.h Mon Dec  2 16:06:37 2013
@@ -54,8 +54,8 @@ typedef struct SalFrame::SalPointerState
 class AquaSalFrame : public SalFrame
 {
 public:
-    NSWindow*                       mpWindow;               // Cocoa window
-	NSView*                         mpView;				    // Cocoa view (actually a custom view, see below
+	NSWindow*                       mpNSWindow;             // Cocoa window
+	NSView*                         mpNSView;               // Cocoa view (actually a custom view)
     NSMenuItem*                     mpDockMenuEntry;        // entry in the dynamic dock menu
     NSRect                          maScreenRect;           // for mirroring purposes
 	AquaSalGraphics*		        mpGraphics; 			// current frame graphics
@@ -175,8 +175,8 @@ public:
     
     static AquaSalFrame* GetCaptureFrame() { return s_pCaptureFrame; }
     
-    NSWindow* getWindow() const { return mpWindow; }
-    NSView* getView() const { return mpView; }
+    NSWindow* getNSWindow() const { return mpNSWindow; }
+    NSView* getNSView() const { return mpNSView; }
     unsigned int getStyleMask() const { return mnStyleMask; }
     
     void getResolution( long& o_rDPIX, long& o_rDPIY );

Modified: openoffice/trunk/main/vcl/inc/vcl/sysdata.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/sysdata.hxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/inc/vcl/sysdata.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/sysdata.hxx Mon Dec  2 16:06:37 2013
@@ -47,7 +47,7 @@ struct SystemEnvData
 #if defined( WNT ) || defined( OS2 )
 	HWND				hWnd;			// the window hwnd
 #elif defined( QUARTZ )
-    NSView*               pView;          // the cocoa (NSView *) implementing this object
+	NSView*				mpNSView;		// the cocoa (NSView *) implementing this object
 #elif defined( UNX )
 	void*				pDisplay;		// the relevant display connection
 	long				aWindow;		// the window of the object

Modified: openoffice/trunk/main/vcl/source/window/syschild.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/window/syschild.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/window/syschild.cxx (original)
+++ openoffice/trunk/main/vcl/source/window/syschild.cxx Mon Dec  2 16:06:37 2013
@@ -244,7 +244,7 @@ sal_IntPtr SystemChildWindow::GetParentW
     nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->hWnd );
 #elif defined QUARTZ
     // FIXME: this is wrong
-    nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->pView );
+    nRet = reinterpret_cast< sal_IntPtr >( GetSystemData()->mpNSView );
 #elif defined UNX
     if( !bUseJava )
     {

Modified: openoffice/trunk/main/vcl/source/window/window.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/window/window.cxx?rev=1547078&r1=1547077&r2=1547078&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/source/window/window.cxx (original)
+++ openoffice/trunk/main/vcl/source/window/window.cxx Mon Dec  2 16:06:37 2013
@@ -8621,8 +8621,8 @@ uno::Reference< XDragSource > Window::Ge
 			 * Using Windows based dnd as a temporary solution        */
                         aDragSourceSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDragSource" );
                         aDropTargetSN = OUString::createFromAscii( "com.sun.star.datatransfer.dnd.OleDropTarget" );
-                        aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
-                        aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->pView) ) );
+                        aDragSourceAL[ 1 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) ) );
+                        aDropTargetAL[ 0 ] = makeAny( static_cast<sal_uInt64>( reinterpret_cast<sal_IntPtr>(pEnvData->mpNSView) ) );
 #elif defined UNX
                         aDropTargetAL.realloc( 3 );
                         aDragSourceAL.realloc( 3 );



Mime
View raw message