diff options
author | Patrick Luby <plubius@neooffice.org> | 2023-08-01 16:09:53 +0200 |
---|---|---|
committer | Patrick Luby <plubius@neooffice.org> | 2023-08-01 21:23:30 +0200 |
commit | 73adf93acc9bbac4c8db9aa844930629a429410e (patch) | |
tree | 40c8666a08f800b7329aab5f52148f8c3919bcf6 /reportdesign | |
parent | 025f540dba1c5b046b4fdbd9418dcaaa900e006d (diff) |
Revert "tdf#144072 prevent use of a deleted pointer"
This reverts commit 01a1d2a84992973b8a0e5f1ae99fd32f5913b58f.
That commit appeared to fix tdf#144072 but it only delays the crash as the reportdesign module will keep reusing the same SdHdl pointer that has already been deleted.
Change-Id: I8e416b0376aa8724b697f54ed45f58341b47dc2a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155181
Tested-by: Patrick Luby <plubius@neooffice.org>
Reviewed-by: Patrick Luby <plubius@neooffice.org>
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/ui/report/ViewsWindow.cxx | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index a5ad82e818e2..e11735bf72ca 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -1043,21 +1043,7 @@ void OViewsWindow::BegDragObj(const Point& _aPnt, SdrHdl* _pHdl,const OSectionVi "createInvisible X:" << aRect.Left() << " Y:" << aRect.Top() << " on View #" << nViewCount); - // tdf#144072 prevent use of a deleted pointer - // BegDragObj_createInvisibleObjectAtPosition() may clear - // the handle list and that will delete the SdrHdl instances - // owned by this section view so set _pHdl to null if it has - // been deleted during the call. - bool bHdlInList = false; - const SdrHdlList& rHdlList = rView.GetHdlList(); - if (_pHdl && rHdlList.GetHdlNum(_pHdl) < rHdlList.GetHdlCount()) - bHdlInList = true; BegDragObj_createInvisibleObjectAtPosition(aRect, rView); - if (bHdlInList && rHdlList.GetHdlNum(_pHdl) >= rHdlList.GetHdlCount()) - { - SAL_WARN("reportdesign", "SdrHdl pointer parameter has been deleted"); - _pHdl = nullptr; - } } } } |