diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-17 10:34:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-17 10:34:55 +0200 |
| commit | 9bb2c28a1725e15988307fd0ac3b398596b70615 (patch) | |
| tree | 3cdf1e549765f91822080ab70db24fc83c5b02fb | |
| parent | 23fbcf7da54fa7f0098a534c1a9add8efcb02f87 (diff) | |
make Link<> typed
Change-Id: I50e2b05131604a6073a9234d4319f12b3906ea6d
| -rw-r--r-- | include/svtools/editbrowsebox.hxx | 9 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 7 | ||||
| -rw-r--r-- | svx/source/inc/gridcell.hxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 2eb3632182cd..262d9c180f4c 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -277,9 +277,10 @@ namespace svt class SVT_DLLPUBLIC CheckBoxControl : public Control { - VclPtr<CheckBox> pBox; - Rectangle aFocusRect; - Link<> m_aClickLink,m_aModifyLink; + VclPtr<CheckBox> pBox; + Rectangle aFocusRect; + Link<VclPtr<CheckBox>,void> m_aClickLink; + Link<> m_aModifyLink; public: CheckBoxControl(vcl::Window* pParent, WinBits nWinStyle = 0); @@ -294,7 +295,7 @@ namespace svt virtual void DataChanged( const DataChangedEvent& _rEvent ) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; - void SetClickHdl(const Link<>& rHdl) {m_aClickLink = rHdl;} + void SetClickHdl(const Link<VclPtr<CheckBox>,void>& rHdl) {m_aClickLink = rHdl;} void SetModifyHdl(const Link<>& rHdl) {m_aModifyLink = rHdl;} diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index a5596d1e8e61..6863c9574601 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2692,7 +2692,7 @@ DbFilterField::DbFilterField(const Reference< XComponentContext >& rxContext,DbG DbFilterField::~DbFilterField() { if (m_nControlClass == ::com::sun::star::form::FormComponentType::CHECKBOX) - static_cast<CheckBoxControl*>(m_pWindow.get())->SetClickHdl( Link<>() ); + static_cast<CheckBoxControl*>(m_pWindow.get())->SetClickHdl( Link<VclPtr<CheckBox>,void>() ); } @@ -3114,7 +3114,7 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co } -IMPL_LINK_NOARG(DbFilterField, OnClick) +IMPL_LINK_NOARG_TYPED(DbFilterField, OnClick, VclPtr<CheckBox>, void) { TriState eState = static_cast<CheckBoxControl*>(m_pWindow.get())->GetBox().GetState(); OUString aText; @@ -3136,7 +3136,6 @@ IMPL_LINK_NOARG(DbFilterField, OnClick) m_aText = aText; m_aCommitLink.Call(this); } - return 1; } TYPEINIT0(FmXGridCell); @@ -3857,7 +3856,7 @@ void FmXCheckBoxCell::disposing() m_aItemListeners.disposeAndClear(aEvt); m_aActionListeners.disposeAndClear(aEvt); - static_cast< CheckBoxControl& >( m_pCellControl->GetWindow() ).SetClickHdl(Link<>()); + static_cast< CheckBoxControl& >( m_pCellControl->GetWindow() ).SetClickHdl(Link<VclPtr<CheckBox>,void>()); m_pBox = NULL; FmXDataCell::disposing(); diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index e413fa136b86..1ce7f14f0966 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -711,7 +711,7 @@ protected: protected: void SetList(const ::com::sun::star::uno::Any& rItems, bool bComboBox); void CreateControl(vcl::Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xModel); - DECL_LINK( OnClick, void* ); + DECL_LINK_TYPED( OnClick, VclPtr<CheckBox>, void ); }; |