From 6e14af669baf11cae91b281d17065a11512fb51d Mon Sep 17 00:00:00 2001 From: Chris Sherlock Date: Sun, 8 Jun 2014 23:52:53 +1000 Subject: vcl: change from clipMgr to pClipMgr Change-Id: I7bd54761b7646c60ba40f9654adbf2a93566849c --- vcl/source/window/clipping.cxx | 16 ++++---- vcl/source/window/dlgctrl.cxx | 8 ++-- vcl/source/window/event.cxx | 10 ++--- vcl/source/window/mouse.cxx | 4 +- vcl/source/window/paint.cxx | 88 +++++++++++++++++++++--------------------- vcl/source/window/stacking.cxx | 78 ++++++++++++++++++------------------- vcl/source/window/window.cxx | 76 ++++++++++++++++++------------------ vcl/source/window/window2.cxx | 8 ++-- vcl/source/window/winproc.cxx | 8 ++-- 9 files changed, 148 insertions(+), 148 deletions(-) diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index c01a91427ab6..52f39d7af112 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -30,26 +30,26 @@ void Window::InitClipRegion() { DBG_TESTSOLARMUTEX(); - ClipManager *clipMgr = ClipManager::GetInstance(); - clipMgr->Init( this ); + ClipManager *pClipMgr = ClipManager::GetInstance(); + pClipMgr->Init( this ); } void Window::SetParentClipMode( sal_uInt16 nMode ) { - ClipManager *clipMgr = ClipManager::GetInstance(); - clipMgr->SetParentClipMode( this, nMode ); + ClipManager *pClipMgr = ClipManager::GetInstance(); + pClipMgr->SetParentClipMode( this, nMode ); } sal_uInt16 Window::GetParentClipMode() const { - ClipManager *clipMgr = ClipManager::GetInstance(); - return clipMgr->GetParentClipMode( const_cast(this) ); + ClipManager *pClipMgr = ClipManager::GetInstance(); + return pClipMgr->GetParentClipMode( const_cast(this) ); } Region Window::GetActiveClipRegion() const { - ClipManager *clipMgr = ClipManager::GetInstance(); - return clipMgr->GetActiveClipRegion( this ); + ClipManager *pClipMgr = ClipManager::GetInstance(); + return pClipMgr->GetActiveClipRegion( this ); } void Window::ClipToPaintRegion(Rectangle& rDstRect) diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index a2516c00df6b..4e7e6c9d565d 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -945,13 +945,13 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) // checks if this window has dialog control bool Window::ImplHasDlgCtrl() { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); Window* pDlgCtrlParent; // lookup window for dialog control pDlgCtrlParent = ImplGetParent(); while ( pDlgCtrlParent && - !clipMgr->IsOverlapWindow( pDlgCtrlParent ) && + !pClipMgr->IsOverlapWindow( pDlgCtrlParent ) && ((pDlgCtrlParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) ) pDlgCtrlParent = pDlgCtrlParent->ImplGetParent(); @@ -963,7 +963,7 @@ bool Window::ImplHasDlgCtrl() void Window::ImplDlgCtrlNextWindow() { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); Window* pDlgCtrlParent; Window* pDlgCtrl; @@ -976,7 +976,7 @@ void Window::ImplDlgCtrlNextWindow() pDlgCtrl = this; pDlgCtrlParent = ImplGetParent(); while ( pDlgCtrlParent && - !clipMgr->IsOverlapWindow( pDlgCtrlParent ) && + !pClipMgr->IsOverlapWindow( pDlgCtrlParent ) && ((pDlgCtrlParent->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) ) pDlgCtrlParent = pDlgCtrlParent->ImplGetParent(); diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index bbfb606f7b93..7cf1a2f1aedb 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -50,10 +50,10 @@ void Window::NotifyAllChildren( DataChangedEvent& rDCEvt ) bool Window::PreNotify( NotifyEvent& rNEvt ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); bool bDone = false; - if ( mpWindowImpl->mpParent && !clipMgr->IsOverlapWindow( this ) ) + if ( mpWindowImpl->mpParent && !pClipMgr->IsOverlapWindow( this ) ) bDone = mpWindowImpl->mpParent->PreNotify( rNEvt ); if ( !bDone ) @@ -93,7 +93,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) bool Window::Notify( NotifyEvent& rNEvt ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); bool nRet = false; @@ -171,7 +171,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) // if the parent also has dialog control activated, the parent takes over control if ( (rNEvt.GetType() == EVENT_KEYINPUT) || (rNEvt.GetType() == EVENT_KEYUP) ) { - if ( clipMgr->IsOverlapWindow( this ) || + if ( pClipMgr->IsOverlapWindow( this ) || ((getNonLayoutRealParent(this)->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) ) { nRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == EVENT_KEYINPUT ); @@ -193,7 +193,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) if ( !nRet ) { - if ( mpWindowImpl->mpParent && !clipMgr->IsOverlapWindow( this ) ) + if ( mpWindowImpl->mpParent && !pClipMgr->IsOverlapWindow( this ) ) nRet = mpWindowImpl->mpParent->Notify( rNEvt ); } diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index e6610a089dfb..874fe099fb2b 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -91,7 +91,7 @@ bool Window::ImplTestMousePointerSet() PointerStyle Window::ImplGetMousePointer() const { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); PointerStyle ePointerStyle; bool bWait = false; @@ -123,7 +123,7 @@ PointerStyle Window::ImplGetMousePointer() const } } - if ( clipMgr->IsOverlapWindow( const_cast(pWindow) ) ) + if ( pClipMgr->IsOverlapWindow( const_cast(pWindow) ) ) break; pWindow = pWindow->ImplGetParent(); diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 6218a546cc7c..586d8ba1456a 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -97,10 +97,10 @@ PaintHelper::PaintHelper(Window *pWindow, sal_uInt16 nPaintFlags) void PaintHelper::DoPaint(const Region* pRegion) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); WindowImpl* pWindowImpl = m_pWindow->ImplGetWindowImpl(); - Region* pWinChildClipRegion = clipMgr->GetChildClipRegion(m_pWindow); + Region* pWinChildClipRegion = pClipMgr->GetChildClipRegion(m_pWindow); if ( pWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL ) pWindowImpl->maInvalidateRegion = *pWinChildClipRegion; else @@ -323,10 +323,10 @@ IMPL_LINK_NOARG(Window, ImplHandleResizeTimerHdl) void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // set PAINTCHILDREN for all parent windows till the first OverlapWindow - if ( !clipMgr->IsOverlapWindow( this ) ) + if ( !pClipMgr->IsOverlapWindow( this ) ) { Window* pTempWindow = this; sal_uInt16 nTranspPaint = IsPaintTransparent() ? IMPL_PAINT_PAINT : 0; @@ -339,7 +339,7 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags if( ! pTempWindow->IsPaintTransparent() ) nTranspPaint = 0; } - while ( !clipMgr->IsOverlapWindow( pTempWindow ) ); + while ( !pClipMgr->IsOverlapWindow( pTempWindow ) ); } // set Paint-Flags @@ -367,7 +367,7 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags Region *pChildRegion; if ( mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALL ) // invalidate the whole child window region in the parent - pChildRegion = clipMgr->GetChildClipRegion(this); + pChildRegion = pClipMgr->GetChildClipRegion(this); else // invalidate the same region in the parent that has to be repainted in the child pChildRegion = &mpWindowImpl->maInvalidateRegion; @@ -382,10 +382,10 @@ void Window::ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags void Window::ImplInvalidateOverlapFrameRegion( const Region& rRegion ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); Region aRegion = rRegion; - clipMgr->ClipBoundaries( this, aRegion, true, true ); + pClipMgr->ClipBoundaries( this, aRegion, true, true ); if ( !aRegion.IsEmpty() ) ImplInvalidateFrameRegion( &aRegion, INVALIDATE_CHILDREN ); @@ -413,11 +413,11 @@ void Window::ImplInvalidateParentFrameRegion( Region& rRegion ) void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // reset background storage if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - clipMgr->InvalidateAllOverlapBackgrounds( this ); + pClipMgr->InvalidateAllOverlapBackgrounds( this ); // check what has to be redrawn bool bInvalidateAll = !pRegion; @@ -437,7 +437,7 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) break; } - if ( clipMgr->IsOverlapWindow( pTempWindow ) ) + if ( pClipMgr->IsOverlapWindow( pTempWindow ) ) break; pTempWindow = pTempWindow->ImplGetParent(); @@ -475,17 +475,17 @@ void Window::ImplInvalidate( const Region* pRegion, sal_uInt16 nFlags ) else aRegion.Intersect( *pRegion ); } - clipMgr->ClipBoundaries( this, aRegion, true, true ); + pClipMgr->ClipBoundaries( this, aRegion, true, true ); if ( nFlags & INVALIDATE_NOCHILDREN ) { nFlags &= ~INVALIDATE_CHILDREN; if ( !(nFlags & INVALIDATE_NOCLIPCHILDREN) ) { if ( nOrgFlags & INVALIDATE_NOCHILDREN ) - clipMgr->ClipAllChildren( this, aRegion ); + pClipMgr->ClipAllChildren( this, aRegion ); else { - if ( clipMgr->ClipChildren( this, aRegion ) ) + if ( pClipMgr->ClipChildren( this, aRegion ) ) nFlags |= INVALIDATE_CHILDREN; } } @@ -525,12 +525,12 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, bool bChildren ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // also shift Paint-Region when paints need processing ImplMoveInvalidateRegion( rRect, nHorzScroll, nVertScroll, bChildren ); // Paint-Region should be shifted, as drawn by the parents - if ( !clipMgr->IsOverlapWindow( this ) ) + if ( !pClipMgr->IsOverlapWindow( this ) ) { Region aPaintAllRegion; Window* pPaintAllWindow = this; @@ -548,7 +548,7 @@ void Window::ImplMoveAllInvalidateRegions( const Rectangle& rRect, aPaintAllRegion.Union( pPaintAllWindow->mpWindowImpl->maInvalidateRegion ); } } - while ( !clipMgr->IsOverlapWindow( pPaintAllWindow ) ); + while ( !pClipMgr->IsOverlapWindow( pPaintAllWindow ) ); if ( !aPaintAllRegion.IsEmpty() ) { aPaintAllRegion.Move( nHorzScroll, nVertScroll ); @@ -604,7 +604,7 @@ void Window::ImplValidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ) void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // assemble region bool bValidateAll = !pRegion; @@ -626,15 +626,15 @@ void Window::ImplValidate( const Region* pRegion, sal_uInt16 nFlags ) Region aRegion( aRect ); if ( pRegion ) aRegion.Intersect( *pRegion ); - clipMgr->ClipBoundaries( this, aRegion, true, true ); + pClipMgr->ClipBoundaries( this, aRegion, true, true ); if ( nFlags & VALIDATE_NOCHILDREN ) { nFlags &= ~VALIDATE_CHILDREN; if ( nOrgFlags & VALIDATE_NOCHILDREN ) - clipMgr->ClipAllChildren( this, aRegion ); + pClipMgr->ClipAllChildren( this, aRegion ); else { - if ( clipMgr->ClipChildren( this, aRegion ) ) + if ( pClipMgr->ClipChildren( this, aRegion ) ) nFlags |= VALIDATE_CHILDREN; } } @@ -701,7 +701,7 @@ void Window::SetPaintTransparent( bool bTransparent ) void Window::SetWindowRegionPixel() { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if ( mpWindowImpl->mpBorderWindow ) mpWindowImpl->mpBorderWindow->SetWindowRegionPixel(); @@ -717,15 +717,15 @@ void Window::SetWindowRegionPixel() { mpWindowImpl->maWinRegion = Region(true); mpWindowImpl->mbWinRegion = false; - clipMgr->SetClipFlag( this ); + pClipMgr->SetClipFlag( this ); if ( IsReallyVisible() ) { // restore background storage if ( mpWindowImpl->mpOverlapData && mpWindowImpl->mpOverlapData->mpSaveBackDev ) - clipMgr->DeleteOverlapBackground( this ); + pClipMgr->DeleteOverlapBackground( this ); if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - clipMgr->InvalidateAllOverlapBackgrounds( this ); + pClipMgr->InvalidateAllOverlapBackgrounds( this ); Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); Region aRegion( aRect ); ImplInvalidateParentFrameRegion( aRegion ); @@ -736,7 +736,7 @@ void Window::SetWindowRegionPixel() void Window::SetWindowRegionPixel( const Region& rRegion ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if ( mpWindowImpl->mpBorderWindow ) mpWindowImpl->mpBorderWindow->SetWindowRegionPixel( rRegion ); @@ -797,23 +797,23 @@ void Window::SetWindowRegionPixel( const Region& rRegion ) { mpWindowImpl->maWinRegion = Region(true); mpWindowImpl->mbWinRegion = false; - clipMgr->SetClipFlag( this ); + pClipMgr->SetClipFlag( this ); } } else { mpWindowImpl->maWinRegion = rRegion; mpWindowImpl->mbWinRegion = true; - clipMgr->SetClipFlag( this ); + pClipMgr->SetClipFlag( this ); } if ( IsReallyVisible() ) { // restore background storage if ( mpWindowImpl->mpOverlapData && mpWindowImpl->mpOverlapData->mpSaveBackDev ) - clipMgr->DeleteOverlapBackground( this ); + pClipMgr->DeleteOverlapBackground( this ); if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - clipMgr->InvalidateAllOverlapBackgrounds( this ); + pClipMgr->InvalidateAllOverlapBackgrounds( this ); Rectangle aRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); Region aRegion( aRect ); ImplInvalidateParentFrameRegion( aRegion ); @@ -906,7 +906,7 @@ void Window::Validate( sal_uInt16 nFlags ) bool Window::HasPaintEvent() const { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if ( !mpWindowImpl->mbReallyVisible ) return false; @@ -917,7 +917,7 @@ bool Window::HasPaintEvent() const if ( mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINT ) return true; - if ( !clipMgr->IsOverlapWindow( const_cast(this) ) ) + if ( !pClipMgr->IsOverlapWindow( const_cast(this) ) ) { const Window* pTempWindow = this; do @@ -926,7 +926,7 @@ bool Window::HasPaintEvent() const if ( pTempWindow->mpWindowImpl->mnPaintFlags & (IMPL_PAINT_PAINTCHILDREN | IMPL_PAINT_PAINTALLCHILDREN) ) return true; } - while ( !clipMgr->IsOverlapWindow( const_cast(pTempWindow) ) ); + while ( !pClipMgr->IsOverlapWindow( const_cast(pTempWindow) ) ); } return false; @@ -934,7 +934,7 @@ bool Window::HasPaintEvent() const void Window::Update() { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if ( mpWindowImpl->mpBorderWindow ) { @@ -958,7 +958,7 @@ void Window::Update() // First we should skip all windows which are Paint-Transparent Window* pUpdateWindow = this; Window* pWindow = pUpdateWindow; - while ( !clipMgr->IsOverlapWindow(pWindow) ) + while ( !pClipMgr->IsOverlapWindow(pWindow) ) { if ( !pWindow->mpWindowImpl->mbPaintTransparent ) { @@ -974,7 +974,7 @@ void Window::Update() { if ( pWindow->mpWindowImpl->mnPaintFlags & IMPL_PAINT_PAINTALLCHILDREN ) pUpdateWindow = pWindow; - if ( clipMgr->IsOverlapWindow( pWindow ) ) + if ( pClipMgr->IsOverlapWindow( pWindow ) ) break; pWindow = pWindow->ImplGetParent(); } @@ -1198,7 +1198,7 @@ void Window::Erase() void Window::ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if ( !IsDeviceOutputNecessary() ) return; @@ -1211,7 +1211,7 @@ void Window::ImplScroll( const Rectangle& rRect, // restore background storage if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - clipMgr->InvalidateAllOverlapBackgrounds( this ); + pClipMgr->InvalidateAllOverlapBackgrounds( this ); if ( mpWindowImpl->mpCursor ) mpWindowImpl->mpCursor->ImplSuspend(); @@ -1250,7 +1250,7 @@ void Window::ImplScroll( const Rectangle& rRect, if ( !(nFlags & SCROLL_NOINVALIDATE) ) { - clipMgr->CalcOverlapRegion( this, aRectMirror, aInvalidateRegion, !bScrollChildren, true, false ); + pClipMgr->CalcOverlapRegion( this, aRectMirror, aInvalidateRegion, !bScrollChildren, true, false ); // --- RTL --- // if the scrolling on the device is performed in the opposite direction @@ -1282,13 +1282,13 @@ void Window::ImplScroll( const Rectangle& rRect, aRegion.Exclude( aInvalidateRegion ); - clipMgr->ClipBoundaries( this, aRegion, false, true ); + pClipMgr->ClipBoundaries( this, aRegion, false, true ); if ( !bScrollChildren ) { if ( nOrgFlags & SCROLL_NOCHILDREN ) - clipMgr->ClipAllChildren( this, aRegion ); + pClipMgr->ClipAllChildren( this, aRegion ); else - clipMgr->ClipChildren( this, aRegion ); + pClipMgr->ClipChildren( this, aRegion ); } if ( mbClipRegion && (nFlags & SCROLL_USECLIPREGION) ) aRegion.Intersect( maRegion ); @@ -1349,9 +1349,9 @@ void Window::ImplScroll( const Rectangle& rRect, if ( !bScrollChildren ) { if ( nOrgFlags & SCROLL_NOCHILDREN ) - clipMgr->ClipAllChildren( this, aInvalidateRegion ); + pClipMgr->ClipAllChildren( this, aInvalidateRegion ); else - clipMgr->ClipChildren( this, aInvalidateRegion ); + pClipMgr->ClipChildren( this, aInvalidateRegion ); } ImplInvalidateFrameRegion( &aInvalidateRegion, nPaintFlags ); } 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(pWindow) ) ) + if ( !bSystemWindow && pClipMgr->IsOverlapWindow( const_cast(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(this) ) ) + if ( pClipMgr->IsOverlapWindow( const_cast(this) ) ) return (Window*)this; else return mpWindowImpl->mpOverlapWindow; case WINDOW_PARENTOVERLAP: - if ( clipMgr->IsOverlapWindow( const_cast(this) ) ) + if ( pClipMgr->IsOverlapWindow( const_cast(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(pWindow) ) ) + if ( !bSystemWindow && pClipMgr->IsOverlapWindow( const_cast(pWindow) ) ) break; pWindow = pWindow->ImplGetParent(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 3e6670f3e561..3fe72867c6b9 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -421,7 +421,7 @@ Window::~Window() #endif } - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // if we get focus pass focus to another window Window* pOverlapWindow = ImplGetFirstOverlapWindow(); @@ -442,10 +442,10 @@ Window::~Window() // of the next FrameWindow if ( pBorderWindow ) { - if ( clipMgr->IsOverlapWindow( pBorderWindow ) ) + if ( pClipMgr->IsOverlapWindow( pBorderWindow ) ) pParent = pBorderWindow->mpWindowImpl->mpOverlapWindow; } - else if ( clipMgr->IsOverlapWindow( this ) ) + else if ( pClipMgr->IsOverlapWindow( this ) ) pParent = mpWindowImpl->mpOverlapWindow; if ( pParent && pParent->IsEnabled() && pParent->IsInputEnabled() && ! pParent->IsInModalMode() ) @@ -854,7 +854,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste { DBG_ASSERT( mpWindowImpl->mbFrame || pParent, "Window::Window(): pParent == NULL" ); - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); ImplSVData* pSVData = ImplGetSVData(); Window* pRealParent = pParent; @@ -1093,7 +1093,7 @@ void Window::ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSyste { if ( pParent ) { - if ( !clipMgr->IsOverlapWindow( this ) ) + if ( !pClipMgr->IsOverlapWindow( this ) ) { mpWindowImpl->mbDisabled = pParent->mpWindowImpl->mbDisabled; mpWindowImpl->mbInputDisabled = pParent->mpWindowImpl->mbInputDisabled; @@ -1463,11 +1463,11 @@ void Window::ImplLogicToPoint( Font& rFont ) const bool Window::ImplUpdatePos() { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); bool bSysChild = false; - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) { mnOutOffX = mpWindowImpl->mnX; mnOutOffY = mpWindowImpl->mnY; @@ -1510,7 +1510,7 @@ void Window::ImplUpdateSysObjPos() void Window::ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); bool bNewPos = false; bool bNewSize = false; @@ -1525,7 +1525,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( IsReallyVisible() ) { if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - clipMgr->InvalidateAllOverlapBackgrounds( this ); + pClipMgr->InvalidateAllOverlapBackgrounds( this ); Rectangle aOldWinRect( Point( nOldOutOffX, nOldOutOffY ), Size( nOldOutWidth, nOldOutHeight ) ); @@ -1615,7 +1615,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( bCopyBits && !pOverlapRegion ) { pOverlapRegion = new Region(); - clipMgr->CalcOverlapRegion( this, Rectangle( Point( mnOutOffX, mnOutOffY ), + pClipMgr->CalcOverlapRegion( this, Rectangle( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ), *pOverlapRegion, false, true, true ); } @@ -1633,7 +1633,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, if ( bCopyBits && !pOverlapRegion ) { pOverlapRegion = new Region(); - clipMgr->CalcOverlapRegion( this, Rectangle( Point( mnOutOffX, mnOutOffY ), + pClipMgr->CalcOverlapRegion( this, Rectangle( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ), *pOverlapRegion, false, true, true ); } @@ -1705,11 +1705,11 @@ void Window::ImplPosSizeWindow( long nX, long nY, { // reset background storage if ( mpWindowImpl->mpOverlapData && mpWindowImpl->mpOverlapData->mpSaveBackDev ) - clipMgr->DeleteOverlapBackground( this ); + pClipMgr->DeleteOverlapBackground( this ); if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - clipMgr->InvalidateAllOverlapBackgrounds( this ); + pClipMgr->InvalidateAllOverlapBackgrounds( this ); // set Clip-Flag - bUpdateSysObjClip = !clipMgr->SetClipFlag( this, true ); + bUpdateSysObjClip = !pClipMgr->SetClipFlag( this, true ); } // invalidate window content ? @@ -1719,7 +1719,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, { bool bInvalidate = false; bool bParentPaint = true; - if ( !clipMgr->IsOverlapWindow( this ) ) + if ( !pClipMgr->IsOverlapWindow( this ) ) bParentPaint = mpWindowImpl->mpParent->IsPaintEnabled(); if ( bCopyBits && bParentPaint && !HasPaintEvent() ) { @@ -1728,7 +1728,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, Size( mnOutWidth, mnOutHeight ) ) ); if ( mpWindowImpl->mbWinRegion ) aRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); - clipMgr->ClipBoundaries( this, aRegion, false, true ); + pClipMgr->ClipBoundaries( this, aRegion, false, true ); if ( !pOverlapRegion->IsEmpty() ) { pOverlapRegion->Move( mnOutOffX-nOldOutOffX, mnOutOffY-nOldOutOffY ); @@ -1781,7 +1781,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, aRegion.Exclude( *pOldRegion ); if ( mpWindowImpl->mbWinRegion ) aRegion.Intersect( ImplPixelToDevicePixel( mpWindowImpl->maWinRegion ) ); - clipMgr->ClipBoundaries( this, aRegion, false, true ); + pClipMgr->ClipBoundaries( this, aRegion, false, true ); if ( !aRegion.IsEmpty() ) ImplInvalidateFrameRegion( &aRegion, INVALIDATE_CHILDREN ); } @@ -1793,8 +1793,8 @@ void Window::ImplPosSizeWindow( long nX, long nY, { Region aRegion( *pOldRegion ); if ( !mpWindowImpl->mbPaintTransparent ) - clipMgr->Exclude( this, aRegion ); - clipMgr->ClipBoundaries( this, aRegion, false, true ); + pClipMgr->Exclude( this, aRegion ); + pClipMgr->ClipBoundaries( this, aRegion, false, true ); if ( !aRegion.IsEmpty() && !mpWindowImpl->mpBorderWindow ) ImplInvalidateParentFrameRegion( aRegion ); } @@ -1802,7 +1802,7 @@ void Window::ImplPosSizeWindow( long nX, long nY, // adapt system objects if ( bUpdateSysObjClip ) - clipMgr->UpdateSysObjClip( this ); + pClipMgr->UpdateSysObjClip( this ); if ( bUpdateSysObjPos ) ImplUpdateSysObjPos(); if ( bNewSize && mpWindowImpl->mpSysObj ) @@ -1928,7 +1928,7 @@ void Window::LoseFocus() void Window::RequestHelp( const HelpEvent& rHEvt ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // if Balloon-Help is requested, show the balloon // with help text set @@ -1937,7 +1937,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) OUString rStr = GetHelpText(); if ( rStr.isEmpty() ) rStr = GetQuickHelpText(); - if ( rStr.isEmpty() && ImplGetParent() && !clipMgr->IsOverlapWindow( this ) ) + if ( rStr.isEmpty() && ImplGetParent() && !pClipMgr->IsOverlapWindow( this ) ) ImplGetParent()->RequestHelp( rHEvt ); else Help::ShowBalloon( this, rHEvt.GetMousePosPixel(), rStr ); @@ -1945,12 +1945,12 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HELPMODE_QUICK ) { const OUString& rStr = GetQuickHelpText(); - if ( rStr.isEmpty() && ImplGetParent() && !clipMgr->IsOverlapWindow( this ) ) + if ( rStr.isEmpty() && ImplGetParent() && !pClipMgr->IsOverlapWindow( this ) ) ImplGetParent()->RequestHelp( rHEvt ); else { Point aPos = GetPosPixel(); - if ( ImplGetParent() && !clipMgr->IsOverlapWindow( this ) ) + if ( ImplGetParent() && !pClipMgr->IsOverlapWindow( this ) ) aPos = ImplGetParent()->OutputToScreenPixel( aPos ); Rectangle aRect( aPos, GetSizePixel() ); OUString aHelpText; @@ -2252,7 +2252,7 @@ Font Window::GetPointFont() const void Window::Show( bool bVisible, sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if ( mpWindowImpl->mbVisible == bVisible ) return; @@ -2289,16 +2289,16 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) Region aInvRegion; bool bSaveBack = false; - if ( clipMgr->IsOverlapWindow( this ) && !mpWindowImpl->mbFrame ) + if ( pClipMgr->IsOverlapWindow( this ) && !mpWindowImpl->mbFrame ) { - if ( clipMgr->RestoreOverlapBackground( this, aInvRegion ) ) + if ( pClipMgr->RestoreOverlapBackground( this, aInvRegion ) ) bSaveBack = true; } if ( !bSaveBack ) { if ( mpWindowImpl->mbInitWinClipRegion ) - clipMgr->InitClipRegion(this); + pClipMgr->InitClipRegion(this); aInvRegion = mpWindowImpl->maWinClipRegion; } @@ -2307,9 +2307,9 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) bRealVisibilityChanged = mpWindowImpl->mbReallyVisible; ImplResetReallyVisible(); - clipMgr->SetClipFlag( this ); + pClipMgr->SetClipFlag( this ); - if ( clipMgr->IsOverlapWindow( this ) && !mpWindowImpl->mbFrame ) + if ( pClipMgr->IsOverlapWindow( this ) && !mpWindowImpl->mbFrame ) { // convert focus if ( !(nFlags & SHOW_NOFOCUSCHANGE) && HasChildPathFocus() ) @@ -2373,7 +2373,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) StateChanged( STATE_CHANGE_VISIBLE ); Window* pTestParent; - if ( clipMgr->IsOverlapWindow( this ) ) + if ( pClipMgr->IsOverlapWindow( this ) ) pTestParent = mpWindowImpl->mpOverlapWindow; else pTestParent = ImplGetParent(); @@ -2385,7 +2385,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) // If it is a SystemWindow it automatically pops up on top of // all other windows if needed. - if ( clipMgr->IsOverlapWindow( this ) && !(nFlags & SHOW_NOACTIVATE) ) + if ( pClipMgr->IsOverlapWindow( this ) && !(nFlags & SHOW_NOACTIVATE) ) { ImplStartToTop(( nFlags & SHOW_FOREGROUNDTASK ) ? TOTOP_FOREGROUNDTASK : 0 ); ImplFocusToTop( 0, false ); @@ -2393,13 +2393,13 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) // save background if ( mpWindowImpl->mpOverlapData && mpWindowImpl->mpOverlapData->mbSaveBack ) - clipMgr->SaveOverlapBackground( this ); + pClipMgr->SaveOverlapBackground( this ); // adjust mpWindowImpl->mbReallyVisible bRealVisibilityChanged = !mpWindowImpl->mbReallyVisible; ImplSetReallyVisible(); // assure clip rectangles will be recalculated - clipMgr->SetClipFlag( this ); + pClipMgr->SetClipFlag( this ); if ( !mpWindowImpl->mbFrame ) { @@ -2469,7 +2469,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags ) return; // invalidate all saved backgrounds if ( mpWindowImpl->mpFrameData->mpFirstBackWin ) - clipMgr->InvalidateAllOverlapBackgrounds( this ); + pClipMgr->InvalidateAllOverlapBackgrounds( this ); // the SHOW/HIDE events also serve as indicators to send child creation/destroy events to the access bridge // However, the access bridge only uses this event if the data member is not NULL (it's kind of a hack that @@ -2961,7 +2961,7 @@ Point Window::ScreenToOutputPixel( const Point& rPos ) const long Window::ImplGetUnmirroredOutOffX() { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // revert mnOutOffX changes that were potentially made in ImplPosSizeWindow long offx = mnOutOffX; @@ -2970,12 +2970,12 @@ long Window::ImplGetUnmirroredOutOffX() { if( mpWindowImpl->mpParent && !mpWindowImpl->mpParent->mpWindowImpl->mbFrame && mpWindowImpl->mpParent->ImplIsAntiparallel() ) { - if ( !clipMgr->IsOverlapWindow( this ) ) + if ( !pClipMgr->IsOverlapWindow( this ) ) offx -= mpWindowImpl->mpParent->mnOutOffX; offx = mpWindowImpl->mpParent->mnOutWidth - mnOutWidth - offx; - if ( !clipMgr->IsOverlapWindow( this ) ) + if ( !pClipMgr->IsOverlapWindow( this ) ) offx += mpWindowImpl->mpParent->mnOutOffX; } diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 935aee853f02..b7317c0b8c88 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -233,7 +233,7 @@ void Window::HideTracking() void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); OutputDevice *pOutDev = GetOutDev(); Rectangle aRect( pOutDev->ImplLogicToDevicePixel( rRect ) ); @@ -273,7 +273,7 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) Point aPoint( mnOutOffX, mnOutOffY ); Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); - clipMgr->ClipBoundaries( this, aRegion, false, false ); + pClipMgr->ClipBoundaries( this, aRegion, false, false ); pOutDev->SelectClipRegion( aRegion, pGraphics ); } } @@ -297,7 +297,7 @@ void Window::InvertTracking( const Rectangle& rRect, sal_uInt16 nFlags ) void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); sal_uInt16 nPoints = rPoly.GetSize(); @@ -339,7 +339,7 @@ void Window::InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags ) Point aPoint( mnOutOffX, mnOutOffY ); Region aRegion( Rectangle( aPoint, Size( mnOutWidth, mnOutHeight ) ) ); - clipMgr->ClipBoundaries( this, aRegion, false, false ); + pClipMgr->ClipBoundaries( this, aRegion, false, false ); pOutDev->SelectClipRegion( aRegion, pGraphics ); } } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 35f4459269b4..6d614d2f2014 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1510,7 +1510,7 @@ static bool ImplHandleWheelEvent( Window* pWindow, const SalWheelMouseEvent& rEv static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool bImmediateUpdate ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); // give up background save when system paints arrive Window* pSaveBackWin = pWindow->ImplGetWindowImpl()->mpFrameData->mpFirstBackWin; while ( pSaveBackWin ) @@ -1519,7 +1519,7 @@ static void ImplHandlePaint( Window* pWindow, const Rectangle& rBoundRect, bool Rectangle aRect( Point( pSaveBackWin->GetOutOffXPixel(), pSaveBackWin->GetOutOffYPixel() ), Size( pSaveBackWin->GetOutputWidthPixel(), pSaveBackWin->GetOutputHeightPixel() ) ); if ( aRect.IsOver( rBoundRect ) ) - clipMgr->DeleteOverlapBackground( pSaveBackWin ); + pClipMgr->DeleteOverlapBackground( pSaveBackWin ); pSaveBackWin = pNext; } @@ -1553,7 +1553,7 @@ static void KillOwnPopups( Window* pWindow ) void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) { - ClipManager *clipMgr = ClipManager::GetInstance(); + ClipManager *pClipMgr = ClipManager::GetInstance(); if( pWindow->GetStyle() & (WB_MOVEABLE|WB_SIZEABLE) ) { @@ -1573,7 +1573,7 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ) pWindow->mnOutHeight = nNewHeight; pWindow->ImplGetWindowImpl()->mbWaitSystemResize = false; if ( pWindow->IsReallyVisible() ) - clipMgr->SetClipFlag( pWindow ); + pClipMgr->SetClipFlag( pWindow ); if ( pWindow->IsVisible() || pWindow->ImplGetWindow()->ImplGetWindowImpl()->mbAllResize || ( pWindow->ImplGetWindowImpl()->mbFrame && pWindow->ImplGetWindowImpl()->mpClientWindow ) ) // propagate resize for system border windows { -- cgit