1 files changed, 27 insertions, 30 deletions
diff --git a/writerperfect/source/writer/EPUBExportDialog.hxx b/writerperfect/source/writer/EPUBExportDialog.hxx
index ab90c48ee04c..51326c1ae1f6 100644
--- a/writerperfect/source/writer/EPUBExportDialog.hxx
+++ b/writerperfect/source/writer/EPUBExportDialog.hxx
@@ -10,10 +10,7 @@
 #ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_EPUBEXPORTDIALOG_HXX
 #define INCLUDED_WRITERPERFECT_SOURCE_WRITER_EPUBEXPORTDIALOG_HXX
 
-#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/lstbox.hxx>
+#include <vcl/weld.hxx>
 
 namespace comphelper
 {
@@ -24,37 +21,37 @@ namespace writerperfect
 {
 
 /// EPUB export options dialog.
-class EPUBExportDialog : public ModalDialog
+class EPUBExportDialog : public weld::GenericDialogController
 {
 public:
-    EPUBExportDialog(vcl::Window *pParent, comphelper::SequenceAsHashMap &rFilterData, css::uno::Reference<css::uno::XComponentContext> xContext, css::uno::Reference<css::lang::XComponent> xDocument);
+    EPUBExportDialog(weld::Window *pParent, comphelper::SequenceAsHashMap &rFilterData, css::uno::Reference<css::uno::XComponentContext> xContext, css::uno::Reference<css::lang::XComponent> xDocument);
     ~EPUBExportDialog() override;
-    void dispose() override;
 
 private:
-    DECL_LINK(VersionSelectHdl, ListBox &, void);
-    DECL_LINK(SplitSelectHdl, ListBox &, void);
-    DECL_LINK(LayoutSelectHdl, ListBox &, void);
-    DECL_LINK(CoverClickHdl, Button *, void);
-    DECL_LINK(MediaClickHdl, Button *, void);
-    DECL_LINK(OKClickHdl, Button *, void);
-
-    css::uno::Reference<css::uno::XComponentContext> mxContext;
-    comphelper::SequenceAsHashMap &mrFilterData;
-    css::uno::Reference<css::lang::XComponent> mxSourceDocument;
-    VclPtr<ListBox> m_pVersion;
-    VclPtr<ListBox> m_pSplit;
-    VclPtr<ListBox> m_pLayout;
-    VclPtr<Edit> m_pCoverPath;
-    VclPtr<PushButton> m_pCoverButton;
-    VclPtr<Edit> m_pMediaDir;
-    VclPtr<PushButton> m_pMediaButton;
-    VclPtr<PushButton> m_pOKButton;
-    VclPtr<Edit> m_pIdentifier;
-    VclPtr<Edit> m_pTitle;
-    VclPtr<Edit> m_pInitialCreator;
-    VclPtr<Edit> m_pLanguage;
-    VclPtr<Edit> m_pDate;
+    DECL_LINK(VersionSelectHdl, weld::ComboBoxText &, void);
+    DECL_LINK(SplitSelectHdl, weld::ComboBoxText &, void);
+    DECL_LINK(LayoutSelectHdl, weld::ComboBoxText &, void);
+    DECL_LINK(CoverClickHdl, weld::Button &, void);
+    DECL_LINK(MediaClickHdl, weld::Button &, void);
+    DECL_LINK(OKClickHdl, weld::Button &, void);
+
+    css::uno::Reference<css::uno::XComponentContext> m_xContext;
+    comphelper::SequenceAsHashMap &m_rFilterData;
+    css::uno::Reference<css::lang::XComponent> m_xSourceDocument;
+
+    std::unique_ptr<weld::ComboBoxText> m_xVersion;
+    std::unique_ptr<weld::ComboBoxText> m_xSplit;
+    std::unique_ptr<weld::ComboBoxText> m_xLayout;
+    std::unique_ptr<weld::Entry> m_xCoverPath;
+    std::unique_ptr<weld::Button> m_xCoverButton;
+    std::unique_ptr<weld::Entry> m_xMediaDir;
+    std::unique_ptr<weld::Button> m_xMediaButton;
+    std::unique_ptr<weld::Button> m_xOKButton;
+    std::unique_ptr<weld::Entry> m_xIdentifier;
+    std::unique_ptr<weld::Entry> m_xTitle;
+    std::unique_ptr<weld::Entry> m_xInitialCreator;
+    std::unique_ptr<weld::Entry> m_xLanguage;
+    std::unique_ptr<weld::Entry> m_xDate;
 };
 
 } // namespace writerperfect