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

loplugin:useuniqueptr in SdrDragView

and fix potential leak on early return in SdrDragView::BegDragObj

Change-Id: I707be6e2c7dc2c251f37447fe3cd98c4b50b59d1
Reviewed-on: https://gerrit.libreoffice.org/53751Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst aca5e1ba
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#include <svx/svdxcgv.hxx> #include <svx/svdxcgv.hxx>
#include <memory>
class SdrUndoGeoObj; class SdrUndoGeoObj;
...@@ -38,7 +39,7 @@ class SVX_DLLPUBLIC SdrDragView : public SdrExchangeView ...@@ -38,7 +39,7 @@ class SVX_DLLPUBLIC SdrDragView : public SdrExchangeView
protected: protected:
SdrHdl* mpDragHdl; SdrHdl* mpDragHdl;
SdrDragMethod* mpCurrentSdrDragMethod; std::unique_ptr<SdrDragMethod> mpCurrentSdrDragMethod;
SdrUndoGeoObj* mpInsPointUndo; SdrUndoGeoObj* mpInsPointUndo;
tools::Rectangle maDragLimit; tools::Rectangle maDragLimit;
OUString maInsPointUndoStr; OUString maInsPointUndoStr;
...@@ -104,7 +105,7 @@ public: ...@@ -104,7 +105,7 @@ public:
void BrkDragObj(); void BrkDragObj();
bool IsDragObj() const { return mpCurrentSdrDragMethod && !mbInsPolyPoint && !mbInsGluePoint; } bool IsDragObj() const { return mpCurrentSdrDragMethod && !mbInsPolyPoint && !mbInsGluePoint; }
SdrHdl* GetDragHdl() const { return mpDragHdl; } SdrHdl* GetDragHdl() const { return mpDragHdl; }
SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod; } SdrDragMethod* GetDragMethod() const { return mpCurrentSdrDragMethod.get(); }
bool IsDraggingPoints() const { return meDragHdl==SdrHdlKind::Poly; } bool IsDraggingPoints() const { return meDragHdl==SdrHdlKind::Poly; }
bool IsDraggingGluePoints() const { return meDragHdl==SdrHdlKind::Glue; } bool IsDraggingGluePoints() const { return meDragHdl==SdrHdlKind::Glue; }
......
This diff is collapsed.
...@@ -1192,7 +1192,7 @@ OUString SdrView::GetStatusText() ...@@ -1192,7 +1192,7 @@ OUString SdrView::GetStatusText()
{ {
SAL_INFO( SAL_INFO(
"svx.svdraw", "svx.svdraw",
"(" << this << ") " << mpCurrentSdrDragMethod); "(" << this << ") " << mpCurrentSdrDragMethod.get());
mpCurrentSdrDragMethod->TakeSdrDragComment(aStr); mpCurrentSdrDragMethod->TakeSdrDragComment(aStr);
} }
} }
......
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