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

[Noel Grandin]

 sw/source/uibase/inc/inputwin.hxx    |    2 +-
 sw/source/uibase/inc/wrtsh.hxx       |    6 +++---
 sw/source/uibase/ribbar/inputwin.cxx |    7 +++----
 sw/source/uibase/wrtsh/select.cxx    |    4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 98680db45f51296f536b9f9889f53172fa50ee8f
Author: Noel Grandin <noelgrandin at gmail.com>
Date:   Wed Sep 23 14:40:09 2015 +0200

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

diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx
index 622642c..444c5b3 100644
--- a/sw/source/uibase/inc/inputwin.hxx
+++ b/sw/source/uibase/inc/inputwin.hxx
@@ -87,7 +87,7 @@ public:
 
     void            ShowWin();
 
-    DECL_LINK( SelTableCellsNotify, SwWrtShell * );
+    DECL_LINK_TYPED( SelTableCellsNotify, SwWrtShell&, void );
 
     void            SetFormula( const OUString& rFormula, bool bDelSel = true );
     const SwView*   GetView() const{return pView;}
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index ed3b34b..16b4836 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -160,7 +160,7 @@ public:
     void    Invalidate();
 
     // select table cells for editing of formulas in the ribbonbar
-    inline void SelTableCells( const Link<> &rLink, bool bMark = true );
+    inline void SelTableCells( const Link<SwWrtShell&,void> &rLink, bool bMark = true );
     inline void EndSelTableCells();
 
     // leave per word or per line selection mode. Is usually called in MB-Up.
@@ -560,7 +560,7 @@ private:
     bool    m_bRetainSelection :1; // Do not remove selections
 
     Point   m_aStart;
-    Link<>  m_aSelTableLink;
+    Link<SwWrtShell&,void>  m_aSelTableLink;
 
     // resets the cursor stack after movement by PageUp/-Down
     SAL_DLLPRIVATE void  _ResetCursorStack();
@@ -609,7 +609,7 @@ inline void SwWrtShell::ResetCursorStack()
         _ResetCursorStack();
 }
 
-inline void SwWrtShell::SelTableCells(const Link<> &rLink, bool bMark )
+inline void SwWrtShell::SelTableCells(const Link<SwWrtShell&,void> &rLink, bool bMark )
 {
     SetSelTableCells( true );
     m_bClearMark = bMark;
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index 6fd9d12..9f0647b 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -418,12 +418,12 @@ void  SwInputWindow::CancelFormula()
 const sal_Unicode CH_LRE = 0x202a;
 const sal_Unicode CH_PDF = 0x202c;
 
-IMPL_LINK( SwInputWindow, SelTableCellsNotify, SwWrtShell *, pCaller )
+IMPL_LINK_TYPED( SwInputWindow, SelTableCellsNotify, SwWrtShell&, rCaller, void )
 {
     if(bIsTable)
     {
-        SwFrameFormat* pTableFormat = pCaller->GetTableFormat();
-        OUString sBoxNms( pCaller->GetBoxNms() );
+        SwFrameFormat* pTableFormat = rCaller.GetTableFormat();
+        OUString sBoxNms( rCaller.GetBoxNms() );
         OUString sTableNm;
         if( pTableFormat && aAktTableName != pTableFormat->GetName() )
             sTableNm = pTableFormat->GetName();
@@ -456,7 +456,6 @@ IMPL_LINK( SwInputWindow, SelTableCellsNotify, SwWrtShell *, pCaller )
     }
     else
         aEdit->GrabFocus();
-    return 0;
 }
 
 void SwInputWindow::SetFormula( const OUString& rFormula, bool bDelFlag )
diff --git a/sw/source/uibase/wrtsh/select.cxx b/sw/source/uibase/wrtsh/select.cxx
index d530b55..7461733 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -783,7 +783,7 @@ long SwWrtShell::BeginDrag(const Point * /*pPt*/, bool )
 long SwWrtShell::DefaultDrag(const Point *, bool )
 {
     if( IsSelTableCells() )
-        m_aSelTableLink.Call(this);
+        m_aSelTableLink.Call(*this);
 
     return 1;
 }
@@ -795,7 +795,7 @@ long SwWrtShell::DefaultEndDrag(const Point * /*pPt*/, bool )
         LeaveExtSel();
 
     if( IsSelTableCells() )
-        m_aSelTableLink.Call(this);
+        m_aSelTableLink.Call(*this);
     EndSelect();
     return 1;
 }