weld FormulaDialog

drop xFocusWin hack, I don't see what gain it gives

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

3 files changed, 16 insertions, 24 deletions

diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index 6a1889b3c1ba..e910bd64300f 100644
--- a/include/formula/formdata.hxx
+++ b/include/formula/formdata.hxx
@@ -44,7 +44,6 @@ public:
     sal_uInt16       GetOffset() const   { return nOffset; }
     const OUString&  GetUndoStr() const  { return aUndoStr; }
     bool             GetMatrixFlag()const{ return bMatrix;}
-    const VclPtr<vcl::Window>& GetFocusWindow()const  { return xFocusWin; }
     const Selection& GetSelection()const { return aSelection;}
 
     void             SetMode( FormulaDlgMode nNew )              { nMode = nNew; }
@@ -52,7 +51,6 @@ public:
     void             SetOffset( sal_uInt16 nNew )                { nOffset = nNew; }
     void             SetUndoStr( const OUString& rNew )          { aUndoStr = rNew; }
     void             SetMatrixFlag(bool bNew)                    { bMatrix=bNew;}
-    void             SetFocusWindow(const VclPtr<vcl::Window>& rWin) { xFocusWin=rWin;}
     void             SetSelection(const Selection& aSel)         { aSelection=aSel;}
 protected:
     void                Reset();
@@ -65,7 +63,6 @@ private:
     sal_uInt16          nOffset;
     OUString            aUndoStr;
     bool                bMatrix;
-    VclPtr<vcl::Window> xFocusWin;
     Selection           aSelection;
 };
 
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);
diff --git a/include/formula/funcutl.hxx b/include/formula/funcutl.hxx
index 7ab1252e7c97..92578e49f8ad 100644
--- a/include/formula/funcutl.hxx
+++ b/include/formula/funcutl.hxx
@@ -104,7 +104,7 @@ protected:
 
 public:
     WeldRefEdit(std::unique_ptr<weld::Entry> xControl);
-    weld::Widget* GetWidget() const { return xEntry.get(); }
+    weld::Entry* GetWidget() const { return xEntry.get(); }
     ~WeldRefEdit();
 
     void SetRefString( const OUString& rStr );
@@ -227,7 +227,7 @@ protected:
 
 public:
     WeldRefButton(std::unique_ptr<weld::Button> xControl);
-    weld::Widget* GetWidget() const { return xButton.get(); }
+    weld::Button* GetWidget() const { return xButton.get(); }
     ~WeldRefButton();
     void SetReferences(IControlReferenceHandler* pDlg, WeldRefEdit* pEdit);
     void SetStartImage();