Kaydet (Commit) 3563fd5b authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: Ie63553874b4f353eb5551f212a4d0f78ec9603b9
Reviewed-on: https://gerrit.libreoffice.org/18780Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 43f7445e
...@@ -167,7 +167,7 @@ void ScCsvControl::EnableRepaint( bool bInvalidate ) ...@@ -167,7 +167,7 @@ void ScCsvControl::EnableRepaint( bool bInvalidate )
void ScCsvControl::Execute( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 ) void ScCsvControl::Execute( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 )
{ {
maCmd.Set( eType, nParam1, nParam2 ); maCmd.Set( eType, nParam1, nParam2 );
maCmdHdl.Call( this ); maCmdHdl.Call( *this );
} }
// layout helpers ------------------------------------------------------------- // layout helpers -------------------------------------------------------------
......
...@@ -39,7 +39,7 @@ ScCsvTableBox::ScCsvTableBox( vcl::Window* pParent, WinBits nBits ) : ...@@ -39,7 +39,7 @@ ScCsvTableBox::ScCsvTableBox( vcl::Window* pParent, WinBits nBits ) :
maHScroll->SetLineSize( 1 ); maHScroll->SetLineSize( 1 );
maVScroll->SetLineSize( 1 ); maVScroll->SetLineSize( 1 );
Link<> aLink = LINK( this, ScCsvTableBox, CsvCmdHdl ); Link<ScCsvControl&,void> aLink = LINK( this, ScCsvTableBox, CsvCmdHdl );
SetCmdHdl( aLink ); SetCmdHdl( aLink );
maRuler->SetCmdHdl( aLink ); maRuler->SetCmdHdl( aLink );
maGrid->SetCmdHdl( aLink ); maGrid->SetCmdHdl( aLink );
...@@ -251,11 +251,9 @@ void ScCsvTableBox::DataChanged( const DataChangedEvent& rDCEvt ) ...@@ -251,11 +251,9 @@ void ScCsvTableBox::DataChanged( const DataChangedEvent& rDCEvt )
ScCsvControl::DataChanged( rDCEvt ); ScCsvControl::DataChanged( rDCEvt );
} }
IMPL_LINK( ScCsvTableBox, CsvCmdHdl, ScCsvControl*, pCtrl ) IMPL_LINK_TYPED( ScCsvTableBox, CsvCmdHdl, ScCsvControl&, rCtrl, void )
{ {
OSL_ENSURE( pCtrl, "ScCsvTableBox::CsvCmdHdl - missing sender" ); const ScCsvCmd& rCmd = rCtrl.GetCmd();
const ScCsvCmd& rCmd = pCtrl->GetCmd();
ScCsvCmdType eType = rCmd.GetType(); ScCsvCmdType eType = rCmd.GetType();
sal_Int32 nParam1 = rCmd.GetParam1(); sal_Int32 nParam1 = rCmd.GetParam1();
sal_Int32 nParam2 = rCmd.GetParam2(); sal_Int32 nParam2 = rCmd.GetParam2();
...@@ -334,7 +332,7 @@ IMPL_LINK( ScCsvTableBox, CsvCmdHdl, ScCsvControl*, pCtrl ) ...@@ -334,7 +332,7 @@ IMPL_LINK( ScCsvTableBox, CsvCmdHdl, ScCsvControl*, pCtrl )
bFound = false; bFound = false;
} }
if( bFound ) if( bFound )
return 0; return;
const ScCsvLayoutData aOldData( maData ); const ScCsvLayoutData aOldData( maData );
switch( eType ) switch( eType )
...@@ -388,8 +386,6 @@ IMPL_LINK( ScCsvTableBox, CsvCmdHdl, ScCsvControl*, pCtrl ) ...@@ -388,8 +386,6 @@ IMPL_LINK( ScCsvTableBox, CsvCmdHdl, ScCsvControl*, pCtrl )
maGrid->ApplyLayout( aOldData ); maGrid->ApplyLayout( aOldData );
EnableRepaint(); EnableRepaint();
} }
return 0;
} }
IMPL_LINK_TYPED( ScCsvTableBox, ScrollHdl, ScrollBar*, pScrollBar, void ) IMPL_LINK_TYPED( ScCsvTableBox, ScrollHdl, ScrollBar*, pScrollBar, void )
......
...@@ -229,7 +229,7 @@ protected: ...@@ -229,7 +229,7 @@ protected:
::css::accessibility::XAccessible > XAccessibleRef; ::css::accessibility::XAccessible > XAccessibleRef;
private: private:
Link<> maCmdHdl; /// External command handler. Link<ScCsvControl&,void> maCmdHdl; /// External command handler.
ScCsvCmd maCmd; /// Data of last command. ScCsvCmd maCmd; /// Data of last command.
const ScCsvLayoutData& mrData; /// Shared layout data. const ScCsvLayoutData& mrData; /// Shared layout data.
...@@ -285,7 +285,7 @@ public: ...@@ -285,7 +285,7 @@ public:
// command handling ------------------------------------------------------- // command handling -------------------------------------------------------
/** Sets a new command handler. */ /** Sets a new command handler. */
inline void SetCmdHdl( const Link<>& rHdl ) { maCmdHdl = rHdl; } inline void SetCmdHdl( const Link<ScCsvControl&,void>& rHdl ) { maCmdHdl = rHdl; }
/** Returns data of the last command. */ /** Returns data of the last command. */
inline const ScCsvCmd& GetCmd() const { return maCmd; } inline const ScCsvCmd& GetCmd() const { return maCmd; }
......
...@@ -123,7 +123,7 @@ protected: ...@@ -123,7 +123,7 @@ protected:
virtual Size GetOptimalSize() const SAL_OVERRIDE; virtual Size GetOptimalSize() const SAL_OVERRIDE;
private: private:
DECL_DLLPRIVATE_LINK( CsvCmdHdl, ScCsvControl* ); DECL_DLLPRIVATE_LINK_TYPED( CsvCmdHdl, ScCsvControl&, void );
DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void );
DECL_DLLPRIVATE_LINK_TYPED( ScrollEndHdl, ScrollBar*, void ); DECL_DLLPRIVATE_LINK_TYPED( ScrollEndHdl, ScrollBar*, void );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment