diff options
| author | Noel Grandin <noel@peralex.com> | 2015-09-16 14:30:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-09-17 08:19:33 +0200 |
| commit | fddd41eb4f87c1a271ed0b40ec1b264148756ff7 (patch) | |
| tree | f2befca6d1398bda64cc99ea190cbbf36d9162d1 /svx | |
| parent | f0c658e49eb907a15c17f2a8ae2f42dd2e550a77 (diff) | |
convert Link<> to typed
Change-Id: I9705eccf8238cf0dc6c5a429c89a2cd3d8331d08
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 11 | ||||
| -rw-r--r-- | svx/source/inc/gridcell.hxx | 16 |
2 files changed, 13 insertions, 14 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 26f89905a889..e798951f67d2 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2891,7 +2891,7 @@ bool DbFilterField::commitControl() if (m_aText != aText) { m_aText = aText; - m_aCommitLink.Call(this); + m_aCommitLink.Call(*this); } return true; default: @@ -2943,7 +2943,7 @@ bool DbFilterField::commitControl() m_aText = aText; m_pWindow->SetText(m_aText); - m_aCommitLink.Call(this); + m_aCommitLink.Call(*this); } return true; } @@ -3134,7 +3134,7 @@ IMPL_LINK_NOARG_TYPED(DbFilterField, OnClick, VclPtr<CheckBox>, void) if (m_aText != aText) { m_aText = aText; - m_aCommitLink.Call(this); + m_aCommitLink.Call(*this); } } @@ -4588,7 +4588,7 @@ void FmXFilterCell::disposing() ::com::sun::star::lang::EventObject aEvt(*this); m_aTextListeners.disposeAndClear(aEvt); - static_cast<DbFilterField*>(m_pCellControl)->SetCommitHdl(Link<>()); + static_cast<DbFilterField*>(m_pCellControl)->SetCommitHdl(Link<DbFilterField&,void>()); FmXGridCell::disposing(); } @@ -4688,14 +4688,13 @@ void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeE } -IMPL_LINK_NOARG(FmXFilterCell, OnCommit) +IMPL_LINK_NOARG_TYPED(FmXFilterCell, OnCommit, DbFilterField&, void) { ::cppu::OInterfaceIteratorHelper aIt( m_aTextListeners ); ::com::sun::star::awt::TextEvent aEvt; aEvt.Source = *this; while( aIt.hasMoreElements() ) static_cast< ::com::sun::star::awt::XTextListener *>(aIt.next())->textChanged( aEvt ); - return 1; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 1ce7f14f0966..e37db6fa44a4 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -677,13 +677,13 @@ class DbFilterField :public DbCellControl ,public ::svxform::OSQLParserClient { - ::com::sun::star::uno::Sequence< OUString > m_aValueList; - OUString m_aText; - Link<> m_aCommitLink; + css::uno::Sequence< OUString > m_aValueList; + OUString m_aText; + Link<DbFilterField&,void> m_aCommitLink; sal_Int16 m_nControlClass; - bool m_bFilterList : 1; - bool m_bFilterListFilled : 1; - bool m_bBound : 1; + bool m_bFilterList : 1; + bool m_bFilterListFilled : 1; + bool m_bBound : 1; public: TYPEINFO_OVERRIDE(); @@ -700,7 +700,7 @@ public: const OUString& GetText() const {return m_aText;} void SetText(const OUString& rText); - void SetCommitHdl( const Link<>& rLink ) { m_aCommitLink = rLink; } + void SetCommitHdl( const Link<DbFilterField&,void>& rLink ) { m_aCommitLink = rLink; } protected: @@ -1126,7 +1126,7 @@ public: virtual sal_Int16 SAL_CALL getMaxTextLen() throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; protected: - DECL_LINK( OnCommit, void* ); + DECL_LINK_TYPED( OnCommit, DbFilterField&, void ); }; #endif // INCLUDED_SVX_SOURCE_INC_GRIDCELL_HXX |