diff options
| -rw-r--r-- | include/svtools/hyperlabel.hxx | 4 | ||||
| -rw-r--r-- | svtools/inc/roadmap.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/control/roadmap.cxx | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/svtools/hyperlabel.hxx b/include/svtools/hyperlabel.hxx index ad61c58bf2f9..81ef7c396a45 100644 --- a/include/svtools/hyperlabel.hxx +++ b/include/svtools/hyperlabel.hxx @@ -38,7 +38,7 @@ namespace svt { protected: HyperLabelImpl* m_pImpl; - Link<> maClickHdl; + Link<HyperLabel*,void> maClickHdl; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -69,7 +69,7 @@ namespace svt void ToggleBackgroundColor( const Color& _rGBColor ); 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; diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index a4e943166faa..304c8c7caa49 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -89,7 +89,7 @@ protected: void Select(); private: - DECL_LINK(ImplClickHdl, HyperLabel*); + DECL_LINK_TYPED(ImplClickHdl, HyperLabel*, void); RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 9a974854a589..f27ac1ab9ff0 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -69,7 +69,7 @@ public: void ToggleBackgroundColor( const Color& _rGBColor ); void SetInteractive( bool _bInteractive ); - void SetClickHdl( const Link<>& rLink ); + void SetClickHdl( const Link<HyperLabel*,void>& rLink ); void Enable( bool bEnable = true); bool IsEnabled() const; void GrabFocus(); @@ -646,9 +646,9 @@ bool ORoadmap::PreNotify(NotifyEvent& _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) @@ -813,7 +813,7 @@ void RoadmapItem::Update(ItemIndex _RMIndex, const OUString& _rText) ImplUpdateIndex( _RMIndex ); } -void RoadmapItem::SetClickHdl(const Link<>& rLink) +void RoadmapItem::SetClickHdl(const Link<HyperLabel*,void>& rLink) { if ( mpDescription ) mpDescription->SetClickHdl( rLink); |