diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-09 15:38:12 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-01-11 10:20:11 +0100 |
commit | 152e2e6943adf46f12c04cf76dc435e48c1f1c74 (patch) | |
tree | 152eb4397fd1b8ab4c9f60fdb3f70392ebd25e42 /sw/source/core/txtnode/fntcap.cxx | |
parent | 3d14462e233571ac8a77ab0484069e6cc944f320 (diff) |
use unique_ptr in sw
Change-Id: I471875142391e537a4301dfe42beb8f8803ff46b
Reviewed-on: https://gerrit.libreoffice.org/66036
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/core/txtnode/fntcap.cxx')
-rw-r--r-- | sw/source/core/txtnode/fntcap.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index 12be40860253..dc090742b0e2 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -486,9 +486,9 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) rDo.SetCapInf( aCapInf ); SwFntObj *pOldLast = pLastFont; - SwFntAccess *pBigFontAccess = nullptr; + std::unique_ptr<SwFntAccess> pBigFontAccess; SwFntObj *pBigFont; - SwFntAccess *pSpaceFontAccess = nullptr; + std::unique_ptr<SwFntAccess> pSpaceFontAccess; SwFntObj *pSpaceFont = nullptr; const void* nFontCacheId2 = nullptr; @@ -508,8 +508,8 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) if ( bWordWise ) { aFont.SetWordLineMode( false ); - pSpaceFontAccess = new SwFntAccess( nFontCacheId2, nIndex2, &aFont, - rDo.GetInf().GetShell() ); + pSpaceFontAccess.reset(new SwFntAccess( nFontCacheId2, nIndex2, &aFont, + rDo.GetInf().GetShell() )); pSpaceFont = pSpaceFontAccess->Get(); } else @@ -521,8 +521,8 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) aFont.SetStrikeout( STRIKEOUT_NONE ); nFontCacheId2 = nullptr; nIndex2 = 0; - pBigFontAccess = new SwFntAccess( nFontCacheId2, nIndex2, &aFont, - rDo.GetInf().GetShell() ); + pBigFontAccess.reset(new SwFntAccess( nFontCacheId2, nIndex2, &aFont, + rDo.GetInf().GetShell() )); pBigFont = pBigFontAccess->Get(); } else @@ -733,7 +733,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) // clean up: if( pBigFont != pOldLast ) - delete pBigFontAccess; + pBigFontAccess.reset(); if( bTextLines ) { @@ -744,7 +744,7 @@ void SwSubFont::DoOnCapitals( SwDoCapitals &rDo ) static_cast<SwDoDrawCapital&>( rDo ).DrawSpace( aStartPos ); } if ( bWordWise ) - delete pSpaceFontAccess; + pSpaceFontAccess.reset(); } pLastFont = pOldLast; pLastFont->SetDevFont( rDo.GetInf().GetShell(), rDo.GetOut() ); |