diff options
author | Noel Grandin <noel@peralex.com> | 2015-10-13 13:17:30 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-10-15 09:58:34 +0200 |
commit | 99b21cc9f3f32284061be255f437b2954a7aada0 (patch) | |
tree | f26509e7b905d147bc14fcda9fd30e2861ed00e3 /sfx2/source/appl/newhelp.hxx | |
parent | c837bfda8c646fe2f7ff789032dd9a6ee6fd396f (diff) |
convert Link<> to typed
Change-Id: I6c55c74d47b13149c2fa210bb9de4e8c430c57cc
Diffstat (limited to 'sfx2/source/appl/newhelp.hxx')
-rw-r--r-- | sfx2/source/appl/newhelp.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index d89081c8dc26..5540ebc5a25b 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -149,7 +149,7 @@ public: virtual void ActivatePage() override; virtual Control* GetLastFocusControl() override; - void SetDoubleClickHdl( const Link<>& rLink ); + void SetDoubleClickHdl( const Link<ComboBox&,void>& rLink ); void SetFactory( const OUString& rFactory ); inline OUString GetFactory() const { return sFactory; } OUString GetSelectEntry() const; @@ -288,9 +288,9 @@ private: Idle aIdle; Link<SfxHelpIndexWindow_Impl*,void> aSelectFactoryLink; - Link<> aPageDoubleClickLink; + Link<Control*,bool> aPageDoubleClickLink; Link<IndexTabPage_Impl&,void> aIndexKeywordLink; - OUString sKeyword; + OUString sKeyword; VclPtr<SfxHelpWindow_Impl> pParentWin; @@ -319,6 +319,7 @@ private: DECL_LINK_TYPED(KeywordHdl, IndexTabPage_Impl&, void); DECL_LINK_TYPED(ContentTabPageDoubleClickHdl, SvTreeListBox*, bool); DECL_LINK_TYPED(TabPageDoubleClickHdl, ListBox&, void); + DECL_LINK_TYPED(IndexTabPageDoubleClickHdl, ComboBox&, void); public: explicit SfxHelpIndexWindow_Impl( SfxHelpWindow_Impl* pParent ); @@ -330,7 +331,7 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - void SetDoubleClickHdl( const Link<>& rLink ); + void SetDoubleClickHdl( const Link<Control*,bool>& 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(); } @@ -364,7 +365,7 @@ IndexTabPage_Impl* SfxHelpIndexWindow_Impl::GetIndexPage() if ( !pIPage ) { pIPage = VclPtr<IndexTabPage_Impl>::Create( m_pTabCtrl, this ); - pIPage->SetDoubleClickHdl( aPageDoubleClickLink ); + pIPage->SetDoubleClickHdl( LINK(this, SfxHelpIndexWindow_Impl, IndexTabPageDoubleClickHdl) ); pIPage->SetKeywordHdl( aIndexKeywordLink ); } return pIPage; @@ -523,7 +524,7 @@ friend class SfxHelpIndexWindow_Impl; void ShowStartPage(); DECL_LINK_TYPED( SelectHdl, ToolBox*, void ); - DECL_LINK(OpenHdl, void *); + DECL_LINK_TYPED( OpenHdl, Control*, bool ); DECL_LINK_TYPED( SelectFactoryHdl, SfxHelpIndexWindow_Impl*, void ); DECL_LINK_TYPED( ChangeHdl, HelpListener_Impl&, void ); |