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

convert Link<> to typed

Change-Id: I9ce3a85eb5eba35691c376d19436c624df68be33
üst 5ba32287
......@@ -2017,9 +2017,13 @@ void SwTOXEntryTabPage::dispose()
// pVoid is used as signal to change all levels of the example
IMPL_LINK_TYPED(SwTOXEntryTabPage, ModifyClickHdl, Button*, pVoid, void)
{
ModifyHdl(pVoid);
OnModify(pVoid);
}
IMPL_LINK(SwTOXEntryTabPage, ModifyHdl, void*, pVoid)
IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, ModifyHdl, LinkParamNone*, void)
{
OnModify(nullptr);
}
void SwTOXEntryTabPage::OnModify(void* pVoid)
{
UpdateDescriptor();
......@@ -2032,7 +2036,6 @@ IMPL_LINK(SwTOXEntryTabPage, ModifyHdl, void*, pVoid)
pTOXDlg->CreateOrUpdateExample(
pTOXDlg->GetCurrentTOXType().eType, TOX_PAGE_ENTRY, nCurLevel);
}
return 0;
}
bool SwTOXEntryTabPage::FillItemSet( SfxItemSet* )
......@@ -2362,7 +2365,7 @@ IMPL_LINK_NOARG_TYPED(SwTOXEntryTabPage, AllLevelsHdl, Button*, void)
for(sal_uInt16 i = 1; i < m_pCurrentForm->GetFormMax(); i++)
m_pCurrentForm->SetPattern(i, sNewToken);
ModifyHdl(this);
OnModify(this);
}
}
......
......@@ -258,9 +258,9 @@ class SwTokenWindow : public VclHBox, public VclBuilderContainer
OUString aButtonTexts[TOKEN_END]; // Text of the buttons
OUString aButtonHelpTexts[TOKEN_END]; // QuickHelpText of the buttons
OUString sCharStyle;
Link<SwFormToken&,void> aButtonSelectedHdl;
VclPtr<Control> pActiveCtrl;
Link<> aModifyHdl;
Link<SwFormToken&,void> aButtonSelectedHdl;
VclPtr<Control> pActiveCtrl;
Link<LinkParamNone*,void> aModifyHdl;
OUString accessibleName;
OUString sAdditionalAccnameString1;
OUString sAdditionalAccnameString2;
......@@ -301,10 +301,9 @@ public:
void SetButtonSelectedHdl(const Link<SwFormToken&,void>& rLink)
{ aButtonSelectedHdl = rLink;}
void SetModifyHdl(const Link<>& rLink){aModifyHdl = rLink;}
void SetModifyHdl(const Link<LinkParamNone*,void>& rLink){aModifyHdl = rLink;}
Control* GetActiveControl()
{ return pActiveCtrl;}
Control* GetActiveControl() { return pActiveCtrl; }
void InsertAtSelection(const OUString& rText, const SwFormToken& aToken);
void RemoveControl(SwTOXButton* pDel, bool bInternalCall = false);
......@@ -429,7 +428,8 @@ class SwTOXEntryTabPage : public SfxTabPage
void WriteBackLevel();
void UpdateDescriptor();
DECL_LINK(ModifyHdl, void*);
DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void);
void OnModify(void*);
DECL_LINK_TYPED(ModifyClickHdl, Button*, void);
using SfxTabPage::ActivatePage;
......
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