1 files changed, 7 insertions, 11 deletions

diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index 3b4be283fc46..cb55e2cc8d6f 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -21,11 +21,11 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSAVE_HXX
 
 #include <apitools.hxx>
-#include <vcl/dialog.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <memory>
 #include <o3tl/typed_flags_set.hxx>
+#include <vcl/weld.hxx>
+#include <memory>
 
 namespace com { namespace sun { namespace star {
     namespace sdbc {
@@ -43,41 +43,37 @@ namespace o3tl {
     template<> struct typed_flags<SADFlags> : is_typed_flags<SADFlags, 0x0301> {};
 }
 
-
-class Button;
-class Edit;
 namespace dbaui
 {
     class OSaveAsDlgImpl;
     class IObjectNameCheck;
-    class OSaveAsDlg : public ModalDialog
+    class OSaveAsDlg : public weld::GenericDialogController
     {
     private:
         std::unique_ptr<OSaveAsDlgImpl> m_pImpl;
         css::uno::Reference< css::uno::XComponentContext >    m_xContext;
     public:
-        OSaveAsDlg( vcl::Window * pParent, sal_Int32 _rType,
+        OSaveAsDlg( weld::Window * pParent, sal_Int32 _rType,
                     const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
                     const css::uno::Reference< css::sdbc::XConnection>& _xConnection,
                     const OUString& rDefault,
                     const IObjectNameCheck& _rObjectNameCheck,
                     SADFlags _nFlags);
 
-        OSaveAsDlg( vcl::Window* _pParent,
+        OSaveAsDlg( weld::Window* _pParent,
                     const css::uno::Reference< css::uno::XComponentContext >& _rxContext,
                     const OUString& _rDefault,
                     const OUString& _sLabel,
                     const IObjectNameCheck& _rObjectNameCheck,
                     SADFlags _nFlags);
         virtual ~OSaveAsDlg() override;
-        virtual void dispose() override;
 
         const OUString& getName() const;
         OUString getCatalog() const;
         OUString getSchema() const;
     private:
-        DECL_LINK(ButtonClickHdl, Button *, void);
-        DECL_LINK(EditModifyHdl,  Edit&, void);
+        DECL_LINK(ButtonClickHdl, weld::Button&, void);
+        DECL_LINK(EditModifyHdl,  weld::Entry&, void);
 
         void implInitOnlyTitle(const OUString& _rLabel);
         void implInit();