summaryrefslogtreecommitdiff
path: root/svx
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 /svx
parentf4f05ab199101b9f11718ddc82e139815c1fc521 (diff)
convert Link<> to typed
Change-Id: I3d35a0bb75b6989dd13371543d1bdf3ef5f47641
Diffstat (limited to 'svx')
-rw-r--r--svx/source/fmcomp/gridcell.cxx7
-rw-r--r--svx/source/inc/gridcell.hxx2
2 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index e798951f67d2..934be2eca6c7 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -4033,7 +4033,7 @@ void FmXListBoxCell::disposing()
m_aActionListeners.disposeAndClear(aEvt);
m_pBox->SetSelectHdl( Link<>() );
- m_pBox->SetDoubleClickHdl( Link<>() );
+ m_pBox->SetDoubleClickHdl( Link<ListBox&,void>() );
m_pBox = NULL;
FmXTextCell::disposing();
@@ -4305,7 +4305,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Wind
&& ( _nEventId == VCLEVENT_LISTBOX_SELECT )
)
{
- OnDoubleClick( NULL );
+ OnDoubleClick( *m_pBox );
::com::sun::star::awt::ItemEvent aEvent;
aEvent.Source = *this;
@@ -4324,7 +4324,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Wind
-IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick)
+IMPL_LINK_NOARG_TYPED(FmXListBoxCell, OnDoubleClick, ListBox&, void)
{
if (m_pBox)
{
@@ -4337,7 +4337,6 @@ IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick)
while( aIt.hasMoreElements() )
static_cast< ::com::sun::star::awt::XActionListener *>(aIt.next())->actionPerformed( aEvent );
}
- return 1;
}
FmXComboBoxCell::FmXComboBoxCell( DbGridColumn* pColumn, DbCellControl& _rControl )
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index e37db6fa44a4..812c5d4867ca 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -1032,7 +1032,7 @@ public:
protected:
virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) SAL_OVERRIDE;
- DECL_LINK( OnDoubleClick, void* );
+ DECL_LINK_TYPED( OnDoubleClick, ListBox&, void );
};