From eca5ea9f79181d45cd7fbabe2313617d3025818a Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
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 <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 include/svx/hyperdlg.hxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/svx/hyperdlg.hxx')

diff --git a/include/svx/hyperdlg.hxx b/include/svx/hyperdlg.hxx
index c42601d6c15a..c0a41a602345 100644
--- a/include/svx/hyperdlg.hxx
+++ b/include/svx/hyperdlg.hxx
@@ -34,7 +34,7 @@ class AbstractSvxHpLinkDlg;
 class SVX_DLLPUBLIC SvxHlinkDlgWrapper : public SfxChildWindow
 {
 private:
-    AbstractSvxHpLinkDlg*   mpDlg;
+    VclPtr<AbstractSvxHpLinkDlg>   mpDlg;
 
 public:
     SvxHlinkDlgWrapper( vcl::Window*pParent, sal_uInt16 nId,
-- 
cgit