summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-05-02 15:17:58 +0100
committerCaolán McNamara <caolanm@redhat.com>2017-05-02 15:40:28 +0100
commit4778f39ece4b41625b876e5e7673893e1e011a62 (patch)
treea6933a979b2b1f0cf8e7cb1fd327214164ec79f4 /sw
parent89c60b5d6671bd18cf57f55a2685ac43becd3756 (diff)
ofz fix leak
Change-Id: I237f19f237e6b78f98798352c1f881b0d27a6a9e
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index 86663ea36ede..b269f013da52 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -825,48 +825,48 @@ Tcg255::~Tcg255()
bool Tcg255::processSubStruct( sal_uInt8 nId, SvStream &rS )
{
- Tcg255SubStruct* pSubStruct = nullptr;
+ std::unique_ptr<Tcg255SubStruct> xSubStruct;
switch ( nId )
{
case 0x1:
{
- pSubStruct = new PlfMcd;
+ xSubStruct.reset(new PlfMcd);
break;
}
case 0x2:
{
- pSubStruct = new PlfAcd;
+ xSubStruct.reset(new PlfAcd);
break;
}
case 0x3:
case 0x4:
{
- pSubStruct = new PlfKme;
+ xSubStruct.reset(new PlfKme);
break;
}
case 0x10:
{
- pSubStruct = new TcgSttbf;
+ xSubStruct.reset(new TcgSttbf);
break;
}
case 0x11:
{
- pSubStruct = new MacroNames;
+ xSubStruct.reset(new MacroNames);
break;
}
case 0x12:
{
- pSubStruct = new SwCTBWrapper;
+ xSubStruct.reset(new SwCTBWrapper);
break;
}
default:
SAL_INFO("sw.ww8","Unknown id 0x" << std::hex << nId);
return false;
}
- pSubStruct->ch = nId;
- if ( !pSubStruct->Read( rS ) )
+ xSubStruct->ch = nId;
+ if (!xSubStruct->Read(rS))
return false;
- rgtcgData.push_back( pSubStruct );
+ rgtcgData.push_back(xSubStruct.release());
return true;
}