summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2015-10-04 15:05:38 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-10-12 10:48:13 +0000
commit3c99f8500f657ed84b316390d5175a6f5e56bc69 (patch)
tree749f16652560a50d409b12a23bf1a5d93b3cd2d5 /include
parentbbadb38539eb233ac45b267034066a7274181c65 (diff)
convert Link<> to typed
Change-Id: Iec15042138e0715459b2c9e872a7464d75a6b1eb Reviewed-on: https://gerrit.libreoffice.org/19305 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/sfx2/dinfdlg.hxx2
-rw-r--r--include/sfx2/mgetempl.hxx4
-rw-r--r--include/svtools/PlaceEditDialog.hxx2
-rw-r--r--include/svtools/ServerDetailsControls.hxx2
-rw-r--r--include/svtools/addresstemplate.hxx2
-rw-r--r--include/svtools/editbrowsebox.hxx3
-rw-r--r--include/svtools/prnsetup.hxx2
-rw-r--r--include/svx/ctredlin.hxx3
-rw-r--r--include/svx/fillctrl.hxx4
-rw-r--r--include/svx/float3d.hxx2
-rw-r--r--include/svx/fontwork.hxx2
-rw-r--r--include/svx/lboxctrl.hxx2
-rw-r--r--include/svx/rubydialog.hxx6
-rw-r--r--include/svx/sidebar/AreaPropertyPanelBase.hxx6
-rw-r--r--include/svx/sidebar/LinePropertyPanelBase.hxx10
-rw-r--r--include/svx/srchdlg.hxx2
-rw-r--r--include/vcl/lstbox.hxx6
-rw-r--r--include/vcl/tabctrl.hxx2
18 files changed, 33 insertions, 29 deletions
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index c33120863f34..77cd59561307 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -426,7 +426,7 @@ private:
Idle m_aBoxLoseFocusIdle;
Link<void*,void> m_aRemovedHdl;
- DECL_STATIC_LINK( CustomPropertiesWindow, TypeHdl, CustomPropertiesTypeBox* );
+ DECL_STATIC_LINK_TYPED( CustomPropertiesWindow, TypeHdl, ListBox&, void );
DECL_LINK_TYPED( RemoveHdl, Button*, void );
DECL_LINK_TYPED( EditLoseFocusHdl, Control&, void );
DECL_LINK_TYPED( BoxLoseFocusHdl, Control&, void );
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index f719b721a95e..f8d353c8a85b 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -71,9 +71,9 @@ friend class SfxStyleDialog;
DECL_LINK_TYPED( GetFocusHdl, Control&, void );
DECL_LINK_TYPED( LoseFocusHdl, Control&, void );
- DECL_LINK( EditStyleSelectHdl_Impl, void * );
+ DECL_LINK_TYPED( EditStyleSelectHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( EditStyleHdl_Impl, Button*, void );
- DECL_LINK( EditLinkStyleSelectHdl_Impl, void * );
+ DECL_LINK_TYPED( EditLinkStyleSelectHdl_Impl, ListBox&, void );
DECL_LINK_TYPED( EditLinkStyleHdl_Impl, Button*, void );
void UpdateName_Impl(ListBox *, const OUString &rNew);
diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx
index 11ddc5fe5e97..92bafdb75be9 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -86,7 +86,7 @@ private:
DECL_LINK_TYPED ( DelHdl, Button *, void );
DECL_LINK_TYPED ( EditHdl, DetailsContainer*, void );
DECL_LINK ( ModifyHdl, void* );
- DECL_LINK ( SelectTypeHdl, void * );
+ DECL_LINK_TYPED ( SelectTypeHdl, ListBox&, void );
DECL_LINK ( EditLabelHdl, void * );
DECL_LINK ( EditUsernameHdl, void * );
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index 18ca39d6b40a..377cbc3370a6 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -149,7 +149,7 @@ class CmisDetailsContainer : public DetailsContainer
private:
void selectRepository( );
DECL_LINK_TYPED ( RefreshReposHdl, Button*, void );
- DECL_LINK ( SelectRepoHdl, void * );
+ DECL_LINK_TYPED ( SelectRepoHdl, ListBox&, void );
};
#endif
diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx
index 00b532a0ba3a..75aa5f7fd8dc 100644
--- a/include/svtools/addresstemplate.hxx
+++ b/include/svtools/addresstemplate.hxx
@@ -126,7 +126,7 @@ namespace svt
void loadConfiguration();
DECL_LINK_TYPED(OnFieldScroll, ScrollBar*, void);
- DECL_LINK(OnFieldSelect, ListBox*);
+ DECL_LINK_TYPED(OnFieldSelect, ListBox&, void);
DECL_LINK_TYPED(OnAdministrateDatasources, Button*, void);
DECL_STATIC_LINK_TYPED(AddressBookSourceDialog, OnComboGetFocus, Control&, void);
DECL_LINK_TYPED(OnComboLoseFocus, Control&, void);
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 753e0684f8e9..afe8adccbaae 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -389,6 +389,9 @@ namespace svt
protected:
virtual bool MoveAllowed(const KeyEvent& rEvt) const SAL_OVERRIDE;
virtual void SetModifyHdl(const Link<>& rLink) SAL_OVERRIDE;
+ private:
+ Link<> maModifyHdl;
+ DECL_LINK_TYPED(ListBoxSelectHdl, ListBox&, void);
};
diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx
index 3c7c5848a788..afec7688e160 100644
--- a/include/svtools/prnsetup.hxx
+++ b/include/svtools/prnsetup.hxx
@@ -54,7 +54,7 @@ private:
SVT_DLLPRIVATE void ImplSetInfo();
DECL_DLLPRIVATE_LINK_TYPED( ImplPropertiesHdl, Button*, void );
- DECL_DLLPRIVATE_LINK( ImplChangePrinterHdl, void* );
+ DECL_DLLPRIVATE_LINK_TYPED( ImplChangePrinterHdl, ListBox&, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplStatusHdl, Timer*, void );
public:
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index 28b4f68ddc60..386e0e26063a 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -194,10 +194,11 @@ private:
VclPtr<Edit> m_pEdComment;
bool bModified;
- DECL_LINK( SelDateHdl, ListBox* );
+ DECL_LINK_TYPED( SelDateHdl, ListBox&, void );
DECL_LINK_TYPED( RowEnableHdl, Button*, void );
DECL_LINK_TYPED( TimeHdl, Button*, void );
DECL_LINK( ModifyHdl, void* );
+ DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void );
DECL_LINK( ModifyDate, void* );
DECL_LINK_TYPED( RefHandle, Button*, void );
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index 7ba3b025350b..613c74260a01 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -60,8 +60,8 @@ private:
sal_Int32 mnLastPosHatch;
sal_Int32 mnLastPosBitmap;
- DECL_LINK(SelectFillTypeHdl,ListBox *);
- DECL_LINK(SelectFillAttrHdl,ListBox *);
+ DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void);
+ DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void);
public:
SFX_DECL_TOOLBOX_CONTROL();
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 105036552eb3..ef78729a9bbb 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -194,7 +194,7 @@ private:
DECL_LINK_TYPED( ClickAssignHdl, Button*, void );
DECL_LINK_TYPED( ClickHdl, Button*, void );
DECL_LINK_TYPED( ClickColorHdl, Button*, void );
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectHdl, ListBox&, void );
DECL_LINK( ModifyHdl, void * );
void ClickLight(PushButton &rBtn);
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 4dd6aaeb1236..38148e0dc370 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -150,7 +150,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontWorkDialog : public SfxDockingWindow
DECL_LINK( ModifyInputHdl_Impl, void * );
DECL_LINK_TYPED( InputTimoutHdl_Impl, Idle *, void );
- DECL_LINK( ColorSelectHdl_Impl, void * );
+ DECL_LINK_TYPED( ColorSelectHdl_Impl, ListBox&, void );
void SetStyle_Impl(const XFormTextStyleItem*);
void SetAdjust_Impl(const XFormTextAdjustItem*);
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index 05982c4eeee9..960361be4ab2 100644
--- a/include/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
@@ -39,7 +39,7 @@ protected:
void Impl_SetInfo( sal_Int32 nCount );
DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void );
- DECL_LINK( SelectHdl, void * );
+ DECL_LINK_TYPED( SelectHdl, ListBox&, void );
public:
SvxListBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index c47932ba72d9..61992decfb69 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -132,9 +132,9 @@ class SvxRubyDialog : public SfxModelessDialog
DECL_LINK_TYPED(CloseHdl_Impl, Button*, void);
DECL_LINK_TYPED(StylistHdl_Impl, Button*, void);
DECL_LINK_TYPED(ScrollHdl_Impl, ScrollBar*, void);
- DECL_LINK(PositionHdl_Impl, ListBox*);
- DECL_LINK(AdjustHdl_Impl, ListBox*);
- DECL_LINK(CharStyleHdl_Impl, void *);
+ DECL_LINK_TYPED(PositionHdl_Impl, ListBox&, void);
+ DECL_LINK_TYPED(AdjustHdl_Impl, ListBox&, void);
+ DECL_LINK_TYPED(CharStyleHdl_Impl, ListBox&, void);
DECL_LINK(EditModifyHdl_Impl, Edit*);
DECL_LINK_TYPED(EditScrollHdl_Impl, sal_Int32, bool);
DECL_LINK_TYPED(EditJumpHdl_Impl, sal_Int32, void);
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index b0ac3e345454..893284222fd4 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -159,9 +159,9 @@ protected:
sfx2::sidebar::SidebarController* mpSidebarController;
- DECL_LINK(SelectFillTypeHdl, ListBox* );
- DECL_LINK(SelectFillAttrHdl, ListBox* );
- DECL_LINK(ChangeTrgrTypeHdl_Impl, void*);
+ DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void );
+ DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void );
+ DECL_LINK_TYPED(ChangeTrgrTypeHdl_Impl, ListBox&, void);
DECL_LINK(ModifyTransparentHdl_Impl, void*);
DECL_LINK_TYPED(ModifyTransSliderHdl, Slider*, void);
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index dadb601b144a..18c108caca0c 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -165,13 +165,13 @@ private:
void Initialize();
- DECL_LINK(ChangeLineStyleHdl, void*);
+ DECL_LINK_TYPED(ChangeLineStyleHdl, ListBox&, void);
DECL_LINK_TYPED(ToolboxWidthSelectHdl, ToolBox*, void);
DECL_LINK(ChangeTransparentHdl , void *);
- DECL_LINK(ChangeStartHdl, void *);
- DECL_LINK(ChangeEndHdl, void *);
- DECL_LINK(ChangeEdgeStyleHdl, void *);
- DECL_LINK(ChangeCapStyleHdl, void *);
+ DECL_LINK_TYPED(ChangeStartHdl, ListBox&, void);
+ DECL_LINK_TYPED(ChangeEndHdl, ListBox&, void);
+ DECL_LINK_TYPED(ChangeEdgeStyleHdl, ListBox&, void);
+ DECL_LINK_TYPED(ChangeCapStyleHdl, ListBox&, void);
VclPtr<PopupControl> CreateLineWidthPopupControl (PopupContainer* pParent);
};
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 1d1286358dc7..598c142f1ce9 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -235,7 +235,7 @@ private:
DECL_LINK_TYPED( CommandHdl_Impl, Button*, void );
DECL_LINK_TYPED(TemplateHdl_Impl, Button*, void);
DECL_LINK_TYPED( FocusHdl_Impl, Control&, void );
- DECL_LINK( LBSelectHdl_Impl, Control* );
+ DECL_LINK_TYPED( LBSelectHdl_Impl, ListBox&, void );
DECL_LINK_TYPED(LoseFocusHdl_Impl, Control&, void);
DECL_LINK_TYPED(FormatHdl_Impl, Button*, void);
DECL_LINK_TYPED(NoFormatHdl_Impl, Button*, void);
diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx
index 1db08a1948df..acc824958acd 100644
--- a/include/vcl/lstbox.hxx
+++ b/include/vcl/lstbox.hxx
@@ -44,7 +44,7 @@ private:
sal_uInt16 mnDDHeight;
sal_Int32 mnSaveValue;
sal_Int32 m_nMaxWidthChars;
- Link<> maSelectHdl;
+ Link<ListBox&,void> maSelectHdl;
Link<ListBox&,void> maDoubleClickHdl;
sal_uInt16 mnLineCount;
@@ -191,8 +191,8 @@ public:
void DrawEntry( const UserDrawEvent& rEvt, bool bDrawImage, bool bDrawText, bool bDrawTextAtImagePos = false );
- void SetSelectHdl( const Link<>& rLink ) { maSelectHdl = rLink; }
- const Link<>& GetSelectHdl() const { return maSelectHdl; }
+ void SetSelectHdl( const Link<ListBox&,void>& rLink ) { maSelectHdl = rLink; }
+ const Link<ListBox&,void>& GetSelectHdl() const { return maSelectHdl; }
void SetDoubleClickHdl( const Link<ListBox&,void>& rLink ) { maDoubleClickHdl = rLink; }
const Link<ListBox&,void>& GetDoubleClickHdl() const { return maDoubleClickHdl; }
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index fa5b94761acf..05d1053f4ed7 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -77,7 +77,7 @@ private:
SAL_DLLPRIVATE void ImplFreeLayoutData();
SAL_DLLPRIVATE bool ImplHandleKeyEvent( const KeyEvent& rKeyEvent );
- DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, void* );
+ DECL_DLLPRIVATE_LINK_TYPED( ImplListBoxSelectHdl, ListBox&, void );
DECL_DLLPRIVATE_LINK_TYPED( ImplWindowEventListener, VclWindowEvent&, void );