1 files changed, 14 insertions, 19 deletions
diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx
index 873ab04866d7..7b4464e80019 100644
--- a/include/formula/formula.hxx
+++ b/include/formula/formula.hxx
@@ -60,24 +60,22 @@ class RefButton;
 class WeldRefButton;
 class FormEditData;
 
-class FORMULA_DLLPUBLIC FormulaModalDialog :   public ModalDialog, public formula::IFormulaEditorHelper
+class FORMULA_DLLPUBLIC FormulaModalDialog
+    : public weld::GenericDialogController, public formula::IFormulaEditorHelper
 {
     friend class FormulaDlg_Impl;
 public:
-                    FormulaModalDialog( vcl::Window* pParent
-                                            ,IFunctionManager const * _pFunctionMgr
-                                            ,IControlReferenceHandler* _pDlg );
+    FormulaModalDialog(weld::Window* pParent, IFunctionManager const * _pFunctionMgr,
+                       IControlReferenceHandler* _pDlg);
     virtual ~FormulaModalDialog() override;
-    virtual void dispose() override;
 
 private:
     std::unique_ptr<FormulaDlg_Impl, o3tl::default_delete<FormulaDlg_Impl>> m_pImpl;
 
 protected:
 
-    virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
-    static ::std::pair<WeldRefButton*,WeldRefEdit*> RefInputStartBefore( WeldRefEdit* pEdit, WeldRefButton* pButton );
+    static ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
+    ::std::pair<WeldRefButton*,WeldRefEdit*> RefInputStartBefore( WeldRefEdit* pEdit, WeldRefButton* pButton );
     void            RefInputStartAfter();
     void            RefInputDoneAfter();
 
@@ -90,17 +88,15 @@ protected:
 };
 
 class FORMULA_DLLPUBLIC FormulaDlg:
-    public SfxModelessDialog, public IFormulaEditorHelper
+    public SfxModelessDialogController, public IFormulaEditorHelper
 {
     friend class FormulaDlg_Impl;
 public:
-                    FormulaDlg( SfxBindings* pB
-                                    , SfxChildWindow* pCW
-                                    , vcl::Window* pParent
-                                    , IFunctionManager const * _pFunctionMgr
-                                    , IControlReferenceHandler* _pDlg );
+    FormulaDlg(SfxBindings* pB, SfxChildWindow* pCW,
+               weld::Window* pParent,
+               IFunctionManager const * _pFunctionMgr,
+               IControlReferenceHandler* _pDlg);
     virtual ~FormulaDlg() override;
-    virtual void dispose() override;
 private:
     std::unique_ptr<FormulaDlg_Impl, o3tl::default_delete<FormulaDlg_Impl>> m_pImpl;
 
@@ -110,9 +106,8 @@ protected:
 
 protected:
 
-    virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
-    static ::std::pair<WeldRefButton*,WeldRefEdit*> RefInputStartBefore( WeldRefEdit* pEdit, WeldRefButton* pButton );
+    static ::std::pair<RefButton*,RefEdit*> RefInputStartBefore( RefEdit* pEdit, RefButton* pButton );
+    ::std::pair<WeldRefButton*,WeldRefEdit*> RefInputStartBefore( WeldRefEdit* pEdit, WeldRefButton* pButton );
     void            RefInputStartAfter();
     void            RefInputDoneAfter( bool bForced );
 
@@ -126,7 +121,7 @@ protected:
     const IFunctionDescription* getCurrentFunctionDescription() const;
     bool            UpdateParaWin(Selection& _rSelection);
     void            UpdateParaWin(const Selection& _rSelection, const OUString& _sRefStr);
-    RefEdit*        GetActiveEdit();
+    WeldRefEdit*    GetActiveEdit();
     void            SetEdSelection();
 
     void            StoreFormEditData(FormEditData* pData);