summaryrefslogtreecommitdiff
path: root/sc/source/ui/inc
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/inc')
-rw-r--r--sc/source/ui/inc/PivotLayoutDialog.hxx4
-rw-r--r--sc/source/ui/inc/RandomNumberGeneratorDialog.hxx4
-rw-r--r--sc/source/ui/inc/SamplingDialog.hxx4
-rw-r--r--sc/source/ui/inc/StatisticsInputOutputDialog.hxx4
-rw-r--r--sc/source/ui/inc/StatisticsTwoVariableDialog.hxx4
-rw-r--r--sc/source/ui/inc/areasdlg.hxx2
-rw-r--r--sc/source/ui/inc/condformatdlg.hxx2
-rw-r--r--sc/source/ui/inc/consdlg.hxx2
-rw-r--r--sc/source/ui/inc/crnrdlg.hxx4
-rw-r--r--sc/source/ui/inc/namedefdlg.hxx2
-rw-r--r--sc/source/ui/inc/namedlg.hxx2
-rw-r--r--sc/source/ui/inc/optsolver.hxx4
-rw-r--r--sc/source/ui/inc/solvrdlg.hxx4
-rw-r--r--sc/source/ui/inc/tabopdlg.hxx4
-rw-r--r--sc/source/ui/inc/tpdefaults.hxx2
-rw-r--r--sc/source/ui/inc/tpformula.hxx2
-rw-r--r--sc/source/ui/inc/validate.hxx4
-rw-r--r--sc/source/ui/inc/xmlsourcedlg.hxx2
18 files changed, 28 insertions, 28 deletions
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx
index a299d3fa0df0..e8aeaecb95d0 100644
--- a/sc/source/ui/inc/PivotLayoutDialog.hxx
+++ b/sc/source/ui/inc/PivotLayoutDialog.hxx
@@ -90,8 +90,8 @@ private:
DECL_LINK_TYPED(CancelClicked, Button*, void);
DECL_LINK_TYPED(OKClicked, Button*, void);
- DECL_LINK(GetFocusHandler, Control*);
- DECL_LINK(LoseFocusHandler, void*);
+ DECL_LINK_TYPED(GetFocusHandler, Control&, void);
+ DECL_LINK_TYPED(LoseFocusHandler, Control&, void);
DECL_LINK_TYPED(ToggleSource, RadioButton&, void);
DECL_LINK_TYPED(ToggleDestination, RadioButton&, void);
DECL_LINK(SourceEditModified, void*);
diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
index a588b503d727..b9d7934bd4f5 100644
--- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
+++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
@@ -73,8 +73,8 @@ private:
DECL_LINK_TYPED( OkClicked, Button*, void );
DECL_LINK_TYPED( CloseClicked, Button*, void );
DECL_LINK_TYPED( ApplyClicked, Button*, void );
- DECL_LINK( GetFocusHandler, Control* );
- DECL_LINK( LoseFocusHandler, void* );
+ DECL_LINK_TYPED( GetFocusHandler, Control&, void );
+ DECL_LINK_TYPED( LoseFocusHandler, Control&, void );
DECL_LINK( InputRangeModified, void* );
DECL_LINK( Parameter1ValueModified, void* );
diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx
index 15b54d78279d..10507378f558 100644
--- a/sc/source/ui/inc/SamplingDialog.hxx
+++ b/sc/source/ui/inc/SamplingDialog.hxx
@@ -73,8 +73,8 @@ private:
ScRange PerformPeriodicSampling(ScDocShell* pDocShell);
DECL_LINK_TYPED( OkClicked, Button*, void );
- DECL_LINK( GetFocusHandler, Control* );
- DECL_LINK( LoseFocusHandler, void* );
+ DECL_LINK_TYPED( GetFocusHandler, Control&, void );
+ DECL_LINK_TYPED( LoseFocusHandler, Control&, void );
DECL_LINK( SamplingSizeValueModified, void* );
DECL_LINK_TYPED( ToggleSamplingMethod, RadioButton&, void );
DECL_LINK( RefInputModifyHandler, void* );
diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
index 340e5fbdd550..21510d6cf884 100644
--- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
+++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
@@ -81,8 +81,8 @@ private:
DECL_LINK_TYPED( GroupByChanged, RadioButton&, void );
DECL_LINK_TYPED( OkClicked, Button*, void );
- DECL_LINK( GetFocusHandler, Control* );
- DECL_LINK( LoseFocusHandler, void* );
+ DECL_LINK_TYPED( GetFocusHandler, Control&, void );
+ DECL_LINK_TYPED( LoseFocusHandler, Control&, void );
DECL_LINK( RefInputModifyHandler, void* );
};
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index 0a18619ab6ea..ebe8de00494d 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -84,8 +84,8 @@ private:
DECL_LINK_TYPED( GroupByChanged, RadioButton&, void );
DECL_LINK_TYPED( OkClicked, Button*, void );
- DECL_LINK( GetFocusHandler, Control* );
- DECL_LINK( LoseFocusHandler, void* );
+ DECL_LINK_TYPED( GetFocusHandler, Control&, void );
+ DECL_LINK_TYPED( LoseFocusHandler, Control&, void );
DECL_LINK( RefInputModifyHandler, void* );
};
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index b48233e4e4c4..7b93cc8f46a8 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -76,7 +76,7 @@ private:
DECL_LINK( Impl_SelectHdl, ListBox* );
DECL_LINK( Impl_ModifyHdl, formula::RefEdit* );
DECL_LINK_TYPED( Impl_BtnHdl, Button*, void );
- DECL_LINK( Impl_GetFocusHdl, Control* );
+ DECL_LINK_TYPED( Impl_GetFocusHdl, Control&, void );
};
#endif
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 62678a1efd89..bac7c365f590 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -148,7 +148,7 @@ public:
void InvalidateRefData();
DECL_LINK_TYPED( BtnPressedHdl, Button*, void );
- DECL_LINK( RangeGetFocusHdl, formula::RefEdit* );
+ DECL_LINK_TYPED( RangeGetFocusHdl, Control&, void );
};
#endif
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 2bdf95278847..e875010bfda9 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -93,7 +93,7 @@ private:
DECL_LINK_TYPED( OkHdl, Button*, void );
DECL_LINK_TYPED( ClickHdl, Button*, void );
- DECL_LINK( GetFocusHdl, Control* );
+ DECL_LINK_TYPED( GetFocusHdl, Control&, void );
DECL_LINK( ModifyHdl, formula::RefEdit* );
DECL_LINK( SelectHdl, ListBox* );
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index a8f4a7174460..8e84a04daaea 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -86,8 +86,8 @@ private:
DECL_LINK_TYPED( ColClickHdl, Button*, void );
DECL_LINK_TYPED( RowClickHdl, Button*, void );
DECL_LINK( Range2DataModifyHdl, void * );
- DECL_LINK( GetFocusHdl, Control* );
- DECL_LINK( LoseFocusHdl, void* );
+ DECL_LINK_TYPED( GetFocusHdl, Control&, void );
+ DECL_LINK_TYPED( LoseFocusHdl, Control&, void );
};
#endif // INCLUDED_SC_SOURCE_UI_INC_CRNRDLG_HXX
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index 94c3bfc55d9a..0cc9c6cd9911 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -67,7 +67,7 @@ private:
DECL_LINK_TYPED( CancelBtnHdl, Button*, void );
DECL_LINK_TYPED( AddBtnHdl, Button*, void );
DECL_LINK( NameModifyHdl, void* );
- DECL_LINK( AssignGetFocusHdl, void * );
+ DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void );
protected:
virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE;
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 9a8329ab00d1..332a0d7b0b0d 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -106,7 +106,7 @@ private:
DECL_LINK_TYPED( RemoveBtnHdl, Button*, void );
DECL_LINK( EdModifyHdl, void * );
DECL_LINK_TYPED( EdModifyCheckBoxHdl, CheckBox&, void );
- DECL_LINK( AssignGetFocusHdl, void * );
+ DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void );
DECL_LINK_TYPED( SelectionChangedHdl_Impl, SvTreeListBox*, void );
DECL_LINK( ScopeChangedHdl, void* );
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index 77062131d0c4..6bdb0dd1b64d 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -191,8 +191,8 @@ private:
DECL_LINK_TYPED( BtnHdl, Button*, void );
DECL_LINK_TYPED( DelBtnHdl, Button*, void );
- DECL_LINK( GetFocusHdl, Control* );
- DECL_LINK( LoseFocusHdl, void* );
+ DECL_LINK_TYPED( GetFocusHdl, Control&, void );
+ DECL_LINK_TYPED( LoseFocusHdl, Control&, void );
DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void);
DECL_LINK_TYPED( CursorUpHdl, ScCursorRefEdit&, void );
DECL_LINK_TYPED( CursorDownHdl, ScCursorRefEdit&, void );
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index f937d8fecaf3..828dbb2f1777 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -81,8 +81,8 @@ private:
void RaiseError( ScSolverErr eError );
DECL_LINK_TYPED( BtnHdl, Button*, void );
- DECL_LINK( GetFocusHdl, Control* );
- DECL_LINK( LoseFocusHdl, void* );
+ DECL_LINK_TYPED( GetFocusHdl, Control&, void );
+ DECL_LINK_TYPED( LoseFocusHdl, Control&, void );
};
#endif // INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX
diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx
index fb1e1d2081a4..e9eac1f2e2a1 100644
--- a/sc/source/ui/inc/tabopdlg.hxx
+++ b/sc/source/ui/inc/tabopdlg.hxx
@@ -88,8 +88,8 @@ private:
void RaiseError( ScTabOpErr eError );
DECL_LINK_TYPED( BtnHdl, Button*, void );
- DECL_LINK( GetFocusHdl, Control* );
- DECL_LINK( LoseFocusHdl, void* );
+ DECL_LINK_TYPED( GetFocusHdl, Control&, void );
+ DECL_LINK_TYPED( LoseFocusHdl, Control&, void );
};
#endif // INCLUDED_SC_SOURCE_UI_INC_TABOPDLG_HXX
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index deb267368baa..0cc0371f8e33 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -37,7 +37,7 @@ private:
DECL_LINK(NumModifiedHdl, void *);
DECL_LINK( PrefixModifiedHdl, Edit* );
- DECL_LINK( PrefixEditOnFocusHdl, Edit* );
+ DECL_LINK_TYPED( PrefixEditOnFocusHdl, Control&, void );
private:
VclPtr<NumericField> m_pEdNSheets;
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 1024c7dcb878..35e5a70b9cf3 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -54,7 +54,7 @@ private:
DECL_LINK_TYPED( ButtonHdl, Button*, void );
DECL_LINK( SepModifyHdl, Edit* );
- DECL_LINK( SepEditOnFocusHdl, Edit* );
+ DECL_LINK_TYPED( SepEditOnFocusHdl, Control&, void );
private:
VclPtr<ListBox> mpLbFormulaSyntax;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 00a66ac50927..9251a899771f 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -124,8 +124,8 @@ private:
OUString maStrList;
sal_Unicode mcFmlaSep; /// List separator in formulas.
- DECL_LINK(EditSetFocusHdl, void *);
- DECL_LINK( KillFocusHdl, vcl::Window *);
+ DECL_LINK_TYPED( EditSetFocusHdl, Control&, void );
+ DECL_LINK_TYPED( KillFocusHdl, Control&, void );
void OnClick( Button *pBtn );
VclPtr<formula::RefEdit> m_pRefEdit;
public:
diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx
index 6c5e4f0aed33..b9e50fc41f46 100644
--- a/sc/source/ui/inc/xmlsourcedlg.hxx
+++ b/sc/source/ui/inc/xmlsourcedlg.hxx
@@ -94,7 +94,7 @@ private:
void CancelPressed();
void RefEditModified();
- DECL_LINK(GetFocusHdl, Control*);
+ DECL_LINK_TYPED(GetFocusHdl, Control&, void);
DECL_LINK_TYPED(BtnPressedHdl, Button*, void);
DECL_LINK_TYPED(TreeItemSelectHdl, SvTreeListBox*, void);
DECL_LINK(RefModifiedHdl, void*);