diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-19 09:11:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-26 11:15:35 +0200 |
| commit | 167bc621ef825ed5b961502fe9324a675ee34e42 (patch) | |
| tree | 523838d8adc14a62f846529ee6eab3343b2fe87b /sc/source/ui/inc | |
| parent | 46a27805fb707544a844a961a3743b8b992282f0 (diff) | |
Convert vcl Button Link<> click handler to typed Link<Button*,void>
Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b
Diffstat (limited to 'sc/source/ui/inc')
63 files changed, 131 insertions, 127 deletions
diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 2449d65b1047..839119f5ad89 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -88,8 +88,8 @@ private: ScAddress::Details maAddressDetails; bool mbDialogLostFocus; - DECL_LINK(CancelClicked, PushButton*); - DECL_LINK(OKClicked, PushButton*); + DECL_LINK_TYPED(CancelClicked, Button*, void); + DECL_LINK_TYPED(OKClicked, Button*, void); DECL_LINK(GetFocusHandler, Control*); DECL_LINK(LoseFocusHandler, void*); DECL_LINK(ToggleSource, void*); diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 045a5726b771..dc751e490431 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -70,9 +70,9 @@ private: void SelectGeneratorAndGenerateNumbers(); - DECL_LINK( OkClicked, PushButton* ); - DECL_LINK( CloseClicked, PushButton* ); - DECL_LINK( ApplyClicked, PushButton* ); + 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* ); diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index c98fd7725e20..544475f25a0a 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -72,7 +72,7 @@ private: ScRange PerformRandomSampling(ScDocShell* pDocShell); ScRange PerformPeriodicSampling(ScDocShell* pDocShell); - DECL_LINK( OkClicked, PushButton* ); + DECL_LINK_TYPED( OkClicked, Button*, void ); DECL_LINK( GetFocusHandler, Control* ); DECL_LINK( LoseFocusHandler, void* ); DECL_LINK( SamplingSizeValueModified, void* ); diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index e41ac800ee80..22a41d751fbb 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -80,7 +80,7 @@ private: void GetRangeFromSelection(); DECL_LINK( GroupByChanged, void* ); - DECL_LINK( OkClicked, PushButton* ); + DECL_LINK_TYPED( OkClicked, Button*, void ); DECL_LINK( GetFocusHandler, Control* ); DECL_LINK( LoseFocusHandler, void* ); DECL_LINK( RefInputModifyHandler, void* ); diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index ebe8b19ac82a..d02a54e9b00f 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -83,7 +83,7 @@ private: void GetRangeFromSelection(); DECL_LINK( GroupByChanged, void* ); - DECL_LINK( OkClicked, PushButton* ); + DECL_LINK_TYPED( OkClicked, Button*, void ); DECL_LINK( GetFocusHandler, Control* ); DECL_LINK( LoseFocusHandler, void* ); DECL_LINK( RefInputModifyHandler, void* ); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index dbc09faa4467..b48233e4e4c4 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -75,7 +75,7 @@ private: // Handler: DECL_LINK( Impl_SelectHdl, ListBox* ); DECL_LINK( Impl_ModifyHdl, formula::RefEdit* ); - DECL_LINK( Impl_BtnHdl, PushButton* ); + DECL_LINK_TYPED( Impl_BtnHdl, Button*, void ); DECL_LINK( Impl_GetFocusHdl, Control* ); }; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 123ca41c9485..ceffe378bc69 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -328,8 +328,8 @@ private: void selectCurrentMemberOnly(bool bSet); void cycleFocus(bool bReverse = false); - DECL_LINK( ButtonHdl, Button* ); - DECL_LINK( TriStateHdl, void* ); + DECL_LINK_TYPED( ButtonHdl, Button*, void ); + DECL_LINK_TYPED( TriStateHdl, Button*, void ); DECL_LINK( CheckHdl, SvTreeListBox* ); DECL_LINK( EdModifyHdl, void* ); diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index dd65562828b2..4c125f9689f2 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -48,7 +48,7 @@ private: ScDocument* mpDoc; ScAddress maPos; - DECL_LINK(OkBtnHdl, void*); + DECL_LINK_TYPED(OkBtnHdl, Button*, void); DECL_LINK(TypeSelectHdl, void*); DECL_LINK(PosSelectHdl, void*); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 531b8c19a3ba..5a6faed4f9da 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -86,8 +86,8 @@ public: ScConditionalFormat* GetConditionalFormat() const; void RecalcAll(); - DECL_LINK( AddBtnHdl, void* ); - DECL_LINK( RemoveBtnHdl, void* ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); + DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK( ScrollHdl, void* ); DECL_LINK( EntrySelectHdl, ScCondFrmtEntry* ); @@ -147,7 +147,7 @@ public: void InvalidateRefData(); - DECL_LINK( BtnPressedHdl, Button* ); + DECL_LINK_TYPED( BtnPressedHdl, Button*, void ); DECL_LINK( RangeGetFocusHdl, formula::RefEdit* ); }; diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 5bb04e32721c..814e366f9598 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -242,7 +242,7 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() SAL_OVERRIDE; void Init(); - DECL_LINK( OptionBtnHdl, void* ); + DECL_LINK_TYPED( OptionBtnHdl, Button*, void ); DECL_LINK( DataBarTypeSelectHdl, void* ); public: ScDataBarFrmtEntry( vcl::Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = NULL ); diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index d713383a6ece..a72e6a20c852 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -67,9 +67,10 @@ private: ScDocument* mpDoc; ScAddress maPos; - DECL_LINK(RemoveBtnHdl, void*); + DECL_LINK_TYPED(RemoveBtnHdl, Button*, void); + DECL_LINK_TYPED(EditBtnClickHdl, Button*, void); + DECL_LINK_TYPED(AddBtnHdl, Button*, void); DECL_LINK(EditBtnHdl, void*); - DECL_LINK(AddBtnHdl, void*); bool mbModified; }; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 03e6e831b271..0ccea7822fa7 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -152,10 +152,10 @@ private: DECL_LINK( SelectHandle, void* ); DECL_LINK( DeselectHandle, void* ); DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); - DECL_LINK( KeepMineHandle, void* ); - DECL_LINK( KeepOtherHandle, void* ); - DECL_LINK( KeepAllMineHandle, void* ); - DECL_LINK( KeepAllOthersHandle, void* ); + DECL_LINK_TYPED( KeepMineHandle, Button*, void ); + DECL_LINK_TYPED( KeepOtherHandle, Button*, void ); + DECL_LINK_TYPED( KeepAllMineHandle, Button*, void ); + DECL_LINK_TYPED( KeepAllOthersHandle, Button*, void ); public: ScConflictsDlg( vcl::Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ); diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 0c09811eb3dd..ec532f370422 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -91,8 +91,8 @@ private: void FillAreaLists (); bool VerifyEdit ( formula::RefEdit* pEd ); - DECL_LINK( OkHdl, void* ); - DECL_LINK( ClickHdl, PushButton* ); + DECL_LINK_TYPED( OkHdl, Button*, void ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( ModifyHdl, formula::RefEdit* ); DECL_LINK( SelectHdl, ListBox* ); diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index cc0b941e7da2..a3969d775612 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -38,7 +38,7 @@ private: VclPtr<RadioButton> m_pBtnCols; VclPtr<OKButton> m_pBtnOk; - DECL_LINK(OkHdl, void *); + DECL_LINK_TYPED(OkHdl, Button*, void); }; #endif diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index f23f5dd51d7e..a8f4a7174460 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -77,14 +77,14 @@ private: void UpdateRangeData ( const ScRange& rRange, bool bColName ); void SetColRowData( const ScRange& rLabelRange, bool bRef=false); void AdjustColRowData( const ScRange& rDataRange, bool bRef=false); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( OkBtnHdl, void * ); - DECL_LINK( AddBtnHdl, void * ); - DECL_LINK( RemoveBtnHdl, void * ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); + DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK( Range1SelectHdl, void * ); DECL_LINK( Range1DataModifyHdl, void * ); - DECL_LINK( ColClickHdl, void * ); - DECL_LINK( RowClickHdl, void * ); + DECL_LINK_TYPED( ColClickHdl, Button*, void ); + DECL_LINK_TYPED( RowClickHdl, Button*, void ); DECL_LINK( Range2DataModifyHdl, void * ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, void* ); diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index fb85f0e47687..2d5047c75bc4 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -47,7 +47,7 @@ public: void AppendNamedRange(const OUString& rNames); private: - DECL_LINK( RadioClickHdl, RadioButton * ); + DECL_LINK_TYPED( RadioClickHdl, Button *, void ); }; class ScDataPilotServiceDlg : public ModalDialog diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 762b0cd5d761..7bd344a63334 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -63,13 +63,13 @@ private: void SetButtonState(); // Handler: - DECL_LINK(Impl_NewHdl, void *); - DECL_LINK(Impl_PrevHdl, void *); - DECL_LINK(Impl_NextHdl, void *); + DECL_LINK_TYPED(Impl_NewHdl, Button*, void); + DECL_LINK_TYPED(Impl_PrevHdl, Button*, void); + DECL_LINK_TYPED(Impl_NextHdl, Button*, void); - DECL_LINK(Impl_RestoreHdl, void *); - DECL_LINK(Impl_DeleteHdl, void *); - DECL_LINK(Impl_CloseHdl, void *); + DECL_LINK_TYPED(Impl_RestoreHdl, Button*, void); + DECL_LINK_TYPED(Impl_DeleteHdl, Button*, void); + DECL_LINK_TYPED(Impl_CloseHdl, Button*, void); DECL_LINK(Impl_ScrollHdl, void *); DECL_LINK( Impl_DataModifyHdl, Edit* ); diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index 0b8bf8c38966..a81dbd18ed5b 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -46,8 +46,9 @@ class DataStreamDlg : public ModalDialog VclPtr<VclFrame> m_pVclFrameLimit; VclPtr<VclFrame> m_pVclFrameMove; + DECL_LINK_TYPED(UpdateClickHdl, Button*, void); DECL_LINK(UpdateHdl, void *); - DECL_LINK(BrowseHdl, void *); + DECL_LINK_TYPED(BrowseHdl, Button*, void); void UpdateEnable(); ScRange GetStartRange(); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 68154228fb02..3476cd18caf4 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -91,10 +91,10 @@ private: void UpdateDBData( const OUString& rStrName ); void SetInfoStrings( const ScDBData* pDBData ); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( OkBtnHdl, void * ); - DECL_LINK( AddBtnHdl, void * ); - DECL_LINK( RemoveBtnHdl, void * ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); + DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK( NameModifyHdl, void * ); DECL_LINK( AssModifyHdl, void * ); }; diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index a2741a6448a5..ea1bf0cbd2ab 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -43,7 +43,7 @@ private: static InsertDeleteFlags nPreviousChecks; void DisableChecks( bool bDelAllChecked = true ); - DECL_LINK( DelAllHdl, void * ); + DECL_LINK_TYPED( DelAllHdl, Button*, void ); public: ScDeleteContentsDlg( vcl::Window* pParent, diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 3ba0db194083..21d48bb6aebe 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -46,7 +46,7 @@ private: virtual bool ImplGetValue( double& rfValue ) const = 0; virtual void ImplSetValue( double fValue ) = 0; - DECL_LINK( ClickHdl, RadioButton* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbAuto; @@ -119,7 +119,7 @@ public: sal_Int32 GetDatePart() const; private: - DECL_LINK( ClickHdl, RadioButton* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK( CheckHdl, SvxCheckListBox* ); private: diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index a3450cfc4133..f2ca572b2888 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -82,6 +82,7 @@ private: void UseSplitterInitPos(); DECL_LINK( SetSelectionHdl, void* ); + DECL_LINK_TYPED( SetSelectionClickHdl, Button*, void ); DECL_LINK( SelHdl, ListBox* ); DECL_LINK(SetSplitHdl,ScPrivatSplit*); DECL_LINK_TYPED( TimerHdl, Idle*, void ); diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 70a2d086bb45..96d3b5961631 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -101,8 +101,8 @@ private: bool CheckIncrementVal(); bool CheckEndVal(); - DECL_LINK( OKHdl, void * ); - DECL_LINK( DisableHdl, Button * ); + DECL_LINK_TYPED( OKHdl, Button*, void ); + DECL_LINK_TYPED( DisableHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FILLDLG_HXX diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index ceb6b0a60b49..af30de6f8803 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -148,8 +148,8 @@ private: // Handler: DECL_LINK( LbSelectHdl, ListBox* ); DECL_LINK( ValModifyHdl, ComboBox* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); + DECL_LINK_TYPED( EndDlgHdl, Button*, void ); DECL_LINK( ScrollHdl, void* ); DECL_LINK( MoreExpandedHdl, void* ); @@ -216,7 +216,7 @@ private: // Handler DECL_LINK( FilterAreaSelHdl, ListBox* ); DECL_LINK( FilterAreaModHdl, formula::RefEdit* ); - DECL_LINK( EndDlgHdl, Button* ); + DECL_LINK_TYPED( EndDlgHdl, Button*, void ); // Hack: RefInput control DECL_LINK_TYPED( TimeOutHdl, Idle*, void ); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index b867d251f96e..2192e60f7717 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -61,8 +61,8 @@ private: void Init(); DECL_LINK( RefHandle, SvxTPFilter* ); - DECL_LINK(HighlightHandle, CheckBox*); - DECL_LINK(OKBtnHdl, PushButton*); + DECL_LINK_TYPED(HighlightHandle, Button*, void); + DECL_LINK_TYPED(OKBtnHdl, Button*, void); protected: diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index a09ddba9aaad..05ce58b5794e 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -226,7 +226,7 @@ private: VclPtr<ImageButton> aButton; VclPtr<ScrollBar> aScrollBar; long nVertOffset; - DECL_LINK( ClickHdl, void* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK( Impl_ScrollHdl, void* ); }; diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 65ea1d9d5f6f..4c68cb053243 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -100,9 +100,9 @@ private: void TestModes(); // Handler - DECL_LINK( InsAllHdl, void* ); - DECL_LINK( LinkBtnHdl, void* ); - DECL_LINK( ShortCutHdl, PushButton* ); + DECL_LINK_TYPED( InsAllHdl, Button*, void ); + DECL_LINK_TYPED( LinkBtnHdl, Button*, void ); + DECL_LINK_TYPED( ShortCutHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_INSCODLG_HXX diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index f80a634d2c21..647512aa07d7 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -91,11 +91,11 @@ private: void FillTables_Impl( ScDocument* pSrcDoc ); void DoEnable_Impl(); - DECL_LINK(BrowseHdl_Impl, void *); - DECL_LINK(ChoiceHdl_Impl, void *); + DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void); + DECL_LINK_TYPED(ChoiceHdl_Impl, Button*, void); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(CountHdl_Impl, void *); - DECL_LINK(DoEnterHdl, void *); + DECL_LINK_TYPED(DoEnterHdl, Button*, void); DECL_LINK_TYPED(BrowseTimeoutHdl, Timer *, void); DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); }; diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index c985d4ddce8c..610ea8c3d8d7 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -51,9 +51,9 @@ private: SfxObjectShellRef aSourceRef; DECL_LINK(FileHdl, void *); - DECL_LINK(BrowseHdl, void *); + DECL_LINK_TYPED(BrowseHdl, Button*, void); DECL_LINK(RangeHdl, void *); - DECL_LINK(ReloadHdl, void *); + DECL_LINK_TYPED(ReloadHdl, Button*, void); DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); void UpdateSourceRanges(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 72b106fd3504..bb15971e2282 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -49,7 +49,7 @@ private: long nDefaultValue; long nCurrentValue; - DECL_LINK(SetDefValHdl, void *); + DECL_LINK_TYPED(SetDefValHdl, Button*, void); DECL_LINK(ModifyHdl, void *); }; diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index fa3e5ed2a051..1512f9db2778 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -75,7 +75,7 @@ private: void Init (); void InitDocListBox (); - DECL_LINK( OkHdl, void * ); + DECL_LINK_TYPED( OkHdl, Button*, void ); DECL_LINK( SelHdl, ListBox * ); DECL_LINK( CheckBtnHdl, void * ); DECL_LINK( CheckNameHdl, Edit * ); diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index acdb9ed31e52..94c3bfc55d9a 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -64,8 +64,8 @@ private: bool IsNameValid(); bool IsFormulaValid(); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( AddBtnHdl, void* ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); DECL_LINK( NameModifyHdl, void* ); DECL_LINK( AssignGetFocusHdl, void * ); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 5b6edb18fec1..dd125914360b 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -100,10 +100,10 @@ private: void SelectionChanged(); // Handler: - DECL_LINK( OkBtnHdl, void * ); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( AddBtnHdl, void * ); - DECL_LINK( RemoveBtnHdl, void * ); + DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( AddBtnHdl, Button*, void ); + DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); DECL_LINK( EdModifyHdl, void * ); DECL_LINK( AssignGetFocusHdl, void * ); DECL_LINK( SelectionChangedHdl_Impl, void* ); diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index a71a95b23e9c..3e22bcb9add9 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -34,7 +34,7 @@ class ScDocShell; class ScNamePasteDlg : public ModalDialog { - DECL_LINK( ButtonHdl, Button * ); + DECL_LINK_TYPED( ButtonHdl, Button *, void ); private: VclPtr<PushButton> m_pBtnPasteAll; diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index d48d78da49a2..8f452cd650b7 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -189,11 +189,11 @@ private: bool FindTimeout( sal_Int32& rTimeout ); void ShowError( bool bCondition, formula::RefEdit* pFocus ); - DECL_LINK( BtnHdl, PushButton* ); - DECL_LINK( DelBtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); + DECL_LINK_TYPED( DelBtnHdl, Button*, void ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, void* ); - DECL_LINK(ScrollHdl, void *); + DECL_LINK( ScrollHdl, void *); DECL_LINK( CursorUpHdl, ScCursorRefEdit* ); DECL_LINK( CursorDownHdl, ScCursorRefEdit* ); DECL_LINK( CondModifyHdl, void* ); @@ -230,7 +230,7 @@ class ScSolverSuccessDialog : public ModalDialog VclPtr<PushButton> m_pBtnOk; VclPtr<PushButton> m_pBtnCancel; - DECL_LINK(ClickHdl, PushButton*); + DECL_LINK_TYPED(ClickHdl, Button*, void); public: ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution ); diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index c2272b311c76..07480b3d3187 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -92,7 +92,7 @@ private: // Handler: DECL_LINK( LbSelectHdl, ListBox* ); DECL_LINK( ValModifyHdl, ComboBox* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 32a0b724c466..145704a3c974 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -64,8 +64,8 @@ private: OUString m_aSelectLockedCells; OUString m_aSelectUnlockedCells; - DECL_LINK( OKHdl, void* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); + DECL_LINK_TYPED( OKHdl, Button*, void ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK( PasswordModifyHdl, void* ); }; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index bfebea6b8439..06710d492bdd 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -112,8 +112,8 @@ private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); DECL_LINK(DblClickHdl, void *); - DECL_LINK( RadioClickHdl, RadioButton* ); - DECL_LINK( ClickHdl, PushButton* ); + DECL_LINK_TYPED( RadioClickHdl, Button* , void); + DECL_LINK_TYPED( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbNone; @@ -151,8 +151,8 @@ private: /** Searches for a listbox entry, starts search at specified position. */ sal_Int32 FindListBoxEntry( const ListBox& rLBox, const OUString& rEntry, sal_Int32 nStartPos ) const; - DECL_LINK( RadioClickHdl, RadioButton* ); - DECL_LINK( CheckHdl, CheckBox* ); + DECL_LINK_TYPED( RadioClickHdl, Button*, void ); + DECL_LINK_TYPED( CheckHdl, Button*, void ); DECL_LINK( SelectHdl, ListBox* ); private: diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 8c746c1438f0..19cc33ebec57 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -85,8 +85,8 @@ private: OUString maTextHashGood; OUString maTextHashRegen; - DECL_LINK( OKHdl, void* ); - DECL_LINK( RetypeBtnHdl, PushButton* ); + DECL_LINK_TYPED( OKHdl, Button*, void ); + DECL_LINK_TYPED( RetypeBtnHdl, Button*, void ); struct TableItem { @@ -131,9 +131,9 @@ private: VclPtr<RadioButton> m_pBtnRemovePassword; - DECL_LINK( OKHdl, void* ); - DECL_LINK( RadioBtnHdl, RadioButton* ); - DECL_LINK( CheckBoxHdl, void* ); + DECL_LINK_TYPED( OKHdl, Button*, void ); + DECL_LINK_TYPED( RadioBtnHdl, Button*, void ); + DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); DECL_LINK( PasswordModifyHdl, void* ); ScPassHashProtectable* mpProtected; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 96bc48d9add2..ce5779f4b8e1 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -51,8 +51,8 @@ private: const OUString aDefScenarioName; bool bIsEdit; - DECL_LINK(OkHdl, void *); - DECL_LINK( EnableHdl, CheckBox * ); + DECL_LINK_TYPED( OkHdl, Button*, void); + DECL_LINK_TYPED( EnableHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index c05237a49984..e86785f782aa 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -102,8 +102,9 @@ private: DECL_LINK( CharSetHdl, SvxTextEncodingBox* ); DECL_LINK( FirstRowHdl, NumericField* ); - DECL_LINK( RbSepFixHdl, RadioButton* ); + DECL_LINK_TYPED( RbSepFixHdl, Button*, void ); DECL_LINK( SeparatorHdl, Control* ); + DECL_LINK_TYPED( SeparatorClickHdl, Button*, void ); DECL_LINK( LbColTypeHdl, ListBox* ); DECL_LINK(UpdateTextHdl, void *); DECL_LINK( ColTypeHdl, ScCsvTableBox* ); diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 10bfe1f98752..ac0c8ca0dbc4 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -62,13 +62,13 @@ private: void Init (); void UpdateChecks (); - DECL_LINK( CheckHdl, Button * ); - DECL_LINK( AddHdl, void * ); - DECL_LINK( RemoveHdl, void * ); + DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK_TYPED( AddHdl, Button*, void ); + DECL_LINK_TYPED( RemoveHdl, Button*, void ); DECL_LINK( SelFmtHdl, void * ); - DECL_LINK( CloseHdl, PushButton * ); + DECL_LINK_TYPED( CloseHdl, Button *, void ); DECL_LINK( DblClkHdl, void * ); - DECL_LINK( RenameHdl, void *); + DECL_LINK_TYPED( RenameHdl, Button*, void); }; #endif diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 348d27878dae..890d84da0e2c 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -61,7 +61,7 @@ private: private: sal_uInt16 GetCodeFromCombo( const ComboBox& rEd ) const; - DECL_LINK( FixedWidthHdl, CheckBox* ); + DECL_LINK_TYPED( FixedWidthHdl, Button*, void ); DECL_LINK( DoubleClickHdl, ListBox* ); }; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 3fddc293ddad..127767f531f3 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -98,7 +98,7 @@ private: static bool IsDateEntry(EditTextObject* pTextObj); static bool IsExtFileNameEntry(EditTextObject* pTextObj); DECL_LINK( ListHdl_Impl, ListBox* ); - DECL_LINK( ClickHdl, PushButton* ); + DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_STATIC_LINK( ScHFEditPage, MenuHdl, ScExtIButton* ); }; diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index ca290c49de56..47c320217c35 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -56,8 +56,8 @@ private: void Init(); - DECL_LINK( CancelBtnHdl, void * ); - DECL_LINK( OkBtnHdl, void * ); + DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); + DECL_LINK_TYPED( OkBtnHdl, Button*, void ); protected: diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 28e557e08b3f..db7926f9afab 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -48,7 +48,7 @@ class ScSolverOptionsDialog : public ModalDialog DECL_LINK( EngineSelectHdl, void* ); DECL_LINK( SettingsSelHdl, void* ); DECL_LINK( SettingsDoubleClickHdl, void* ); - DECL_LINK( ButtonHdl, PushButton* ); + DECL_LINK_TYPED( ButtonHdl, Button*, void ); void ReadFromComponent(); void FillListBox(); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 253067a20d95..f937d8fecaf3 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -80,7 +80,7 @@ private: bool CheckTargetValue( const OUString& rStrVal ); void RaiseError( ScSolverErr eError ); - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, void* ); }; diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index c514aaffd8e9..65492a0b0e84 100644 --- a/sc/source/ui/inc/sortdlg.hxx +++ b/sc/source/ui/inc/sortdlg.hxx @@ -47,7 +47,7 @@ public: ScSortWarningDlg( vcl::Window* pParent, const OUString& rExtendText,const OUString& rCurrentText ); virtual ~ScSortWarningDlg(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); private: VclPtr<FixedText> aFtText; VclPtr<PushButton> aBtnExtSort; diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 749e9d94dfcb..2dd41dcb4291 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -32,7 +32,7 @@ public: virtual void dispose() SAL_OVERRIDE; private: VclPtr<PushButton> m_pBtnRemove; - DECL_LINK( RemoveHdl, PushButton * ); + DECL_LINK_TYPED( RemoveHdl, Button *, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SUBTDLG_HXX diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 122f112c068b..b0576cac3332 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -64,7 +64,7 @@ private: void FillColorValueSets_Impl(); DECL_LINK(TabBgColorDblClickHdl_Impl, void *); - DECL_LINK(TabBgColorOKHdl_Impl, void *); + DECL_LINK_TYPED(TabBgColorOKHdl_Impl, Button*, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TABBGCOLORDLG_HXX diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 33c247f7cfcd..fb1e1d2081a4 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -87,7 +87,7 @@ private: void Init(); void RaiseError( ScTabOpErr eError ); - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK_TYPED( BtnHdl, Button*, void ); DECL_LINK( GetFocusHdl, Control* ); DECL_LINK( LoseFocusHdl, void* ); }; diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 999c52a0b0bf..7ab302b7abac 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -59,7 +59,7 @@ private: bool bHidePrint; // Handler: - DECL_LINK( ButtonClickHdl, TriStateBox* ); + DECL_LINK_TYPED( ButtonClickHdl, Button*, void ); void UpdateButtons(); }; diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index d7c8a5dec970..4eda9235c23f 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -50,9 +50,9 @@ private: VclPtr<CheckBox> m_pBtnConvertDate; - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK( RadioHdl, RadioButton* ); + DECL_LINK_TYPED( RadioHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 0b27e75b27b6..9a51172ec4f1 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -67,16 +67,16 @@ private: VclPtr<FixedText> m_pFtPrec; VclPtr<NumericField> m_pEdPrec; - ScDocOptions* pOldOptions; - ScDocOptions* pLocalOptions; - sal_uInt16 nWhichCalc; + ScDocOptions* pOldOptions; + ScDocOptions* pLocalOptions; + sal_uInt16 nWhichCalc; private: void Init(); // Handler: - DECL_LINK( RadioClickHdl, RadioButton* ); - DECL_LINK( CheckClickHdl, CheckBox* ); + DECL_LINK_TYPED( RadioClickHdl, Button*, void ); + DECL_LINK_TYPED( CheckClickHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index a3175b8ee1fd..1024c7dcb878 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -52,7 +52,7 @@ private: bool IsValidSeparator(const OUString& rSep) const; bool IsValidSeparatorSet() const; - DECL_LINK( ButtonHdl, Button* ); + DECL_LINK_TYPED( ButtonHdl, Button*, void ); DECL_LINK( SepModifyHdl, Edit* ); DECL_LINK( SepEditOnFocusHdl, Edit* ); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 9f5c8a599a23..9933947fb837 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -53,9 +53,9 @@ private: sal_uInt16 nPageUsage; VclPtr<ScStyleDlg> pStyleDlg; - DECL_LINK(BtnHdl, void *); + DECL_LINK_TYPED(BtnHdl, Button*, void); DECL_LINK( HFEditHdl, void* ); - DECL_LINK(TurnOnHdl, void *); + DECL_LINK_TYPED(TurnOnHdl, Button*, void); }; class ScHeaderPage : public ScHFPage diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 0aa944192ba9..d642b2bea328 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -164,10 +164,10 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK( EnableHdl, CheckBox * ); + DECL_LINK_TYPED( EnableHdl, Button*, void ); DECL_LINK( SelOutPosHdl, ListBox * ); void EdOutPosModHdl ( Edit* pEd ); - DECL_LINK( SortDirHdl, RadioButton * ); + DECL_LINK_TYPED( SortDirHdl, Button *, void ); DECL_LINK( FillAlgorHdl, void * ); }; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 3295262e33b2..f31b635b51e5 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -158,7 +158,7 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK( CheckHdl, CheckBox * ); + DECL_LINK_TYPED( CheckHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPSUBT_HXX diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 46042b854896..a7babb368e2a 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -73,8 +73,8 @@ private: private: // Handler: - DECL_LINK(PageDirHdl, void *); - DECL_LINK( PageNoHdl, CheckBox* ); + DECL_LINK_TYPED(PageDirHdl, Button*, void); + DECL_LINK_TYPED( PageNoHdl, Button*, void ); DECL_LINK(ScaleHdl, void *); }; diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 2a4c28ffc77f..8195c7d45c23 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -96,7 +96,7 @@ private: // Handler: DECL_LINK( LbSelectHdl, ListBox* ); - DECL_LINK( BtnClickHdl, PushButton* ); + DECL_LINK_TYPED( BtnClickHdl, Button*, void ); DECL_LINK( EdEntriesModHdl, VclMultiLineEdit* ); }; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 2dc3667ae9ab..96d1e1b7acbe 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -63,7 +63,7 @@ class ScTpContentOptions : public SfxTabPage void InitGridOpt(); DECL_LINK( GridHdl, ListBox* ); DECL_LINK( SelLbObjHdl, ListBox* ); - DECL_LINK( CBHdl, CheckBox* ); + DECL_LINK_TYPED( CBHdl, Button*, void ); ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); @@ -107,7 +107,7 @@ class ScTpLayoutOptions : public SfxTabPage SvxStringArray aUnitArr; DECL_LINK(MetricHdl, void *); - DECL_LINK( AlignHdl, CheckBox* ); + DECL_LINK_TYPED( AlignHdl, Button*, void ); ScDocument *pDoc; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index d050942fb8bb..00a66ac50927 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -101,7 +101,7 @@ private: void SetSecondFormula( const OUString& rFmlaStr ); DECL_LINK(SelectHdl, void *); - DECL_LINK(CheckHdl, void *); + DECL_LINK_TYPED(CheckHdl, Button*, void); VclPtr<ListBox> m_pLbAllow; VclPtr<CheckBox> m_pCbAllow; /// Allow blank cells. @@ -299,7 +299,7 @@ private: // Handler ------------------------ DECL_LINK(SelectActionHdl, void *); - DECL_LINK(ClickSearchHdl, void *); + DECL_LINK_TYPED(ClickSearchHdl, Button*, void); public: ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ); diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 1bc0c375c936..44c6d7ebc3c1 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -95,7 +95,7 @@ private: void RefEditModified(); DECL_LINK(GetFocusHdl, Control*); - DECL_LINK(BtnPressedHdl, Button*); + DECL_LINK_TYPED(BtnPressedHdl, Button*, void); DECL_LINK(TreeItemSelectHdl, void*); DECL_LINK(RefModifiedHdl, void*); }; |