Dispose pDlgInterface member during destruction

Requires a VclPtr -> ScopedVclPtr assignment operator, similar to the existing
VclPtr -> ScopedVclPtr constructor.

Change-Id: I2b43967ee84f90eea20f8eaa17741229473752b1

1 files changed, 16 insertions, 0 deletions

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index f809176a77d4..a11552635082 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -347,6 +347,22 @@ public:
     {
     }
 
+    /** Up-casting assignment operator.
+
+        Does not work for up-casts to ambiguous bases.
+
+        @param rRef another VclPtr
+    */
+    template<typename derived_type>
+    typename std::enable_if<
+        std::is_base_of<reference_type, derived_type>::value,
+        ScopedVclPtr &>::type
+    operator =(VclPtr<derived_type> const & rRef)
+    {
+        disposeAndReset(rRef.get());
+        return *this;
+    }
+
     /**
      * Override and disallow this, to prevent people accidentally calling it and actually
      * getting VclPtr::Create and getting a naked VclPtr<> instance