summaryrefslogtreecommitdiff
path: root/vcl/source/window/clipping.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-09-04 12:12:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-09-05 09:29:42 +0200
commit3b4ffee640b9f3f19d142de518ebc85378e68e9c (patch)
treef850ce5e1d381dd5d4c2aa24429d3aeabec453bc /vcl/source/window/clipping.cxx
parent93e5da84a40be70857833903e3ebdea395c06596 (diff)
loplugin:useuniqueptr in Window
Change-Id: I0072d3085b1c00573d72948d1bbefb241b0da205 Reviewed-on: https://gerrit.libreoffice.org/59998 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/window/clipping.cxx')
-rw-r--r--vcl/source/window/clipping.cxx26
1 files changed, 12 insertions, 14 deletions
diff --git a/vcl/source/window/clipping.cxx b/vcl/source/window/clipping.cxx
index b7c6fbf36cb5..8ad91cedb45f 100644
--- a/vcl/source/window/clipping.cxx
+++ b/vcl/source/window/clipping.cxx
@@ -403,9 +403,9 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller )
bool bUpdate = true;
if ( mpWindowImpl->mpSysObj )
{
- vcl::Region* pOldRegion = nullptr;
+ std::unique_ptr<vcl::Region> pOldRegion;
if ( bSysObjOnlySmaller && !mpWindowImpl->mbInitWinClipRegion )
- pOldRegion = new vcl::Region( mpWindowImpl->maWinClipRegion );
+ pOldRegion.reset(new vcl::Region( mpWindowImpl->maWinClipRegion ));
mbInitClipRegion = true;
mpWindowImpl->mbInitWinClipRegion = true;
@@ -418,27 +418,25 @@ bool Window::ImplSetClipFlagChildren( bool bSysObjOnlySmaller )
pWindow = pWindow->mpWindowImpl->mpNext;
}
- if ( !ImplSysObjClip( pOldRegion ) )
+ if ( !ImplSysObjClip( pOldRegion.get() ) )
{
mbInitClipRegion = true;
mpWindowImpl->mbInitWinClipRegion = true;
bUpdate = false;
}
-
- delete pOldRegion;
}
else
{
- mbInitClipRegion = true;
- mpWindowImpl->mbInitWinClipRegion = true;
+ mbInitClipRegion = true;
+ mpWindowImpl->mbInitWinClipRegion = true;
- vcl::Window* pWindow = mpWindowImpl->mpFirstChild;
- while ( pWindow )
- {
- if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) )
- bUpdate = false;
- pWindow = pWindow->mpWindowImpl->mpNext;
- }
+ vcl::Window* pWindow = mpWindowImpl->mpFirstChild;
+ while ( pWindow )
+ {
+ if ( !pWindow->ImplSetClipFlagChildren( bSysObjOnlySmaller ) )
+ bUpdate = false;
+ pWindow = pWindow->mpWindowImpl->mpNext;
+ }
}
return bUpdate;
}