weld SdPresLayoutDlg

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

1 files changed, 12 insertions, 11 deletions

diff --git a/sd/source/ui/inc/sdpreslt.hxx b/sd/source/ui/inc/sdpreslt.hxx
index 548b2c604aea..2360493a0a0a 100644
--- a/sd/source/ui/inc/sdpreslt.hxx
+++ b/sd/source/ui/inc/sdpreslt.hxx
@@ -22,8 +22,8 @@
 
 #include <vector>
 
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
+#include <vcl/customweld.hxx>
+#include <vcl/weld.hxx>
 #include <svtools/valueset.hxx>
 
 class SfxItemSet;
@@ -33,27 +33,22 @@ class DrawDocShell;
 }
 
 class SdPresLayoutDlg
-    : public ModalDialog
+    : public weld::GenericDialogController
 {
 public:
     SdPresLayoutDlg(
         ::sd::DrawDocShell* pDocShell,
-        vcl::Window* pWindow,
+        weld::Window* pWindow,
         const SfxItemSet& rInAttrs);
     virtual ~SdPresLayoutDlg() override;
-    virtual void dispose() override;
 
     void                GetAttr(SfxItemSet& rOutAttrs);
 
-    DECL_LINK(ClickLayoutHdl, ValueSet*, void);
-    DECL_LINK(ClickLoadHdl, Button*, void);
+    DECL_LINK(ClickLayoutHdl, SvtValueSet*, void);
+    DECL_LINK(ClickLoadHdl, weld::Button&, void);
 
 private:
     ::sd::DrawDocShell* mpDocSh;
-    VclPtr<ValueSet>           m_pVS;
-    VclPtr<CheckBox>           m_pCbxMasterPage;
-    VclPtr<CheckBox>           m_pCbxCheckMasters;
-    VclPtr<PushButton>         m_pBtnLoad;
 
     const SfxItemSet&   mrOutAttrs;
 
@@ -63,6 +58,12 @@ private:
     long                mnLayoutCount;   ///< number of master pages in the document
     const OUString      maStrNone;
 
+    std::unique_ptr<weld::CheckButton> m_xCbxMasterPage;
+    std::unique_ptr<weld::CheckButton> m_xCbxCheckMasters;
+    std::unique_ptr<weld::Button> m_xBtnLoad;
+    std::unique_ptr<SvtValueSet> m_xVS;
+    std::unique_ptr<weld::CustomWeld> m_xVSWin;
+
     void                FillValueSet();
     void                Reset();
 };