summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-01 16:12:24 +0200
committerXisco Faulí <xiscofauli@libreoffice.org>2020-05-05 20:07:02 +0200
commitee74bd26ef3cd6522ed1687ee2ddc573fba36fff (patch)
tree28c72a9ffc2cf341fb592f51ec56fc03c5fd5d11 /include
parentb6e392208e8d2ff98dbb0ef0c990dc8768603399 (diff)
tdf#130792 Draw crashes when trying to add a point in a multiline
regression from commit b4fc996520b47a6212661a9de3a1c72ccfc379a4 loplugin:useuniqueptr in SdrHdlList which changed SdrHdlList so that it crashes when passed a bad index. I can't seem to fix the calling code without creating other regressions, so just revert that part of the commit. The calling code is in SdrDragView::ImpBegInsObjPoint where it calls BegDragObj Change-Id: I494baa9a2e815fd7b9532840b65483ba2a70bd42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93277 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 31a44b5d08a1419aa1693996376514db577a5e01) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93381 Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
Diffstat (limited to 'include')
-rw-r--r--include/svx/svdhdl.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 2aaa3b7f7bc7..9df6d7692cdb 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -459,7 +459,7 @@ public:
// 3.Level Position (x+y)
void Sort();
size_t GetHdlCount() const { return maList.size(); }
- SdrHdl* GetHdl(size_t nNum) const { return maList[nNum].get(); }
+ SdrHdl* GetHdl(size_t nNum) const { return nNum < maList.size() ? maList[nNum].get() : nullptr; }
size_t GetHdlNum(const SdrHdl* pHdl) const;
void SetHdlSize(sal_uInt16 nSiz);
sal_uInt16 GetHdlSize() const { return nHdlSize; }