summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-12-07 16:42:16 +0000
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-12-08 12:48:34 +0100
commit3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b (patch)
tree9277b73fda3686e01a125453289d1d02dc6c377f
parentRemoved spurious chars (diff)
downloadcore-3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b.tar.gz
core-3c0cb54b7ca20439e7e5e1e19dc6fcc75709973b.zip
crashtesting: doubly deleted reloadtimer
since... commit 0cc702232e4799f03a468d1e8014d050a683165e Date: Tue Dec 4 15:00:43 2018 +0200 use unique_ptr in SfxObjectShell_Impl Change-Id: I3f3b0514bdb87f59d9c5f34d2d36dc63e8b1e33d Reviewed-on: https://gerrit.libreoffice.org/64527 Change-Id: I00e2cd2bcbb9a252a45d31da650e327506d2990d Reviewed-on: https://gerrit.libreoffice.org/64780 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sfx2/source/doc/objmisc.cxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index a7fc00a38aa8..b3e00909e375 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1284,14 +1284,14 @@ void AutoReloadTimer_Impl::Invoke()
SfxStringItem(SID_REFERER, pObjSh->GetMedium()->GetName()));
}
SfxRequest aReq( SID_RELOAD, SfxCallMode::SLOT, aSet );
- pObjSh->Get_Impl()->pReloadTimer = nullptr;
- delete this;
+ // this will delete this
+ pObjSh->Get_Impl()->pReloadTimer.reset();
pFrame->ExecReload_Impl( aReq );
return;
}
- pObjSh->Get_Impl()->pReloadTimer = nullptr;
- delete this;
+ // this will delete this
+ pObjSh->Get_Impl()->pReloadTimer.reset();
}
SfxModule* SfxObjectShell::GetModule() const