summaryrefslogtreecommitdiff
path: root/include/svx
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/svx
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/svx')
-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
9 files changed, 19 insertions, 18 deletions
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);