Kaydet (Commit) 9bb2c28a authored tarafından Noel Grandin's avatar Noel Grandin

make Link<> typed

Change-Id: I50e2b05131604a6073a9234d4319f12b3906ea6d
üst 23fbcf7d
......@@ -279,7 +279,8 @@ namespace svt
{
VclPtr<CheckBox> pBox;
Rectangle aFocusRect;
Link<> m_aClickLink,m_aModifyLink;
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;}
......
......@@ -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();
......
......@@ -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 );
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment