ScopedVclPtr vs std::unique_ptr for VclAbstractDialog derivatives

Change-Id: I5e43312b6f42ce0c63946f366eaf1e6dcb9629b2
Reviewed-on: https://gerrit.libreoffice.org/30344
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 12 insertions, 3 deletions

diff --git a/include/vcl/abstdlg.hxx b/include/vcl/abstdlg.hxx
index 6b89f95e7613..c173326706c8 100644
--- a/include/vcl/abstdlg.hxx
+++ b/include/vcl/abstdlg.hxx
@@ -36,8 +36,9 @@ class Bitmap;
 */
 class VCL_DLLPUBLIC VclAbstractDialog : public virtual VclReferenceBase
 {
-public:
+protected:
     virtual             ~VclAbstractDialog() override;
+public:
     virtual short       Execute() = 0;
 
     // Screenshot interface
@@ -49,27 +50,33 @@ public:
 
 class VCL_DLLPUBLIC VclAbstractDialog2 : public virtual VclReferenceBase
 {
-public:
+protected:
     virtual             ~VclAbstractDialog2() override;
-
+public:
     virtual void        StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) = 0;
     virtual long        GetResult() = 0;
 };
 
 class VCL_DLLPUBLIC VclAbstractTerminatedDialog : public VclAbstractDialog
 {
+protected:
+    virtual             ~VclAbstractTerminatedDialog() override = default;
 public:
     virtual void        EndDialog(long nResult) = 0;
 };
 
 class VCL_DLLPUBLIC VclAbstractRefreshableDialog : public VclAbstractDialog
 {
+protected:
+    virtual             ~VclAbstractRefreshableDialog() override = default;
 public:
     virtual void        Update() = 0;
 };
 
 class VCL_DLLPUBLIC AbstractPasswordToOpenModifyDialog : public VclAbstractDialog
 {
+protected:
+    virtual             ~AbstractPasswordToOpenModifyDialog() override = default;
 public:
     virtual OUString    GetPasswordToOpen() const   = 0;
     virtual OUString    GetPasswordToModify() const = 0;
@@ -78,6 +85,8 @@ public:
 
 class VCL_DLLPUBLIC AbstractScreenshotAnnotationDlg : public VclAbstractDialog
 {
+protected:
+    virtual             ~AbstractScreenshotAnnotationDlg() override = default;
 };
 
 class VCL_DLLPUBLIC VclAbstractDialogFactory