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

convert Link<> to typed

Change-Id: I885694b2f7c950a292dd903952c5d298b9d0df9f
üst 68ddda0f
...@@ -38,7 +38,7 @@ namespace svt ...@@ -38,7 +38,7 @@ namespace svt
{ {
protected: protected:
HyperLabelImpl* m_pImpl; HyperLabelImpl* m_pImpl;
Link<> maClickHdl; Link<HyperLabel*,void> maClickHdl;
virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
...@@ -69,7 +69,7 @@ namespace svt ...@@ -69,7 +69,7 @@ namespace svt
void ToggleBackgroundColor( const Color& _rGBColor ); void ToggleBackgroundColor( const Color& _rGBColor );
void SetInteractive( bool _bInteractive ); void SetInteractive( bool _bInteractive );
void SetClickHdl( const Link<>& rLink ) { maClickHdl = rLink; } void SetClickHdl( const Link<HyperLabel*,void>& rLink ) { maClickHdl = rLink; }
Size CalcMinimumSize( long nMaxWidth = 0 ) const; Size CalcMinimumSize( long nMaxWidth = 0 ) const;
......
...@@ -89,7 +89,7 @@ protected: ...@@ -89,7 +89,7 @@ protected:
void Select(); void Select();
private: private:
DECL_LINK(ImplClickHdl, HyperLabel*); DECL_LINK_TYPED(ImplClickHdl, HyperLabel*, void);
RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); RoadmapItem* GetByIndex( ItemIndex _nItemIndex );
const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const;
......
...@@ -69,7 +69,7 @@ public: ...@@ -69,7 +69,7 @@ public:
void ToggleBackgroundColor( const Color& _rGBColor ); void ToggleBackgroundColor( const Color& _rGBColor );
void SetInteractive( bool _bInteractive ); void SetInteractive( bool _bInteractive );
void SetClickHdl( const Link<>& rLink ); void SetClickHdl( const Link<HyperLabel*,void>& rLink );
void Enable( bool bEnable = true); void Enable( bool bEnable = true);
bool IsEnabled() const; bool IsEnabled() const;
void GrabFocus(); void GrabFocus();
...@@ -646,9 +646,9 @@ bool ORoadmap::PreNotify(NotifyEvent& _rNEvt) ...@@ -646,9 +646,9 @@ bool ORoadmap::PreNotify(NotifyEvent& _rNEvt)
return Window::PreNotify( _rNEvt ); return Window::PreNotify( _rNEvt );
} }
IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, _CurHyperLabel) IMPL_LINK_TYPED(ORoadmap, ImplClickHdl, HyperLabel*, _CurHyperLabel, void)
{ {
return SelectRoadmapItemByID( _CurHyperLabel->GetID() ) ? 1 : 0; SelectRoadmapItemByID( _CurHyperLabel->GetID() );
} }
void ORoadmap::DataChanged(const DataChangedEvent& rDCEvt) void ORoadmap::DataChanged(const DataChangedEvent& rDCEvt)
...@@ -813,7 +813,7 @@ void RoadmapItem::Update(ItemIndex _RMIndex, const OUString& _rText) ...@@ -813,7 +813,7 @@ void RoadmapItem::Update(ItemIndex _RMIndex, const OUString& _rText)
ImplUpdateIndex( _RMIndex ); ImplUpdateIndex( _RMIndex );
} }
void RoadmapItem::SetClickHdl(const Link<>& rLink) void RoadmapItem::SetClickHdl(const Link<HyperLabel*,void>& rLink)
{ {
if ( mpDescription ) if ( mpDescription )
mpDescription->SetClickHdl( rLink); mpDescription->SetClickHdl( rLink);
......
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