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

loplugin:useuniqueptr in EditFieldInfo

Change-Id: I8c4cc4ab212409bce54b64d59d07d77a924ed11c
üst 330cae47
...@@ -500,8 +500,8 @@ private: ...@@ -500,8 +500,8 @@ private:
Outliner* pOutliner; Outliner* pOutliner;
const SvxFieldItem& rFldItem; const SvxFieldItem& rFldItem;
Color* pTxtColor; std::unique_ptr<Color> pTxtColor;
Color* pFldColor; std::unique_ptr<Color> pFldColor;
OUString aRepresentation; OUString aRepresentation;
...@@ -518,28 +518,22 @@ public: ...@@ -518,28 +518,22 @@ public:
{ {
pOutliner = pOutl; pOutliner = pOutl;
nPara = nPa; nPos = nPo; nPara = nPa; nPos = nPo;
pTxtColor = nullptr; pFldColor = nullptr;
mpSdrPage = nullptr; mpSdrPage = nullptr;
} }
~EditFieldInfo()
{
delete pTxtColor;
delete pFldColor;
}
Outliner* GetOutliner() const { return pOutliner; } Outliner* GetOutliner() const { return pOutliner; }
const SvxFieldItem& GetField() const { return rFldItem; } const SvxFieldItem& GetField() const { return rFldItem; }
Color* GetTextColor() const { return pTxtColor; } Color* GetTextColor() const { return pTxtColor.get(); }
void SetTextColor( const Color& rColor ) void SetTextColor( const Color& rColor )
{ delete pTxtColor; pTxtColor = new Color( rColor ); } { pTxtColor.reset( new Color( rColor ) ); }
Color* GetFieldColor() const { return pFldColor; } Color* GetFieldColor() const { return pFldColor.get(); }
void SetFieldColor( const Color& rColor ) void SetFieldColor( const Color& rColor )
{ delete pFldColor; pFldColor = new Color( rColor ); } { pFldColor.reset( new Color( rColor ) ); }
void ClearFieldColor() void ClearFieldColor()
{ delete pFldColor; pFldColor = nullptr; } { pFldColor.reset(); }
sal_Int32 GetPara() const { return nPara; } sal_Int32 GetPara() const { return nPara; }
sal_Int32 GetPos() const { return nPos; } sal_Int32 GetPos() const { return nPos; }
......
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