diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:06 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-09-08 08:16:48 +0200 |
commit | 0c714e260ef7153229bca8794a01c8fffd7c7361 (patch) | |
tree | 5a4a3d5a055911782d71ef35f1c85b723d48ce3d | |
parent | 8275e66fc1b872ff01131dfc54123fe1dd13b3e8 (diff) |
convert Link<> to typed
Change-Id: I2977a0fcd18bd719b30cb4100501058884069572
-rw-r--r-- | include/svx/sdrundomanager.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdedxv.hxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/sdrundomanager.cxx | 2 | ||||
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx index 96dc794997f8..f93ba2f35146 100644 --- a/include/svx/sdrundomanager.hxx +++ b/include/svx/sdrundomanager.hxx @@ -30,7 +30,7 @@ private: using EditUndoManager::Undo; using EditUndoManager::Redo; - Link<> maEndTextEditHdl; + Link<SdrUndoManager*,void> maEndTextEditHdl; SfxUndoAction* mpLastUndoActionBeforeTextEdit; bool mbEndTextEditTriggeredFromUndo; @@ -53,7 +53,7 @@ public: // activate (start text edit) and empty link to reset (end text edit). On // reset all text edit actions will be removed from this undo manager to // restore the state before activation - void SetEndTextEditHdl(const Link<>& rLink); + void SetEndTextEditHdl(const Link<SdrUndoManager*,void>& rLink); // check from outside if we are inside a callback for ending text edit. This // is needed to detect inside end text edit if it is a regular one or triggered diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 2aa9f893a67a..a6ef4ed8a9d1 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -119,7 +119,7 @@ protected: DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,void); // link for EndTextEditHdl - DECL_LINK(EndTextEditHdl, SdrUndoManager*); + DECL_LINK_TYPED(EndTextEditHdl, SdrUndoManager*, void); void ImpMacroUp(const Point& rUpPos); void ImpMacroDown(const Point& rDownPos); diff --git a/svx/source/svdraw/sdrundomanager.cxx b/svx/source/svdraw/sdrundomanager.cxx index 1487ddb89d94..1a4541d0158e 100644 --- a/svx/source/svdraw/sdrundomanager.cxx +++ b/svx/source/svdraw/sdrundomanager.cxx @@ -100,7 +100,7 @@ void SdrUndoManager::Clear() } } -void SdrUndoManager::SetEndTextEditHdl(const Link<>& rLink) +void SdrUndoManager::SetEndTextEditHdl(const Link<SdrUndoManager*,void>& rLink) { maEndTextEditHdl = rLink; diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index f38d33fde3ad..43dee90ba2f8 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -523,10 +523,9 @@ IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,v } } -IMPL_LINK(SdrObjEditView, EndTextEditHdl, SdrUndoManager*, /*pUndoManager*/) +IMPL_LINK_NOARG_TYPED(SdrObjEditView, EndTextEditHdl, SdrUndoManager*, void) { SdrEndTextEdit(); - return 0; } SdrUndoManager* SdrObjEditView::getSdrUndoManagerForEnhancedTextEdit() const @@ -863,7 +862,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) // reset the callback link and let the undo manager cleanup all text edit // undo actions to get the stack back to the form before the text edit - pSdrUndoManager->SetEndTextEditHdl(Link<>()); + pSdrUndoManager->SetEndTextEditHdl(Link<SdrUndoManager*,void>()); } else { |