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

loplugin:useuniqueptr in ScPrintSaverTab

Change-Id: I51ef59e97e9b46cf9496dbefaabcc15471e9cdae
Reviewed-on: https://gerrit.libreoffice.org/51902Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 449d4163
......@@ -31,8 +31,8 @@ class ScPrintSaverTab
typedef ::std::vector< ScRange > ScRangeVec;
ScRangeVec maPrintRanges; ///< Array
ScRange* mpRepeatCol; ///< single
ScRange* mpRepeatRow; ///< single
std::unique_ptr<ScRange> mpRepeatCol; ///< single
std::unique_ptr<ScRange> mpRepeatRow; ///< single
bool mbEntireSheet;
public:
......@@ -44,8 +44,8 @@ public:
const ScRangeVec& GetPrintRanges() const { return maPrintRanges; }
bool IsEntireSheet() const { return mbEntireSheet; }
const ScRange* GetRepeatCol() const { return mpRepeatCol; }
const ScRange* GetRepeatRow() const { return mpRepeatRow; }
const ScRange* GetRepeatCol() const { return mpRepeatCol.get(); }
const ScRange* GetRepeatRow() const { return mpRepeatRow.get(); }
bool operator==( const ScPrintSaverTab& rCmp ) const;
};
......
......@@ -26,16 +26,14 @@
// Data per table
ScPrintSaverTab::ScPrintSaverTab() :
mpRepeatCol(nullptr),
mpRepeatRow(nullptr),
mbEntireSheet(false)
{
}
ScPrintSaverTab::~ScPrintSaverTab()
{
delete mpRepeatCol;
delete mpRepeatRow;
mpRepeatCol.reset();
mpRepeatRow.reset();
}
void ScPrintSaverTab::SetAreas( const ScRangeVec& rRanges, bool bEntireSheet )
......@@ -46,10 +44,8 @@ void ScPrintSaverTab::SetAreas( const ScRangeVec& rRanges, bool bEntireSheet )
void ScPrintSaverTab::SetRepeat( const ScRange* pCol, const ScRange* pRow )
{
delete mpRepeatCol;
mpRepeatCol = pCol ? new ScRange(*pCol) : nullptr;
delete mpRepeatRow;
mpRepeatRow = pRow ? new ScRange(*pRow) : nullptr;
mpRepeatCol.reset(pCol ? new ScRange(*pCol) : nullptr);
mpRepeatRow.reset(pRow ? new ScRange(*pRow) : nullptr);
}
inline bool PtrEqual( const ScRange* p1, const ScRange* p2 )
......@@ -60,8 +56,8 @@ inline bool PtrEqual( const ScRange* p1, const ScRange* p2 )
bool ScPrintSaverTab::operator==( const ScPrintSaverTab& rCmp ) const
{
return
PtrEqual( mpRepeatCol, rCmp.mpRepeatCol ) &&
PtrEqual( mpRepeatRow, rCmp.mpRepeatRow ) &&
PtrEqual( mpRepeatCol.get(), rCmp.mpRepeatCol.get() ) &&
PtrEqual( mpRepeatRow.get(), rCmp.mpRepeatRow.get() ) &&
(mbEntireSheet == rCmp.mbEntireSheet) &&
(maPrintRanges == rCmp.maPrintRanges);
}
......
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