summaryrefslogtreecommitdiff
path: root/dbaccess
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-10-20 15:55:27 +0200
committerNoel Grandin <noel@peralex.com>2015-10-20 16:16:45 +0200
commitda88c8b78428b30e6a4f9bc3e1e734b37e45cb2d (patch)
tree6764c3efae14fc7af513a1d0e8a0c2c804d43652 /dbaccess
parent516b5115df7597216f887f39add9944630cf3438 (diff)
convert Link<> to typed
Change-Id: I9453beedfa059d4f260ca136c02a6104fc4d4829
Diffstat (limited to 'dbaccess')
-rw-r--r--dbaccess/source/ui/dlg/indexdialog.cxx6
-rw-r--r--dbaccess/source/ui/dlg/indexfieldscontrol.cxx2
-rw-r--r--dbaccess/source/ui/inc/indexdialog.hxx2
-rw-r--r--dbaccess/source/ui/inc/indexfieldscontrol.hxx4
4 files changed, 6 insertions, 8 deletions
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 6506bd90d089..76cba671709a 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -733,17 +733,15 @@ namespace dbaui
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!");
Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData());
aPosition->setModified(true);
updateToolbox();
-
- return 1L;
}
void DbaIndexDialog::updateControls(const SvTreeListEntry* _pEntry)
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index 3837febff35d..695ea3f47fc8 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -387,7 +387,7 @@ namespace dbaui
{
ListBoxControl& rListBox = rController.GetListBox();
if (!rListBox.IsTravelSelect())
- m_aModifyHdl.Call(this);
+ m_aModifyHdl.Call(*this);
if (&rListBox == m_pFieldNameCell.get())
{ // a field has been selected
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index 9e8cfe1c4dd0..a9bc4922b3bf 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -132,7 +132,7 @@ namespace dbaui
DECL_LINK_TYPED( OnIndexAction, ToolBox*, void );
DECL_LINK_TYPED( OnEntryEdited, SvTreeListEntry*, bool );
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( OnEditIndexAgain, void*, void );
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 96ca024ed43c..892a32cdbbee 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -40,7 +40,7 @@ namespace dbaui
IndexFields m_aFields; // !! order matters !!
IndexFields::const_iterator m_aSeekRow; // !!
- Link<> m_aModifyHdl;
+ Link<IndexFieldsControl&,void> m_aModifyHdl;
VclPtr< ::svt::ListBoxControl> m_pSortingCell;
VclPtr< ::svt::ListBoxControl> m_pFieldNameCell;
@@ -67,7 +67,7 @@ namespace dbaui
const IndexFields& GetSavedValue() const { return m_aSavedValue; }
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;
protected: