diff options
Diffstat (limited to 'sc/source/ui/inc')
102 files changed, 375 insertions, 375 deletions
diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index e7e1897c21ec..9a2807d54336 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -66,7 +66,7 @@ public: virtual void Init() override; - DECL_LINK_TYPED( WindowChildEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowChildEventListener, VclWindowEvent&, void ); protected: virtual ~ScAccessibleDocument() override; diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index b31a4da2e31e..6390df7fbedf 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -54,7 +54,7 @@ public: SfxBroadcaster& GetBroadcaster() const { return maBroadcaster; } virtual void UpdateData() = 0; - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); private: mutable SfxBroadcaster maBroadcaster; @@ -119,7 +119,7 @@ public: virtual void UpdateData() override { } - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); protected: ScEditObjectViewForwarder* mpViewForwarder; ScEditViewForwarder* mpEditViewForwarder; diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index f9a139422285..49b1efab696c 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -38,7 +38,7 @@ private: VclPtr<RadioButton> mpTwoFactorRadio; VclPtr<NumericField> mpRowsPerSampleField; - DECL_LINK_TYPED(FactorChanged, RadioButton&, void); + DECL_LINK(FactorChanged, RadioButton&, void); void FactorChanged(); AnovaFactor meFactor; diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 9a417edf1d25..e746df2d23b2 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -86,14 +86,14 @@ private: ScAddress::Details maAddressDetails; bool mbDialogLostFocus; - DECL_LINK_TYPED(CancelClicked, Button*, void); - DECL_LINK_TYPED(OKClicked, Button*, 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_TYPED(SourceListSelected, ListBox&, void); - DECL_LINK_TYPED(SourceEditModified, Edit&, void); + DECL_LINK(CancelClicked, Button*, void); + DECL_LINK(OKClicked, Button*, void); + DECL_LINK(GetFocusHandler, Control&, void); + DECL_LINK(LoseFocusHandler, Control&, void); + DECL_LINK(ToggleSource, RadioButton&, void); + DECL_LINK(ToggleDestination, RadioButton&, void); + DECL_LINK(SourceListSelected, ListBox&, void); + DECL_LINK(SourceEditModified, Edit&, void); void ToggleSource(); void ToggleDestination(); virtual bool Close() override; diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 1b7db2f3fa76..87821f4e6341 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -70,17 +70,17 @@ private: void SelectGeneratorAndGenerateNumbers(); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( CloseClicked, Button*, void ); - DECL_LINK_TYPED( ApplyClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - - DECL_LINK_TYPED( InputRangeModified, Edit&, void ); - DECL_LINK_TYPED( Parameter1ValueModified, Edit&, void ); - DECL_LINK_TYPED( Parameter2ValueModified, Edit&, void ); - DECL_LINK_TYPED( DistributionChanged, ListBox&, void ); - DECL_LINK_TYPED( CheckChanged, CheckBox&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( CloseClicked, Button*, void ); + DECL_LINK( ApplyClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + + DECL_LINK( InputRangeModified, Edit&, void ); + DECL_LINK( Parameter1ValueModified, Edit&, void ); + DECL_LINK( Parameter2ValueModified, Edit&, void ); + DECL_LINK( DistributionChanged, ListBox&, void ); + DECL_LINK( CheckChanged, CheckBox&, void ); }; diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 356477484c2d..e3f267fe62a5 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -72,12 +72,12 @@ private: ScRange PerformRandomSampling(ScDocShell* pDocShell); ScRange PerformPeriodicSampling(ScDocShell* pDocShell); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK_TYPED( SamplingSizeValueModified, Edit&, void ); - DECL_LINK_TYPED( ToggleSamplingMethod, RadioButton&, void ); - DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + DECL_LINK( SamplingSizeValueModified, Edit&, void ); + DECL_LINK( ToggleSamplingMethod, RadioButton&, void ); + DECL_LINK( RefInputModifyHandler, Edit&, void ); void ToggleSamplingMethod(); }; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 2f6a42710613..8a55f5dd9857 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -79,11 +79,11 @@ private: void Init(); void GetRangeFromSelection(); - DECL_LINK_TYPED( GroupByChanged, RadioButton&, void ); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); + DECL_LINK( GroupByChanged, RadioButton&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + DECL_LINK( RefInputModifyHandler, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 30ffdc183c51..ac15249d25c5 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -82,11 +82,11 @@ private: void Init(); void GetRangeFromSelection(); - DECL_LINK_TYPED( GroupByChanged, RadioButton&, void ); - DECL_LINK_TYPED( OkClicked, Button*, void ); - DECL_LINK_TYPED( GetFocusHandler, Control&, void ); - DECL_LINK_TYPED( LoseFocusHandler, Control&, void ); - DECL_LINK_TYPED( RefInputModifyHandler, Edit&, void ); + DECL_LINK( GroupByChanged, RadioButton&, void ); + DECL_LINK( OkClicked, Button*, void ); + DECL_LINK( GetFocusHandler, Control&, void ); + DECL_LINK( LoseFocusHandler, Control&, void ); + DECL_LINK( RefInputModifyHandler, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 66a6e33bd4eb..8d036f7adf85 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -95,21 +95,21 @@ private: void Init(); void InitFilter(); - DECL_LINK_TYPED( FilterHandle, SvxTPFilter*, void ); - DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void ); - DECL_LINK_TYPED( RejectHandle, SvxTPView*, void ); - DECL_LINK_TYPED( AcceptHandle, SvxTPView*, void ); - DECL_LINK_TYPED( RejectAllHandle, SvxTPView*, void ); - DECL_LINK_TYPED( AcceptAllHandle, SvxTPView*, void ); - DECL_LINK_TYPED( ExpandingHandle, SvTreeListBox*, bool ); - DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void ); - DECL_LINK_TYPED( RefInfoHandle, const OUString*, void ); - - DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, void ); - DECL_LINK_TYPED( ChgTrackModHdl, ScChangeTrack&, void ); - DECL_LINK_TYPED( CommandHdl, SvSimpleTable*, void ); - DECL_LINK_TYPED( ReOpenTimerHdl, Idle*, void ); - DECL_LINK_TYPED( ColCompareHdl, const SvSortData*, sal_Int32 ); + DECL_LINK( FilterHandle, SvxTPFilter*, void ); + DECL_LINK( RefHandle, SvxTPFilter*, void ); + DECL_LINK( RejectHandle, SvxTPView*, void ); + DECL_LINK( AcceptHandle, SvxTPView*, void ); + DECL_LINK( RejectAllHandle, SvxTPView*, void ); + DECL_LINK( AcceptAllHandle, SvxTPView*, void ); + DECL_LINK( ExpandingHandle, SvTreeListBox*, bool ); + DECL_LINK( SelectHandle, SvTreeListBox*, void ); + DECL_LINK( RefInfoHandle, const OUString*, void ); + + DECL_LINK( UpdateSelectionHdl, Idle*, void ); + DECL_LINK( ChgTrackModHdl, ScChangeTrack&, void ); + DECL_LINK( CommandHdl, SvSimpleTable*, void ); + DECL_LINK( ReOpenTimerHdl, Idle*, void ); + DECL_LINK( ColCompareHdl, const SvSortData*, sal_Int32 ); protected: diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index cbad65a67d84..1d53ce0dfddb 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -69,7 +69,7 @@ class ScFormulaReferenceHelper bool bHighlightRef; bool bAccInserted; - DECL_LINK_TYPED( AccelSelectHdl, Accelerator&, void ); + DECL_LINK( AccelSelectHdl, Accelerator&, void ); public: ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings); @@ -121,7 +121,7 @@ private: Idle aIdle; OUString aDocName; // document on which the dialog was opened - DECL_LINK_TYPED( UpdateFocusHdl, Idle*, void ); + DECL_LINK( UpdateFocusHdl, Idle*, void ); protected: void disposeRefHandler(); diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 2691571bc29b..6ad979c6243e 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -73,10 +73,10 @@ private: bool Impl_GetItem( Edit* pEd, SfxStringItem& rItem ); // Handler: - DECL_LINK_TYPED( Impl_SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( Impl_ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( Impl_BtnHdl, Button*, void ); - DECL_LINK_TYPED( Impl_GetFocusHdl, Control&, void ); + DECL_LINK( Impl_SelectHdl, ListBox&, void ); + DECL_LINK( Impl_ModifyHdl, Edit&, void ); + DECL_LINK( Impl_BtnHdl, Button*, void ); + DECL_LINK( Impl_GetFocusHdl, Control&, void ); }; #endif diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 7e60e75946be..d32ff75ddeff 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -37,7 +37,7 @@ protected: virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) override; private: - DECL_LINK_TYPED( OkHandler, SfxPoolItem*, void ); // for closing by double clicking in TabPages + DECL_LINK( OkHandler, SfxPoolItem*, void ); // for closing by double clicking in TabPages sal_uInt16 m_nNumberPageId; sal_uInt16 m_nFontPageId; }; diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index caf2d45dbea0..ff078209911b 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -63,8 +63,8 @@ private: void ExecuteEntries(); void AdjustEntries(sal_uLong nDiff); void StartTimer(sal_uLong nNow); - DECL_LINK_TYPED( TimerHdl, Timer*, void ); - DECL_LINK_TYPED( InitHdl, Idle*, void ); + DECL_LINK( TimerHdl, Timer*, void ); + DECL_LINK( InitHdl, Idle*, void ); public: ScAutoStyleList(ScDocShell* pShell); diff --git a/sc/source/ui/inc/cbnumberformat.hxx b/sc/source/ui/inc/cbnumberformat.hxx index f593ccf900e9..9773fd9b34cc 100644 --- a/sc/source/ui/inc/cbnumberformat.hxx +++ b/sc/source/ui/inc/cbnumberformat.hxx @@ -28,7 +28,7 @@ public: explicit ScNumberFormat(vcl::Window* pParent, WinBits nStyle); private: - DECL_STATIC_LINK_TYPED(ScNumberFormat, NumFormatSelectHdl, ListBox&, void); + DECL_STATIC_LINK(ScNumberFormat, NumFormatSelectHdl, ListBox&, void); }; #endif diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 8bb339ed97a5..d3fa6a0bc05a 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -64,8 +64,8 @@ private: void ExecuteFillSingleEdit(); - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); - DECL_LINK_TYPED( DialogClosed, Dialog&, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( DialogClosed, Dialog&, void ); RotateTransliteration m_aRotateCase; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 856a607f4590..44a0da483918 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -165,7 +165,7 @@ private: VclPtr<ScMenuFloatingWindow> mpSubMenu; size_t mnMenuPos; - DECL_LINK_TYPED( TimeoutHdl, Timer*, void ); + DECL_LINK( TimeoutHdl, Timer*, void ); SubMenuItemData(ScMenuFloatingWindow* pParent); void reset(); @@ -392,10 +392,10 @@ private: void selectCurrentMemberOnly(bool bSet); void updateMemberParents( SvTreeListEntry* pLeaf, size_t nIdx ); - DECL_LINK_TYPED( ButtonHdl, Button*, void ); - DECL_LINK_TYPED( TriStateHdl, Button*, void ); - DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( EdModifyHdl, Edit&, void ); + DECL_LINK( ButtonHdl, Button*, void ); + DECL_LINK( TriStateHdl, Button*, void ); + DECL_LINK( CheckHdl, SvTreeListBox*, void ); + DECL_LINK( EdModifyHdl, Edit&, void ); private: VclPtr<ScSearchEdit> maEdSearch; diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 1e2e542d5c40..682be33c87ad 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -49,9 +49,9 @@ private: ScDocument* mpDoc; ScAddress maPos; - DECL_LINK_TYPED(OkBtnHdl, Button*, void); - DECL_LINK_TYPED(TypeSelectHdl, ListBox&, void); - DECL_LINK_TYPED(PosSelectHdl, ListBox&, void); + DECL_LINK(OkBtnHdl, Button*, void); + DECL_LINK(TypeSelectHdl, ListBox&, void); + DECL_LINK(PosSelectHdl, ListBox&, void); void Init(); diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 34c6f3fc2297..62f37584fe19 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -71,14 +71,14 @@ public: ScConditionalFormat* GetConditionalFormat() const; void RecalcAll(); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EntrySelectHdl, ScCondFrmtEntry&, void ); - - DECL_LINK_TYPED( TypeListHdl, ListBox&, void ); - DECL_LINK_TYPED( AfterTypeListHdl, void*, void ); - DECL_LINK_TYPED( ColFormatTypeHdl, ListBox&, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( EntrySelectHdl, ScCondFrmtEntry&, void ); + + DECL_LINK( TypeListHdl, ListBox&, void ); + DECL_LINK( AfterTypeListHdl, void*, void ); + DECL_LINK( ColFormatTypeHdl, ListBox&, void ); }; class ScCondFormatDlg : public ScAnyRefDlg @@ -105,7 +105,7 @@ private: OUString msBaseTitle; void updateTitle(); - DECL_LINK_TYPED( EdRangeModifyHdl, Edit&, void ); + DECL_LINK( EdRangeModifyHdl, Edit&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; @@ -128,8 +128,8 @@ public: void InvalidateRefData(); - DECL_LINK_TYPED( BtnPressedHdl, Button*, void ); - DECL_LINK_TYPED( RangeGetFocusHdl, Control&, void ); + DECL_LINK( BtnPressedHdl, Button*, void ); + DECL_LINK( RangeGetFocusHdl, Control&, void ); }; #endif diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 675abc99db33..d5c99b72ad9f 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -100,9 +100,9 @@ class ScConditionFrmtEntry : public ScCondFrmtEntry, public SfxListener virtual OUString GetExpressionString() override; void Init(ScCondFormatDlg* pDialogParent); - DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ConditionTypeSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( OnEdChanged, Edit&, void ); + DECL_LINK( StyleSelectHdl, ListBox&, void ); + DECL_LINK( ConditionTypeSelectHdl, ListBox&, void ); + DECL_LINK( OnEdChanged, Edit&, void ); // Searches the lookup table for the entry position, given condition mode static sal_Int32 ConditionModeToEntryPos( ScConditionMode eMode ); @@ -142,7 +142,7 @@ class ScFormulaFrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(ScCondFormatDlg* pDialogParent); - DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); + DECL_LINK( StyleSelectHdl, ListBox&, void ); public: ScFormulaFrmtEntry( vcl::Window* pParent, ScDocument* PDoc, ScCondFormatDlg* pDialogParent, const ScAddress& rPos, const ScCondFormatEntry* pFormatEntry = nullptr ); @@ -176,7 +176,7 @@ class ScColorScale2FrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(); - DECL_LINK_TYPED( EntryTypeHdl, ListBox&, void ); + DECL_LINK( EntryTypeHdl, ListBox&, void ); public: ScColorScale2FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr ); virtual ~ScColorScale2FrmtEntry() override; @@ -211,7 +211,7 @@ class ScColorScale3FrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(); - DECL_LINK_TYPED( EntryTypeHdl, ListBox&, void ); + DECL_LINK( EntryTypeHdl, ListBox&, void ); public: ScColorScale3FrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScColorScaleFormat* pFormat = nullptr ); virtual ~ScColorScale3FrmtEntry() override; @@ -242,8 +242,8 @@ class ScDataBarFrmtEntry : public ScCondFrmtEntry virtual OUString GetExpressionString() override; void Init(); - DECL_LINK_TYPED( OptionBtnHdl, Button*, void ); - DECL_LINK_TYPED( DataBarTypeSelectHdl, ListBox&, void ); + DECL_LINK( OptionBtnHdl, Button*, void ); + DECL_LINK( DataBarTypeSelectHdl, ListBox&, void ); public: ScDataBarFrmtEntry( vcl::Window* pParemt, ScDocument* pDoc, const ScAddress& rPos, const ScDataBarFormat* pFormat = nullptr ); virtual ~ScDataBarFrmtEntry() override; @@ -274,7 +274,7 @@ protected: private: void Init(); - DECL_LINK_TYPED( StyleSelectHdl, ListBox&, void ); + DECL_LINK( StyleSelectHdl, ListBox&, void ); VclPtr<ListBox> maLbDateEntry; VclPtr<FixedText> maFtStyle; @@ -299,7 +299,7 @@ class ScIconSetFrmtEntry : public ScCondFrmtEntry void Init(); - DECL_LINK_TYPED( IconSetTypeHdl, ListBox&, void ); + DECL_LINK( IconSetTypeHdl, ListBox&, void ); public: ScIconSetFrmtEntry( vcl::Window* pParent, ScDocument* pDoc, const ScAddress& rPos, const ScIconSetFormat* pFormat = nullptr ); diff --git a/sc/source/ui/inc/condformatmgr.hxx b/sc/source/ui/inc/condformatmgr.hxx index f436ca81e7e2..fffd18f8bdc3 100644 --- a/sc/source/ui/inc/condformatmgr.hxx +++ b/sc/source/ui/inc/condformatmgr.hxx @@ -67,10 +67,10 @@ private: ScDocument* mpDoc; - DECL_LINK_TYPED(RemoveBtnHdl, Button*, void); - DECL_LINK_TYPED(EditBtnClickHdl, Button*, void); - DECL_LINK_TYPED(AddBtnHdl, Button*, void); - DECL_LINK_TYPED(EditBtnHdl, SvTreeListBox*, bool); + DECL_LINK(RemoveBtnHdl, Button*, void); + DECL_LINK(EditBtnClickHdl, Button*, void); + DECL_LINK(AddBtnHdl, Button*, void); + DECL_LINK(EditBtnHdl, SvTreeListBox*, bool); bool mbModified; }; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index a8582a1081ac..db53e0915cf2 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -149,13 +149,13 @@ private: void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); - DECL_LINK_TYPED( SelectHandle, SvTreeListBox*, void ); - DECL_LINK_TYPED( DeselectHandle, SvTreeListBox*, void ); - DECL_LINK_TYPED( UpdateSelectionHdl, Idle*, 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 ); + DECL_LINK( SelectHandle, SvTreeListBox*, void ); + DECL_LINK( DeselectHandle, SvTreeListBox*, void ); + DECL_LINK( UpdateSelectionHdl, Idle*, void ); + DECL_LINK( KeepMineHandle, Button*, void ); + DECL_LINK( KeepOtherHandle, Button*, void ); + DECL_LINK( KeepAllMineHandle, Button*, void ); + DECL_LINK( 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 b3938dc49af4..ecd20847dccd 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -91,11 +91,11 @@ private: void FillAreaLists (); bool VerifyEdit ( formula::RefEdit* pEd ); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); static ScSubTotalFunc LbPosToFunc( sal_Int32 nPos ); static sal_Int32 FuncToLbPos( ScSubTotalFunc eFunc ); diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index d1fa598153e6..8e839c1ace8c 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -98,8 +98,8 @@ class ScContentTree : public SvTreeListBox ScDocument* GetSourceDocument(); - DECL_LINK_TYPED( ContentDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ExecDragHdl, void*, void ); + DECL_LINK( ContentDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( ExecDragHdl, void*, void ); public: SvTreeListEntry* pTmpEntry; diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index ab4d7d7b6932..faf4e4b11037 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_TYPED(OkHdl, Button*, void); + DECL_LINK(OkHdl, Button*, void); }; #endif diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 5804859bf7bf..6bffcb7d059f 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -77,17 +77,17 @@ 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_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( RemoveBtnHdl, Button*, void ); - DECL_LINK_TYPED( Range1SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( Range1DataModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ColClickHdl, Button*, void ); - DECL_LINK_TYPED( RowClickHdl, Button*, void ); - DECL_LINK_TYPED( Range2DataModifyHdl, Edit&, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( Range1SelectHdl, ListBox&, void ); + DECL_LINK( Range1DataModifyHdl, Edit&, void ); + DECL_LINK( ColClickHdl, Button*, void ); + DECL_LINK( RowClickHdl, Button*, void ); + DECL_LINK( Range2DataModifyHdl, Edit&, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_CRNRDLG_HXX diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index b75c306fdda0..abd88e133677 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -123,9 +123,9 @@ protected: virtual Size GetOptimalSize() const override; private: - DECL_DLLPRIVATE_LINK_TYPED( CsvCmdHdl, ScCsvControl&, void ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_DLLPRIVATE_LINK_TYPED( ScrollEndHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( CsvCmdHdl, ScCsvControl&, void ); + DECL_DLLPRIVATE_LINK( ScrollHdl, ScrollBar*, void ); + DECL_DLLPRIVATE_LINK( ScrollEndHdl, ScrollBar*, void ); // accessibility ---------------------------------------------------------- public: diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index a1b9a277e95e..6216d4f6fc2f 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -36,7 +36,7 @@ private: void FillObjects(); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: ScDataPilotDatabaseDlg(vcl::Window* pParent); diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 3ffaef9c5974..dce9670d757f 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -46,7 +46,7 @@ public: void AppendNamedRange(const OUString& rNames); private: - DECL_LINK_TYPED( RadioClickHdl, Button *, void ); + DECL_LINK( RadioClickHdl, Button *, void ); }; class ScDataPilotServiceDlg : public ModalDialog diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 4317ef27fbda..754289bc88d1 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -63,16 +63,16 @@ private: void SetButtonState(); // Handler: - DECL_LINK_TYPED(Impl_NewHdl, Button*, void); - DECL_LINK_TYPED(Impl_PrevHdl, Button*, void); - DECL_LINK_TYPED(Impl_NextHdl, Button*, void); + DECL_LINK(Impl_NewHdl, Button*, void); + DECL_LINK(Impl_PrevHdl, Button*, void); + DECL_LINK(Impl_NextHdl, Button*, 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_RestoreHdl, Button*, void); + DECL_LINK(Impl_DeleteHdl, Button*, void); + DECL_LINK(Impl_CloseHdl, Button*, void); - DECL_LINK_TYPED(Impl_ScrollHdl, ScrollBar*, void); - DECL_LINK_TYPED(Impl_DataModifyHdl, Edit&, void); + DECL_LINK(Impl_ScrollHdl, ScrollBar*, void); + DECL_LINK(Impl_DataModifyHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_DATAFDLG_HXX diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index c60bec047ab2..5ddf9ac7a55e 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -99,7 +99,7 @@ private: void Text2Doc(); void Refresh(); - DECL_LINK_TYPED( ImportTimerHdl, Timer*, void ); + DECL_LINK( ImportTimerHdl, Timer*, void ); private: ScDocShell* mpDocShell; diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index ee0ef36b8791..74fba3ff6de4 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -47,10 +47,10 @@ class DataStreamDlg : public ModalDialog VclPtr<VclFrame> m_pVclFrameLimit; VclPtr<VclFrame> m_pVclFrameMove; - DECL_LINK_TYPED(UpdateClickHdl, Button*, void); - DECL_LINK_TYPED(UpdateHdl, Edit&, void); - DECL_LINK_TYPED(UpdateComboBoxHdl, ComboBox&, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); + DECL_LINK(UpdateClickHdl, Button*, void); + DECL_LINK(UpdateHdl, Edit&, void); + DECL_LINK(UpdateComboBoxHdl, ComboBox&, void); + DECL_LINK(BrowseHdl, Button*, void); void UpdateEnable(); ScRange GetStartRange(); diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 34f831732c03..fcbc3cda24a9 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -91,12 +91,12 @@ private: void UpdateDBData( const OUString& rStrName ); void SetInfoStrings( const ScDBData* pDBData ); - 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_TYPED( NameModifyHdl, Edit&, void ); - DECL_LINK_TYPED( AssModifyHdl, Edit&, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( NameModifyHdl, Edit&, void ); + DECL_LINK( AssModifyHdl, Edit&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_DBNAMDLG_HXX diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index fa6667a84a11..f2122ead7846 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 ); - DECL_LINK_TYPED( DelAllHdl, Button*, void ); + DECL_LINK( DelAllHdl, Button*, void ); public: ScDeleteContentsDlg( vcl::Window* pParent, diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index af6deb00b2db..f54893ed4613 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -68,7 +68,7 @@ protected: public: virtual ~ScDocFunc() {} - DECL_LINK_TYPED( NotifyDrawUndo, SdrUndoAction*, void ); + DECL_LINK( NotifyDrawUndo, SdrUndoAction*, void ); // for grouping multiple operations into one with a new name void EnterListAction( sal_uInt16 nNameResId ); diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index e7503b062e09..31adcf66ea43 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -341,7 +341,7 @@ public: void LockDocument(); void UnlockDocument(); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); virtual SfxStyleSheetBasePool* GetStyleSheetPool() override; @@ -399,7 +399,7 @@ public: static OUString GetDifFilterName(); static bool HasAutomaticTableName( const OUString& rFilter ); - DECL_LINK_TYPED( RefreshDBDataHdl, Timer*, void ); + DECL_LINK( RefreshDBDataHdl, Timer*, void ); void BeforeXMLLoading(); void AfterXMLLoading(bool bRet); diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 68c134d6d1fa..7abcea8f7136 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_TYPED( ClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbAuto; @@ -119,8 +119,8 @@ public: sal_Int32 GetDatePart() const; private: - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( CheckHdl, SvTreeListBox*, void ); private: VclPtr<RadioButton> mpRbAutoStart; diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 90c0f09d1403..0da1b1532f05 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -39,7 +39,7 @@ class ScDrawShell : public SfxShell ScViewData* pViewData; ::rtl::Reference<svx::sidebar::SelectionChangeHandler> mpSelectionChangeHandler; - DECL_LINK_TYPED( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); + DECL_LINK( NameObjectHdl, AbstractSvxObjectNameDialog&, bool ); void SetHlinkForObject( SdrObject* pObj, const OUString& rHlnk ); diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index f5333d108264..bc29dc93e528 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -38,7 +38,7 @@ class ScDrawTextObjectBar : public SfxShell rtl::Reference<TransferableClipboardListener> mxClipEvtLstnr; bool bPastePossible; - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); public: SFX_DECL_INTERFACE(SCID_DRAW_TEXT_SHELL) diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index a3e127dc35de..cea49c96b25e 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -65,11 +65,11 @@ private: void SetMyHeightLeRi(Size &aNewSize); void UseSplitterInitPos(); - DECL_LINK_TYPED( SetSelectionHdl, ListBox&, void ); - DECL_LINK_TYPED( SetSelectionClickHdl, Button*, void ); - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED( SetSplitHdl, ScPrivatSplit&, void ); - DECL_LINK_TYPED( TimerHdl, Idle*, void ); + DECL_LINK( SetSelectionHdl, ListBox&, void ); + DECL_LINK( SetSelectionClickHdl, Button*, void ); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK( SetSplitHdl, ScPrivatSplit&, void ); + DECL_LINK( TimerHdl, Idle*, void ); protected: diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx index 1638ce4b2785..eaeed421ca27 100644 --- a/sc/source/ui/inc/editsh.hxx +++ b/sc/source/ui/inc/editsh.hxx @@ -46,7 +46,7 @@ private: const SvxURLField* GetURLField(); ScInputHandler* GetMyInputHdl(); - DECL_LINK_TYPED( ClipboardChanged, TransferableDataHelper*, void ); + DECL_LINK( ClipboardChanged, TransferableDataHelper*, void ); public: SFX_DECL_INTERFACE(SCID_EDIT_SHELL) diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 0674b0fb45ed..1a913143c334 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_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( DisableHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( 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 c901bad73f05..05a80e8dcf63 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -148,15 +148,15 @@ private: ScQueryItem* GetOutputItem (); // Handler: - DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ValModifyHdl, Edit&, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( EndDlgHdl, Button*, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( MoreExpandedHdl, VclExpander&, void ); + DECL_LINK( LbSelectHdl, ListBox&, void ); + DECL_LINK( ValModifyHdl, Edit&, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( EndDlgHdl, Button*, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( MoreExpandedHdl, VclExpander&, void ); // Hack: RefInput control - DECL_LINK_TYPED( TimeOutHdl, Timer*, void ); + DECL_LINK( TimeOutHdl, Timer*, void ); }; class ScSpecialFilterDlg : public ScAnyRefDlg @@ -216,12 +216,12 @@ private: const ScRange& rSource ); // Handler - DECL_LINK_TYPED( FilterAreaSelHdl, ListBox&, void ); - DECL_LINK_TYPED( FilterAreaModHdl, Edit&, void ); - DECL_LINK_TYPED( EndDlgHdl, Button*, void ); + DECL_LINK( FilterAreaSelHdl, ListBox&, void ); + DECL_LINK( FilterAreaModHdl, Edit&, void ); + DECL_LINK( EndDlgHdl, Button*, void ); // Hack: RefInput control - DECL_LINK_TYPED( TimeOutHdl, Idle*, void ); + DECL_LINK( TimeOutHdl, Idle*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FILTDLG_HXX diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 4b6a3cac0e32..bc1ef9b3ecbb 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -77,9 +77,9 @@ private: void Init(); // Handler: - DECL_LINK_TYPED( EdAreaModifyHdl, Edit&, void ); - DECL_LINK_TYPED( LbAreaSelHdl, ListBox&, void ); - DECL_LINK_TYPED( BtnCopyResultHdl, CheckBox&, void ); + DECL_LINK( EdAreaModifyHdl, Edit&, void ); + DECL_LINK( LbAreaSelHdl, ListBox&, void ); + DECL_LINK( BtnCopyResultHdl, CheckBox&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_FOPTMGR_HXX diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index d54d0cc45e14..bbdfdb30250c 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -50,12 +50,12 @@ protected: VclPtr<Dialog> pDialog; Timer aScrollTimer; // for Autoscrolling - DECL_LINK_TYPED( ScrollHdl, Timer *, void ); + DECL_LINK( ScrollHdl, Timer *, void ); void ForceScroll(const Point& aPixPos); Timer aDragTimer; // for Drag&Drop - DECL_LINK_TYPED( DragTimerHdl, Timer *, void ); - DECL_LINK_TYPED( DragHdl, void *, void ); + DECL_LINK( DragTimerHdl, Timer *, void ); + DECL_LINK( DragHdl, void *, void ); bool bIsInDragMode; Point aMDPos; // Position of MouseButtonDown diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 6f3a3c94bc93..7272cc0b5803 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -192,8 +192,8 @@ class ScGridWindow : public vcl::Window, public DropTargetHelper, public DragSou bool bAutoMarkVisible:1; bool bListValButton:1; - DECL_LINK_TYPED( PopupModeEndHdl, FloatingWindow*, void ); - DECL_LINK_TYPED( PopupSpellingHdl, SpellCallbackInfo&, void ); + DECL_LINK( PopupModeEndHdl, FloatingWindow*, void ); + DECL_LINK( PopupSpellingHdl, SpellCallbackInfo&, void ); bool TestMouse( const MouseEvent& rMEvt, bool bAction ); diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 9a04ff9707e9..151b16ffe6ee 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -58,9 +58,9 @@ private: void Init(); - DECL_LINK_TYPED( RefHandle, SvxTPFilter*, void ); - DECL_LINK_TYPED( HighlightHandle, Button*, void ); - DECL_LINK_TYPED( OKBtnHdl, Button*, void ); + DECL_LINK( RefHandle, SvxTPFilter*, void ); + DECL_LINK( HighlightHandle, Button*, void ); + DECL_LINK( OKBtnHdl, Button*, void ); protected: diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 7ea15d724a15..e11cfb096f06 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -134,7 +134,7 @@ private: void UpdateFormulaMode(); static void InvalidateAttribs(); void ImplCreateEditEngine(); - DECL_LINK_TYPED( DelayTimer, Timer*, void ); + DECL_LINK( DelayTimer, Timer*, void ); void GetColData(); void UseColData(); void NextAutoEntry( bool bBack ); @@ -156,9 +156,9 @@ private: void SkipClosingPar(); bool GetFuncName( OUString& aStart, OUString& aResult ); // fdo75264 void ShowArgumentsTip( OUString& rSelText ); - DECL_LINK_TYPED( ModifyHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( ShowHideTipVisibleParentListener, VclWindowEvent&, void ); - DECL_LINK_TYPED( ShowHideTipVisibleSecParentListener, VclWindowEvent&, void ); + DECL_LINK( ModifyHdl, LinkParamNone*, void ); + DECL_LINK( ShowHideTipVisibleParentListener, VclWindowEvent&, void ); + DECL_LINK( ShowHideTipVisibleSecParentListener, VclWindowEvent&, void ); public: ScInputHandler(const ScInputHandler&) = delete; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index c049b385f11b..63318f20931f 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -99,8 +99,8 @@ public: void DoScroll(); - DECL_LINK_TYPED(NotifyHdl, EENotify&, void); - DECL_LINK_TYPED(ModifyHdl, LinkParamNone*, void); + DECL_LINK(NotifyHdl, EENotify&, void); + DECL_LINK(ModifyHdl, LinkParamNone*, void); protected: virtual void Paint( vcl::RenderContext& rRenderContext, const Rectangle& rRect ) override; @@ -215,8 +215,8 @@ private: VclPtr<ScrollBar> maScrollbar; long mnVertOffset; - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( Impl_ScrollHdl, ScrollBar*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( Impl_ScrollHdl, ScrollBar*, void ); }; class ScInputWindow : public ToolBox // Parent toolbox diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 8b14a994891c..24897a7e775a 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -97,9 +97,9 @@ private: void TestModes(); // Handler - DECL_LINK_TYPED( InsAllHdl, Button*, void ); - DECL_LINK_TYPED( LinkBtnHdl, Button*, void ); - DECL_LINK_TYPED( ShortCutHdl, Button*, void ); + DECL_LINK( InsAllHdl, Button*, void ); + DECL_LINK( LinkBtnHdl, Button*, void ); + DECL_LINK( 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 cd5cd171e252..141a92a5a8cf 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -91,13 +91,13 @@ private: void FillTables_Impl( ScDocument* pSrcDoc ); void DoEnable_Impl(); - DECL_LINK_TYPED( BrowseHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChoiceHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( CountHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( DoEnterHdl, Button*, void ); - DECL_LINK_TYPED( BrowseTimeoutHdl, Timer *, void ); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK( BrowseHdl_Impl, Button*, void ); + DECL_LINK( ChoiceHdl_Impl, Button*, void ); + DECL_LINK( SelectHdl_Impl, ListBox&, void ); + DECL_LINK( CountHdl_Impl, Edit&, void ); + DECL_LINK( DoEnterHdl, Button*, void ); + DECL_LINK( BrowseTimeoutHdl, Timer *, void ); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_INSTBDLG_HXX diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index 7b5215411944..a67e2972a5b8 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -32,7 +32,7 @@ class ScSelEntryDlg : public ModalDialog private: VclPtr<ListBox> m_pLb; - DECL_LINK_TYPED( DblClkHdl, ListBox&, void ); + DECL_LINK( DblClkHdl, ListBox&, void ); public: ScSelEntryDlg(vcl::Window* pParent, const std::vector<OUString> &rEntryList); diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index f8781b656d42..f199e42c0621 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -51,11 +51,11 @@ private: SfxObjectShellRef aSourceRef; - DECL_LINK_TYPED(FileHdl, ComboBox&, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); - DECL_LINK_TYPED(RangeHdl, ListBox&, void); - DECL_LINK_TYPED(ReloadHdl, Button*, void); - DECL_LINK_TYPED( DialogClosedHdl, sfx2::FileDialogHelper*, void ); + DECL_LINK(FileHdl, ComboBox&, void); + DECL_LINK(BrowseHdl, Button*, void); + DECL_LINK(RangeHdl, ListBox&, void); + DECL_LINK(ReloadHdl, Button*, void); + DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); void UpdateSourceRanges(); void UpdateEnable(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index f5f9d5e4afae..f6815065d798 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -49,8 +49,8 @@ private: long nDefaultValue; long nCurrentValue; - DECL_LINK_TYPED(SetDefValHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SetDefValHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_MTRINDLG_HXX diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 6d4f12bddbf6..0b77c8d89aa5 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -75,10 +75,10 @@ private: void Init (); void InitDocListBox (); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( SelHdl, ListBox&, void ); - DECL_LINK_TYPED( CheckBtnHdl, RadioButton&, void ); - DECL_LINK_TYPED( CheckNameHdl, Edit&, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( SelHdl, ListBox&, void ); + DECL_LINK( CheckBtnHdl, RadioButton&, void ); + DECL_LINK( CheckNameHdl, Edit&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx index be8855caba25..3a036a91a2b3 100644 --- a/sc/source/ui/inc/namedefdlg.hxx +++ b/sc/source/ui/inc/namedefdlg.hxx @@ -64,10 +64,10 @@ private: bool IsNameValid(); bool IsFormulaValid(); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( AddBtnHdl, Button*, void ); - DECL_LINK_TYPED( NameModifyHdl, Edit&, void ); - DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( NameModifyHdl, Edit&, void ); + DECL_LINK( AssignGetFocusHdl, Control&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 20f779fdb7f4..7101a5b50a1d 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -99,15 +99,15 @@ private: void SelectionChanged(); // Handler: - 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_TYPED( EdModifyHdl, Edit&, void ); - DECL_LINK_TYPED( EdModifyCheckBoxHdl, CheckBox&, void ); - DECL_LINK_TYPED( AssignGetFocusHdl, Control&, void ); - DECL_LINK_TYPED( SelectionChangedHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ScopeChangedHdl, ListBox&, void ); + DECL_LINK( OkBtnHdl, Button*, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( AddBtnHdl, Button*, void ); + DECL_LINK( RemoveBtnHdl, Button*, void ); + DECL_LINK( EdModifyHdl, Edit&, void ); + DECL_LINK( EdModifyCheckBoxHdl, CheckBox&, void ); + DECL_LINK( AssignGetFocusHdl, Control&, void ); + DECL_LINK( SelectionChangedHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( ScopeChangedHdl, ListBox&, void ); protected: virtual void RefInputDone( bool bForced = false ) override; diff --git a/sc/source/ui/inc/namemgrtable.hxx b/sc/source/ui/inc/namemgrtable.hxx index c725ba381ed7..cb9ab35dbe2f 100644 --- a/sc/source/ui/inc/namemgrtable.hxx +++ b/sc/source/ui/inc/namemgrtable.hxx @@ -84,8 +84,8 @@ public: bool IsMultiSelection(); std::vector<ScRangeNameLine> GetSelectedEntries(); - DECL_LINK_TYPED( ScrollHdl, SvTreeListBox*, void); - DECL_LINK_TYPED( HeaderEndDragHdl, HeaderBar*, void); + DECL_LINK( ScrollHdl, SvTreeListBox*, void); + DECL_LINK( HeaderEndDragHdl, HeaderBar*, void); }; #endif diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 46d779dfe535..4ae4fa18d88a 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -36,7 +36,7 @@ class ScDocShell; class ScNamePasteDlg : public ModalDialog { - DECL_LINK_TYPED( ButtonHdl, Button *, void ); + DECL_LINK( ButtonHdl, Button *, void ); private: VclPtr<PushButton> m_pBtnPasteAll; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index f424c6d02792..0f276d089274 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -194,7 +194,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - DECL_LINK_TYPED( ToolBoxDropdownClickHdl, ToolBox*, void ); + DECL_LINK( ToolBoxDropdownClickHdl, ToolBox*, void ); protected: virtual void Select() override; @@ -257,7 +257,7 @@ private: ScNavigatorControllerItem** ppBoundItems; - DECL_LINK_TYPED( TimeHdl, Idle*, void ); + DECL_LINK( TimeHdl, Idle*, void ); void DoResize(); diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index b6f8f8d70d00..2d83b8fe500e 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -49,7 +49,7 @@ private: SdrObject* pObject; bool bVisible; Point aGridOff; - DECL_LINK_TYPED( TimeHdl, Timer*, void ); + DECL_LINK( TimeHdl, Timer*, void ); public: ScNoteMarker( vcl::Window* pWin, vcl::Window* pRight, vcl::Window* pBottom, vcl::Window* pDiagonal, diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 809f44850e0e..a46978b3c19e 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -189,16 +189,16 @@ private: bool FindTimeout( sal_Int32& rTimeout ); void ShowError( bool bCondition, formula::RefEdit* pFocus ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( DelBtnHdl, Button*, 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 ); - DECL_LINK_TYPED( CondModifyHdl, Edit&, void ); - DECL_LINK_TYPED( TargetModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( DelBtnHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void); + DECL_LINK( CursorUpHdl, ScCursorRefEdit&, void ); + DECL_LINK( CursorDownHdl, ScCursorRefEdit&, void ); + DECL_LINK( CondModifyHdl, Edit&, void ); + DECL_LINK( TargetModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); }; class ScSolverProgressDialog : public ModelessDialog @@ -230,7 +230,7 @@ class ScSolverSuccessDialog : public ModalDialog VclPtr<PushButton> m_pBtnOk; VclPtr<PushButton> m_pBtnCancel; - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(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 da55fc7a414b..c3fcdd64d8a1 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -90,9 +90,9 @@ private: sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler: - DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( ValModifyHdl, Edit&, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); + DECL_LINK( LbSelectHdl, ListBox&, void ); + DECL_LINK( ValModifyHdl, Edit&, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index f39e6d32b053..ca5dbb461254 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -154,7 +154,7 @@ public: void CalcAll() { CalcPages(); } void SetInGetState(bool bSet) { bInGetState = bSet; } - DECL_STATIC_LINK_TYPED( ScPreview, InvalidateHdl, void*, void ); + DECL_STATIC_LINK( ScPreview, InvalidateHdl, void*, void ); static void StaticInvalidate(); FmFormView* GetDrawView() { return pDrawView; } diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 77a9589b5183..dab12bc523b1 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -55,8 +55,8 @@ class SC_DLLPUBLIC ScPreviewShell: public SfxViewShell bool GetPageSize( Size& aPageSize ); private: void Construct( vcl::Window* pParent ); - DECL_LINK_TYPED( ScrollHandler, ScrollBar*, void ); - DECL_LINK_TYPED( CloseHdl, SystemWindow&, void); + DECL_LINK( ScrollHandler, ScrollBar*, void ); + DECL_LINK( CloseHdl, SystemWindow&, void); void DoScroll( sal_uInt16 nMode ); void ExitPreview(); diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index e995585acc5f..fb1948491b0d 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -65,9 +65,9 @@ private: OUString m_aSelectLockedCells; OUString m_aSelectUnlockedCells; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( PasswordModifyHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( PasswordModifyHdl, Edit&, void ); }; #endif diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index f5b6c73fe6c0..70fe3b65a375 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -74,8 +74,8 @@ private: /** Searches for a listbox entry, starts search at specified position. */ sal_Int32 FindBaseItemPos( const OUString& rEntry, sal_Int32 nStartPos ) const; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); private: VclPtr<ScDPFunctionListBox> mpLbFunc; @@ -111,9 +111,9 @@ public: private: void Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData ); - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); - DECL_LINK_TYPED( RadioClickHdl, Button*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); + DECL_LINK( RadioClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); private: VclPtr<RadioButton> mpRbNone; @@ -151,9 +151,9 @@ 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_TYPED( RadioClickHdl, Button*, void ); - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( RadioClickHdl, Button*, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( SelectHdl, ListBox&, void ); private: VclPtr<ListBox> m_pLbSortBy; @@ -202,7 +202,7 @@ public: OUString GetDimensionName() const; private: - DECL_LINK_TYPED( DblClickHdl, ListBox&, void ); + DECL_LINK( DblClickHdl, ListBox&, void ); private: VclPtr<ListBox> mpLbDims; diff --git a/sc/source/ui/inc/redcom.hxx b/sc/source/ui/inc/redcom.hxx index 35e350cfc686..d0c4a145215a 100644 --- a/sc/source/ui/inc/redcom.hxx +++ b/sc/source/ui/inc/redcom.hxx @@ -34,8 +34,8 @@ private: OUString aComment; AbstractSvxPostItDialog* pDlg; - DECL_LINK_TYPED( PrevHdl, AbstractSvxPostItDialog&, void ); - DECL_LINK_TYPED( NextHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( PrevHdl, AbstractSvxPostItDialog&, void ); + DECL_LINK( NextHdl, AbstractSvxPostItDialog&, void ); protected: diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 667b819ff7d3..bced3fbd507e 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -83,8 +83,8 @@ private: OUString maTextHashBad; OUString maTextHashGood; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( RetypeBtnHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( RetypeBtnHdl, Button*, void ); struct TableItem { @@ -127,10 +127,10 @@ private: VclPtr<RadioButton> m_pBtnRemovePassword; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( RadioBtnHdl, Button*, void ); - DECL_LINK_TYPED( CheckBoxHdl, Button*, void ); - DECL_LINK_TYPED( PasswordModifyHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( RadioBtnHdl, Button*, void ); + DECL_LINK( CheckBoxHdl, Button*, void ); + DECL_LINK( PasswordModifyHdl, Edit&, void ); ScPassHashProtectable* mpProtected; }; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 6e3673db711d..08bac4560f45 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -53,8 +53,8 @@ private: const OUString aDefScenarioName; bool bIsEdit; - DECL_LINK_TYPED( OkHdl, Button*, void); - DECL_LINK_TYPED( EnableHdl, Button*, void ); + DECL_LINK( OkHdl, Button*, void); + DECL_LINK( 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 14719ef13c0b..65848aa1ec7c 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -114,16 +114,16 @@ private: void UpdateVertical(); inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos - DECL_LINK_TYPED( CharSetHdl, ListBox&, void ); - DECL_LINK_TYPED( FirstRowHdl, Edit&, void ); - DECL_LINK_TYPED( RbSepFixHdl, Button*, void ); - DECL_LINK_TYPED( SeparatorEditHdl, Edit&, void ); - DECL_LINK_TYPED( SeparatorClickHdl, Button*, void ); - DECL_LINK_TYPED( SeparatorComboBoxHdl, ComboBox&, void ); + DECL_LINK( CharSetHdl, ListBox&, void ); + DECL_LINK( FirstRowHdl, Edit&, void ); + DECL_LINK( RbSepFixHdl, Button*, void ); + DECL_LINK( SeparatorEditHdl, Edit&, void ); + DECL_LINK( SeparatorClickHdl, Button*, void ); + DECL_LINK( SeparatorComboBoxHdl, ComboBox&, void ); void SeparatorHdl(Control*); - DECL_LINK_TYPED( LbColTypeHdl, ListBox&, void ); - DECL_LINK_TYPED( UpdateTextHdl, ScCsvTableBox&, void ); - DECL_LINK_TYPED( ColTypeHdl, ScCsvTableBox&, void ); + DECL_LINK( LbColTypeHdl, ListBox&, void ); + DECL_LINK( UpdateTextHdl, ScCsvTableBox&, void ); + DECL_LINK( ColTypeHdl, ScCsvTableBox&, void ); }; inline bool ScImportAsciiDlg::Seek(sal_uLong nPos) diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 15feb9ca9826..1c4e4f4f1276 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_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( AddHdl, Button*, void ); - DECL_LINK_TYPED( RemoveHdl, Button*, void ); - DECL_LINK_TYPED( SelFmtHdl, ListBox&, void ); - DECL_LINK_TYPED( CloseHdl, Button *, void ); - DECL_LINK_TYPED( DblClkHdl, ListBox&, void ); - DECL_LINK_TYPED( RenameHdl, Button*, void ); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( AddHdl, Button*, void ); + DECL_LINK( RemoveHdl, Button*, void ); + DECL_LINK( SelFmtHdl, ListBox&, void ); + DECL_LINK( CloseHdl, Button *, void ); + DECL_LINK( DblClkHdl, ListBox&, void ); + DECL_LINK( RenameHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 552dea78369b..91a59287444f 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -66,8 +66,8 @@ private: private: sal_uInt16 GetCodeFromCombo( const ComboBox& rEd ) const; - DECL_LINK_TYPED( FixedWidthHdl, Button*, void ); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); + DECL_LINK( FixedWidthHdl, Button*, void ); + DECL_LINK( DoubleClickHdl, ListBox&, void ); }; #endif diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 5f027fb5276b..12a93772fdc6 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -86,7 +86,7 @@ private: sal_uInt16 nWhich; - DECL_LINK_TYPED( ObjectSelectHdl, ScEditWindow&, void ); + DECL_LINK( ObjectSelectHdl, ScEditWindow&, void ); private: void InitPreDefinedList(); @@ -97,9 +97,9 @@ private: bool IsPageEntry(EditEngine*pEngine, EditTextObject* pTextObj); static bool IsDateEntry(EditTextObject* pTextObj); static bool IsExtFileNameEntry(EditTextObject* pTextObj); - DECL_LINK_TYPED( ListHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( MenuHdl, ScExtIButton&, void ); + DECL_LINK( ListHdl_Impl, ListBox&, void); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( MenuHdl, ScExtIButton&, void ); }; class ScRightHeaderEditPage : public ScHFEditPage diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index a4b3fdf4593d..bdc109e0f2e6 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -26,7 +26,7 @@ class SearchResultsDlg : public ModelessDialog SfxBindings* mpBindings; ScDocument* mpDoc; - DECL_LINK_TYPED( ListSelectHdl, SvTreeListBox*, void ); + DECL_LINK( ListSelectHdl, SvTreeListBox*, void ); public: SearchResultsDlg( SfxBindings* _pBindings, vcl::Window* pParent, sal_uInt16 nId ); virtual ~SearchResultsDlg() override; diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index fdbb73abf3ec..17ea38156bda 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -44,7 +44,7 @@ private: ScViewData* mpViewData; ScDocShell* mpDocShell; - DECL_LINK_TYPED( ToggleHandle, CheckBox&, void ); + DECL_LINK( ToggleHandle, CheckBox&, void ); public: SC_DLLPUBLIC ScShareDocumentDlg( vcl::Window* pParent, ScViewData* pViewData ); diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index b81b793992ff..60823c4c4537 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -31,7 +31,7 @@ private: VclPtr<VclFrame> m_pFrame; VclPtr<ListBox> m_pLb; - DECL_LINK_TYPED( DblClkHdl, ListBox&, void ); + DECL_LINK( DblClkHdl, ListBox&, void ); public: ScShowTabDlg( vcl::Window* pParent ); diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 2c0bd54cff8d..57548099bca6 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -56,8 +56,8 @@ private: void Init(); - DECL_LINK_TYPED( CancelBtnHdl, Button*, void ); - DECL_LINK_TYPED( OkBtnHdl, Button*, void ); + DECL_LINK( CancelBtnHdl, Button*, void ); + DECL_LINK( OkBtnHdl, Button*, void ); protected: diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index e8c3f7388b54..ac0102a63a92 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -45,10 +45,10 @@ class ScSolverOptionsDialog : public ModalDialog OUString maEngine; css::uno::Sequence<css::beans::PropertyValue> maProperties; - DECL_LINK_TYPED( EngineSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( SettingsSelHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SettingsDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ButtonHdl, Button*, void ); + DECL_LINK( EngineSelectHdl, ListBox&, void ); + DECL_LINK( SettingsSelHdl, SvTreeListBox*, void ); + DECL_LINK( SettingsDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( ButtonHdl, Button*, void ); void ReadFromComponent(); void FillListBox(); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 67116e575a90..3879d66a813e 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -80,9 +80,9 @@ private: bool CheckTargetValue( const OUString& rStrVal ); void RaiseError( ScSolverErr eError ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX diff --git a/sc/source/ui/inc/sortdlg.hxx b/sc/source/ui/inc/sortdlg.hxx index 69175a9b970a..85b24b5de216 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() override; virtual void dispose() override; - DECL_LINK_TYPED( BtnHdl, Button*, void ); + DECL_LINK( BtnHdl, Button*, void ); private: VclPtr<FixedText> aFtText; VclPtr<PushButton> aBtnExtSort; diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 8ed729b2d2b6..48b93e28dafd 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -67,7 +67,7 @@ private: VclScrolledWindow& m_rScrolledWindow; ScrollBar& m_rVertScroll; - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); + DECL_LINK(ScrollHdl, ScrollBar*, void); void checkAutoVScroll(); diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 08b85bd032bc..6077f9c6c6f9 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -32,7 +32,7 @@ public: virtual void dispose() override; private: VclPtr<PushButton> m_pBtnRemove; - DECL_LINK_TYPED( RemoveHdl, Button *, void ); + DECL_LINK( 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 0f3373a2a652..e0a5166632ed 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -62,8 +62,8 @@ private: void FillColorValueSets_Impl(); - DECL_LINK_TYPED(TabBgColorDblClickHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(TabBgColorOKHdl_Impl, Button*, void); + DECL_LINK(TabBgColorDblClickHdl_Impl, ValueSet*, void); + DECL_LINK(TabBgColorOKHdl_Impl, Button*, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TABBGCOLORDLG_HXX diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index c6dfd23e32a6..5434c7b61259 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -42,7 +42,7 @@ private: sal_uInt16 GetMaxId() const; SCTAB GetPrivatDropPos(const Point& rPos ); - DECL_LINK_TYPED(ShowPageList, const CommandEvent&, void); + DECL_LINK(ShowPageList, const CommandEvent&, void); protected: virtual void Select() override; diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 1e31559687b8..163b9d3f8a79 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -87,9 +87,9 @@ private: void Init(); void RaiseError( ScTabOpErr eError ); - DECL_LINK_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( GetFocusHdl, Control&, void ); - DECL_LINK_TYPED( LoseFocusHdl, Control&, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( GetFocusHdl, Control&, void ); + DECL_LINK( LoseFocusHdl, Control&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TABOPDLG_HXX diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index cc93e5544e09..db34edaf3636 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_TYPED( ButtonClickHdl, Button*, void ); + DECL_LINK( ButtonClickHdl, Button*, void ); void UpdateButtons(); }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 4cd3d79fe19d..58cebc8763ba 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -167,14 +167,14 @@ private: void DoAddWin( ScGridWindow* pWin ); void InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ); - DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED(EndScrollHdl, ScrollBar*, void ); + DECL_LINK(ScrollHdl, ScrollBar*, void ); + DECL_LINK(EndScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED(SplitHdl, Splitter*, void); + DECL_LINK(SplitHdl, Splitter*, void); void DoHSplit(long nSplitPos); void DoVSplit(long nSplitPos); - DECL_LINK_TYPED( TimerHdl, Timer*, void ); + DECL_LINK( TimerHdl, Timer*, void ); void UpdateVarZoom(); @@ -240,7 +240,7 @@ public: void RemoveHintWindow(); void TestHintWindow(); - DECL_LINK_TYPED( TabBarResize, ::TabBar*, void ); + DECL_LINK( TabBarResize, ::TabBar*, void ); /** Sets an absolute tab bar width (in pixels). */ void SetTabBarWidth( long nNewWidth ); /** Sets a relative tab bar width. diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 5fec291467e2..392a133a4256 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -179,11 +179,11 @@ private: void DoReadUserData( const OUString& rData ); void DoReadUserDataSequence( const css::uno::Sequence< css::beans::PropertyValue >& rSettings ); - DECL_LINK_TYPED( SimpleRefClose, const OUString*, void ); - DECL_LINK_TYPED( SimpleRefDone, const OUString&, void ); - DECL_LINK_TYPED( SimpleRefAborted, const OUString&, void ); - DECL_LINK_TYPED( SimpleRefChange, const OUString&, void ); - DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void ); + DECL_LINK( SimpleRefClose, const OUString*, void ); + DECL_LINK( SimpleRefDone, const OUString&, void ); + DECL_LINK( SimpleRefAborted, const OUString&, void ); + DECL_LINK( SimpleRefChange, const OUString&, void ); + DECL_LINK( FormControlActivated, LinkParamNone*, void ); protected: virtual void Activate(bool bMDI) override; diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 35f7d0ddc25d..934df868eb5e 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_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); - DECL_LINK_TYPED( RadioHdl, Button*, void ); + DECL_LINK( RadioHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 213ac740f450..f0cc0f098e50 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -77,8 +77,8 @@ private: void Init(); // Handler: - DECL_LINK_TYPED( RadioClickHdl, Button*, void ); - DECL_LINK_TYPED( CheckClickHdl, Button*, void ); + DECL_LINK( RadioClickHdl, Button*, void ); + DECL_LINK( CheckClickHdl, Button*, void ); }; #endif diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 4533a85db9e6..287d13740abf 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -35,9 +35,9 @@ private: void CheckPrefix(Edit* pEdit); void OnFocusPrefixInput(Edit* pEdit); - DECL_LINK_TYPED( NumModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( PrefixModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( PrefixEditOnFocusHdl, Control&, void ); + DECL_LINK( NumModifiedHdl, Edit&, void ); + DECL_LINK( PrefixModifiedHdl, Edit&, void ); + DECL_LINK( 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 6eb4ff43eca4..18542e28b5de 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -53,9 +53,9 @@ private: bool IsValidSeparator(const OUString& rSep) const; bool IsValidSeparatorSet() const; - DECL_LINK_TYPED( ButtonHdl, Button*, void ); - DECL_LINK_TYPED( SepModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SepEditOnFocusHdl, Control&, void ); + DECL_LINK( ButtonHdl, Button*, void ); + DECL_LINK( SepModifyHdl, Edit&, void ); + DECL_LINK( SepEditOnFocusHdl, Control&, void ); private: VclPtr<ListBox> mpLbFormulaSyntax; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 36f9432757b6..06544a0afeda 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_TYPED( BtnHdl, Button*, void ); - DECL_LINK_TYPED( HFEditHdl, void*, void ); - DECL_LINK_TYPED( TurnOnHdl, Button*, void ); + DECL_LINK( BtnHdl, Button*, void ); + DECL_LINK( HFEditHdl, void*, void ); + DECL_LINK( TurnOnHdl, Button*, void ); }; class ScHeaderPage : public ScHFPage diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 1a14b048544a..5ce0f55708b0 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -109,7 +109,7 @@ private: sal_uInt16 nSelected; OString aSelectedIdent; - DECL_DLLPRIVATE_LINK_TYPED( TimerHdl, Idle*, void ); + DECL_DLLPRIVATE_LINK( TimerHdl, Idle*, void ); protected: diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 50f20f396276..80be8041123e 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -92,7 +92,7 @@ private: void SetLastSortKey( sal_uInt16 nItem ); // Handler ------------------------ - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); }; // Sort Options @@ -162,11 +162,11 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK_TYPED( EnableHdl, Button*, void ); - DECL_LINK_TYPED( SelOutPosHdl, ListBox&, void ); + DECL_LINK( EnableHdl, Button*, void ); + DECL_LINK( SelOutPosHdl, ListBox&, void ); void EdOutPosModHdl ( Edit* pEd ); - DECL_LINK_TYPED( SortDirHdl, Button *, void ); - DECL_LINK_TYPED( FillAlgorHdl, ListBox&, void ); + DECL_LINK( SortDirHdl, Button *, void ); + DECL_LINK( FillAlgorHdl, ListBox&, void ); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPSORT_HXX diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index efc08298d326..08d2769b8d7c 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -70,9 +70,9 @@ private: sal_uInt16 GetFieldSelPos ( SCCOL nField ); // Handler ------------------------ - DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectTreeListBoxHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( CheckHdl, SvTreeListBox*, void ); + DECL_LINK( SelectListBoxHdl, ListBox&, void ); + DECL_LINK( SelectTreeListBoxHdl, SvTreeListBox*, void ); + DECL_LINK( CheckHdl, SvTreeListBox*, void ); void SelectHdl(void *); }; @@ -160,7 +160,7 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK_TYPED( CheckHdl, Button*, void ); + DECL_LINK( 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 91cbad99f728..f3d01eef310d 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -73,9 +73,9 @@ private: private: // Handler: - DECL_LINK_TYPED(PageDirHdl, Button*, void); - DECL_LINK_TYPED( PageNoHdl, Button*, void ); - DECL_LINK_TYPED(ScaleHdl, ListBox&, void); + DECL_LINK(PageDirHdl, Button*, void); + DECL_LINK( PageNoHdl, Button*, void ); + DECL_LINK(ScaleHdl, ListBox&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPTABLE_HXX diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 3bebe5aac5d8..8e5af6e49b47 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -94,9 +94,9 @@ private: const ScRefAddress& rEndPos ); // Handler: - DECL_LINK_TYPED( LbSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( BtnClickHdl, Button*, void ); - DECL_LINK_TYPED( EdEntriesModHdl, Edit&, void); + DECL_LINK( LbSelectHdl, ListBox&, void ); + DECL_LINK( BtnClickHdl, Button*, void ); + DECL_LINK( EdEntriesModHdl, Edit&, void); }; #endif // INCLUDED_SC_SOURCE_UI_INC_TPUSRLST_HXX diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index a8a73b8e99f2..b6cf36b718b0 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -61,9 +61,9 @@ class ScTpContentOptions : public SfxTabPage ScViewOptions* pLocalOptions; void InitGridOpt(); - DECL_LINK_TYPED( GridHdl, ListBox&, void ); - DECL_LINK_TYPED( SelLbObjHdl, ListBox&, void ); - DECL_LINK_TYPED( CBHdl, Button*, void ); + DECL_LINK( GridHdl, ListBox&, void ); + DECL_LINK( SelLbObjHdl, ListBox&, void ); + DECL_LINK( CBHdl, Button*, void ); ScTpContentOptions( vcl::Window* pParent, const SfxItemSet& rArgSet ); @@ -106,8 +106,8 @@ class ScTpLayoutOptions : public SfxTabPage SvxStringArray aUnitArr; - DECL_LINK_TYPED(MetricHdl, ListBox&, void ); - DECL_LINK_TYPED( AlignHdl, Button*, void ); + DECL_LINK(MetricHdl, ListBox&, void ); + DECL_LINK( AlignHdl, Button*, void ); ScDocument *pDoc; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 802bc30d4485..58df264167c6 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -92,8 +92,8 @@ private: void SetFirstFormula( const OUString& rFmlaStr ); void SetSecondFormula( const OUString& rFmlaStr ); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(CheckHdl, Button*, void); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(CheckHdl, Button*, void); VclPtr<ListBox> m_pLbAllow; VclPtr<CheckBox> m_pCbAllow; /// Allow blank cells. @@ -116,8 +116,8 @@ private: OUString maStrList; sal_Unicode mcFmlaSep; /// List separator in formulas. - DECL_LINK_TYPED( EditSetFocusHdl, Control&, void ); - DECL_LINK_TYPED( KillFocusHdl, Control&, void ); + DECL_LINK( EditSetFocusHdl, Control&, void ); + DECL_LINK( KillFocusHdl, Control&, void ); void OnClick( Button *pBtn ); VclPtr<formula::RefEdit> m_pRefEdit; public: @@ -282,8 +282,8 @@ private: void Init(); // Handler ------------------------ - DECL_LINK_TYPED(SelectActionHdl, ListBox&, void); - DECL_LINK_TYPED(ClickSearchHdl, Button*, void); + DECL_LINK(SelectActionHdl, ListBox&, void); + DECL_LINK(ClickSearchHdl, Button*, void); public: ScTPValidationError( vcl::Window* pParent, const SfxItemSet& rArgSet ); diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 1e717cc98668..e007a4b6f055 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -225,7 +225,7 @@ private: bool bPagebreak:1; // Page break preview mode bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click - DECL_DLLPRIVATE_LINK_TYPED( EditEngineHdl, EditStatus&, void ); + DECL_DLLPRIVATE_LINK( EditEngineHdl, EditStatus&, void ); SAL_DLLPRIVATE void CalcPPT(); SAL_DLLPRIVATE void CreateTabData( SCTAB nNewTab ); diff --git a/sc/source/ui/inc/xmlsourcedlg.hxx b/sc/source/ui/inc/xmlsourcedlg.hxx index 6c4f64c5dce5..d5e415aee4da 100644 --- a/sc/source/ui/inc/xmlsourcedlg.hxx +++ b/sc/source/ui/inc/xmlsourcedlg.hxx @@ -94,10 +94,10 @@ private: void CancelPressed(); void RefEditModified(); - DECL_LINK_TYPED(GetFocusHdl, Control&, void); - DECL_LINK_TYPED(BtnPressedHdl, Button*, void); - DECL_LINK_TYPED(TreeItemSelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(RefModifiedHdl, Edit&, void); + DECL_LINK(GetFocusHdl, Control&, void); + DECL_LINK(BtnPressedHdl, Button*, void); + DECL_LINK(TreeItemSelectHdl, SvTreeListBox*, void); + DECL_LINK(RefModifiedHdl, Edit&, void); }; #endif |