summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-16 16:10:05 +0200
committerNoel Grandin <noel@peralex.com>2015-09-17 08:19:34 +0200
commit1e2119fd0211b671cad7ba7005a99a1da1a0caf5 (patch)
treec4298af25e9a082066ad98a69c5c6c281a360ac5 /extensions
parentf4f05ab199101b9f11718ddc82e139815c1fc521 (diff)
convert Link<> to typed
Change-Id: I3d35a0bb75b6989dd13371543d1bdf3ef5f47641
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/abpilot/tableselectionpage.cxx4
-rw-r--r--extensions/source/abpilot/tableselectionpage.hxx2
-rw-r--r--extensions/source/bibliography/datman.cxx5
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx5
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.hxx2
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx7
-rw-r--r--extensions/source/dbpilots/gridwizard.hxx2
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx8
-rw-r--r--extensions/source/dbpilots/listcombowizard.hxx4
9 files changed, 15 insertions, 24 deletions
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index 065f2d1bc85e..ed7beec4aec3 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -86,12 +86,10 @@ namespace abp
}
- IMPL_LINK( TableSelectionPage, OnTableDoubleClicked, void*, /*NOTINTERESTEDIN*/ )
+ IMPL_LINK_NOARG_TYPED( TableSelectionPage, OnTableDoubleClicked, ListBox&, void )
{
if ( 1 == m_pTableList->GetSelectEntryCount() )
getDialog()->travelNext();
-
- return 0L;
}
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index de58a65be2b1..3b92ba60ada5 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -51,7 +51,7 @@ namespace abp
private:
DECL_LINK( OnTableSelected, void* );
- DECL_LINK( OnTableDoubleClicked, void* );
+ DECL_LINK_TYPED( OnTableDoubleClicked, ListBox&, void );
};
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 860ab2dcb297..fcc7598a36e8 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -474,7 +474,7 @@ class DBChangeDialog_Impl : public ModalDialog
BibDataManager* pDatMan;
- DECL_LINK(DoubleClickHdl, SvTabListBox*);
+ DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void);
public:
DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan );
virtual ~DBChangeDialog_Impl();
@@ -513,10 +513,9 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* p
}
}
-IMPL_LINK(DBChangeDialog_Impl, DoubleClickHdl, SvTabListBox*, /*pLB*/)
+IMPL_LINK_NOARG_TYPED(DBChangeDialog_Impl, DoubleClickHdl, ListBox&, void)
{
EndDialog(RET_OK);
- return 0;
}
DBChangeDialog_Impl::~DBChangeDialog_Impl()
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 23edfb922aa4..13857eb888b5 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -217,11 +217,10 @@ namespace dbp
}
}
- IMPL_LINK( OTableSelectionPage, OnListboxDoubleClicked, ListBox*, _pBox )
+ IMPL_LINK_TYPED( OTableSelectionPage, OnListboxDoubleClicked, ListBox&, _rBox, void )
{
- if (_pBox->GetSelectEntryCount())
+ if (_rBox.GetSelectEntryCount())
getDialog()->travelNext();
- return 0L;
}
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index 36001317b8ff..b8adf46b6540 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -55,7 +55,7 @@ namespace dbp
protected:
DECL_LINK( OnListboxSelection, ListBox* );
- DECL_LINK( OnListboxDoubleClicked, ListBox* );
+ DECL_LINK_TYPED( OnListboxDoubleClicked, ListBox&, void );
DECL_LINK_TYPED( OnSearchClicked, Button*, void );
void implCollectDatasource();
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index b477bc0de38b..74b96f4e51b3 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -391,16 +391,13 @@ namespace dbp
}
- IMPL_LINK(OGridFieldsSelection, OnEntryDoubleClicked, ListBox*, _pList)
+ IMPL_LINK_TYPED(OGridFieldsSelection, OnEntryDoubleClicked, ListBox&, _rList, void)
{
- PushButton* pSimulateButton = m_pExistFields == _pList ? m_pSelectOne : m_pDeselectOne;
+ PushButton* pSimulateButton = m_pExistFields == &_rList ? m_pSelectOne : m_pDeselectOne;
if (pSimulateButton->IsEnabled())
{
OnMoveOneEntry( pSimulateButton );
- return 0;
}
- else
- return 1L;
}
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index c93f0ec64795..ca3a9b4e4cc6 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -97,7 +97,7 @@ namespace dbp
DECL_LINK_TYPED(OnMoveOneEntry, Button*, void);
DECL_LINK_TYPED(OnMoveAllEntries, Button*, void);
DECL_LINK(OnEntrySelected, ListBox*);
- DECL_LINK(OnEntryDoubleClicked, ListBox*);
+ DECL_LINK_TYPED(OnEntryDoubleClicked, ListBox&, void);
void implCheckButtons();
};
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 62c84053025f..87a605d57bfe 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -307,11 +307,10 @@ namespace dbp
}
- IMPL_LINK( OContentTableSelection, OnTableDoubleClicked, ListBox*, _pListBox )
+ IMPL_LINK_TYPED( OContentTableSelection, OnTableDoubleClicked, ListBox&, _rListBox, void )
{
- if (_pListBox->GetSelectEntryCount())
+ if (_rListBox.GetSelectEntryCount())
getDialog()->travelNext();
- return 0L;
}
@@ -403,11 +402,10 @@ namespace dbp
}
- IMPL_LINK( OContentFieldSelection, OnTableDoubleClicked, ListBox*, /*NOTINTERESTEDIN*/ )
+ IMPL_LINK_NOARG_TYPED( OContentFieldSelection, OnTableDoubleClicked, ListBox&, void )
{
if (m_pSelectTableField->GetSelectEntryCount())
getDialog()->travelNext();
- return 0L;
}
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index d0b7ff3c1d97..75a839c75150 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -115,7 +115,7 @@ namespace dbp
virtual bool canAdvance() const SAL_OVERRIDE;
protected:
- DECL_LINK( OnTableDoubleClicked, ListBox* );
+ DECL_LINK_TYPED( OnTableDoubleClicked, ListBox&, void );
DECL_LINK( OnTableSelected, ListBox* );
};
@@ -134,7 +134,7 @@ namespace dbp
protected:
DECL_LINK( OnFieldSelected, ListBox* );
- DECL_LINK( OnTableDoubleClicked, ListBox* );
+ DECL_LINK_TYPED( OnTableDoubleClicked, ListBox&, void );
// TabPage overridables
virtual void ActivatePage() SAL_OVERRIDE;