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

convert Link<> to typed

Change-Id: I282ea95e748ea52099a84fd3e8e8151e03ce25f9
Reviewed-on: https://gerrit.libreoffice.org/18806Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
Tested-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst b43226b9
...@@ -133,7 +133,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP, ...@@ -133,7 +133,7 @@ ScFunctionDockWin::ScFunctionDockWin( SfxBindings* pBindingsP,
aDDFuncList->SetSelectHdl(aLink); aDDFuncList->SetSelectHdl(aLink);
aInsertButton->SetClickHdl(LINK( this, ScFunctionDockWin, SetSelectionClickHdl)); aInsertButton->SetClickHdl(LINK( this, ScFunctionDockWin, SetSelectionClickHdl));
Link<> a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl); Link<ScPrivatSplit&,void> a3Link=LINK( this, ScFunctionDockWin, SetSplitHdl);
aPrivatSplit->SetCtrModifiedHdl(a3Link); aPrivatSplit->SetCtrModifiedHdl(a3Link);
StartListening( *pBindingsP, true ); StartListening( *pBindingsP, true );
...@@ -978,9 +978,9 @@ IMPL_LINK_NOARG_TYPED( ScFunctionDockWin, SetSelectionHdl, ListBox&, void ) ...@@ -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(); short nDeltaY=aPrivatSplit->GetDeltaY();
Size aFLSize=aFuncList->GetSizePixel(); Size aFLSize=aFuncList->GetSizePixel();
...@@ -994,8 +994,6 @@ IMPL_LINK( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit*, pCtrl ) ...@@ -994,8 +994,6 @@ IMPL_LINK( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit*, pCtrl )
aFiFuncDesc->SetPosPixel(aFDTopLeft); aFiFuncDesc->SetPosPixel(aFDTopLeft);
aFiFuncDesc->SetSizePixel(aFDSize); aFiFuncDesc->SetSizePixel(aFDSize);
} }
return 0;
} }
void ScFunctionDockWin::ToggleFloatingMode() void ScFunctionDockWin::ToggleFloatingMode()
......
...@@ -221,7 +221,7 @@ short ScPrivatSplit::GetDeltaY() ...@@ -221,7 +221,7 @@ short ScPrivatSplit::GetDeltaY()
#************************************************************************/ #************************************************************************/
void ScPrivatSplit::CtrModified() void ScPrivatSplit::CtrModified()
{ {
aCtrModifiedLink.Call( this ); aCtrModifiedLink.Call( *this );
} }
void ScPrivatSplit::MoveSplitTo(Point aPos) void ScPrivatSplit::MoveSplitTo(Point aPos)
......
...@@ -84,7 +84,7 @@ private: ...@@ -84,7 +84,7 @@ private:
DECL_LINK_TYPED( SetSelectionHdl, ListBox&, void ); DECL_LINK_TYPED( SetSelectionHdl, ListBox&, void );
DECL_LINK_TYPED( SetSelectionClickHdl, Button*, void ); DECL_LINK_TYPED( SetSelectionClickHdl, Button*, void );
DECL_LINK( SelHdl, ListBox* ); DECL_LINK( SelHdl, ListBox* );
DECL_LINK(SetSplitHdl,ScPrivatSplit*); DECL_LINK_TYPED( SetSplitHdl, ScPrivatSplit&, void );
DECL_LINK_TYPED( TimerHdl, Idle*, void ); DECL_LINK_TYPED( TimerHdl, Idle*, void );
protected: protected:
......
...@@ -26,7 +26,7 @@ class ScPrivatSplit : public Control ...@@ -26,7 +26,7 @@ class ScPrivatSplit : public Control
{ {
private: private:
Link<> aCtrModifiedLink; Link<ScPrivatSplit&,void> aCtrModifiedLink;
bool aMovingFlag; bool aMovingFlag;
Pointer aWinPointer; Pointer aWinPointer;
short nOldX; short nOldX;
...@@ -60,7 +60,7 @@ public: ...@@ -60,7 +60,7 @@ public:
virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE;
virtual void DataChanged( const DataChangedEvent& rDCEvt ) 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 #endif
......
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