summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-09-08 11:13:25 +0200
committerNoel Grandin <noel@peralex.com>2015-09-09 10:06:12 +0200
commit6f4e11a95bcd7a591cb93d1a842bbc8ad1ed31c9 (patch)
tree139df8cac0eb95a75844bec5b400affb669cc417 /chart2/source
parentf73144801474aa4b3d6b997ceab7fabae8bfc3e7 (diff)
convert Link<> to typed
Change-Id: I2aeda615e39db5a3cd39e168db34425e2912be8b
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/controller/inc/ChartController.hxx2
-rw-r--r--chart2/source/controller/main/ChartController.cxx5
2 files changed, 3 insertions, 4 deletions
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index 263e30915232..cca42182e702 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -437,7 +437,7 @@ public:
ViewElementListProvider getViewElementListProvider();
DrawModelWrapper* GetDrawModelWrapper();
- DECL_LINK( NotifyUndoActionHdl, SdrUndoAction* );
+ DECL_LINK_TYPED( NotifyUndoActionHdl, SdrUndoAction*, void );
public:
//private
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 6f316e332f9b..b99858f6cfc4 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1459,9 +1459,9 @@ void SAL_CALL ChartController::modified(
//todo? update menu states ?
}
-IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction )
+IMPL_LINK_TYPED( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction, void )
{
- ENSURE_OR_RETURN( pUndoAction, "invalid Undo action", 1L );
+ ENSURE_OR_RETURN_VOID( pUndoAction, "invalid Undo action" );
OUString aObjectCID = m_aSelection.getSelectedCID();
if ( aObjectCID.isEmpty() )
@@ -1478,7 +1478,6 @@ IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction )
DBG_UNHANDLED_EXCEPTION();
}
}
- return 0L;
}
DrawModelWrapper* ChartController::GetDrawModelWrapper()