Kaydet (Commit) 9de789e3 authored tarafından Noel Grandin's avatar Noel Grandin

convert Link<> to typed

Change-Id: I2eb3c18753f413ca56047be12d6c859c938a0487
üst 01d0f0f6
...@@ -90,7 +90,7 @@ namespace svx{ ...@@ -90,7 +90,7 @@ namespace svx{
class SpellUndoAction_Impl : public SfxUndoAction class SpellUndoAction_Impl : public SfxUndoAction
{ {
sal_uInt16 m_nId; sal_uInt16 m_nId;
const Link<>& m_rActionLink; const Link<SpellUndoAction_Impl&,void>& m_rActionLink;
//undo of button enabling //undo of button enabling
bool m_bEnableChangePB; bool m_bEnableChangePB;
bool m_bEnableChangeAllPB; bool m_bEnableChangeAllPB;
...@@ -107,7 +107,7 @@ class SpellUndoAction_Impl : public SfxUndoAction ...@@ -107,7 +107,7 @@ class SpellUndoAction_Impl : public SfxUndoAction
long m_nOffset; long m_nOffset;
public: public:
SpellUndoAction_Impl(sal_uInt16 nId, const Link<>& rActionLink) : SpellUndoAction_Impl(sal_uInt16 nId, const Link<SpellUndoAction_Impl&,void>& rActionLink) :
m_nId(nId), m_nId(nId),
m_rActionLink( rActionLink), m_rActionLink( rActionLink),
m_bEnableChangePB(false), m_bEnableChangePB(false),
...@@ -163,7 +163,7 @@ SpellUndoAction_Impl::~SpellUndoAction_Impl() ...@@ -163,7 +163,7 @@ SpellUndoAction_Impl::~SpellUndoAction_Impl()
void SpellUndoAction_Impl::Undo() void SpellUndoAction_Impl::Undo()
{ {
m_rActionLink.Call(this); m_rActionLink.Call(*this);
} }
...@@ -680,22 +680,22 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, UndoHdl, Button*, void) ...@@ -680,22 +680,22 @@ IMPL_LINK_NOARG_TYPED(SpellDialog, UndoHdl, Button*, void)
} }
IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) IMPL_LINK_TYPED( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl&, rAction, void )
{ {
switch(pAction->GetId()) switch(rAction.GetId())
{ {
case SPELLUNDO_CHANGE_TEXTENGINE: case SPELLUNDO_CHANGE_TEXTENGINE:
{ {
if(pAction->IsEnableChangePB()) if(rAction.IsEnableChangePB())
m_pChangePB->Enable(false); m_pChangePB->Enable(false);
if(pAction->IsEnableChangeAllPB()) if(rAction.IsEnableChangeAllPB())
m_pChangeAllPB->Enable(false); m_pChangeAllPB->Enable(false);
} }
break; break;
case SPELLUNDO_CHANGE_NEXTERROR: case SPELLUNDO_CHANGE_NEXTERROR:
{ {
m_pSentenceED->MoveErrorMarkTo((sal_uInt16)pAction->GetOldErrorStart(), (sal_uInt16)pAction->GetOldErrorEnd(), false); m_pSentenceED->MoveErrorMarkTo((sal_uInt16)rAction.GetOldErrorStart(), (sal_uInt16)rAction.GetOldErrorEnd(), false);
if(pAction->IsErrorLanguageSelected()) if(rAction.IsErrorLanguageSelected())
{ {
UpdateBoxes_Impl(); UpdateBoxes_Impl();
} }
...@@ -703,14 +703,14 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) ...@@ -703,14 +703,14 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction )
break; break;
case SPELLUNDO_CHANGE_ADD_TO_DICTIONARY: case SPELLUNDO_CHANGE_ADD_TO_DICTIONARY:
{ {
if(pAction->GetDictionary().is()) if(rAction.GetDictionary().is())
pAction->GetDictionary()->remove(pAction->GetAddedWord()); rAction.GetDictionary()->remove(rAction.GetAddedWord());
} }
break; break;
case SPELLUNDO_MOVE_ERROREND : case SPELLUNDO_MOVE_ERROREND :
{ {
if(pAction->GetOffset() != 0) if(rAction.GetOffset() != 0)
m_pSentenceED->MoveErrorEnd(pAction->GetOffset()); m_pSentenceED->MoveErrorEnd(rAction.GetOffset());
} }
break; break;
case SPELLUNDO_UNDO_EDIT_MODE : case SPELLUNDO_UNDO_EDIT_MODE :
...@@ -723,8 +723,6 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction ) ...@@ -723,8 +723,6 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction )
//undo of ignored rules is not supported //undo of ignored rules is not supported
break; break;
} }
return 0;
} }
void SpellDialog::Impl_Restore() void SpellDialog::Impl_Restore()
......
...@@ -159,7 +159,7 @@ private: ...@@ -159,7 +159,7 @@ private:
OUString m_sTitleSpelling; OUString m_sTitleSpelling;
OUString m_sTitleSpellingGrammar; OUString m_sTitleSpellingGrammar;
Link<> aDialogUndoLink; Link<SpellUndoAction_Impl&,void> aDialogUndoLink;
bool bModified; bool bModified;
bool bFocusLocked; bool bFocusLocked;
...@@ -184,7 +184,7 @@ private: ...@@ -184,7 +184,7 @@ private:
DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void ); DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void );
DECL_LINK_TYPED( AddToDictClickHdl, Button*, void ); DECL_LINK_TYPED( AddToDictClickHdl, Button*, void );
DECL_LINK( LanguageSelectHdl, SvxLanguageBox* ); DECL_LINK( LanguageSelectHdl, SvxLanguageBox* );
DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* ); DECL_LINK_TYPED( DialogUndoHdl, SpellUndoAction_Impl&, void );
DECL_LINK( HandleHyperlink, FixedHyperlink * ); DECL_LINK( HandleHyperlink, FixedHyperlink * );
DECL_LINK_TYPED( InitHdl, void*, void ); DECL_LINK_TYPED( InitHdl, void*, void );
......
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