mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

coverity#1325071 Resource leak

Browse Source 
Change-Id: If045233eeb0d8f6fab89dff4c4307a3b8bde5a92
This commit is contained in:
Caolán McNamara
2015-09-29 10:25:48 +01:00
parent 2f50e90080
commit a0c42a13de
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
svx/source/svdraw/svdotxed.cxx
View File

@@ -278,8 +278,6 @@ void SdrTextObj::TakeTextEditArea(Size* pPaperMin, Size* pPaperMax, Rectangle* p
void SdrTextObj::EndTextEdit(SdrOutliner& rOutl) void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
{ {
OutlinerParaObject* pNewText = NULL;
if(rOutl.IsModified()) if(rOutl.IsModified())
{ {
@@ -287,7 +285,8 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
rOutl.UpdateFields(); rOutl.UpdateFields();
sal_Int32 nParaAnz = rOutl.GetParagraphCount(); sal_Int32 nParaAnz = rOutl.GetParagraphCount();
pNewText = rOutl.CreateParaObject( 0, nParaAnz ); bool bNewTextTransferred = false;
OutlinerParaObject* pNewText = rOutl.CreateParaObject( 0, nParaAnz );
// need to end edit mode early since SetOutlinerParaObject already // need to end edit mode early since SetOutlinerParaObject already
// uses GetCurrentBoundRect() which needs to take the text into account // uses GetCurrentBoundRect() which needs to take the text into account
@@ -298,10 +297,17 @@ void SdrTextObj::EndTextEdit(SdrOutliner& rOutl)
if (IsChainable() && GetTextChain()->GetSwitchingToNextBox(this)) { if (IsChainable() && GetTextChain()->GetSwitchingToNextBox(this)) {
GetTextChain()->SetSwitchingToNextBox(this, false); GetTextChain()->SetSwitchingToNextBox(this, false);
if( getActiveText() ) if( getActiveText() )
{
getActiveText()->SetOutlinerParaObject( pNewText); getActiveText()->SetOutlinerParaObject( pNewText);
bNewTextTransferred = true;
}
} else { // If we are not doing in-chaining switching just set the ParaObject } else { // If we are not doing in-chaining switching just set the ParaObject
SetOutlinerParaObject(pNewText); SetOutlinerParaObject(pNewText);
bNewTextTransferred = true;
} }
if (!bNewTextTransferred)
delete pNewText;
} }
/* Beginning Chaining-related code */ /* Beginning Chaining-related code */