summaryrefslogtreecommitdiff
path: root/sw/source/ui/fldui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/fldui')
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx4
-rw-r--r--sw/source/ui/fldui/changedb.cxx6
-rw-r--r--sw/source/ui/fldui/flddb.cxx10
-rw-r--r--sw/source/ui/fldui/flddb.hxx10
-rw-r--r--sw/source/ui/fldui/flddinf.cxx4
-rw-r--r--sw/source/ui/fldui/flddinf.hxx4
-rw-r--r--sw/source/ui/fldui/flddok.cxx6
-rw-r--r--sw/source/ui/fldui/flddok.hxx6
-rw-r--r--sw/source/ui/fldui/fldedt.cxx6
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx18
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx18
-rw-r--r--sw/source/ui/fldui/fldpage.cxx6
-rw-r--r--sw/source/ui/fldui/fldpage.hxx6
-rw-r--r--sw/source/ui/fldui/fldref.cxx10
-rw-r--r--sw/source/ui/fldui/fldref.hxx10
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx4
-rw-r--r--sw/source/ui/fldui/fldvar.cxx12
-rw-r--r--sw/source/ui/fldui/fldvar.hxx12
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx12
20 files changed, 83 insertions, 83 deletions
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx
index 7423d169f2b1..c1d4855f4d02 100644
--- a/sw/source/ui/fldui/DropDownFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx
@@ -108,12 +108,12 @@ void sw::DropDownFieldDialog::Apply()
}
}
-IMPL_LINK_TYPED(sw::DropDownFieldDialog, ButtonHdl, Button*, pButton, void)
+IMPL_LINK(sw::DropDownFieldDialog, ButtonHdl, Button*, pButton, void)
{
EndDialog(m_pNextPB == pButton ? RET_OK : RET_YES );
}
-IMPL_LINK_NOARG_TYPED(sw::DropDownFieldDialog, DoubleClickHdl, ListBox&, void)
+IMPL_LINK_NOARG(sw::DropDownFieldDialog, DoubleClickHdl, ListBox&, void)
{
EndDialog(RET_OK);
}
diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx
index bdcbad03dc0b..26b3dc063f3a 100644
--- a/sw/source/ui/fldui/changedb.cxx
+++ b/sw/source/ui/fldui/changedb.cxx
@@ -215,7 +215,7 @@ void SwChangeDBDlg::UpdateFields()
pSh->EndAllAction();
}
-IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void)
+IMPL_LINK_NOARG(SwChangeDBDlg, ButtonHdl, Button*, void)
{
OUString sTableName;
OUString sColumnName;
@@ -229,7 +229,7 @@ IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, ButtonHdl, Button*, void)
EndDialog(RET_OK);
}
-IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, TreeSelectHdl, SvTreeListBox*, void)
+IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl, SvTreeListBox*, void)
{
SvTreeListEntry* pEntry = m_pAvailDBTLB->GetCurEntry();
@@ -256,7 +256,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData)
}
}
-IMPL_LINK_NOARG_TYPED(SwChangeDBDlg, AddDBHdl, Button*, void)
+IMPL_LINK_NOARG(SwChangeDBDlg, AddDBHdl, Button*, void)
{
const OUString sNewDB = SwDBManager::LoadAndRegisterDataSource();
if (!sNewDB.isEmpty())
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index a64ec9a60cec..ed26ffbe74fc 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -275,7 +275,7 @@ sal_uInt16 SwFieldDBPage::GetGroup()
return GRP_DB;
}
-IMPL_LINK_TYPED( SwFieldDBPage, TypeListBoxHdl, ListBox&, rBox, void )
+IMPL_LINK( SwFieldDBPage, TypeListBoxHdl, ListBox&, rBox, void )
{
TypeHdl(&rBox);
}
@@ -400,7 +400,7 @@ void SwFieldDBPage::TypeHdl( ListBox* pBox )
}
}
-IMPL_LINK_TYPED( SwFieldDBPage, NumSelectHdl, ListBox&, rLB, void )
+IMPL_LINK( SwFieldDBPage, NumSelectHdl, ListBox&, rLB, void )
{
m_pNewFormatRB->Check();
m_aOldNumSelectHdl.Call(rLB);
@@ -435,7 +435,7 @@ void SwFieldDBPage::CheckInsert()
EnableInsert(bInsert);
}
-IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void )
+IMPL_LINK( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void )
{
SvTreeListEntry* pEntry = pBox->GetCurEntry();
if (pEntry)
@@ -475,7 +475,7 @@ IMPL_LINK_TYPED( SwFieldDBPage, TreeSelectHdl, SvTreeListBox *, pBox, void )
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void)
+IMPL_LINK_NOARG(SwFieldDBPage, AddDBHdl, Button*, void)
{
OUString sNewDB = SwDBManager::LoadAndRegisterDataSource();
if(!sNewDB.isEmpty())
@@ -485,7 +485,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDBPage, AddDBHdl, Button*, void)
}
// Modify
-IMPL_LINK_NOARG_TYPED(SwFieldDBPage, ModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(SwFieldDBPage, ModifyHdl, Edit&, void)
{
CheckInsert();
}
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 8e58090b485f..788de1f064a6 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -54,11 +54,11 @@ class SwFieldDBPage : public SwFieldPage
sal_uInt16 m_nOldSubType;
Link<ListBox&,void> m_aOldNumSelectHdl;
- DECL_LINK_TYPED( TypeListBoxHdl, ListBox&, void );
- DECL_LINK_TYPED( NumSelectHdl, ListBox&, void );
- DECL_LINK_TYPED( TreeSelectHdl, SvTreeListBox*, void );
- DECL_LINK_TYPED( ModifyHdl, Edit&, void );
- DECL_LINK_TYPED( AddDBHdl, Button*, void );
+ DECL_LINK( TypeListBoxHdl, ListBox&, void );
+ DECL_LINK( NumSelectHdl, ListBox&, void );
+ DECL_LINK( TreeSelectHdl, SvTreeListBox*, void );
+ DECL_LINK( ModifyHdl, Edit&, void );
+ DECL_LINK( AddDBHdl, Button*, void );
void TypeHdl(ListBox*);
void CheckInsert();
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index b09d6d7a8426..7f92d992b82a 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -221,7 +221,7 @@ void SwFieldDokInfPage::Reset(const SfxItemSet* )
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void)
+IMPL_LINK_NOARG(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void)
{
// save old ListBoxPos
SvTreeListEntry* pOldEntry = pSelEntry;
@@ -240,7 +240,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, TypeHdl, SvTreeListBox*, void)
SubTypeHdl(*m_pSelectionLB);
}
-IMPL_LINK_NOARG_TYPED(SwFieldDokInfPage, SubTypeHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldDokInfPage, SubTypeHdl, ListBox&, void)
{
sal_uInt16 nSubType = (sal_uInt16)reinterpret_cast<sal_uLong>(pSelEntry->GetUserData());
sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index e01057460c16..01ac1d5c0df2 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -50,8 +50,8 @@ class SwFieldDokInfPage : public SwFieldPage
sal_uLong nOldFormat;
OUString m_sOldCustomFieldName;
- DECL_LINK_TYPED(TypeHdl, SvTreeListBox*, void);
- DECL_LINK_TYPED(SubTypeHdl, ListBox&, void);
+ DECL_LINK(TypeHdl, SvTreeListBox*, void);
+ DECL_LINK(SubTypeHdl, ListBox&, void);
sal_Int32 FillSelectionLB(sal_uInt16 nSubTypeId);
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index b63c6b21f096..1d4dce0d107c 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -205,7 +205,7 @@ void SwFieldDokPage::Reset(const SfxItemSet* )
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldDokPage, TypeHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldDokPage, TypeHdl, ListBox&, void)
{
// save old ListBoxPos
const sal_Int32 nOld = GetTypeSel();
@@ -458,7 +458,7 @@ void SwFieldDokPage::AddSubType(sal_uInt16 nTypeId)
m_pSelectionLB->SetEntryData(nPos, reinterpret_cast<void*>(nTypeId));
}
-IMPL_LINK_NOARG_TYPED(SwFieldDokPage, SubTypeHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldDokPage, SubTypeHdl, ListBox&, void)
{
sal_Int32 nPos = m_pSelectionLB->GetSelectEntryPos();
if(nPos == LISTBOX_ENTRY_NOTFOUND)
@@ -525,7 +525,7 @@ sal_Int32 SwFieldDokPage::FillFormatLB(sal_uInt16 nTypeId)
return nSize;
}
-IMPL_LINK_NOARG_TYPED(SwFieldDokPage, FormatHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldDokPage, FormatHdl, ListBox&, void)
{
sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index cd20b27cc8cb..ab5cde0c4de8 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -50,9 +50,9 @@ class SwFieldDokPage : public SwFieldPage
sal_Int32 nOldSel;
sal_uLong nOldFormat;
- DECL_LINK_TYPED(TypeHdl, ListBox&, void);
- DECL_LINK_TYPED(FormatHdl, ListBox&, void);
- DECL_LINK_TYPED(SubTypeHdl, ListBox&, void);
+ DECL_LINK(TypeHdl, ListBox&, void);
+ DECL_LINK(FormatHdl, ListBox&, void);
+ DECL_LINK(SubTypeHdl, ListBox&, void);
void AddSubType(sal_uInt16 nTypeId);
sal_Int32 FillFormatLB(sal_uInt16 nTypeId);
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index e11971426d03..4396c1ead502 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -239,7 +239,7 @@ void SwFieldEditDlg::InsertHdl()
}
// kick off changing of the field
-IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, OKHdl, Button*, void)
+IMPL_LINK_NOARG(SwFieldEditDlg, OKHdl, Button*, void)
{
if (GetOKButton()->IsEnabled())
{
@@ -257,7 +257,7 @@ short SwFieldEditDlg::Execute()
}
// Traveling between fields of the same type
-IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void )
+IMPL_LINK( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void )
{
bool bNext = pButton == m_pNextBT;
@@ -291,7 +291,7 @@ IMPL_LINK_TYPED( SwFieldEditDlg, NextPrevHdl, Button *, pButton, void )
Init();
}
-IMPL_LINK_NOARG_TYPED(SwFieldEditDlg, AddressHdl, Button*, void)
+IMPL_LINK_NOARG(SwFieldEditDlg, AddressHdl, Button*, void)
{
SwFieldPage* pTabPage = static_cast<SwFieldPage*>(GetTabPage());
SwFieldMgr& rMgr = pTabPage->GetFieldMgr();
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index b5c79b24ea21..60a17d53eb4f 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -210,7 +210,7 @@ void SwFieldFuncPage::Reset(const SfxItemSet* )
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, TypeHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldFuncPage, TypeHdl, ListBox&, void)
{
// save old ListBoxPos
const sal_Int32 nOld = GetTypeSel();
@@ -403,7 +403,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, TypeHdl, ListBox&, void)
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, SelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldFuncPage, SelectHdl, ListBox&, void)
{
const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
@@ -411,17 +411,17 @@ IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, SelectHdl, ListBox&, void)
m_pNameED->SetText( m_pSelectionLB->GetSelectEntry() );
}
-IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, InsertMacroHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldFuncPage, InsertMacroHdl, ListBox&, void)
{
SelectHdl(*m_pSelectionLB);
InsertHdl(nullptr);
}
-IMPL_LINK_TYPED( SwFieldFuncPage, ListModifyButtonHdl, Button*, pControl, void)
+IMPL_LINK( SwFieldFuncPage, ListModifyButtonHdl, Button*, pControl, void)
{
ListModifyHdl(pControl);
}
-IMPL_LINK_TYPED( SwFieldFuncPage, ListModifyReturnActionHdl, ReturnActionEdit&, rControl, void)
+IMPL_LINK( SwFieldFuncPage, ListModifyReturnActionHdl, ReturnActionEdit&, rControl, void)
{
ListModifyHdl(&rControl);
}
@@ -471,11 +471,11 @@ void SwFieldFuncPage::ListModifyHdl(Control* pControl)
ListEnableHdl(*m_pListItemED);
}
-IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ListEnableListBoxHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableListBoxHdl, ListBox&, void)
{
ListEnableHdl(*m_pListItemED);
}
-IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ListEnableHdl, Edit&, void)
+IMPL_LINK_NOARG(SwFieldFuncPage, ListEnableHdl, Edit&, void)
{
//enable "Add" button when text is in the Edit that's not already member of the box
m_pListAddPB->Enable(!m_pListItemED->GetText().isEmpty() &&
@@ -531,7 +531,7 @@ void SwFieldFuncPage::UpdateSubType()
}
// call MacroBrowser, fill Listbox with Macros
-IMPL_LINK_NOARG_TYPED( SwFieldFuncPage, MacroHdl, Button *, void)
+IMPL_LINK_NOARG( SwFieldFuncPage, MacroHdl, Button *, void)
{
const OUString sMacro(TurnMacroString(m_pNameED->GetText()).replaceAll(".", ";"));
if (GetFieldMgr().ChooseMacro(sMacro))
@@ -646,7 +646,7 @@ void SwFieldFuncPage::FillUserData()
SetUserData(USER_DATA_VERSION ";" + OUString::number( nTypeSel ));
}
-IMPL_LINK_NOARG_TYPED(SwFieldFuncPage, ModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(SwFieldFuncPage, ModifyHdl, Edit&, void)
{
const sal_Int32 nLen = m_pNameED->GetText().getLength();
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index b8034a495beb..2f969b2af15d 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -66,18 +66,18 @@ class SwFieldFuncPage : public SwFieldPage
sal_uLong nOldFormat;
bool bDropDownLBChanged;
- DECL_LINK_TYPED( TypeHdl, ListBox&, void );
- DECL_LINK_TYPED( SelectHdl, ListBox&, void );
- DECL_LINK_TYPED( InsertMacroHdl, ListBox&, void );
- DECL_LINK_TYPED( ModifyHdl, Edit&, void );
- DECL_LINK_TYPED( ListModifyReturnActionHdl, ReturnActionEdit&, void );
- DECL_LINK_TYPED( ListModifyButtonHdl, Button*, void );
- DECL_LINK_TYPED( ListEnableHdl, Edit&, void );
- DECL_LINK_TYPED( ListEnableListBoxHdl, ListBox&, void );
+ DECL_LINK( TypeHdl, ListBox&, void );
+ DECL_LINK( SelectHdl, ListBox&, void );
+ DECL_LINK( InsertMacroHdl, ListBox&, void );
+ DECL_LINK( ModifyHdl, Edit&, void );
+ DECL_LINK( ListModifyReturnActionHdl, ReturnActionEdit&, void );
+ DECL_LINK( ListModifyButtonHdl, Button*, void );
+ DECL_LINK( ListEnableHdl, Edit&, void );
+ DECL_LINK( ListEnableListBoxHdl, ListBox&, void );
void ListModifyHdl(Control*);
// select Macro
- DECL_LINK_TYPED( MacroHdl, Button *, void );
+ DECL_LINK( MacroHdl, Button *, void );
void UpdateSubType();
static OUString TurnMacroString(const OUString &rMacro);
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index d4084939d64a..d94a6829df32 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -299,13 +299,13 @@ void SwFieldPage::RestorePos(ListBox* pLst1)
}
// Insert new fields
-IMPL_LINK_TYPED( SwFieldPage, TreeListBoxInsertHdl, SvTreeListBox*, pBtn, bool )
+IMPL_LINK( SwFieldPage, TreeListBoxInsertHdl, SvTreeListBox*, pBtn, bool )
{
InsertHdl(pBtn);
return false;
}
-IMPL_LINK_TYPED( SwFieldPage, ListBoxInsertHdl, ListBox&, rBox, void )
+IMPL_LINK( SwFieldPage, ListBoxInsertHdl, ListBox&, rBox, void )
{
InsertHdl(&rBox);
}
@@ -345,7 +345,7 @@ void SwFieldPage::EnableInsert(bool bEnable)
m_bInsert = bEnable;
}
-IMPL_LINK_NOARG_TYPED(SwFieldPage, NumFormatHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldPage, NumFormatHdl, ListBox&, void)
{
InsertHdl(nullptr);
}
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index b7c5090b9b13..a7e665b428b1 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -54,9 +54,9 @@ protected:
SwField* GetCurField() { return m_pCurField;}
SwWrtShell* GetWrtShell() { return m_pWrtShell;}
- DECL_LINK_TYPED( ListBoxInsertHdl, ListBox&, void );
- DECL_LINK_TYPED( TreeListBoxInsertHdl, SvTreeListBox*, bool );
- DECL_LINK_TYPED( NumFormatHdl, ListBox&, void );
+ DECL_LINK( ListBoxInsertHdl, ListBox&, void );
+ DECL_LINK( TreeListBoxInsertHdl, SvTreeListBox*, bool );
+ DECL_LINK( NumFormatHdl, ListBox&, void );
void InsertHdl(void *);
void Init();
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 301cfb5d385b..ab7ce0e6e2cf 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -129,7 +129,7 @@ void SwFieldRefPage::dispose()
SwFieldPage::dispose();
}
-IMPL_LINK_NOARG_TYPED(SwFieldRefPage, ModifyHdl_Impl, Edit&, void)
+IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl_Impl, Edit&, void)
{
OUString sFilter = comphelper::string::strip(m_pFilterED->GetText(), ' ');
UpdateSubType(sFilter);
@@ -299,7 +299,7 @@ void SwFieldRefPage::Reset(const SfxItemSet* )
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldRefPage, TypeHdl, ListBox&, void)
{
// save old ListBoxPos
const sal_Int32 nOld = GetTypeSel();
@@ -438,11 +438,11 @@ IMPL_LINK_NOARG_TYPED(SwFieldRefPage, TypeHdl, ListBox&, void)
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void)
+IMPL_LINK_NOARG(SwFieldRefPage, SubTypeTreeListBoxHdl, SvTreeListBox*, void)
{
SubTypeHdl();
}
-IMPL_LINK_NOARG_TYPED(SwFieldRefPage, SubTypeListBoxHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldRefPage, SubTypeListBoxHdl, ListBox&, void)
{
SubTypeHdl();
}
@@ -827,7 +827,7 @@ sal_Int32 SwFieldRefPage::FillFormatLB(sal_uInt16 nTypeId)
}
// Modify
-IMPL_LINK_NOARG_TYPED(SwFieldRefPage, ModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(SwFieldRefPage, ModifyHdl, Edit&, void)
{
OUString aName(m_pNameED->GetText());
const bool bEmptyName = aName.isEmpty();
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 30f13754e246..bcc122e8c17f 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -61,11 +61,11 @@ class SwFieldRefPage : public SwFieldPage
// fallback, if previously selected text node doesn't exist anymore
size_t mnSavedSelectedPos;
- DECL_LINK_TYPED(TypeHdl, ListBox&, void);
- DECL_LINK_TYPED(SubTypeListBoxHdl, ListBox&, void);
- DECL_LINK_TYPED(SubTypeTreeListBoxHdl, SvTreeListBox*, void);
- DECL_LINK_TYPED(ModifyHdl, Edit&, void);
- DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void);
+ DECL_LINK(TypeHdl, ListBox&, void);
+ DECL_LINK(SubTypeListBoxHdl, ListBox&, void);
+ DECL_LINK(SubTypeTreeListBoxHdl, SvTreeListBox*, void);
+ DECL_LINK(ModifyHdl, Edit&, void);
+ DECL_LINK(ModifyHdl_Impl, Edit&, void);
void SubTypeHdl();
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 72cfc891e05b..cfc424d0bfa2 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -179,7 +179,7 @@ SfxItemSet* SwFieldDlg::CreateInputItemSet( sal_uInt16 nID )
}
// kick off inserting of new fields
-IMPL_LINK_NOARG_TYPED(SwFieldDlg, OKHdl, Button*, void)
+IMPL_LINK_NOARG(SwFieldDlg, OKHdl, Button*, void)
{
if (GetOKButton().IsEnabled())
{
@@ -190,7 +190,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldDlg, OKHdl, Button*, void)
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldDlg, CancelHdl, Button*, void)
+IMPL_LINK_NOARG(SwFieldDlg, CancelHdl, Button*, void)
{
Close();
}
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 98e073e045b4..95a367e968ab 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -207,7 +207,7 @@ void SwFieldVarPage::Reset(const SfxItemSet* )
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldVarPage, TypeHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldVarPage, TypeHdl, ListBox&, void)
{
// save old ListBoxPos
const sal_Int32 nOld = GetTypeSel();
@@ -237,7 +237,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, TypeHdl, ListBox&, void)
bInit = false;
}
-IMPL_LINK_TYPED( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void )
+IMPL_LINK( SwFieldVarPage, SubTypeListBoxHdl, ListBox&, rBox, void )
{
SubTypeHdl(&rBox);
}
@@ -829,7 +829,7 @@ void SwFieldVarPage::FillFormatLB(sal_uInt16 nTypeId)
}
// Modify
-IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ModifyHdl, Edit&, void)
+IMPL_LINK_NOARG(SwFieldVarPage, ModifyHdl, Edit&, void)
{
OUString sValue(m_pValueED->GetText());
bool bHasValue = !sValue.isEmpty();
@@ -952,7 +952,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ModifyHdl, Edit&, void)
EnableInsert(bInsert);
}
-IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
+IMPL_LINK( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
{
const sal_uInt16 nTypeId = (sal_uInt16)reinterpret_cast<sal_uLong>(m_pTypeLB->GetEntryData(GetTypeSel()));
@@ -1096,7 +1096,7 @@ IMPL_LINK_TYPED( SwFieldVarPage, TBClickHdl, ToolBox *, pBox, void )
}
}
-IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ChapterHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwFieldVarPage, ChapterHdl, ListBox&, void)
{
bool bEnable = m_pChapterLevelLB->GetSelectEntryPos() != 0;
@@ -1105,7 +1105,7 @@ IMPL_LINK_NOARG_TYPED(SwFieldVarPage, ChapterHdl, ListBox&, void)
SeparatorHdl(*m_pSeparatorED);
}
-IMPL_LINK_NOARG_TYPED(SwFieldVarPage, SeparatorHdl, Edit&, void)
+IMPL_LINK_NOARG(SwFieldVarPage, SeparatorHdl, Edit&, void)
{
bool bEnable = !m_pSeparatorED->GetText().isEmpty() ||
m_pChapterLevelLB->GetSelectEntryPos() == 0;
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 9294da46b626..66421cea84e2 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -76,12 +76,12 @@ class SwFieldVarPage : public SwFieldPage
sal_uLong nOldFormat;
bool bInit;
- DECL_LINK_TYPED( TypeHdl, ListBox&, void );
- DECL_LINK_TYPED( SubTypeListBoxHdl, ListBox&, void );
- DECL_LINK_TYPED( ModifyHdl, Edit&, void );
- DECL_LINK_TYPED( TBClickHdl, ToolBox *, void );
- DECL_LINK_TYPED( ChapterHdl, ListBox&, void );
- DECL_LINK_TYPED( SeparatorHdl, Edit&, void );
+ DECL_LINK( TypeHdl, ListBox&, void );
+ DECL_LINK( SubTypeListBoxHdl, ListBox&, void );
+ DECL_LINK( ModifyHdl, Edit&, void );
+ DECL_LINK( TBClickHdl, ToolBox *, void );
+ DECL_LINK( ChapterHdl, ListBox&, void );
+ DECL_LINK( SeparatorHdl, Edit&, void );
void SubTypeHdl(ListBox*);
void UpdateSubType();
diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx
index 8cc3cba5b31d..553e472ea344 100644
--- a/sw/source/ui/fldui/inpdlg.cxx
+++ b/sw/source/ui/fldui/inpdlg.cxx
@@ -164,7 +164,7 @@ void SwFieldInputDlg::Apply()
rSh.EndAllAction();
}
-IMPL_LINK_NOARG_TYPED(SwFieldInputDlg, NextHdl, Button*, void)
+IMPL_LINK_NOARG(SwFieldInputDlg, NextHdl, Button*, void)
{
EndDialog(RET_OK);
}
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index d448a193f533..4c8d82e3c90b 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -107,7 +107,7 @@ void SwJavaEditDialog::dispose()
SvxStandardDialog::dispose();
}
-IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, PrevHdl, Button*, void)
+IMPL_LINK_NOARG(SwJavaEditDialog, PrevHdl, Button*, void)
{
pSh->EnterStdMode();
@@ -118,7 +118,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, PrevHdl, Button*, void)
RadioButtonHdl(nullptr);
}
-IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void)
+IMPL_LINK_NOARG(SwJavaEditDialog, NextHdl, Button*, void)
{
pSh->EnterStdMode();
@@ -129,7 +129,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, NextHdl, Button*, void)
RadioButtonHdl(nullptr);
}
-IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, OKHdl, Button*, void)
+IMPL_LINK_NOARG(SwJavaEditDialog, OKHdl, Button*, void)
{
SetField();
EndDialog( RET_OK );
@@ -229,7 +229,7 @@ bool SwJavaEditDialog::IsUpdate() const
return pField && ( sal_uInt32(bIsUrl ? 1 : 0) != pField->GetFormat() || pField->GetPar2() != aType || pField->GetPar1() != aText );
}
-IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, RadioButtonHdl, Button*, void)
+IMPL_LINK_NOARG(SwJavaEditDialog, RadioButtonHdl, Button*, void)
{
bool bEnable = m_pUrlRB->IsChecked();
m_pUrlPB->Enable(bEnable);
@@ -248,7 +248,7 @@ IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, RadioButtonHdl, Button*, void)
}
}
-IMPL_LINK_NOARG_TYPED( SwJavaEditDialog, InsertFileHdl, Button *, void )
+IMPL_LINK_NOARG( SwJavaEditDialog, InsertFileHdl, Button *, void )
{
if ( !pFileDlg )
{
@@ -260,7 +260,7 @@ IMPL_LINK_NOARG_TYPED( SwJavaEditDialog, InsertFileHdl, Button *, void )
pFileDlg->StartExecuteModal( LINK( this, SwJavaEditDialog, DlgClosedHdl ) );
}
-IMPL_LINK_NOARG_TYPED(SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, void)
+IMPL_LINK_NOARG(SwJavaEditDialog, DlgClosedHdl, sfx2::FileDialogHelper *, void)
{
if ( pFileDlg->GetError() == ERRCODE_NONE )
{
generated by cgit (git 2.34.1) at 2025-01-22 20:58:02 +0000