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

use more std::unique_ptr in ScUndoDraw

Change-Id: I4216efd74f279a0997754b75b62b2dedce09511e
Reviewed-on: https://gerrit.libreoffice.org/61434
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 692c4f4d
......@@ -37,7 +37,7 @@ public:
ScUndoDraw( std::unique_ptr<SfxUndoAction> pUndo, ScDocShell* pDocSh );
virtual ~ScUndoDraw() override;
SfxUndoAction* ReleaseDrawUndo() { return pDrawUndo.release(); }
std::unique_ptr<SfxUndoAction> ReleaseDrawUndo() { return std::move(pDrawUndo); }
virtual void Undo() override;
virtual void Redo() override;
......
......@@ -77,7 +77,7 @@ bool ScSimpleUndo::Merge( SfxUndoAction *pNextAction )
// ScUndoDraw is later deleted by the UndoManager
ScUndoDraw* pCalcUndo = static_cast<ScUndoDraw*>(pNextAction);
pDetectiveUndo.reset( pCalcUndo->ReleaseDrawUndo() );
pDetectiveUndo = pCalcUndo->ReleaseDrawUndo();
return true;
}
......
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