[Libreoffice-commits] core.git: svx/source

[Noel Grandin (via logerrit)]

 svx/source/dialog/dlgctl3d.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 2cbf6d5643717e9484ee3a8519ff1689b4c82b24
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Oct 20 08:53:21 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Oct 20 10:21:08 2022 +0200

    fix assert in debug mode
    
    not actually a leak, just a deletion ordering problem
    
    warn:svx:29983:29983:svx/source/svdraw/svdmodel.cxx:200:
    SdrModel::~SdrModel: Not all incarnations of SdrObjects deleted,
    possible memory leak
    warn:svx:29983:29983:svx/source/svdraw/svdmodel.cxx:202: leaked instance
    of 12E3dSphereObj
    warn:svx:29983:29983:svx/source/svdraw/svdmodel.cxx:202: leaked instance
    of 8E3dScene
    soffice.bin: /home/noel/libo/svx/source/svdraw/svdmodel.cxx:204: virtual
    SdrModel::~SdrModel(): Assertion `maAllIncarnatedObjects.empty()'
    failed.
    
    Change-Id: Ia0e6e1387825c0d849904b1bc604eb1252090318
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141543
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx
index ffad222628eb..e315819b06f5 100644
--- a/svx/source/dialog/dlgctl3d.cxx
+++ b/svx/source/dialog/dlgctl3d.cxx
@@ -60,7 +60,9 @@ void Svx3DPreviewControl::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 
 Svx3DPreviewControl::~Svx3DPreviewControl()
 {
+    mp3DObj.clear();
     mxFmPage.clear();
+    mpScene.clear();
     mp3DView.reset();
     mpModel.reset();
 }