1 files changed, 40 insertions, 46 deletions
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index c0fc7eda5cb6..d87afdb6ee27 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -70,8 +70,8 @@
 #define RECOVERY_OPERATIONSTATE_UPDATE              "update"
 
 #define DLG_RET_UNKNOWN                                  -1
-#define DLG_RET_OK                                        1
-#define DLG_RET_CANCEL                                    0
+#define DLG_RET_OK                                      RET_OK
+#define DLG_RET_CANCEL                                  RET_CANCEL
 #define DLG_RET_OK_AUTOLUNCH                            101
 
 
@@ -146,6 +146,7 @@ struct TURLInfo
 
     /// standard icon
     Image StandardImage;
+    OUString StandardImageId;
 
     public:
 
@@ -535,65 +536,58 @@ class RecoveryDialog : public Dialog
 };
 
 
-class BrokenRecoveryDialog : public ModalDialog
+class BrokenRecoveryDialog : public weld::GenericDialogController
 {
+// member
+private:
+    OUString m_sSavePath;
+    RecoveryCore*   m_pCore;
+    bool const        m_bBeforeRecovery;
+    bool        m_bExecutionNeeded;
+
+    std::unique_ptr<weld::TreeView> m_xFileListLB;
+    std::unique_ptr<weld::Entry> m_xSaveDirED;
+    std::unique_ptr<weld::Button> m_xSaveDirBtn;
+    std::unique_ptr<weld::Button> m_xOkBtn;
+    std::unique_ptr<weld::Button> m_xCancelBtn;
+
+// interface
+public:
 
-    // member
-    private:
-        VclPtr<ListBox>         m_pFileListLB;
-        VclPtr<Edit>            m_pSaveDirED;
-        VclPtr<PushButton>      m_pSaveDirBtn;
-        VclPtr<PushButton>      m_pOkBtn;
-        VclPtr<CancelButton>    m_pCancelBtn;
-
-        OUString m_sSavePath;
-        RecoveryCore*   m_pCore;
-        bool const        m_bBeforeRecovery;
-        bool        m_bExecutionNeeded;
-
-
-    // interface
-    public:
-
-
-        /** @short TODO */
-        BrokenRecoveryDialog(vcl::Window*       pParent        ,
-                             RecoveryCore* pCore          ,
-                             bool      bBeforeRecovery);
-        virtual ~BrokenRecoveryDialog() override;
-        virtual void dispose() override;
-
-
-        /** @short TODO */
-        bool isExecutionNeeded();
-
+    /** @short TODO */
+    BrokenRecoveryDialog(weld::Window* pParent,
+                         RecoveryCore* pCore,
+                         bool bBeforeRecovery);
+    virtual ~BrokenRecoveryDialog() override;
 
-        /** @short TODO */
-        const OUString& getSaveDirURL();
+    /** @short TODO */
+    bool isExecutionNeeded();
 
 
-    // helper
-    private:
+    /** @short TODO */
+    const OUString& getSaveDirURL();
 
 
-        /** @short TODO */
-        void impl_refresh();
+// helper
+private:
+    /** @short TODO */
+    void impl_refresh();
 
 
-        /** @short TODO */
-        DECL_LINK(SaveButtonHdl, Button*, void);
+    /** @short TODO */
+    DECL_LINK(SaveButtonHdl, weld::Button&, void);
 
 
-        /** @short TODO */
-        DECL_LINK(OkButtonHdl, Button*, void);
+    /** @short TODO */
+    DECL_LINK(OkButtonHdl, weld::Button&, void);
 
 
-        /** @short TODO */
-        DECL_LINK(CancelButtonHdl, Button*, void);
+    /** @short TODO */
+    DECL_LINK(CancelButtonHdl, weld::Button&, void);
 
 
-        /** @short TODO */
-        void impl_askForSavePath();
+    /** @short TODO */
+    void impl_askForSavePath();
 };
     }
 }