diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-15 14:24:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:55 +0200 |
| commit | 3368bca3c29592af8190cfd8829d76ed768651b7 (patch) | |
| tree | 0eddf98f7fe16454c2d5b9c1f36358d864919ff7 /sfx2/source/appl | |
| parent | 7edf29b33f39a067f77a0ef19b5786dc2fa10b9e (diff) | |
convert Link<> to typed
Change-Id: I38996f9ab99efd10dcfabd532cabfbb7691ef357
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.hxx | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 69508671fa5c..3a102be60996 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2929,7 +2929,7 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl) -IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin ) +IMPL_LINK_TYPED( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin, void ) { if ( sTitle.isEmpty() ) sTitle = GetParent()->GetText(); @@ -2943,8 +2943,6 @@ IMPL_LINK( SfxHelpWindow_Impl, SelectFactoryHdl, SfxHelpIndexWindow_Impl* , pWin if ( pWin ) ShowStartPage(); pIndexWin->ClearSearchPage(); - - return 0; } diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 61e143a30153..175b6f5f3b3e 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -287,9 +287,9 @@ private: Idle aIdle; - Link<> aSelectFactoryLink; + Link<SfxHelpIndexWindow_Impl*,void> aSelectFactoryLink; Link<> aPageDoubleClickLink; - Link<IndexTabPage_Impl&,void> aIndexKeywordLink; + Link<IndexTabPage_Impl&,void> aIndexKeywordLink; OUString sKeyword; VclPtr<SfxHelpWindow_Impl> pParentWin; @@ -330,7 +330,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; void SetDoubleClickHdl( const Link<>& rLink ); - inline void SetSelectFactoryHdl( const Link<>& rLink ) { aSelectFactoryLink = rLink; } + inline void SetSelectFactoryHdl( const Link<SfxHelpIndexWindow_Impl*,void>& rLink ) { aSelectFactoryLink = rLink; } void SetFactory( const OUString& rFactory, bool bActive ); inline OUString GetFactory() const { return pIPage->GetFactory(); } OUString GetSelectEntry() const; @@ -523,7 +523,7 @@ friend class SfxHelpIndexWindow_Impl; DECL_LINK_TYPED( SelectHdl, ToolBox*, void ); DECL_LINK(OpenHdl, void *); - DECL_LINK( SelectFactoryHdl, SfxHelpIndexWindow_Impl* ); + DECL_LINK_TYPED( SelectFactoryHdl, SfxHelpIndexWindow_Impl*, void ); DECL_LINK_TYPED( ChangeHdl, HelpListener_Impl&, void ); public: |