[Libreoffice-commits] core.git: 2 commits - include/sfx2 include/svtools svtools/source sw/source

[Noel Grandin]

 include/sfx2/sfxdlg.hxx               |    2 +-
 include/svtools/editbrowsebox.hxx     |    6 +++---
 svtools/source/brwbox/ebbcontrols.cxx |    5 ++---
 sw/source/ui/dialog/swdlgfact.cxx     |    2 +-
 sw/source/ui/dialog/swdlgfact.hxx     |    4 ++--
 sw/source/uibase/app/docst.cxx        |    6 ++----
 6 files changed, 11 insertions(+), 14 deletions(-)

New commits:
commit 7320072e3b49e39528e2ec9e51aa777eaff31031
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Oct 16 13:41:03 2015 +0200

    convert Link<> to typed
    
    Change-Id: I39a0b4d5fb62ae66926148103b396578ed37405d

diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 30bb095..f6e87ca 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -79,7 +79,7 @@ public:
 class SfxAbstractApplyTabDialog : virtual public SfxAbstractTabDialog
 {
 public:
-    virtual void                SetApplyHdl( const Link<>& rLink ) = 0;
+    virtual void                SetApplyHdl( const Link<LinkParamNone*,void>& rLink ) = 0;
 };
 
 class SfxAbstractInsertObjectDialog : virtual public VclAbstractDialog
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index b507812..46c970b 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -167,7 +167,7 @@ IMPL_LINK_NOARG_TYPED(AbstractApplyTabDialog_Impl, ApplyHdl, Button*, void)
         m_aHandler.Call(NULL);
 }
 
-void AbstractApplyTabDialog_Impl::SetApplyHdl( const Link<>& rLink )
+void AbstractApplyTabDialog_Impl::SetApplyHdl( const Link<LinkParamNone*,void>& rLink )
 {
     m_aHandler = rLink;
     pDlg->SetApplyHandler(LINK(this, AbstractApplyTabDialog_Impl, ApplyHdl));
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx
index 61ed7a0..37dd753 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -133,8 +133,8 @@ public:
     }
     DECL_LINK_TYPED(ApplyHdl, Button*, void);
 private:
-    Link<> m_aHandler;
-    virtual void                SetApplyHdl( const Link<>& rLink ) override;
+    Link<LinkParamNone*,void> m_aHandler;
+    virtual void                SetApplyHdl( const Link<LinkParamNone*,void>& rLink ) override;
 };
 
 class AbstractSwConvertTableDlg_Impl :  public AbstractSwConvertTableDlg
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index b324353..8ab012ea2 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -515,7 +515,7 @@ public:
         , m_bModified(bModified)
     {
     }
-    DECL_LINK( ApplyHdl, void* );
+    DECL_LINK_TYPED( ApplyHdl, LinkParamNone*, void );
     void apply()
     {
         ApplyHdl(NULL);
@@ -533,7 +533,7 @@ private:
     bool m_bModified;
 };
 
-IMPL_LINK_NOARG(ApplyStyle, ApplyHdl)
+IMPL_LINK_NOARG_TYPED(ApplyStyle, ApplyHdl, LinkParamNone*, void)
 {
     SwWrtShell* pWrtShell = m_rDocSh.GetWrtShell();
     SwDoc* pDoc = m_rDocSh.GetDoc();
@@ -611,8 +611,6 @@ IMPL_LINK_NOARG(ApplyStyle, ApplyHdl)
     }
 
     pWrtShell->EndAllAction();
-
-    return m_nRet;
 }
 
 sal_uInt16 SwDocShell::Edit(
commit a9bb16e89ca23e1975becbb0fa061e379613ace4
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Oct 16 13:22:11 2015 +0200

    convert Link<> to typed
    
    Change-Id: I9aa883a2228ed5d39e924e4364cd3a812f2037a3

diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index e1c7c10..532b47e 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -284,7 +284,7 @@ namespace svt
         VclPtr<CheckBox>             pBox;
         Rectangle                    aFocusRect;
         Link<VclPtr<CheckBox>,void>  m_aClickLink;
-        Link<>                       m_aModifyLink;
+        Link<LinkParamNone*,void>    m_aModifyLink;
 
     public:
         CheckBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0);
@@ -301,7 +301,7 @@ namespace svt
 
         void SetClickHdl(const Link<VclPtr<CheckBox>,void>& rHdl) {m_aClickLink = rHdl;}
 
-        void SetModifyHdl(const Link<>& rHdl) {m_aModifyLink = rHdl;}
+        void SetModifyHdl(const Link<LinkParamNone*,void>& rHdl) {m_aModifyLink = rHdl;}
 
         CheckBox&   GetBox() {return *pBox;};
 
@@ -326,7 +326,7 @@ namespace svt
     protected:
         virtual bool WantMouseEvent() const override;
     private:
-        DECL_LINK(ModifyHdl, void*);
+        DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void);
     };
 
 
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index f16c21e..3550f48 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -263,7 +263,7 @@ namespace svt
     IMPL_LINK_NOARG_TYPED(CheckBoxControl, OnClick, Button*, void)
     {
         m_aClickLink.Call(pBox);
-        m_aModifyLink.Call(pBox);
+        m_aModifyLink.Call(nullptr);
     }
 
 
@@ -359,10 +359,9 @@ namespace svt
     }
 
 
-    IMPL_LINK_NOARG(CheckBoxCellController, ModifyHdl)
+    IMPL_LINK_NOARG_TYPED(CheckBoxCellController, ModifyHdl, LinkParamNone*, void)
     {
         callModifyHdl();
-        return 0;
     }
 
     //= MultiLineEditImplementation