Kaydet (Commit) 7d782a4b authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:useuniqueptr in LwpSpacingOverride

Change-Id: I1f71c1e35c49b99c9fde1fe43fc9f5717158355e
Reviewed-on: https://gerrit.libreoffice.org/50737Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 9a3e2ce7
...@@ -356,19 +356,19 @@ public: ...@@ -356,19 +356,19 @@ public:
void Override(LwpSpacingOverride* other); void Override(LwpSpacingOverride* other);
LwpSpacingCommonOverride* GetSpacing(){return m_pSpacing;} LwpSpacingCommonOverride* GetSpacing(){return m_pSpacing.get();}
LwpSpacingCommonOverride* GetAboveLineSpacing(){return m_pAboveLineSpacing;} LwpSpacingCommonOverride* GetAboveLineSpacing(){return m_pAboveLineSpacing.get();}
LwpSpacingCommonOverride* GetAboveSpacing(){return m_pParaSpacingAbove;} LwpSpacingCommonOverride* GetAboveSpacing(){return m_pParaSpacingAbove.get();}
LwpSpacingCommonOverride* GetBelowSpacing(){return m_pParaSpacingBelow;} LwpSpacingCommonOverride* GetBelowSpacing(){return m_pParaSpacingBelow.get();}
private: private:
LwpSpacingOverride(LwpSpacingOverride const& rOther); LwpSpacingOverride(LwpSpacingOverride const& rOther);
LwpSpacingOverride& operator=(LwpSpacingOverride const& rOther) = delete; LwpSpacingOverride& operator=(LwpSpacingOverride const& rOther) = delete;
LwpSpacingCommonOverride* m_pSpacing; std::unique_ptr<LwpSpacingCommonOverride> m_pSpacing;
LwpSpacingCommonOverride* m_pAboveLineSpacing; std::unique_ptr<LwpSpacingCommonOverride> m_pAboveLineSpacing;
LwpSpacingCommonOverride* m_pParaSpacingAbove; std::unique_ptr<LwpSpacingCommonOverride> m_pParaSpacingAbove;
LwpSpacingCommonOverride* m_pParaSpacingBelow; std::unique_ptr<LwpSpacingCommonOverride> m_pParaSpacingBelow;
}; };
class LwpIndentOverride final : public LwpOverride class LwpIndentOverride final : public LwpOverride
......
...@@ -359,10 +359,6 @@ m_pParaSpacingBelow(new LwpSpacingCommonOverride) ...@@ -359,10 +359,6 @@ m_pParaSpacingBelow(new LwpSpacingCommonOverride)
LwpSpacingOverride::~LwpSpacingOverride() LwpSpacingOverride::~LwpSpacingOverride()
{ {
delete m_pSpacing;
delete m_pAboveLineSpacing;
delete m_pParaSpacingAbove;
delete m_pParaSpacingBelow;
} }
LwpSpacingOverride::LwpSpacingOverride(LwpSpacingOverride const& rOther) LwpSpacingOverride::LwpSpacingOverride(LwpSpacingOverride const& rOther)
...@@ -372,14 +368,10 @@ LwpSpacingOverride::LwpSpacingOverride(LwpSpacingOverride const& rOther) ...@@ -372,14 +368,10 @@ LwpSpacingOverride::LwpSpacingOverride(LwpSpacingOverride const& rOther)
, m_pParaSpacingAbove(nullptr) , m_pParaSpacingAbove(nullptr)
, m_pParaSpacingBelow(nullptr) , m_pParaSpacingBelow(nullptr)
{ {
std::unique_ptr<LwpSpacingCommonOverride> pSpacing(::clone(rOther.m_pSpacing)); m_pSpacing.reset( ::clone(rOther.m_pSpacing.get()) );
std::unique_ptr<LwpSpacingCommonOverride> pAboveLineSpacing(::clone(rOther.m_pAboveLineSpacing)); m_pAboveLineSpacing.reset( ::clone(rOther.m_pAboveLineSpacing.get()) );
std::unique_ptr<LwpSpacingCommonOverride> pParaSpacingAbove(::clone(rOther.m_pParaSpacingAbove)); m_pParaSpacingAbove.reset( ::clone(rOther.m_pParaSpacingAbove.get()) );
std::unique_ptr<LwpSpacingCommonOverride> pParaSpacingBelow(::clone(rOther.m_pParaSpacingBelow)); m_pParaSpacingBelow.reset( ::clone(rOther.m_pParaSpacingBelow.get()) );
m_pSpacing = pSpacing.release();
m_pAboveLineSpacing = pAboveLineSpacing.release();
m_pParaSpacingAbove = pParaSpacingAbove.release();
m_pParaSpacingBelow = pParaSpacingBelow.release();
} }
LwpSpacingOverride* LwpSpacingOverride::clone() const LwpSpacingOverride* LwpSpacingOverride::clone() const
......
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