Skip to content

C
core
Kaydet (Commit) d3a0aa10 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

would leak on SdrRectObj::RecalcXPoly, drop NULL checks before delete

üst 8fe21bbc
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 9 deletions
svx/source/svdraw/svdorect.cxx
Dosyayı görüntüle @ d3a0aa10
...@@ -111,10 +111,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect) ...@@ -111,10 +111,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
SdrRectObj::~SdrRectObj() SdrRectObj::~SdrRectObj()
{ {
if(mpXPoly) delete mpXPoly;
{
delete mpXPoly;
}
} }
SdrRectObj& SdrRectObj::operator=(const SdrRectObj& rCopy) SdrRectObj& SdrRectObj::operator=(const SdrRectObj& rCopy)
...@@ -136,11 +133,8 @@ SdrRectObj& SdrRectObj::operator=(const SdrRectObj& rCopy) ...@@ -136,11 +133,8 @@ SdrRectObj& SdrRectObj::operator=(const SdrRectObj& rCopy)
void SdrRectObj::SetXPolyDirty() void SdrRectObj::SetXPolyDirty()
{ {
if(mpXPoly) delete mpXPoly;
{ mpXPoly = 0L;
delete mpXPoly;
mpXPoly = 0L;
}
} }
XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const
...@@ -169,6 +163,7 @@ XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const ...@@ -169,6 +163,7 @@ XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const
void SdrRectObj::RecalcXPoly() void SdrRectObj::RecalcXPoly()
{ {
delete mpXPoly;
mpXPoly = new XPolygon(ImpCalcXPoly(aRect,GetEckenradius())); mpXPoly = new XPolygon(ImpCalcXPoly(aRect,GetEckenradius()));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment