diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-15 14:16:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-16 08:38:55 +0200 |
| commit | 7edf29b33f39a067f77a0ef19b5786dc2fa10b9e (patch) | |
| tree | 3c34bfa396b219306c27320ce4dc84387b0b2a76 | |
| parent | a72445099566348a56410a0df7b04af35ab684b5 (diff) | |
convert Link<> to typed
Change-Id: I1cd4adb0b9ae24298a3978fdbfa0091e76f65044
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 3 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.hxx | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 4da5f1559cff..69508671fa5c 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1045,7 +1045,7 @@ IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, ClickHdl, Button*, void) SearchHdl(NULL); } -IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) +IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, SearchHdl, LinkParamNone*, void) { OUString aSearchText = comphelper::string::strip(m_pSearchED->GetText(), ' '); if ( !aSearchText.isEmpty() ) @@ -1081,7 +1081,6 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) aBox->Execute(); } } - return 0; } IMPL_LINK_NOARG_TYPED(SearchTabPage_Impl, OpenHdl, Button*, void) diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 9ac7c85e24d7..61e143a30153 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -170,7 +170,7 @@ public: class SearchBox_Impl : public ComboBox { private: - Link<> aSearchLink; + Link<LinkParamNone*,void> aSearchLink; public: SearchBox_Impl(vcl::Window* pParent, WinBits nStyle) @@ -182,7 +182,7 @@ public: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void Select() SAL_OVERRIDE; - inline void SetSearchLink( const Link<>& rLink ) { aSearchLink = rLink; } + inline void SetSearchLink( const Link<LinkParamNone*,void>& rLink ) { aSearchLink = rLink; } }; class SearchResultsBox_Impl : public ListBox @@ -214,7 +214,7 @@ private: void ClearSearchResults(); void RememberSearchText( const OUString& rSearchText ); - DECL_LINK(SearchHdl, void *); + DECL_LINK_TYPED(SearchHdl, LinkParamNone*, void); DECL_LINK_TYPED(ClickHdl, Button*, void); DECL_LINK_TYPED(OpenHdl, Button*, void); DECL_LINK(ModifyHdl, void *); |