diff options
Diffstat (limited to 'vcl/source/window/stacking.cxx')
-rw-r--r-- | vcl/source/window/stacking.cxx | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index cc85232344d7..ba4fd85f1b74 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -62,7 +62,7 @@ Window* Window::ImplGetTopmostFrameWindow() void Window::ImplInsertWindow( Window* pParent ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); mpWindowImpl->mpParent = pParent; mpWindowImpl->mpRealParent = pParent; @@ -77,10 +77,10 @@ void Window::ImplInsertWindow( Window* pParent ) mpWindowImpl->mbFrame = false; // search overlap window and insert window in list - if ( clipMgr->IsOverlapWindow(this) ) + if ( pClipMgr->IsOverlapWindow(this) ) { Window* pFirstOverlapParent = pParent; - while ( !clipMgr->IsOverlapWindow( pFirstOverlapParent ) ) + while ( !pClipMgr->IsOverlapWindow( pFirstOverlapParent ) ) pFirstOverlapParent = pFirstOverlapParent->ImplGetParent(); mpWindowImpl->mpOverlapWindow = pFirstOverlapParent; @@ -97,7 +97,7 @@ void Window::ImplInsertWindow( Window* pParent ) } else { - if ( clipMgr->IsOverlapWindow( pParent ) ) + if ( pClipMgr->IsOverlapWindow( pParent ) ) mpWindowImpl->mpOverlapWindow = pParent; else mpWindowImpl->mpOverlapWindow = pParent->mpWindowImpl->mpOverlapWindow; @@ -113,12 +113,12 @@ void Window::ImplInsertWindow( Window* pParent ) void Window::ImplRemoveWindow( bool bRemoveFrameData ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // remove window from the lists if ( !mpWindowImpl->mbFrame ) { - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) { if ( mpWindowImpl->mpFrameData->mpFirstOverlap == this ) mpWindowImpl->mpFrameData->mpFirstOverlap = mpWindowImpl->mpNextOverlap; @@ -197,9 +197,9 @@ void Window::reorderWithinParent(sal_uInt16 nNewPosition) void Window::ImplToBottomChild() { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); - if ( !clipMgr->IsOverlapWindow( this ) && !mpWindowImpl->mbReallyVisible && (mpWindowImpl->mpParent->mpWindowImpl->mpLastChild != this) ) + if ( !pClipMgr->IsOverlapWindow( this ) && !mpWindowImpl->mbReallyVisible && (mpWindowImpl->mpParent->mpWindowImpl->mpLastChild != this) ) { // put the window to the end of the list if ( mpWindowImpl->mpPrev ) @@ -216,9 +216,9 @@ void Window::ImplToBottomChild() void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); - DBG_ASSERT( clipMgr->IsOverlapWindow(this), "Window::ImplCalcToTop(): Is not a OverlapWindow" ); + DBG_ASSERT( pClipMgr->IsOverlapWindow(this), "Window::ImplCalcToTop(): Is not a OverlapWindow" ); if ( !mpWindowImpl->mbFrame ) { @@ -229,7 +229,7 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); Region aInvalidateRegion; - clipMgr->CalcOverlapRegionOverlaps( this, aRegion, aInvalidateRegion ); + pClipMgr->CalcOverlapRegionOverlaps( this, aRegion, aInvalidateRegion ); if ( !aInvalidateRegion.IsEmpty() ) { @@ -245,9 +245,9 @@ void Window::ImplCalcToTop( ImplCalcToTopData* pPrevData ) void Window::ImplToTop( sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); - DBG_ASSERT( clipMgr->IsOverlapWindow(this), "Window::ImplToTop(): Is not a OverlapWindow" ); + DBG_ASSERT( pClipMgr->IsOverlapWindow(this), "Window::ImplToTop(): Is not a OverlapWindow" ); if ( mpWindowImpl->mbFrame ) { @@ -328,8 +328,8 @@ void Window::ImplToTop( sal_uInt16 nFlags ) { // reset background storage if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - clipMgr->InvalidateAllOverlapBackgrounds( this ); - clipMgr->SetClipFlagOverlapWindows( mpWindowImpl->mpOverlapWindow ); + pClipMgr->InvalidateAllOverlapBackgrounds( this ); + pClipMgr->SetClipFlagOverlapWindows( mpWindowImpl->mpOverlapWindow ); } } } @@ -337,13 +337,13 @@ void Window::ImplToTop( sal_uInt16 nFlags ) void Window::ImplStartToTop( sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); ImplCalcToTopData aStartData; ImplCalcToTopData* pCurData; ImplCalcToTopData* pNextData; Window* pOverlapWindow; - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) pOverlapWindow = this; else pOverlapWindow = mpWindowImpl->mpOverlapWindow; @@ -392,14 +392,14 @@ void Window::ImplStartToTop( sal_uInt16 nFlags ) void Window::ImplFocusToTop( sal_uInt16 nFlags, bool bReallyVisible ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // do we need to fetch the focus? if ( !(nFlags & TOTOP_NOGRABFOCUS) ) { // first window with GrabFocus-Activate gets the focus Window* pFocusWindow = this; - while ( !clipMgr->IsOverlapWindow( pFocusWindow ) ) + while ( !pClipMgr->IsOverlapWindow( pFocusWindow ) ) { // if the window has no BorderWindow, we // should always find the belonging BorderWindow @@ -458,7 +458,7 @@ void Window::ToTop( sal_uInt16 nFlags ) void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if ( mpWindowImpl->mpBorderWindow ) { @@ -468,7 +468,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) if ( nFlags & WINDOW_ZORDER_FIRST ) { - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) pRefWindow = mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; else pRefWindow = mpWindowImpl->mpParent->mpWindowImpl->mpFirstChild; @@ -476,7 +476,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) } else if ( nFlags & WINDOW_ZORDER_LAST ) { - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) pRefWindow = mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpLastOverlap; else pRefWindow = mpWindowImpl->mpParent->mpWindowImpl->mpLastChild; @@ -494,7 +494,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) if ( pRefWindow->mpWindowImpl->mpPrev == this ) return; - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) { if ( mpWindowImpl->mpPrev ) mpWindowImpl->mpPrev->mpWindowImpl->mpNext = mpWindowImpl->mpNext; @@ -532,7 +532,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) if ( pRefWindow->mpWindowImpl->mpNext == this ) return; - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) { if ( mpWindowImpl->mpPrev ) mpWindowImpl->mpPrev->mpWindowImpl->mpNext = mpWindowImpl->mpNext; @@ -570,12 +570,12 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) { // restore background storage if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - clipMgr->InvalidateAllOverlapBackgrounds( this ); + pClipMgr->InvalidateAllOverlapBackgrounds( this ); if ( mpWindowImpl->mbInitWinClipRegion || !mpWindowImpl->maWinClipRegion.IsEmpty() ) { bool bInitWinClipRegion = mpWindowImpl->mbInitWinClipRegion; - clipMgr->SetClipFlag( this ); + pClipMgr->SetClipFlag( this ); // When ClipRegion was not initialised, assume // the window has not been sent, therefore do not @@ -590,7 +590,7 @@ void Window::SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ) // Is INCOMPLETE !!! Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); Window* pWindow = NULL; - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) { if ( mpWindowImpl->mpOverlapWindow ) pWindow = mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; @@ -727,11 +727,11 @@ bool Window::ImplIsRealParentPath( const Window* pWindow ) const bool Window::ImplIsChild( const Window* pWindow, bool bSystemWindow ) const { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); do { - if ( !bSystemWindow && clipMgr->IsOverlapWindow( const_cast<Window*>(pWindow) ) ) + if ( !bSystemWindow && pClipMgr->IsOverlapWindow( const_cast<Window*>(pWindow) ) ) break; pWindow = pWindow->ImplGetParent(); @@ -786,7 +786,7 @@ void Window::ImplResetReallyVisible() void Window::ImplUpdateWindowPtr( Window* pWindow ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if ( mpWindowImpl->mpFrameWindow != pWindow->mpWindowImpl->mpFrameWindow ) { @@ -798,7 +798,7 @@ void Window::ImplUpdateWindowPtr( Window* pWindow ) mpWindowImpl->mpFrameData = pWindow->mpWindowImpl->mpFrameData; mpWindowImpl->mpFrame = pWindow->mpWindowImpl->mpFrame; mpWindowImpl->mpFrameWindow = pWindow->mpWindowImpl->mpFrameWindow; - if ( clipMgr->IsOverlapWindow( pWindow ) ) + if ( pClipMgr->IsOverlapWindow( pWindow ) ) mpWindowImpl->mpOverlapWindow = pWindow; else mpWindowImpl->mpOverlapWindow = pWindow->mpWindowImpl->mpOverlapWindow; @@ -878,7 +878,7 @@ void Window::SetParent( Window* pNewParent ) DBG_ASSERT( pNewParent, "Window::SetParent(): pParent == NULL" ); DBG_ASSERT( pNewParent != this, "someone tried to reparent a window to itself" ); - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if( pNewParent == this ) return; @@ -927,7 +927,7 @@ void Window::SetParent( Window* pNewParent ) // check if the overlap window changes Window* pOldOverlapWindow; Window* pNewOverlapWindow = NULL; - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) pOldOverlapWindow = NULL; else { @@ -971,7 +971,7 @@ void Window::SetParent( Window* pNewParent ) // If the Overlap-Window has changed, we need to test whether // OverlapWindows that had the Child window as their parent // need to be put into the window hierarchy. - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) { if ( bNewFrame ) { @@ -1073,7 +1073,7 @@ Window* Window::GetChild( sal_uInt16 nChild ) const Window* Window::GetWindow( sal_uInt16 nType ) const { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); switch ( nType ) { @@ -1099,13 +1099,13 @@ Window* Window::GetWindow( sal_uInt16 nType ) const return mpWindowImpl->mpLastOverlap; case WINDOW_OVERLAP: - if ( clipMgr->IsOverlapWindow( const_cast<Window*>(this) ) ) + if ( pClipMgr->IsOverlapWindow( const_cast<Window*>(this) ) ) return (Window*)this; else return mpWindowImpl->mpOverlapWindow; case WINDOW_PARENTOVERLAP: - if ( clipMgr->IsOverlapWindow( const_cast<Window*>(this) ) ) + if ( pClipMgr->IsOverlapWindow( const_cast<Window*>(this) ) ) return mpWindowImpl->mpOverlapWindow; else return mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpOverlapWindow; @@ -1163,11 +1163,11 @@ Window* Window::GetWindow( sal_uInt16 nType ) const bool Window::IsChild( const Window* pWindow, bool bSystemWindow ) const { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); do { - if ( !bSystemWindow && clipMgr->IsOverlapWindow( const_cast<Window*>(pWindow) ) ) + if ( !bSystemWindow && pClipMgr->IsOverlapWindow( const_cast<Window*>(pWindow) ) ) break; pWindow = pWindow->ImplGetParent(); |