summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-07 09:35:04 +0200
committerNoel Grandin <noel@peralex.com>2015-09-08 08:16:46 +0200
commit61623d5b90510ae6c791a41031d586a9316e74c4 (patch)
tree0b5a8115ae6d603cbe6208b958d8b440ea8fd06f /reportdesign
parentd7efea29cdc2faa57d172d7e4d8def18fd49536c (diff)
convert Link<> to typed
Change-Id: I365a81a0a960f5da736c9a97aa056da16c99452f
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/ui/dlg/AddField.cxx4
-rw-r--r--reportdesign/source/ui/dlg/Navigator.cxx6
-rw-r--r--reportdesign/source/ui/inc/AddField.hxx2
3 files changed, 4 insertions, 8 deletions
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 2fceb7b71335..cac6622c76bf 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -494,11 +494,9 @@ void OAddFieldWindow::_elementReplaced( const container::ContainerEvent& /*_rEve
{
}
-IMPL_LINK_NOARG( OAddFieldWindow, OnSelectHdl )
+IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnSelectHdl, SvTreeListBox*, void )
{
m_aActions->EnableItem(SID_ADD_CONTROL_PAIR, ( m_pListBox.get() && m_pListBox->GetSelectionCount() > 0 ));
-
- return 0L;
}
IMPL_LINK_NOARG_TYPED( OAddFieldWindow, OnClickHdl, Button*, void )
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx
index c2092737e6b0..6125bacda554 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -184,7 +184,7 @@ public:
virtual ~NavigatorTree();
virtual void dispose() SAL_OVERRIDE;
- DECL_LINK(OnEntrySelDesel, NavigatorTree*);
+ DECL_LINK_TYPED(OnEntrySelDesel, SvTreeListBox*, void);
DECL_LINK_TYPED( OnDropActionTimer, Timer*, void );
virtual void _selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException) SAL_OVERRIDE;
@@ -455,7 +455,7 @@ IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void)
}
-IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/)
+IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void)
{
if ( !m_pSelectionListener->locked() )
{
@@ -467,8 +467,6 @@ IMPL_LINK(NavigatorTree, OnEntrySelDesel, NavigatorTree*, /*pThis*/)
m_rController.select(aSelection);
m_pSelectionListener->unlock();
}
-
- return 0L;
}
void NavigatorTree::_selectionChanged( const lang::EventObject& aEvent ) throw (uno::RuntimeException)
diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx
index aeb046382bd4..fcb03b0fc80f 100644
--- a/reportdesign/source/ui/inc/AddField.hxx
+++ b/reportdesign/source/ui/inc/AddField.hxx
@@ -71,7 +71,7 @@ class OAddFieldWindow :public FloatingWindow
DECL_LINK_TYPED( OnClickHdl, Button*, void );
DECL_LINK( OnDoubleClickHdl, void* );
- DECL_LINK( OnSelectHdl, void* );
+ DECL_LINK_TYPED( OnSelectHdl, SvTreeListBox*, void );
DECL_LINK_TYPED( OnSortAction, ToolBox*, void );
OAddFieldWindow(const OAddFieldWindow&) SAL_DELETED_FUNCTION;