[Libreoffice-commits] core.git: sc/source

[Noel Grandin]

 sc/source/ui/formdlg/dwfunctr.cxx |    8 +++-----
 sc/source/ui/formdlg/privsplt.cxx |    2 +-
 sc/source/ui/inc/dwfunctr.hxx     |    2 +-
 sc/source/ui/inc/privsplt.hxx     |    4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit b198cb8f53fb442758e5abd3d271238a2d0c1b1c
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Wed Sep 23 10:28:42 2015 +0200

    convert Link<> to typed
    
    Change-Id: I282ea95e748ea52099a84fd3e8e8151e03ce25f9
    Reviewed-on: https://gerrit.libreoffice.org/18806
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx
index 827371a..766575a 100644
--- a/sc/source/ui/formdlg/dwfunctr.cxx
+++ b/sc/source/ui/formdlg/dwfunctr.cxx
@@ -133,7 +133,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
     aDDFuncList->SetSelectHdl(aLink);
     aInsertButton->SetClickHdl(LINK( this, ScFunctionDockWin, SetSelectionClickHdl));
 
-    Link<> a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl);
+    Link<ScPrivatSplit&,void> a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl);
     aPrivatSplit->SetCtrModifiedHdl(a3Link);
     StartListening( *pBindingsP, true );
 
@@ -978,9 +978,9 @@ IMPL_LINK_NOARG_TYPED( ScFunctionDockWin, SetSelectionHdl, ListBox&, void )
 #*
 #************************************************************************/
 
-IMPL_LINK( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit*, pCtrl )
+IMPL_LINK_TYPED( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit&, rCtrl, void )
 {
-    if (pCtrl == aPrivatSplit.get())
+    if (&rCtrl == aPrivatSplit.get())
     {
         short nDeltaY=aPrivatSplit->GetDeltaY();
         Size aFLSize=aFuncList->GetSizePixel();
@@ -994,8 +994,6 @@ IMPL_LINK( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit*, pCtrl )
         aFiFuncDesc->SetPosPixel(aFDTopLeft);
         aFiFuncDesc->SetSizePixel(aFDSize);
     }
-
-    return 0;
 }
 
 void ScFunctionDockWin::ToggleFloatingMode()
diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx
index ee8d6e3..72adb6d 100644
--- a/sc/source/ui/formdlg/privsplt.cxx
+++ b/sc/source/ui/formdlg/privsplt.cxx
@@ -221,7 +221,7 @@ short ScPrivatSplit::GetDeltaY()
 #************************************************************************/
 void ScPrivatSplit::CtrModified()
 {
-    aCtrModifiedLink.Call( this );
+    aCtrModifiedLink.Call( *this );
 }
 
 void ScPrivatSplit::MoveSplitTo(Point aPos)
diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx
index 9cad0bd..3749cb4 100644
--- a/sc/source/ui/inc/dwfunctr.hxx
+++ b/sc/source/ui/inc/dwfunctr.hxx
@@ -84,7 +84,7 @@ private:
                     DECL_LINK_TYPED( SetSelectionHdl, ListBox&, void );
                     DECL_LINK_TYPED( SetSelectionClickHdl, Button*, void );
                     DECL_LINK( SelHdl, ListBox* );
-                    DECL_LINK(SetSplitHdl,ScPrivatSplit*);
+                    DECL_LINK_TYPED( SetSplitHdl, ScPrivatSplit&, void );
                     DECL_LINK_TYPED( TimerHdl, Idle*, void );
 
 protected:
diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx
index a10c162..96cac4f 100644
--- a/sc/source/ui/inc/privsplt.hxx
+++ b/sc/source/ui/inc/privsplt.hxx
@@ -26,7 +26,7 @@ class ScPrivatSplit : public Control
 {
 private:
 
-        Link<>              aCtrModifiedLink;
+        Link<ScPrivatSplit&,void> aCtrModifiedLink;
         bool                aMovingFlag;
         Pointer             aWinPointer;
         short               nOldX;
@@ -60,7 +60,7 @@ public:
         virtual void    StateChanged( StateChangedType nType ) SAL_OVERRIDE;
         virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
-        void            SetCtrModifiedHdl( const Link<>& rLink ) { aCtrModifiedLink = rLink; }
+        void            SetCtrModifiedHdl( const Link<ScPrivatSplit&,void>& rLink ) { aCtrModifiedLink = rLink; }
 };
 
 #endif