From eca5ea9f79181d45cd7fbabe2313617d3025818a Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 21 Sep 2016 14:48:15 +0200 Subject: make the AbstractDialog stuff extend from VclReferenceBase Because some stuff wants to multiple-inherit from VclAbstractDialog and OutputDevice-subclasses, and we'd prefer to keep all the lifetime management through a single smart pointer class (VclPtr) The change in msgbox.cxx and window.cxx is to workaround a bug in VS2013 to do with virtual inheritance and delegating constructors. Change-Id: I178e8983b7d20a7d2790aa283be838dca5d14773 Reviewed-on: https://gerrit.libreoffice.org/29140 Tested-by: Jenkins Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- sw/source/uibase/dialog/wordcountwrapper.cxx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'sw/source/uibase/dialog') diff --git a/sw/source/uibase/dialog/wordcountwrapper.cxx b/sw/source/uibase/dialog/wordcountwrapper.cxx index 2b5e963484f7..031d034e26bb 100644 --- a/sw/source/uibase/dialog/wordcountwrapper.cxx +++ b/sw/source/uibase/dialog/wordcountwrapper.cxx @@ -28,6 +28,11 @@ SwWordCountWrapper::SwWordCountWrapper( vcl::Window *pParentWindow, SetWindow(xAbstDlg->GetWindow()); } +SwWordCountWrapper::~SwWordCountWrapper() +{ + xAbstDlg.disposeAndClear(); +} + SfxChildWinInfo SwWordCountWrapper::GetInfo() const { SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); -- cgit