[Libreoffice-commits] core.git: lotuswordpro/source

[Caolán McNamara]

 lotuswordpro/source/filter/lwppara.cxx  |   22 ++++++++--------------
 lotuswordpro/source/filter/lwppara.hxx  |    4 ++--
 lotuswordpro/source/filter/lwppara1.cxx |   18 +++++++-----------
 3 files changed, 17 insertions(+), 27 deletions(-)

New commits:
commit c36547d16e1ea4f085880d480e7a6381108ff7d8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 23 13:11:24 2018 +0000

    ofz: Direct leak
    
    Change-Id: Ide16aad0cadd393ce28425ed54c5e77f93d61317
    Reviewed-on: https://gerrit.libreoffice.org/48412
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index d831268d8711..56d3100d7c14 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -109,7 +109,6 @@ LwpPara::LwpPara(LwpObjectHeader const & objHdr, LwpSvStream* pStrm)
     , m_AllText("")
     , m_bHasBullet(false)
     , m_pSilverBullet(nullptr)
-    , m_pBullOver(nullptr)
     , m_bBullContinue(false)
     , m_SectionStyleName("")
     , m_bHasDropcap(false)
@@ -128,11 +127,6 @@ LwpPara::~LwpPara()
         m_pBreaks = nullptr;
     }
 
-    if (m_pBullOver)
-    {
-        delete m_pBullOver;
-        m_pBullOver = nullptr;
-    }
     delete m_pIndentOverride;
 
     LwpParaProperty* pNextProp;
@@ -531,9 +525,9 @@ void LwpPara::RegisterStyle()
                 {
                     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
@@ -618,7 +612,7 @@ void LwpPara::RegisterStyle()
                         }
 
                         // Don't bump the number if this bullet is skipped
-                        if (m_pBullOver->IsSkip())
+                        if (m_xBullOver->IsSkip())
                             ;
                         else if ( pParaSilverBullet
                             && pParaSilverBullet->GetObjectID() == m_pSilverBullet->GetObjectID()
@@ -690,13 +684,13 @@ void LwpPara::RegisterStyle()
                     LwpStory* pMyStory = GetStory();
                     if (pMyStory)
                     {
-                        if (pMyStory->IsBullStyleUsedBefore(m_aBulletStyleName, m_pParaNumbering->GetPosition()))
+                        if (pMyStory->IsBullStyleUsedBefore(m_aBulletStyleName, m_xParaNumbering->GetPosition()))
                         {
                             //m_bBullContinue = sal_True;
                         }
                         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
     }
     if (m_pSilverBullet->HasName())
     {
-        nLevel = m_pParaNumbering->GetPosition();
+        nLevel = m_xParaNumbering->GetPosition();
         m_nLevel = nLevel;//for get para level
     }
 
     return pBulletStyleMgr->AddBulletList(pCont, bOrdered, m_aBulletStyleName,
-            nLevel, m_pBullOver->IsSkip());
+            nLevel, m_xBullOver->IsSkip());
 }
 
 LwpNumberingOverride* LwpPara::GetParaNumbering()
 {
-    return m_pParaNumbering.get();
+    return m_xParaNumbering.get();
 }
 
 void LwpForked3NotifyList::Read(LwpObjectStream* pObjStrm)
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index c18b9dee9d03..701cb7daeb59 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -218,8 +218,8 @@ protected:
     bool m_bHasBullet;
     LwpObjectID m_aSilverBulletID;
     LwpSilverBullet* m_pSilverBullet;
-    LwpBulletOverride* m_pBullOver;
-    std::unique_ptr<LwpNumberingOverride> m_pParaNumbering;
+    std::unique_ptr<LwpBulletOverride> m_xBullOver;
+    std::unique_ptr<LwpNumberingOverride> m_xParaNumbering;
     OUString m_aBulletStyleName;
     bool m_bBullContinue;
     //end add
diff --git a/lotuswordpro/source/filter/lwppara1.cxx b/lotuswordpro/source/filter/lwppara1.cxx
index fc5c46a3e979..21b341df589a 100644
--- a/lotuswordpro/source/filter/lwppara1.cxx
+++ b/lotuswordpro/source/filter/lwppara1.cxx
@@ -445,7 +445,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
 
     if (pProps)
     {
-        m_pBullOver = new LwpBulletOverride();
+        m_xBullOver.reset(new LwpBulletOverride);
         // get local bulletoverride
         LwpBulletOverride* pLocalBullet  = static_cast<LwpParaBulletProperty*>(pProps)->GetLocalParaBullet();
         if (!pLocalBullet)
@@ -463,18 +463,17 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
             m_bHasBullet = true;
 
             const LwpOverride* pBullet= pParaStyle->GetBulletOverride();
-            std::unique_ptr<LwpBulletOverride> pFinalBullet(
+            std::unique_ptr<LwpBulletOverride> xFinalBullet(
                 pBullet
                     ? polymorphic_downcast<LwpBulletOverride*>(pBullet->clone())
                     : new LwpBulletOverride)
                 ;
 
             std::unique_ptr<LwpBulletOverride> const pLocalBullet2(pLocalBullet->clone());
-            pLocalBullet2->Override(pFinalBullet.get());
+            pLocalBullet2->Override(xFinalBullet.get());
 
-            aSilverBulletID = pFinalBullet->GetSilverBullet();
-            delete m_pBullOver;
-            m_pBullOver = pFinalBullet.release();
+            aSilverBulletID = xFinalBullet->GetSilverBullet();
+            m_xBullOver = std::move(xFinalBullet);
             if (!aSilverBulletID.IsNull())
             {
                 m_pSilverBullet = dynamic_cast<LwpSilverBullet*>(aSilverBulletID.obj(VO_SILVERBULLET).get());
@@ -487,7 +486,6 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
     }
     else
     {
-//      m_pBullOver = pParaStyle->GetBulletOverride();
         const LwpBulletOverride* pBullOver = pParaStyle->GetBulletOverride();
         if (pBullOver)
         {
@@ -501,9 +499,7 @@ void LwpPara::OverrideParaBullet(LwpParaProperty* pProps)
                     m_pSilverBullet->SetFoundry(m_pFoundry);
             }
 
-            std::unique_ptr<LwpBulletOverride> pBulletOverride(pBullOver->clone());
-            delete m_pBullOver;
-            m_pBullOver = pBulletOverride.release();
+            m_xBullOver.reset(pBullOver->clone());
         }
     }
 }
@@ -544,7 +540,7 @@ void LwpPara::OverrideParaNumbering(LwpParaProperty const * pProps)
         pOver->OverrideLevel(m_nLevel);
     }
 
-    m_pParaNumbering = std::move(pOver);
+    m_xParaNumbering = std::move(pOver);
 }
 
 /**************************************************************************