diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-26 10:16:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-27 11:14:25 +0200 |
| commit | edc69a55c30ac6cc12de0bf18bddb7dc3f210be4 (patch) | |
| tree | d661c9dadcf3bf4b9215667a15501656cee9e4fe /vcl/source/window | |
| parent | 5ad3886ec8d3d465c956d99fab42fffda656392c (diff) | |
simplify GetWindowClipRegionPixel
since it has only one call-site
Change-Id: I80344faf4beab9aa9427ba8d448b0cf3fd30c7b6
Diffstat (limited to 'vcl/source/window')
| -rw-r--r-- | vcl/source/window/clipping.cxx | 34 |
1 files changed, 8 insertions, 26 deletions
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx index 38efc376c7ef..ef56b63cff55 100644 --- a/vcl/source/window/clipping.cxx +++ b/vcl/source/window/clipping.cxx @@ -112,37 +112,19 @@ void Window::ExpandPaintClipRegion( const vcl::Region& rRegion ) } } -vcl::Region Window::GetWindowClipRegionPixel( sal_uInt16 nFlags ) const +vcl::Region Window::GetWindowClipRegionPixel() const { - vcl::Region aWinClipRegion; - if ( nFlags & WINDOW_GETCLIPREGION_NOCHILDREN ) - { - if ( mpWindowImpl->mbInitWinClipRegion ) - const_cast<vcl::Window*>(this)->ImplInitWinClipRegion(); - aWinClipRegion = mpWindowImpl->maWinClipRegion; - } - else - { - vcl::Region* pWinChildClipRegion = const_cast<vcl::Window*>(this)->ImplGetWinChildClipRegion(); - aWinClipRegion = *pWinChildClipRegion; - // --- RTL --- remirror clip region before passing it to somebody - if( ImplIsAntiparallel() ) - { - const OutputDevice *pOutDev = GetOutDev(); - pOutDev->ReMirror( aWinClipRegion ); - } - } + if ( mpWindowImpl->mbInitWinClipRegion ) + const_cast<vcl::Window*>(this)->ImplInitWinClipRegion(); + aWinClipRegion = mpWindowImpl->maWinClipRegion; - if ( nFlags & WINDOW_GETCLIPREGION_NULL ) - { - Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); - vcl::Region aWinRegion( aWinRect ); + Rectangle aWinRect( Point( mnOutOffX, mnOutOffY ), Size( mnOutWidth, mnOutHeight ) ); + vcl::Region aWinRegion( aWinRect ); - if ( aWinRegion == aWinClipRegion ) - aWinClipRegion.SetNull(); - } + if ( aWinRegion == aWinClipRegion ) + aWinClipRegion.SetNull(); aWinClipRegion.Move( -mnOutOffX, -mnOutOffY ); |