1 files changed, 26 insertions, 56 deletions

diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx
index a5f975d64b65..8ec7d504279e 100644
--- a/formula/source/ui/dlg/ControlHelper.hxx
+++ b/formula/source/ui/dlg/ControlHelper.hxx
@@ -24,58 +24,28 @@
 namespace formula
 {
 
-// class EditBox
-class EditBox : public Control
-{
-private:
-
-    VclPtr<MultiLineEdit>  pMEdit;
-    Link<EditBox&,void>    aSelChangedLink;
-    Selection              aOldSel;
-
-    DECL_LINK(ChangedHdl, void *, void);
-
-protected:
-
-    virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
-    virtual void    Resize() override;
-    virtual void    GetFocus() override;
-
-
-public:
-                    EditBox( vcl::Window* pParent, WinBits nBits );
-
-                    virtual ~EditBox() override;
-    virtual void    dispose() override;
-
-    MultiLineEdit*  GetEdit() {return pMEdit;}
-
-    void            SetSelChangedHdl( const Link<EditBox&,void>& rLink ) { aSelChangedLink = rLink; }
-
-    void            UpdateOldSel();
-};
-
+class ParaWin;
 
 // class ArgEdit
 
-class ArgEdit : public RefEdit
+class ArgEdit : public WeldRefEdit
 {
 public:
-            ArgEdit( vcl::Window* pParent, WinBits nBits );
-    virtual ~ArgEdit() override;
-    virtual void dispose() override;
+    ArgEdit(std::unique_ptr<weld::Entry> xControl);
 
-    void    Init( ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
-                  ScrollBar& rArgSlider, sal_uInt16 nArgCount );
+    void    Init(ArgEdit* pPrevEdit, ArgEdit* pNextEdit,
+                 weld::ScrolledWindow& rArgSlider,
+                 ParaWin& rParaWin, sal_uInt16 nArgCount);
 
 protected:
-    virtual void    KeyInput( const KeyEvent& rKEvt ) override;
+    DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
 
 private:
-    VclPtr<ArgEdit>    pEdPrev;
-    VclPtr<ArgEdit>    pEdNext;
-    VclPtr<ScrollBar>  pSlider;
-    sal_uInt16      nArgs;
+    ArgEdit* pEdPrev;
+    ArgEdit* pEdNext;
+    weld::ScrolledWindow* pSlider;
+    ParaWin* pParaWin;
+    sal_uInt16 nArgs;
 };
 
 
@@ -89,24 +59,24 @@ private:
     Link<ArgInput&,void>          aEdFocusLink;
     Link<ArgInput&,void>          aEdModifyLink;
 
-    VclPtr<FixedText>      pFtArg;
-    VclPtr<PushButton>     pBtnFx;
-    VclPtr<ArgEdit>        pEdArg;
-    VclPtr<RefButton>      pRefBtn;
+    weld::Label*pFtArg;
+    weld::Button* pBtnFx;
+    ArgEdit* pEdArg;
+    WeldRefButton* pRefBtn;
 
-    DECL_LINK( FxBtnClickHdl, Button*, void );
-    DECL_LINK( FxBtnFocusHdl, Control&, void );
-    DECL_LINK( EdFocusHdl, Control&, void );
-    DECL_LINK( EdModifyHdl, Edit&, void );
+    DECL_LINK( FxBtnClickHdl, weld::Button&, void );
+    DECL_LINK( FxBtnFocusHdl, weld::Widget&, void );
+    DECL_LINK( EdFocusHdl, WeldRefEdit&, void );
+    DECL_LINK( EdModifyHdl, WeldRefEdit&, void );
 
 public:
 
     ArgInput();
 
-    void        InitArgInput (  FixedText*      pftArg,
-                                PushButton*    pbtnFx,
-                                ArgEdit*        pedArg,
-                                RefButton*  prefBtn);
+    void        InitArgInput(weld::Label* pftArg,
+                             weld::Button* pbtnFx,
+                             ArgEdit* pedArg,
+                             WeldRefButton* prefBtn);
 
     void        SetArgName(const OUString &aArg);
     OUString    GetArgName();
@@ -115,9 +85,9 @@ public:
     void        SetArgVal(const OUString &aVal);
     OUString    GetArgVal();
 
-    void        SetArgSelection (const Selection& rSel);
+    void        SelectAll();
 
-    ArgEdit*    GetArgEdPtr() {return pEdArg;}
+    ArgEdit*    GetArgEdPtr() { return pEdArg; }
 
 
     void            SetFxClickHdl( const Link<ArgInput&,void>& rLink ) { aFxClickLink = rLink; }