diff options
| -rw-r--r-- | include/svx/imapdlg.hxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/imapdlg.cxx | 6 | ||||
| -rw-r--r-- | svx/source/dialog/imapwnd.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/imapwnd.hxx | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index ebd0f486a489..223e5eb62b33 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -119,7 +119,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow virtual bool Close() SAL_OVERRIDE; DECL_LINK_TYPED( TbxClickHdl, ToolBox*, void ); - DECL_LINK( InfoHdl, IMapWindow* ); + DECL_LINK_TYPED( InfoHdl, IMapWindow&, void ); DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void ); DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void ); DECL_LINK( URLModifyHdl, void* ); diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 68beba59c96b..686a75997a48 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -590,10 +590,10 @@ void SvxIMapDlg::SetActiveTool( sal_uInt16 nId ) m_pTbxIMapDlg1->CheckItem( mnPolyEditId, bEditMode ); } -IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) +IMPL_LINK_TYPED( SvxIMapDlg, InfoHdl, IMapWindow&, rWnd, void ) { OUString aStr; - const NotifyInfo& rInfo = pWnd->GetInfo(); + const NotifyInfo& rInfo = rWnd.GetInfo(); if ( rInfo.bNewObj ) { @@ -654,8 +654,6 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd ) else m_pCbbTarget->SetText( rInfo.aMarkTarget ); } - - return 0; } IMPL_LINK_TYPED( SvxIMapDlg, MousePosHdl, GraphCtrl*, pWnd, void ) diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 4ce3c790ff68..90de6e96734e 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -626,7 +626,7 @@ void IMapWindow::UpdateInfo( bool bNewObj ) aInfo.aMarkAltText = pIMapObj->GetAltText(); aInfo.aMarkTarget = pIMapObj->GetTarget(); aInfo.bActivated = pIMapObj->IsActive(); - aInfoLink.Call( this ); + aInfoLink.Call( *this ); } else { @@ -637,7 +637,7 @@ void IMapWindow::UpdateInfo( bool bNewObj ) aInfo.bActivated = false; } - aInfoLink.Call( this ); + aInfoLink.Call( *this ); } } diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index fd584a03ab8f..625d0d6d253e 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -93,7 +93,7 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper NotifyInfo aInfo; ImageMap aIMap; TargetList aTargetList; - Link<> aInfoLink; + Link<IMapWindow&,void> aInfoLink; SfxItemPool* pIMapPool; SfxItemInfo* pItemInfo; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > @@ -140,7 +140,7 @@ public: void DoMacroAssign(); void DoPropertyDialog(); - void SetInfoLink( const Link<>& rLink ) { aInfoLink = rLink; } + void SetInfoLink( const Link<IMapWindow&,void>& rLink ) { aInfoLink = rLink; } void SetTargetList( TargetList& rTargetList ); |