Kaydet (Commit) c36547d1 authored tarafından Caolán McNamara's avatar Caolán McNamara

ofz: Direct leak

Change-Id: Ide16aad0cadd393ce28425ed54c5e77f93d61317
Reviewed-on: https://gerrit.libreoffice.org/48412Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 8b6c9009
...@@ -109,7 +109,6 @@ LwpPara::LwpPara(LwpObjectHeader const & objHdr, LwpSvStream* pStrm) ...@@ -109,7 +109,6 @@ LwpPara::LwpPara(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
, m_AllText("") , m_AllText("")
, m_bHasBullet(false) , m_bHasBullet(false)
, m_pSilverBullet(nullptr) , m_pSilverBullet(nullptr)
, m_pBullOver(nullptr)
, m_bBullContinue(false) , m_bBullContinue(false)
, m_SectionStyleName("") , m_SectionStyleName("")
, m_bHasDropcap(false) , m_bHasDropcap(false)
...@@ -128,11 +127,6 @@ LwpPara::~LwpPara() ...@@ -128,11 +127,6 @@ LwpPara::~LwpPara()
m_pBreaks = nullptr; m_pBreaks = nullptr;
} }
if (m_pBullOver)
{
delete m_pBullOver;
m_pBullOver = nullptr;
}
delete m_pIndentOverride; delete m_pIndentOverride;
LwpParaProperty* pNextProp; LwpParaProperty* pNextProp;
...@@ -531,9 +525,9 @@ void LwpPara::RegisterStyle() ...@@ -531,9 +525,9 @@ void LwpPara::RegisterStyle()
{ {
m_aBulletStyleName = m_pSilverBullet->GetBulletStyleName(); m_aBulletStyleName = m_pSilverBullet->GetBulletStyleName();
} }
else if (!m_pBullOver->IsEditable()) else if (!m_xBullOver->IsEditable())
{ {
m_aBulletStyleName = pBulletStyleMgr->RegisterBulletStyle(this, m_pBullOver, m_pIndentOverride); m_aBulletStyleName = pBulletStyleMgr->RegisterBulletStyle(this, m_xBullOver.get(), m_pIndentOverride);
} }
// test codes // test codes
...@@ -618,7 +612,7 @@ void LwpPara::RegisterStyle() ...@@ -618,7 +612,7 @@ void LwpPara::RegisterStyle()
} }
// Don't bump the number if this bullet is skipped // Don't bump the number if this bullet is skipped
if (m_pBullOver->IsSkip()) if (m_xBullOver->IsSkip())
; ;
else if ( pParaSilverBullet else if ( pParaSilverBullet
&& pParaSilverBullet->GetObjectID() == m_pSilverBullet->GetObjectID() && pParaSilverBullet->GetObjectID() == m_pSilverBullet->GetObjectID()
...@@ -690,13 +684,13 @@ void LwpPara::RegisterStyle() ...@@ -690,13 +684,13 @@ void LwpPara::RegisterStyle()
LwpStory* pMyStory = GetStory(); LwpStory* pMyStory = GetStory();
if (pMyStory) if (pMyStory)
{ {
if (pMyStory->IsBullStyleUsedBefore(m_aBulletStyleName, m_pParaNumbering->GetPosition())) if (pMyStory->IsBullStyleUsedBefore(m_aBulletStyleName, m_xParaNumbering->GetPosition()))
{ {
//m_bBullContinue = sal_True; //m_bBullContinue = sal_True;
} }
else else
{ {
pMyStory->AddBullStyleName2List(m_aBulletStyleName, m_pParaNumbering->GetPosition()); pMyStory->AddBullStyleName2List(m_aBulletStyleName, m_xParaNumbering->GetPosition());
} }
} }
...@@ -897,17 +891,17 @@ rtl::Reference<XFContentContainer> LwpPara::AddBulletList(XFContentContainer* pC ...@@ -897,17 +891,17 @@ rtl::Reference<XFContentContainer> LwpPara::AddBulletList(XFContentContainer* pC
} }
if (m_pSilverBullet->HasName()) if (m_pSilverBullet->HasName())
{ {
nLevel = m_pParaNumbering->GetPosition(); nLevel = m_xParaNumbering->GetPosition();
m_nLevel = nLevel;//for get para level m_nLevel = nLevel;//for get para level
} }
return pBulletStyleMgr->AddBulletList(pCont, bOrdered, m_aBulletStyleName, return pBulletStyleMgr->AddBulletList(pCont, bOrdered, m_aBulletStyleName,
nLevel, m_pBullOver->IsSkip()); nLevel, m_xBullOver->IsSkip());
} }
LwpNumberingOverride* LwpPara::GetParaNumbering() LwpNumberingOverride* LwpPara::GetParaNumbering()
{ {
return m_pParaNumbering.get(); return m_xParaNumbering.get();
} }
void LwpForked3NotifyList::Read(LwpObjectStream* pObjStrm) void LwpForked3NotifyList::Read(LwpObjectStream* pObjStrm)
......
...@@ -218,8 +218,8 @@ protected: ...@@ -218,8 +218,8 @@ protected:
bool m_bHasBullet; bool m_bHasBullet;
LwpObjectID m_aSilverBulletID; LwpObjectID m_aSilverBulletID;
LwpSilverBullet* m_pSilverBullet; LwpSilverBullet* m_pSilverBullet;
LwpBulletOverride* m_pBullOver; std::unique_ptr<LwpBulletOverride> m_xBullOver;
std::unique_ptr<LwpNumberingOverride> m_pParaNumbering; std::unique_ptr<LwpNumberingOverride> m_xParaNumbering;
OUString m_aBulletStyleName; OUString m_aBulletStyleName;
bool m_bBullContinue; bool m_bBullContinue;
//end add //end add
......
...@@ -445,7 +445,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) ...@@ -445,7 +445,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
if (pProps) if (pProps)
{ {
m_pBullOver = new LwpBulletOverride(); m_xBullOver.reset(new LwpBulletOverride);
// get local bulletoverride // get local bulletoverride
LwpBulletOverride* pLocalBullet = static_cast<LwpParaBulletProperty*>(pProps)->GetLocalParaBullet(); LwpBulletOverride* pLocalBullet = static_cast<LwpParaBulletProperty*>(pProps)->GetLocalParaBullet();
if (!pLocalBullet) if (!pLocalBullet)
...@@ -463,18 +463,17 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) ...@@ -463,18 +463,17 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
m_bHasBullet = true; m_bHasBullet = true;
const LwpOverride* pBullet= pParaStyle->GetBulletOverride(); const LwpOverride* pBullet= pParaStyle->GetBulletOverride();
std::unique_ptr<LwpBulletOverride> pFinalBullet( std::unique_ptr<LwpBulletOverride> xFinalBullet(
pBullet pBullet
? polymorphic_downcast<LwpBulletOverride*>(pBullet->clone()) ? polymorphic_downcast<LwpBulletOverride*>(pBullet->clone())
: new LwpBulletOverride) : new LwpBulletOverride)
; ;
std::unique_ptr<LwpBulletOverride> const pLocalBullet2(pLocalBullet->clone()); std::unique_ptr<LwpBulletOverride> const pLocalBullet2(pLocalBullet->clone());
pLocalBullet2->Override(pFinalBullet.get()); pLocalBullet2->Override(xFinalBullet.get());
aSilverBulletID = pFinalBullet->GetSilverBullet(); aSilverBulletID = xFinalBullet->GetSilverBullet();
delete m_pBullOver; m_xBullOver = std::move(xFinalBullet);
m_pBullOver = pFinalBullet.release();
if (!aSilverBulletID.IsNull()) if (!aSilverBulletID.IsNull())
{ {
m_pSilverBullet = dynamic_cast<LwpSilverBullet*>(aSilverBulletID.obj(VO_SILVERBULLET).get()); m_pSilverBullet = dynamic_cast<LwpSilverBullet*>(aSilverBulletID.obj(VO_SILVERBULLET).get());
...@@ -487,7 +486,6 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) ...@@ -487,7 +486,6 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
} }
else else
{ {
// m_pBullOver = pParaStyle->GetBulletOverride();
const LwpBulletOverride* pBullOver = pParaStyle->GetBulletOverride(); const LwpBulletOverride* pBullOver = pParaStyle->GetBulletOverride();
if (pBullOver) if (pBullOver)
{ {
...@@ -501,9 +499,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps) ...@@ -501,9 +499,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
m_pSilverBullet->SetFoundry(m_pFoundry); m_pSilverBullet->SetFoundry(m_pFoundry);
} }
std::unique_ptr<LwpBulletOverride> pBulletOverride(pBullOver->clone()); m_xBullOver.reset(pBullOver->clone());
delete m_pBullOver;
m_pBullOver = pBulletOverride.release();
} }
} }
} }
...@@ -544,7 +540,7 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty const * pProps) ...@@ -544,7 +540,7 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty const * pProps)
pOver->OverrideLevel(m_nLevel); pOver->OverrideLevel(m_nLevel);
} }
m_pParaNumbering = std::move(pOver); m_xParaNumbering = std::move(pOver);
} }
/************************************************************************** /**************************************************************************
......
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