summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-05-26 10:27:48 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-26 12:23:18 +0100
commite805881d74392969746d34756b035850c67883e6 (patch)
treeb566042cf123912a876bbce9722a80566ff3ba77
parentcoverity#1409901 Unused value (diff)
downloadcore-e805881d74392969746d34756b035850c67883e6.tar.gz
core-e805881d74392969746d34756b035850c67883e6.zip
coverity#1409895 Resource leak
Change-Id: I1430ac41bf11bf3ae5c4cba3406a24148acd728e
-rw-r--r--sw/source/uibase/dialog/watermarkdialog.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx
index 6b993d22caf1..29131215a72b 100644
--- a/sw/source/uibase/dialog/watermarkdialog.cxx
+++ b/sw/source/uibase/dialog/watermarkdialog.cxx
@@ -57,12 +57,16 @@ void SwWatermarkDialog::InitFields()
SfxObjectShell* pDocSh = SfxObjectShell::Current();
const SfxPoolItem* pFontItem;
const FontList* pFontList = nullptr;
+ std::unique_ptr<FontList> xFontList;
if ( pDocSh && ( ( pFontItem = pDocSh->GetItem( SID_ATTR_CHAR_FONTLIST ) ) != nullptr ) )
pFontList = static_cast<const SvxFontListItem*>( pFontItem )->GetFontList();
- if(!pFontList)
- pFontList = new FontList(Application::GetDefaultDevice(), nullptr);
+ if (!pFontList)
+ {
+ xFontList.reset(new FontList(Application::GetDefaultDevice(), nullptr));
+ pFontList = xFontList.get();
+ }
m_pFont->Fill( pFontList );