summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/svx/graphctl.hxx13
-rw-r--r--include/svx/imapdlg.hxx9
-rw-r--r--svx/source/dialog/_contdlg.cxx14
-rw-r--r--svx/source/dialog/contimp.hxx10
-rw-r--r--svx/source/dialog/graphctl.cxx2
-rw-r--r--svx/source/dialog/imapdlg.cxx14
6 files changed, 24 insertions, 38 deletions
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index a5dc16db1953..42f60db32ed6 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -39,10 +39,9 @@ class SVX_DLLPUBLIC GraphCtrl : public Control
Graphic aGraphic;
Idle aUpdateIdle;
- Link<> aMousePosLink;
- Link<> aGraphSizeLink;
- Link<> aMarkObjLink;
- Link<> aUpdateLink;
+ Link<GraphCtrl*,void> aMousePosLink;
+ Link<GraphCtrl*,void> aGraphSizeLink;
+ Link<GraphCtrl*,void> aUpdateLink;
MapMode aMap100;
Size aGraphSize;
Point aMousePos;
@@ -104,11 +103,11 @@ public:
SdrObject* GetSelectedSdrObject() const;
bool IsChanged() const { return bSdrMode && pModel->IsChanged(); }
- void SetMousePosLink( const Link<>& rLink ) { aMousePosLink = rLink; }
+ void SetMousePosLink( const Link<GraphCtrl*,void>& rLink ) { aMousePosLink = rLink; }
- void SetGraphSizeLink( const Link<>& rLink ) { aGraphSizeLink = rLink; }
+ void SetGraphSizeLink( const Link<GraphCtrl*,void>& rLink ) { aGraphSizeLink = rLink; }
- void SetUpdateLink( const Link<>& rLink ) { aUpdateLink = rLink; }
+ void SetUpdateLink( const Link<GraphCtrl*,void>& rLink ) { aUpdateLink = rLink; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
};
diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx
index 238b8573483f..3c0b01328963 100644
--- a/include/svx/imapdlg.hxx
+++ b/include/svx/imapdlg.hxx
@@ -76,6 +76,7 @@ public:
class IMapOwnData;
class IMapWindow;
+class GraphCtrl;
class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
{
@@ -119,12 +120,12 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow
DECL_LINK_TYPED( TbxClickHdl, ToolBox*, void );
DECL_LINK( InfoHdl, IMapWindow* );
- DECL_LINK( MousePosHdl, IMapWindow* );
- DECL_LINK( GraphSizeHdl, IMapWindow* );
+ DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void );
+ DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void );
DECL_LINK( URLModifyHdl, void* );
DECL_LINK( URLLoseFocusHdl, void* );
- DECL_LINK_TYPED(UpdateHdl, Idle *, void);
- DECL_LINK( StateHdl, IMapWindow* );
+ DECL_LINK_TYPED( UpdateHdl, Idle *, void );
+ DECL_LINK_TYPED( StateHdl, GraphCtrl*, void );
DECL_LINK( MiscHdl, void* );
void DoOpen();
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 4078e6e41193..6e023967a9e0 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -297,7 +297,7 @@ SvxSuperContourDlg::~SvxSuperContourDlg()
void SvxSuperContourDlg::dispose()
{
- m_pContourWnd->SetUpdateLink( Link<>() );
+ m_pContourWnd->SetUpdateLink( Link<GraphCtrl*,void>() );
SvtMiscOptions aMiscOptions;
aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) );
@@ -535,7 +535,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void )
}
}
-IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
+IMPL_LINK_TYPED( SvxSuperContourDlg, MousePosHdl, GraphCtrl*, pWnd, void )
{
OUString aStr;
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
@@ -548,11 +548,9 @@ IMPL_LINK( SvxSuperContourDlg, MousePosHdl, ContourWindow*, pWnd )
aStr += GetUnitString( rMousePos.Y(), eFieldUnit, cSep );
m_pStbStatus->SetItemText( 2, aStr );
-
- return 0L;
}
-IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
+IMPL_LINK_TYPED( SvxSuperContourDlg, GraphSizeHdl, GraphCtrl*, pWnd, void )
{
OUString aStr;
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
@@ -565,8 +563,6 @@ IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, ContourWindow*, pWnd )
aStr += GetUnitString( rSize.Height(), eFieldUnit, cSep );
m_pStbStatus->SetItemText( 3, aStr );
-
- return 0L;
}
IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, UpdateHdl, Idle *, void)
@@ -606,7 +602,7 @@ IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, CreateHdl, Idle *, void)
LeaveWait();
}
-IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
+IMPL_LINK_TYPED( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void )
{
const SdrObject* pObj = pWnd->GetSelectedSdrObject();
const SdrView* pView = pWnd->GetSdrView();
@@ -659,8 +655,6 @@ IMPL_LINK( SvxSuperContourDlg, StateHdl, ContourWindow*, pWnd )
m_pTbx1->CheckItem(mnPolyInsertId, false);
pWnd->SetPolyEditMode( 0 );
}
-
- return 0L;
}
IMPL_LINK( SvxSuperContourDlg, PipetteHdl, ContourWindow*, pWnd )
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index c80fc346f23c..5f72e27d881b 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.hxx
@@ -84,11 +84,11 @@ class SvxSuperContourDlg : public SvxContourDlg
virtual bool Close() SAL_OVERRIDE;
DECL_LINK_TYPED( Tbx1ClickHdl, ToolBox*, void );
- DECL_LINK( MousePosHdl, ContourWindow* );
- DECL_LINK( GraphSizeHdl, ContourWindow* );
- DECL_LINK_TYPED(UpdateHdl, Idle *, void);
- DECL_LINK_TYPED(CreateHdl, Idle *, void);
- DECL_LINK( StateHdl, ContourWindow* );
+ DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void );
+ DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void );
+ DECL_LINK_TYPED( UpdateHdl, Idle *, void );
+ DECL_LINK_TYPED( CreateHdl, Idle *, void );
+ DECL_LINK_TYPED( StateHdl, GraphCtrl*, void );
DECL_LINK( PipetteHdl, ContourWindow* );
DECL_LINK( PipetteClickHdl, ContourWindow* );
DECL_LINK( WorkplaceClickHdl, ContourWindow* );
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index 81a10966629d..5b5d360113f2 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -291,8 +291,6 @@ void GraphCtrl::SdrObjCreated( const SdrObject& )
void GraphCtrl::MarkListHasChanged()
{
- if ( aMarkObjLink.IsSet() )
- aMarkObjLink.Call( this );
}
void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 618acfdd5c45..0a75e7b2b444 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -218,7 +218,7 @@ SvxIMapDlg::~SvxIMapDlg()
void SvxIMapDlg::dispose()
{
- pIMapWnd->SetUpdateLink( Link<>() );
+ pIMapWnd->SetUpdateLink( Link<GraphCtrl*,void>() );
// Delete URL-List
pIMapWnd.disposeAndClear();
@@ -658,7 +658,7 @@ IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow*, pWnd )
return 0;
}
-IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd )
+IMPL_LINK_TYPED( SvxIMapDlg, MousePosHdl, GraphCtrl*, pWnd, void )
{
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
const Point& rMousePos = pWnd->GetMousePos();
@@ -669,11 +669,9 @@ IMPL_LINK( SvxIMapDlg, MousePosHdl, IMapWindow*, pWnd )
" / " + GetUnitString( rMousePos.Y(), eFieldUnit, cSep );
m_pStbStatus->SetItemText( 2, aStr );
-
- return 0L;
}
-IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd )
+IMPL_LINK_TYPED( SvxIMapDlg, GraphSizeHdl, GraphCtrl*, pWnd, void )
{
const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit();
const Size& rSize = pWnd->GetGraphicSize();
@@ -684,8 +682,6 @@ IMPL_LINK( SvxIMapDlg, GraphSizeHdl, IMapWindow*, pWnd )
" x " + GetUnitString( rSize.Height(), eFieldUnit, cSep );
m_pStbStatus->SetItemText( 3, aStr );
-
- return 0L;
}
IMPL_LINK_NOARG(SvxIMapDlg, URLModifyHdl)
@@ -758,7 +754,7 @@ IMPL_LINK_NOARG_TYPED(SvxIMapDlg, UpdateHdl, Idle *, void)
GetBindings().Invalidate( SID_IMAP_EXEC );
}
-IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
+IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void )
{
const SdrObject* pObj = pWnd->GetSelectedSdrObject();
const SdrModel* pModel = pWnd->GetSdrModel();
@@ -806,8 +802,6 @@ IMPL_LINK( SvxIMapDlg, StateHdl, IMapWindow*, pWnd )
m_pTbxIMapDlg1->CheckItem( mnPolyInsertId, false );
pWnd->SetPolyEditMode( 0 );
}
-
- return 0L;
}
IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl)
generated by cgit (git 2.34.1) at 2025-03-20 03:01:46 +0000