diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-16 16:56:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:34 +0200 |
| commit | 5a91520269cd7a60ab49823401c369428d2d07c0 (patch) | |
| tree | 3c06383b45780f6be2fd317d2b1bac8d5964e9a7 /dbaccess | |
| parent | 39da0a99672d9066dbe417288566d43ed71e24dd (diff) | |
convert Link<> to typed
Change-Id: Ibb426c6d0cd81ff866c431be8277849e002df57a
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/control/ScrollHelper.cxx | 7 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/ScrollHelper.hxx | 8 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/dbtreelistbox.hxx | 4 |
4 files changed, 10 insertions, 15 deletions
diff --git a/dbaccess/source/ui/control/ScrollHelper.cxx b/dbaccess/source/ui/control/ScrollHelper.cxx index e463262b51b6..e6270ca7674f 100644 --- a/dbaccess/source/ui/control/ScrollHelper.cxx +++ b/dbaccess/source/ui/control/ScrollHelper.cxx @@ -37,19 +37,16 @@ namespace dbaui Rectangle aScrollArea( Point(0, _rOutputSize.Height() - LISTBOX_SCROLLING_AREA), Size(_rOutputSize.Width(), LISTBOX_SCROLLING_AREA) ); - Link<> aToCall; // if pointer in bottom area begin scroll if( aScrollArea.IsInside(_rPoint) ) - aToCall = m_aUpScroll; + m_aUpScroll.Call(NULL); else { aScrollArea.SetPos(Point(0,0)); // if pointer in top area begin scroll if( aScrollArea.IsInside(_rPoint) ) - aToCall = m_aDownScroll; + m_aDownScroll.Call(NULL); } - if ( aToCall.IsSet() ) - aToCall.Call( NULL ); } } diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index e395da6176b2..6ce7320e1417 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -413,16 +413,14 @@ void scrollWindow(DBTreeListBox* _pListBox, const Point& _rPos,bool _bUp) } } -IMPL_LINK( DBTreeListBox, ScrollUpHdl, SvTreeListBox*, /*pBox*/ ) +IMPL_LINK_NOARG_TYPED( DBTreeListBox, ScrollUpHdl, LinkParamNone*, void ) { scrollWindow(this,m_aMousePos,true); - return 0; } -IMPL_LINK( DBTreeListBox, ScrollDownHdl, SvTreeListBox*, /*pBox*/ ) +IMPL_LINK_NOARG_TYPED( DBTreeListBox, ScrollDownHdl, LinkParamNone*, void ) { scrollWindow(this,m_aMousePos,false); - return 0; } namespace diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx index f709bb3092e7..1ded72af4837 100644 --- a/dbaccess/source/ui/inc/ScrollHelper.hxx +++ b/dbaccess/source/ui/inc/ScrollHelper.hxx @@ -27,8 +27,8 @@ namespace dbaui { class OScrollHelper { - Link<> m_aUpScroll; - Link<> m_aDownScroll; + Link<LinkParamNone*,void> m_aUpScroll; + Link<LinkParamNone*,void> m_aDownScroll; public: /** default constructor */ @@ -40,7 +40,7 @@ namespace dbaui @param _rUpScroll the method to set */ - inline void setUpScrollMethod( const Link<>& _rUpScroll ) + inline void setUpScrollMethod( const Link<LinkParamNone*,void>& _rUpScroll ) { m_aUpScroll = _rUpScroll; } @@ -49,7 +49,7 @@ namespace dbaui @param _rDownScroll the method to set */ - inline void setDownScrollMethod( const Link<>& _rDownScroll ) + inline void setDownScrollMethod( const Link<LinkParamNone*,void>& _rDownScroll ) { m_aDownScroll = _rDownScroll; } diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx index 5875f795f7eb..9bf8d85d577e 100644 --- a/dbaccess/source/ui/inc/dbtreelistbox.hxx +++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx @@ -76,8 +76,8 @@ namespace dbaui void init(); DECL_LINK_TYPED( OnTimeOut, Timer*, void ); DECL_LINK_TYPED( OnResetEntry, void*, void ); - DECL_LINK( ScrollUpHdl, SvTreeListBox* ); - DECL_LINK( ScrollDownHdl, SvTreeListBox* ); + DECL_LINK_TYPED( ScrollUpHdl, LinkParamNone*, void ); + DECL_LINK_TYPED( ScrollDownHdl, LinkParamNone*, void ); public: DBTreeListBox( vcl::Window* pParent |