Kaydet (Commit) 0c714e26 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I2977a0fcd18bd719b30cb4100501058884069572
üst 8275e66f
...@@ -30,7 +30,7 @@ private: ...@@ -30,7 +30,7 @@ private:
using EditUndoManager::Undo; using EditUndoManager::Undo;
using EditUndoManager::Redo; using EditUndoManager::Redo;
Link<> maEndTextEditHdl; Link<SdrUndoManager*,void> maEndTextEditHdl;
SfxUndoAction* mpLastUndoActionBeforeTextEdit; SfxUndoAction* mpLastUndoActionBeforeTextEdit;
bool mbEndTextEditTriggeredFromUndo; bool mbEndTextEditTriggeredFromUndo;
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
// activate (start text edit) and empty link to reset (end text edit). On // 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 // reset all text edit actions will be removed from this undo manager to
// restore the state before activation // 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 // 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 // is needed to detect inside end text edit if it is a regular one or triggered
......
...@@ -119,7 +119,7 @@ protected: ...@@ -119,7 +119,7 @@ protected:
DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,void); DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,void);
// link for EndTextEditHdl // link for EndTextEditHdl
DECL_LINK(EndTextEditHdl, SdrUndoManager*); DECL_LINK_TYPED(EndTextEditHdl, SdrUndoManager*, void);
void ImpMacroUp(const Point& rUpPos); void ImpMacroUp(const Point& rUpPos);
void ImpMacroDown(const Point& rDownPos); void ImpMacroDown(const Point& rDownPos);
......
...@@ -100,7 +100,7 @@ void SdrUndoManager::Clear() ...@@ -100,7 +100,7 @@ void SdrUndoManager::Clear()
} }
} }
void SdrUndoManager::SetEndTextEditHdl(const Link<>& rLink) void SdrUndoManager::SetEndTextEditHdl(const Link<SdrUndoManager*,void>& rLink)
{ {
maEndTextEditHdl = rLink; maEndTextEditHdl = rLink;
......
...@@ -523,10 +523,9 @@ IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,v ...@@ -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(); SdrEndTextEdit();
return 0;
} }
SdrUndoManager* SdrObjEditView::getSdrUndoManagerForEnhancedTextEdit() const SdrUndoManager* SdrObjEditView::getSdrUndoManagerForEnhancedTextEdit() const
...@@ -863,7 +862,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally) ...@@ -863,7 +862,7 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
// reset the callback link and let the undo manager cleanup all text edit // 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 // undo actions to get the stack back to the form before the text edit
pSdrUndoManager->SetEndTextEditHdl(Link<>()); pSdrUndoManager->SetEndTextEditHdl(Link<SdrUndoManager*,void>());
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment