include/svx/hyperdlg.hxx | 1 +
svx/source/dialog/hyperdlg.cxx | 5 +++++
2 files changed, 6 insertions(+)
New commits:
commit 07341af48ed8ec2368aee87d120942f3e6bb6d49
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Jul 10 21:33:18 2017 +0200
svx: assert on undisposed AbstractSvxHpLinkDlg
3 in () at /lib64/libc.so.6
4 in VclPtr<AbstractSvxHpLinkDlg>::~VclPtr() (this=0x88d47e8,
__in_chrg=<optimized out>) at include/vcl/vclptr.hxx:115
5 in SvxHlinkDlgWrapper::~SvxHlinkDlgWrapper() (this=0x88d47a0,
__in_chrg=<optimized out>) at include/svx/hyperdlg.hxx:34
6 in SvxHlinkDlgWrapper::~SvxHlinkDlgWrapper() (this=0x88d47a0,
__in_chrg=<optimized out>) at include/svx/hyperdlg.hxx:34
7 in SfxChildWindow::Destroy() (this=0x88d47a0) at
sfx2/source/appl/childwin.cxx:182
8 in SfxWorkWindow::RemoveChildWin_Impl(SfxChildWin_Impl*)
(this=0x6c83940, pCW=0x683bc20) at sfx2/source/appl/workwin.cxx:1425
9 in SfxWorkWindow::ToggleChildWindow_Impl(unsigned short, bool)
(this=0x6c83940, nId=5678, bSetFocus=true) at sfx2/source/appl/workwin.cxx:1832
10 in SfxViewFrame::ToggleChildWindow(unsigned short) (this=0x6afdae0,
nId=5678) at sfx2/source/view/viewfrm.cxx:2964
Change-Id: I84a1ba817dc8449dc1942b6ebd443ec955e8c622
diff --git a/include/svx/hyperdlg.hxx b/include/svx/hyperdlg.hxx
index c0a41a602345..2671a34b4857 100644
--- a/include/svx/hyperdlg.hxx
+++ b/include/svx/hyperdlg.hxx
@@ -39,6 +39,7 @@ private:
public:
SvxHlinkDlgWrapper( vcl::Window*pParent, sal_uInt16 nId,
SfxBindings* pBindings, SfxChildWinInfo* pInfo );
+ virtual ~SvxHlinkDlgWrapper() override;
SFX_DECL_CHILDWINDOW_WITHID(SvxHlinkDlgWrapper);
virtual bool QueryClose() override;
diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx
index a276c38e2f7d..2bc82c4a2503 100644
--- a/svx/source/dialog/hyperdlg.cxx
+++ b/svx/source/dialog/hyperdlg.cxx
@@ -77,4 +77,9 @@ bool SvxHlinkDlgWrapper::QueryClose()
return !mpDlg || mpDlg->QueryClose();
}
+SvxHlinkDlgWrapper::~SvxHlinkDlgWrapper()
+{
+ mpDlg.disposeAndClear();
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
