summaryrefslogtreecommitdiff
path: root/sw/source/uibase/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/uibase/inc')
-rw-r--r--sw/source/uibase/inc/ascfldlg.hxx2
-rw-r--r--sw/source/uibase/inc/break.hxx2
-rw-r--r--sw/source/uibase/inc/column.hxx4
-rw-r--r--sw/source/uibase/inc/cption.hxx1
-rw-r--r--sw/source/uibase/inc/dbinsdlg.hxx4
-rw-r--r--sw/source/uibase/inc/drpcps.hxx2
-rw-r--r--sw/source/uibase/inc/envlop.hxx2
-rw-r--r--sw/source/uibase/inc/frmpage.hxx6
-rw-r--r--sw/source/uibase/inc/glosbib.hxx1
-rw-r--r--sw/source/uibase/inc/multmrk.hxx2
-rw-r--r--sw/source/uibase/inc/navipi.hxx2
-rw-r--r--sw/source/uibase/inc/num.hxx6
-rw-r--r--sw/source/uibase/inc/numfmtlb.hxx2
-rw-r--r--sw/source/uibase/inc/numpara.hxx4
-rw-r--r--sw/source/uibase/inc/optcomp.hxx2
-rw-r--r--sw/source/uibase/inc/optload.hxx5
-rw-r--r--sw/source/uibase/inc/optpage.hxx8
-rw-r--r--sw/source/uibase/inc/outline.hxx8
-rw-r--r--sw/source/uibase/inc/pgfnote.hxx2
-rw-r--r--sw/source/uibase/inc/pggrid.hxx2
-rw-r--r--sw/source/uibase/inc/srtdlg.hxx3
-rw-r--r--sw/source/uibase/inc/swuiccoll.hxx3
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx17
-rw-r--r--sw/source/uibase/inc/swuiidxmrk.hxx5
-rw-r--r--sw/source/uibase/inc/tautofmt.hxx2
25 files changed, 53 insertions, 44 deletions
diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx
index bd2b822b59c7..115e2eaf8ae5 100644
--- a/sw/source/uibase/inc/ascfldlg.hxx
+++ b/sw/source/uibase/inc/ascfldlg.hxx
@@ -42,7 +42,7 @@ class SwAsciiFilterDlg : public SfxModalDialog
VclPtr<RadioButton> m_pLF_RB;
bool m_bSaveLineStatus;
- DECL_LINK( CharSetSelHdl, SvxTextEncodingBox* );
+ DECL_LINK_TYPED( CharSetSelHdl, ListBox&, void );
DECL_LINK_TYPED( LineEndHdl, RadioButton&, void );
void SetCRLF( LineEnd eEnd );
LineEnd GetCRLF() const;
diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx
index 49664253dc9c..c37612cdb62d 100644
--- a/sw/source/uibase/inc/break.hxx
+++ b/sw/source/uibase/inc/break.hxx
@@ -52,7 +52,7 @@ class SwBreakDlg: public SvxStandardDialog
bool bHtmlMode;
DECL_LINK_TYPED( ClickHdl, Button*, void );
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectHdl, ListBox&, void );
DECL_LINK_TYPED( PageNumHdl, Button*, void );
DECL_LINK(PageNumModifyHdl, void *);
DECL_LINK_TYPED(OkHdl, Button*, void);
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 0d043bf574a1..ce9c606dce1a 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -60,8 +60,9 @@ class SwColumnDlg : public SfxModalDialog
bool bSelSectionChanged : 1;
bool bFrameChanged : 1;
- DECL_LINK(ObjectHdl, ListBox*);
+ DECL_LINK_TYPED(ObjectListBoxHdl, ListBox&, void);
DECL_LINK_TYPED(OkHdl, Button*, void);
+ void ObjectHdl(ListBox*);
public:
SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh);
@@ -147,6 +148,7 @@ class SwColumnPage : public SfxTabPage
DECL_LINK_TYPED(Up, Button *, void);
DECL_LINK_TYPED(Down, Button *, void);
DECL_LINK( UpdateColMgr, void* );
+ DECL_LINK_TYPED( UpdateColMgrListBox, ListBox&, void );
void Timeout();
void Update(MetricField *pInteractiveField);
diff --git a/sw/source/uibase/inc/cption.hxx b/sw/source/uibase/inc/cption.hxx
index 77927246d5ac..b4a5a9b28380 100644
--- a/sw/source/uibase/inc/cption.hxx
+++ b/sw/source/uibase/inc/cption.hxx
@@ -95,6 +95,7 @@ class SwCaptionDialog : public SvxStandardDialog
::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > xNamed;
DECL_LINK(SelectHdl, void *);
+ DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void);
DECL_LINK(ModifyHdl, void *);
DECL_LINK_TYPED(OptionHdl, Button *, void);
DECL_LINK_TYPED(CaptionHdl, Button *, void);
diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx
index 55d5105f33c4..833d8670e983 100644
--- a/sw/source/uibase/inc/dbinsdlg.hxx
+++ b/sw/source/uibase/inc/dbinsdlg.hxx
@@ -126,7 +126,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
SwInsDBColumns aDBColumns;
const SwDBData aDBData;
- Link<> aOldNumFormatLnk;
+ Link<ListBox&,void> aOldNumFormatLnk;
OUString sNoTmpl;
SwView* pView;
@@ -141,7 +141,7 @@ class SwInsertDBColAutoPilot : public SfxModalDialog, public utl::ConfigItem
DECL_LINK_TYPED( TableFormatHdl, Button*, void );
DECL_LINK_TYPED( DBFormatHdl, Button*, void );
DECL_LINK_TYPED( TableToFromHdl, Button*, void );
- DECL_LINK( SelectHdl, ListBox* );
+ DECL_LINK_TYPED( SelectHdl, ListBox&, void );
DECL_LINK_TYPED( DblClickHdl, ListBox&, void );
DECL_LINK_TYPED( HeaderHdl, Button*, void );
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index 511ecc76b359..c251c7ba0c51 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.hxx
@@ -71,7 +71,7 @@ friend class SwDropCapsPict;
DECL_LINK_TYPED(ClickHdl, Button*, void);
DECL_LINK( ModifyHdl, Edit * );
- DECL_LINK(SelectHdl, void *);
+ DECL_LINK_TYPED(SelectHdl, ListBox&, void);
DECL_LINK_TYPED(WholeWordHdl, Button*, void);
using SfxTabPage::ActivatePage;
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index 853ffc8e6196..cce27158fc39 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -90,7 +90,7 @@ class SwEnvPage : public SfxTabPage
SwWrtShell* pSh;
OUString sActDBName;
- DECL_LINK( DatabaseHdl, ListBox * );
+ DECL_LINK_TYPED( DatabaseHdl, ListBox&, void );
DECL_LINK_TYPED(FieldHdl, Button*, void );
DECL_LINK_TYPED(SenderHdl, Button*, void );
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 97d2a28c70ab..d83af39b4bae 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -134,8 +134,8 @@ class SwFrmPage: public SfxTabPage
DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void);
void RangeModifyHdl();
DECL_LINK_TYPED(AnchorTypeHdl, Button*, void);
- DECL_LINK( PosHdl, ListBox * );
- DECL_LINK( RelHdl, ListBox * );
+ DECL_LINK_TYPED( PosHdl, ListBox&, void );
+ DECL_LINK_TYPED( RelHdl, ListBox&, void );
void InitPos(RndStdIds eId, sal_Int16 nH, sal_Int16 nHRel,
sal_Int16 nV, sal_Int16 nVRel,
long nX, long nY);
@@ -305,7 +305,7 @@ class SwFrmAddPage : public SfxTabPage
bool bNew;
DECL_LINK(EditModifyHdl, void *);
- DECL_LINK(ChainModifyHdl, ListBox*);
+ DECL_LINK_TYPED(ChainModifyHdl, ListBox&, void);
static const sal_uInt16 aAddPgRg[];
diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx
index 0ca522822340..78e80933de90 100644
--- a/sw/source/uibase/inc/glosbib.hxx
+++ b/sw/source/uibase/inc/glosbib.hxx
@@ -95,6 +95,7 @@ protected:
DECL_LINK_TYPED(NewHdl, Button *, void);
DECL_LINK_TYPED( DeleteHdl, Button*, void );
DECL_LINK(ModifyHdl, void *);
+ DECL_LINK_TYPED(ModifyListBoxHdl, ListBox&, void);
DECL_LINK_TYPED(RenameHdl, Button *, void);
public:
diff --git a/sw/source/uibase/inc/multmrk.hxx b/sw/source/uibase/inc/multmrk.hxx
index 2e9c26abaf82..41ccbb425dc1 100644
--- a/sw/source/uibase/inc/multmrk.hxx
+++ b/sw/source/uibase/inc/multmrk.hxx
@@ -31,7 +31,7 @@ class SwTOXMgr;
// insert mark for index entry
class SwMultiTOXMarkDlg : public SvxStandardDialog
{
- DECL_LINK( SelectHdl, ListBox * );
+ DECL_LINK_TYPED( SelectHdl, ListBox&, void );
VclPtr<FixedText> m_pTextFT;
VclPtr<ListBox> m_pTOXLB;
diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx
index 4e855ed1df3c..7f4ba5922ae5 100644
--- a/sw/source/uibase/inc/navipi.hxx
+++ b/sw/source/uibase/inc/navipi.hxx
@@ -101,7 +101,7 @@ class SwNavigationPI : public vcl::Window,
void FillBox();
void MakeMark();
- DECL_LINK( DocListBoxSelectHdl, ListBox * );
+ DECL_LINK_TYPED( DocListBoxSelectHdl, ListBox&, void );
DECL_LINK_TYPED( ToolBoxSelectHdl, ToolBox *, void );
DECL_LINK_TYPED( ToolBoxClickHdl, ToolBox *, void );
DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void );
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index 355eefb0d297..348242561141 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -91,8 +91,8 @@ class SwNumPositionTabPage : public SfxTabPage
void InitControls();
- DECL_LINK( LevelHdl, ListBox * );
- DECL_LINK(EditModifyHdl, void *);
+ DECL_LINK_TYPED( LevelHdl, ListBox&, void );
+ DECL_LINK_TYPED(EditModifyHdl, ListBox&, void);
DECL_LINK( DistanceHdl, MetricField * );
DECL_LINK_TYPED( DistanceLoseFocusHdl, Control&, void );
DECL_LINK_TYPED( RelativeHdl, Button*, void );
@@ -101,7 +101,7 @@ class SwNumPositionTabPage : public SfxTabPage
void InitPosAndSpaceMode();
void ShowControlsDependingOnPosAndSpaceMode();
- DECL_LINK(LabelFollowedByHdl_Impl, void *);
+ DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void);
DECL_LINK( ListtabPosHdl_Impl, MetricField* );
DECL_LINK( AlignAtHdl_Impl, MetricField* );
DECL_LINK( IndentAtHdl_Impl, MetricField* );
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index 6a59a57cfefc..634c07be327c 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -38,7 +38,7 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox
//to be shown in the number format dialog
bool bUseAutomaticLanguage;//determine whether language is automatically assigned
- DECL_DLLPRIVATE_LINK( SelectHdl, ListBox * );
+ DECL_DLLPRIVATE_LINK_TYPED( SelectHdl, ListBox&, void );
SAL_DLLPRIVATE double GetDefValue(const short nFormatType) const;
SAL_DLLPRIVATE void Init(short nFormatType, bool bUsrFormats);
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index c80a3b46d6ad..5825f9845b67 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.hxx
@@ -54,10 +54,10 @@ class SwParagraphNumTabPage : public SfxTabPage
bool bCurNumrule : 1;
DECL_LINK_TYPED(NewStartHdl_Impl, Button*, void);
- DECL_LINK( StyleHdl_Impl, ListBox* );
+ DECL_LINK_TYPED( StyleHdl_Impl, ListBox&,void );
DECL_LINK_TYPED(LineCountHdl_Impl, Button*, void);
DECL_LINK_TYPED(EditNumStyleHdl_Impl, Button*, void);
- DECL_LINK(EditNumStyleSelectHdl_Impl, void *);
+ DECL_LINK_TYPED(EditNumStyleSelectHdl_Impl, ListBox&, void);
static const sal_uInt16 aPageRg[];
diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx
index f247d6c76af1..75db09d9166a 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.hxx
@@ -50,7 +50,7 @@ private:
sal_uLong m_nSavedOptions;
// handler
- DECL_LINK(SelectHdl, void *);
+ DECL_LINK_TYPED(SelectHdl, ListBox&, void);
DECL_LINK_TYPED(UseAsDefaultHdl, Button*, void);
// private methods
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index e7eb2b39d22f..9f6483273da1 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -59,7 +59,7 @@ private:
sal_uInt16 m_nLastTab;
sal_Int32 m_nOldLinkMode;
- DECL_LINK(MetricHdl, void *);
+ DECL_LINK_TYPED(MetricHdl, ListBox&, void);
DECL_LINK_TYPED(StandardizedPageCountCheckHdl, Button*, void);
public:
@@ -154,8 +154,9 @@ private:
bool bHTMLMode;
DECL_LINK(SelectHdl, void *);
+ DECL_LINK_TYPED(SelectListBoxHdl, ListBox&, void);
DECL_LINK(ModifyHdl, void * = 0);
- DECL_LINK( OrderHdl, ListBox* );
+ DECL_LINK_TYPED( OrderHdl, ListBox&, void );
DECL_LINK_TYPED(ShowEntryHdl, SvTreeListBox*, void);
DECL_LINK_TYPED(SaveEntryHdl, SvTreeListBox*, void);
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 8a7a1280705c..33641c98fdc3 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -106,7 +106,7 @@ class SwAddPrinterTabPage : public SfxTabPage
bool bPreview;
DECL_LINK_TYPED(AutoClickHdl, Button*, void);
- DECL_LINK(SelectHdl, void *);
+ DECL_LINK_TYPED(SelectHdl, ListBox&, void);
public:
SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
@@ -340,9 +340,9 @@ class SwRedlineOptionsTabPage : public SfxTabPage
OUString sAuthor;
OUString sNone;
- DECL_LINK(AttribHdl, ListBox*);
- DECL_LINK(ChangedMaskPrevHdl, void* = 0);
- DECL_LINK(ColorHdl, ColorListBox*);
+ DECL_LINK_TYPED(AttribHdl, ListBox&, void);
+ DECL_LINK_TYPED(ChangedMaskPrevHdl, ListBox&, void);
+ DECL_LINK_TYPED(ColorHdl, ListBox&, void);
static void InitFontStyle(SvxFontPrevWindow& rExampleWin);
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index aed1139d5ebb..9eb16b76bb29 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -102,14 +102,14 @@ class SwOutlineSettingsTabPage : public SfxTabPage
OUString* pCollNames;
sal_uInt16 nActLevel;
- DECL_LINK( LevelHdl, ListBox * );
+ DECL_LINK_TYPED( LevelHdl, ListBox&, void );
DECL_LINK( ToggleComplete, NumericField * );
- DECL_LINK( CollSelect, ListBox * );
+ DECL_LINK_TYPED( CollSelect, ListBox&, void );
DECL_LINK_TYPED(CollSelectGetFocus, Control&, void);
- DECL_LINK( NumberSelect, SwNumberingTypeListBox * );
+ DECL_LINK_TYPED( NumberSelect, ListBox&, void );
DECL_LINK(DelimModify, void *);
DECL_LINK( StartModified, NumericField * );
- DECL_LINK(CharFormatHdl, void *);
+ DECL_LINK_TYPED(CharFormatHdl, ListBox&, void);
void Update();
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index ca1ff21b3f8f..a72d20e92d72 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.hxx
@@ -61,7 +61,7 @@ private:
DECL_LINK_TYPED(HeightMetric, Button*, void);
DECL_LINK_TYPED(HeightModify, Control&, void);
DECL_LINK( LineWidthChanged_Impl, void * );
- DECL_LINK( LineColorSelected_Impl, void * );
+ DECL_LINK_TYPED( LineColorSelected_Impl, ListBox&, void);
long lMaxHeight;
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index e6548e01f1d2..95a084e47bc5 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -76,7 +76,7 @@ class SwTextGridPage: public SfxTabPage
DECL_LINK_TYPED(CharorLineLoseFocusdHdl, Control&, void);
DECL_LINK(TextSizeChangedHdl, SpinField*);
DECL_LINK_TYPED(TextSizeLoseFocusHdl, Control&, void);
- DECL_LINK(GridModifyHdl, void*);
+ DECL_LINK_TYPED(GridModifyHdl, ListBox&, void);
DECL_LINK_TYPED(GridModifyClickHdl, Button*, void);
DECL_LINK_TYPED(DisplayGridHdl, Button*, void);
diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx
index 69de0e969bed..e67b47a7e7bb 100644
--- a/sw/source/uibase/inc/srtdlg.hxx
+++ b/sw/source/uibase/inc/srtdlg.hxx
@@ -79,7 +79,8 @@ class SwSortDlg : public SvxStandardDialog
DECL_LINK_TYPED( CheckHdl, Button*, void );
DECL_LINK_TYPED( DelimHdl, Button*, void );
- DECL_LINK( LanguageHdl, ListBox* );
+ DECL_LINK_TYPED( LanguageListBoxHdl, ListBox&, void );
+ void LanguageHdl(ListBox*);
DECL_LINK_TYPED(DelimCharHdl, Button*,void);
public:
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index ef5a227b35a5..684023fb526c 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -57,8 +57,9 @@ class SwCondCollPage : public SfxTabPage
DECL_LINK_TYPED( AssignRemoveTreeListBoxHdl, SvTreeListBox*, bool);
DECL_LINK_TYPED( AssignRemoveClickHdl, Button*, void);
DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void );
- DECL_LINK( SelectHdl, void* );
+ DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void );
void AssignRemove(void*);
+ void SelectHdl(void*);
using SfxTabPage::ActivatePage;
using SfxTabPage::DeactivatePage;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 009c7a1a7ae0..d27e74404d9d 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -202,17 +202,18 @@ class SwTOXSelectTabPage : public SfxTabPage
bool m_bWaitingInitialSettings;
- DECL_LINK(TOXTypeHdl, ListBox* );
+ DECL_LINK_TYPED(TOXTypeHdl, ListBox&, void );
DECL_LINK_TYPED(AddStylesHdl, Button*, void );
DECL_LINK_TYPED(MenuEnableHdl, Menu*, bool);
DECL_LINK_TYPED(MenuExecuteHdl, Menu*, bool);
- DECL_LINK(LanguageHdl, ListBox*);
-
+ DECL_LINK_TYPED(LanguageListBoxHdl, ListBox&, void);
+ void LanguageHdl(ListBox*);
DECL_LINK_TYPED(CheckBoxHdl, Button*, void );
DECL_LINK_TYPED(RadioButtonHdl, Button*, void);
DECL_LINK(ModifyHdl, void*);
+ DECL_LINK_TYPED(ModifyListBoxHdl, ListBox&, void);
- void ApplyTOXDescription();
+ void ApplyTOXDescription();
void FillTOXDescription();
using SfxTabPage::ActivatePage;
@@ -410,7 +411,7 @@ class SwTOXEntryTabPage : public SfxTabPage
CurTOXType aLastTOXType;
bool bInLevelHdl;
- DECL_LINK(StyleSelectHdl, ListBox*);
+ DECL_LINK_TYPED(StyleSelectHdl, ListBox&, void);
DECL_LINK_TYPED(EditStyleHdl, Button*, void);
DECL_LINK_TYPED(InsertTokenHdl, Button*, void);
DECL_LINK_TYPED(LevelHdl, SvTreeListBox*, void);
@@ -420,9 +421,9 @@ class SwTOXEntryTabPage : public SfxTabPage
DECL_LINK(FillCharHdl, ComboBox*);
DECL_LINK_TYPED(RemoveInsertAuthHdl, Button*, void);
DECL_LINK_TYPED(SortKeyHdl, Button*, void);
- DECL_LINK(ChapterInfoHdl, ListBox*);
+ DECL_LINK_TYPED(ChapterInfoHdl, ListBox&, void);
DECL_LINK(ChapterInfoOutlineHdl, NumericField*);
- DECL_LINK(NumberFormatHdl, ListBox*);
+ DECL_LINK_TYPED(NumberFormatHdl, ListBox&, void);
DECL_LINK_TYPED(AllLevelsHdl, Button*, void);
@@ -467,7 +468,7 @@ class SwTOXStylesTabPage : public SfxTabPage
DECL_LINK_TYPED( EditStyleHdl, Button *, void );
DECL_LINK_TYPED( StdHdl, Button*, void );
- DECL_LINK(EnableSelectHdl, void *);
+ DECL_LINK_TYPED(EnableSelectHdl, ListBox&, void);
DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void );
DECL_LINK_TYPED( AssignHdl, Button*, void );
void Modify();
diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx
index 1e394b4e1ad3..4fe7e7959722 100644
--- a/sw/source/uibase/inc/swuiidxmrk.hxx
+++ b/sw/source/uibase/inc/swuiidxmrk.hxx
@@ -114,7 +114,8 @@ class SwIndexMarkPane
DECL_LINK_TYPED(NextSameHdl, Button*, void);
DECL_LINK_TYPED(PrevHdl, Button*, void);
DECL_LINK_TYPED(PrevSameHdl, Button*, void);
- DECL_LINK( ModifyHdl, ListBox* pBox );
+ DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void );
+ DECL_LINK( ModifyHdl, void* );
DECL_LINK( KeyDCBModifyHdl, ComboBox * );
DECL_LINK_TYPED(NewUserIdxHdl, Button*, void);
DECL_LINK_TYPED( SearchTypeHdl, Button*, void);
@@ -208,7 +209,7 @@ class SwAuthorMarkPane
DECL_LINK_TYPED(InsertHdl, Button*, void);
DECL_LINK_TYPED(CloseHdl, Button*, void);
DECL_LINK_TYPED(CreateEntryHdl, Button*, void);
- DECL_LINK(CompEntryHdl, ListBox*);
+ DECL_LINK_TYPED(CompEntryHdl, ListBox&, void);
DECL_LINK_TYPED(ChangeSourceHdl, Button*, void);
DECL_LINK_TYPED(IsEntryAllowedHdl, Edit*, bool);
DECL_LINK(EditModifyHdl, Edit*);
diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx
index 4c619b112027..2c6b868c81b4 100644
--- a/sw/source/uibase/inc/tautofmt.hxx
+++ b/sw/source/uibase/inc/tautofmt.hxx
@@ -75,7 +75,7 @@ class SwAutoFormatDlg : public SfxModalDialog
DECL_LINK_TYPED( AddHdl, Button*, void );
DECL_LINK_TYPED( RemoveHdl, Button*, void );
DECL_LINK_TYPED( RenameHdl, Button*, void );
- DECL_LINK( SelFormatHdl, void * );
+ DECL_LINK_TYPED( SelFormatHdl, ListBox&, void );
public:
SwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell,