diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-06-02 00:18:38 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2014-07-19 23:40:48 +1000 |
| commit | 4e90e2f710580376274e8eb043e3efb18fe419e3 (patch) | |
| tree | bdc892ac45947d180a6806192d628aa1530524b9 | |
| parent | dd0281ca13c00af2130dba9141ad22cc971ce40e (diff) | |
vcl: remove unnecessary ImplExcludeOverlapWindows2()
Change-Id: Ie1442b1ae1944c5fe2006c1d4d50f8618fba023d
| -rw-r--r-- | include/vcl/window.hxx | 1 | ||||
| -rw-r--r-- | vcl/source/window/clipmgr.cxx | 5 | ||||
| -rw-r--r-- | vcl/source/window/clipping.cxx | 8 |
3 files changed, 4 insertions, 10 deletions
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 167d245f0c63..490c5fd1c69b 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -524,7 +524,6 @@ private: SAL_DLLPRIVATE void ImplIntersectWindowRegion( Region& rRegion ); SAL_DLLPRIVATE void ImplExcludeWindowRegion( Region& rRegion ); SAL_DLLPRIVATE void ImplExcludeOverlapWindows( Region& rRegion ); - SAL_DLLPRIVATE void ImplExcludeOverlapWindows2( Region& rRegion ); SAL_DLLPRIVATE bool ImplClipChildren( Region& rRegion ); SAL_DLLPRIVATE void ImplClipAllChildren( Region& rRegion ); diff --git a/vcl/source/window/clipmgr.cxx b/vcl/source/window/clipmgr.cxx index 2b8d6c4d1b12..c7a74c52bef5 100644 --- a/vcl/source/window/clipmgr.cxx +++ b/vcl/source/window/clipmgr.cxx @@ -89,7 +89,10 @@ void ClipManager::ClipBoundaries( Window* pWindow, Region& rRegion, bool bThis, Window* pOverlapWindow = pStartOverlapWindow->mpWindowImpl->mpOverlapWindow->mpWindowImpl->mpFirstOverlap; while ( pOverlapWindow && (pOverlapWindow != pStartOverlapWindow) ) { - pOverlapWindow->ImplExcludeOverlapWindows2( rRegion ); + if ( pWindow->mpWindowImpl->mbReallyVisible ) + pWindow->ImplExcludeWindowRegion( rRegion ); + + ImplExcludeOverlapWindows( rRegion ); pOverlapWindow = pOverlapWindow->mpWindowImpl->mpNext; } pStartOverlapWindow = pStartOverlapWindow->mpWindowImpl->mpOverlapWindow; diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index e7b7e7620e3f..c824dc824559 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -507,14 +507,6 @@ void Window::ImplExcludeOverlapWindows( Region& rRegion ) } } -void Window::ImplExcludeOverlapWindows2( Region& rRegion ) -{ - if ( mpWindowImpl->mbReallyVisible ) - ImplExcludeWindowRegion( rRegion ); - - ImplExcludeOverlapWindows( rRegion ); -} - void Window::ImplIntersectAndUnionOverlapWindows( const Region& rInterRegion, Region& rRegion ) { Window* pWindow = mpWindowImpl->mpFirstOverlap; |