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

convert Link<> to typed

Change-Id: I9453beedfa059d4f260ca136c02a6104fc4d4829
üst 516b5115
...@@ -733,17 +733,15 @@ namespace dbaui ...@@ -733,17 +733,15 @@ namespace dbaui
IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModifiedClick, Button*, void ) IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModifiedClick, Button*, void )
{ {
OnModified(NULL); OnModified(*m_pFields);
} }
IMPL_LINK_NOARG( DbaIndexDialog, OnModified ) IMPL_LINK_NOARG_TYPED( DbaIndexDialog, OnModified, IndexFieldsControl&, void )
{ {
OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!"); OSL_ENSURE(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!");
Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData()); Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData());
aPosition->setModified(true); aPosition->setModified(true);
updateToolbox(); updateToolbox();
return 1L;
} }
void DbaIndexDialog::updateControls(const SvTreeListEntry* _pEntry) void DbaIndexDialog::updateControls(const SvTreeListEntry* _pEntry)
......
...@@ -387,7 +387,7 @@ namespace dbaui ...@@ -387,7 +387,7 @@ namespace dbaui
{ {
ListBoxControl& rListBox = rController.GetListBox(); ListBoxControl& rListBox = rController.GetListBox();
if (!rListBox.IsTravelSelect()) if (!rListBox.IsTravelSelect())
m_aModifyHdl.Call(this); m_aModifyHdl.Call(*this);
if (&rListBox == m_pFieldNameCell.get()) if (&rListBox == m_pFieldNameCell.get())
{ // a field has been selected { // a field has been selected
......
...@@ -132,7 +132,7 @@ namespace dbaui ...@@ -132,7 +132,7 @@ namespace dbaui
DECL_LINK_TYPED( OnIndexAction, ToolBox*, void ); DECL_LINK_TYPED( OnIndexAction, ToolBox*, void );
DECL_LINK_TYPED( OnEntryEdited, SvTreeListEntry*, bool ); DECL_LINK_TYPED( OnEntryEdited, SvTreeListEntry*, bool );
DECL_LINK_TYPED( OnModifiedClick, Button*, void ); DECL_LINK_TYPED( OnModifiedClick, Button*, void );
DECL_LINK( OnModified, void* ); DECL_LINK_TYPED( OnModified, IndexFieldsControl&, void );
DECL_LINK_TYPED( OnCloseDialog, Button*, void ); DECL_LINK_TYPED( OnCloseDialog, Button*, void );
DECL_LINK_TYPED( OnEditIndexAgain, void*, void ); DECL_LINK_TYPED( OnEditIndexAgain, void*, void );
......
...@@ -40,7 +40,7 @@ namespace dbaui ...@@ -40,7 +40,7 @@ namespace dbaui
IndexFields m_aFields; // !! order matters !! IndexFields m_aFields; // !! order matters !!
IndexFields::const_iterator m_aSeekRow; // !! IndexFields::const_iterator m_aSeekRow; // !!
Link<> m_aModifyHdl; Link<IndexFieldsControl&,void> m_aModifyHdl;
VclPtr< ::svt::ListBoxControl> m_pSortingCell; VclPtr< ::svt::ListBoxControl> m_pSortingCell;
VclPtr< ::svt::ListBoxControl> m_pFieldNameCell; VclPtr< ::svt::ListBoxControl> m_pFieldNameCell;
...@@ -67,7 +67,7 @@ namespace dbaui ...@@ -67,7 +67,7 @@ namespace dbaui
const IndexFields& GetSavedValue() const { return m_aSavedValue; } const IndexFields& GetSavedValue() const { return m_aSavedValue; }
void SaveValue() { m_aSavedValue = m_aFields; } void SaveValue() { m_aSavedValue = m_aFields; }
void SetModifyHdl(const Link<>& _rHdl) { m_aModifyHdl = _rHdl; } void SetModifyHdl(const Link<IndexFieldsControl&,void>& _rHdl) { m_aModifyHdl = _rHdl; }
virtual OUString GetCellText(long _nRow,sal_uInt16 nColId) const override; virtual OUString GetCellText(long _nRow,sal_uInt16 nColId) const override;
protected: protected:
......
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