diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /cui/source/inc | |
| parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) | |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'cui/source/inc')
61 files changed, 550 insertions, 550 deletions
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 60b81dbbe899..affdf32f1c85 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -74,7 +74,7 @@ private: inline SpellDialog* GetSpellDialog() const; - DECL_LINK_TYPED(ToolbarHdl, ToolBox*, void); + DECL_LINK(ToolbarHdl, ToolBox*, void); protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; @@ -179,23 +179,23 @@ private: css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpell; - DECL_LINK_TYPED(ChangeHdl, Button*, void); - DECL_LINK_TYPED(DoubleClickChangeHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeAllHdl, Button*, void); - DECL_LINK_TYPED( IgnoreAllHdl, Button*, void ); - DECL_LINK_TYPED(IgnoreHdl, Button*, void); - DECL_LINK_TYPED( CheckGrammarHdl, Button*, void ); - DECL_LINK_TYPED( ExtClickHdl, Button*, void ); - DECL_LINK_TYPED(CancelHdl, Button*, void); - DECL_LINK_TYPED( ModifyHdl, Edit&, void); - DECL_LINK_TYPED(UndoHdl, Button*, void); - DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void ); - DECL_LINK_TYPED( AddToDictClickHdl, Button*, void ); - DECL_LINK_TYPED( LanguageSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DialogUndoHdl, SpellUndoAction_Impl&, void ); - DECL_LINK_TYPED( HandleHyperlink, FixedHyperlink&, void ); - - DECL_LINK_TYPED( InitHdl, void*, void ); + DECL_LINK(ChangeHdl, Button*, void); + DECL_LINK(DoubleClickChangeHdl, ListBox&, void); + DECL_LINK(ChangeAllHdl, Button*, void); + DECL_LINK( IgnoreAllHdl, Button*, void ); + DECL_LINK(IgnoreHdl, Button*, void); + DECL_LINK( CheckGrammarHdl, Button*, void ); + DECL_LINK( ExtClickHdl, Button*, void ); + DECL_LINK(CancelHdl, Button*, void); + DECL_LINK( ModifyHdl, Edit&, void); + DECL_LINK(UndoHdl, Button*, void); + DECL_LINK( AddToDictSelectHdl, MenuButton*, void ); + DECL_LINK( AddToDictClickHdl, Button*, void ); + DECL_LINK( LanguageSelectHdl, ListBox&, void ); + DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl&, void ); + DECL_LINK( HandleHyperlink, FixedHyperlink&, void ); + + DECL_LINK( InitHdl, void*, void ); void AddToDictionaryExecute( sal_uInt16 ItemId, PopupMenu *pMenu ); void StartSpellOptDlg_Impl(); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index d9597bd474f9..80fda68b6552 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -69,7 +69,7 @@ public: virtual ~AboutDialog() override; virtual void dispose() override; - DECL_LINK_TYPED( HandleClick, Button*, void ); + DECL_LINK( HandleClick, Button*, void ); }; #endif // INCLUDED_CUI_SOURCE_INC_ABOUT_HXX diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index e7f0298c27cd..24b92c90c15a 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -147,16 +147,16 @@ private: OUString m_sModuleShortName; OUString m_sModuleUIName; - DECL_LINK_TYPED(ChangeHdl, Button *, void); - DECL_LINK_TYPED(RemoveHdl, Button *, void); - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED(Save, Button *, void); - DECL_LINK_TYPED(Load, Button *, void); - DECL_LINK_TYPED(Default, Button *, void); - DECL_LINK_TYPED(RadioHdl, Button *, void); - - DECL_LINK_TYPED(LoadHdl, sfx2::FileDialogHelper *, void); - DECL_LINK_TYPED(SaveHdl, sfx2::FileDialogHelper *, void); + DECL_LINK(ChangeHdl, Button *, void); + DECL_LINK(RemoveHdl, Button *, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void ); + DECL_LINK(Save, Button *, void); + DECL_LINK(Load, Button *, void); + DECL_LINK(Default, Button *, void); + DECL_LINK(RadioHdl, Button *, void); + + DECL_LINK(LoadHdl, sfx2::FileDialogHelper *, void); + DECL_LINK(SaveHdl, sfx2::FileDialogHelper *, void); OUString GetLabel4Command(const OUString& rCommand); void InitAccCfg(); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 3695dadf6526..c70e95cf544d 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -76,8 +76,8 @@ private: bool HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const; - DECL_LINK_TYPED( UpdateEnableHdl, ListBox&, void ); - DECL_LINK_TYPED( UpdateEnableClickHdl, Button*, void ); + DECL_LINK( UpdateEnableHdl, ListBox&, void ); + DECL_LINK( UpdateEnableClickHdl, Button*, void ); private: VclPtr<ListBox> m_pLbHorAlign; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 5005acf32a2c..5c832436e976 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -49,7 +49,7 @@ class OfaAutoCorrDlg : public SfxTabDialog sal_uInt16 m_nReplacePageId; sal_uInt16 m_nExceptionsPageId; - DECL_LINK_TYPED(SelectLanguageHdl, ListBox&, void); + DECL_LINK(SelectLanguageHdl, ListBox&, void); public: OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet *pSet); @@ -160,9 +160,9 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(EditHdl, Button*, void); - DECL_LINK_TYPED(DoubleClickEditHdl, SvTreeListBox*, bool); + DECL_LINK(SelectHdl, SvTreeListBox*, void); + DECL_LINK(EditHdl, Button*, void); + DECL_LINK(DoubleClickEditHdl, SvTreeListBox*, bool); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); @@ -263,10 +263,10 @@ private: bool bReplaceEditChanged:1; bool bSWriter:1; - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); - DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void); + DECL_LINK(NewDelButtonHdl, Button*, void); + DECL_LINK(NewDelActionHdl, AutoCorrEdit&, bool); + DECL_LINK(ModifyHdl, Edit&, void); bool NewDelHdl(void*); void RefillReplaceBox( bool bFromReset, @@ -323,10 +323,10 @@ private: CollatorWrapper* pCompareClass; LanguageType eLang; - DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); - DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); - DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(NewDelButtonHdl, Button*, void); + DECL_LINK(NewDelActionHdl, AutoCorrEdit&, bool); + DECL_LINK(SelectHdl, ListBox&, void); + DECL_LINK(ModifyHdl, Edit&, void); bool NewDelHdl(void*); /// Box filled with new language void RefillReplaceBoxes(bool bFromReset, @@ -393,8 +393,8 @@ private: sal_UCS4 cStartQuote; sal_UCS4 cEndQuote; - DECL_LINK_TYPED( QuoteHdl, Button*, void ); - DECL_LINK_TYPED( StdQuoteHdl, Button*, void ); + DECL_LINK( QuoteHdl, Button*, void ); + DECL_LINK( StdQuoteHdl, Button*, void ); OUString ChangeStringExt_Impl( sal_UCS4 ); @@ -451,7 +451,7 @@ private: editeng::SortedAutoCompleteStrings* m_pAutoCompleteList; sal_uInt16 m_nAutoCmpltListCnt; - DECL_LINK_TYPED( CheckHdl, CheckBox&, void ); + DECL_LINK( CheckHdl, CheckBox&, void ); OfaAutoCompleteTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -466,7 +466,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; void CopyToClipboard() const; - DECL_LINK_TYPED(DeleteHdl, Button*, void); + DECL_LINK(DeleteHdl, Button*, void); }; // class OfaSmartTagOptionsTabPage --------------------------------------------- @@ -502,21 +502,21 @@ private: Enables/disables all controls in the tab page (except from the check box. */ - DECL_LINK_TYPED(CheckHdl, CheckBox&, void); + DECL_LINK(CheckHdl, CheckBox&, void); /** Handler for the push button Calls the displayPropertyPage function of the smart tag recognizer associated with the currently selected smart tag type. */ - DECL_LINK_TYPED(ClickHdl, Button*, void); + DECL_LINK(ClickHdl, Button*, void); /** Handler for the list box Enables/disables the properties push button if selection in the smart tag types list box changes. */ - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void); public: /// construction via Create() diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 49714edce8b1..9a4d2545b203 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -132,13 +132,13 @@ private: bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot); void ResetFromWallpaperItem( const SfxItemSet& rSet ); - DECL_LINK_TYPED( LoadIdleHdl_Impl, Idle*, void ); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void); - DECL_LINK_TYPED( RadioClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FileClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED(BackgroundColorHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED( TblDestinationHdl_Impl, ListBox&, void ); + DECL_LINK( LoadIdleHdl_Impl, Idle*, void ); + DECL_LINK(SelectHdl_Impl, ListBox&, void ); + DECL_LINK(BrowseHdl_Impl, Button*, void); + DECL_LINK( RadioClickHdl_Impl, Button*, void ); + DECL_LINK( FileClickHdl_Impl, Button*, void ); + DECL_LINK(BackgroundColorHdl_Impl, ValueSet*, void); + DECL_LINK( TblDestinationHdl_Impl, ListBox&, void ); }; #endif // INCLUDED_CUI_SOURCE_INC_BACKGRND_HXX diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index f2b2eaa1bb7f..c32dba59e174 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -118,15 +118,15 @@ private: std::set<sal_Int16> maUsedBorderStyles; // Handler - DECL_LINK_TYPED( SelStyleHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SelColHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( LinesChanged_Impl, LinkParamNone*, void ); - DECL_LINK_TYPED( ModifyDistanceHdl_Impl, Edit&, void); - DECL_LINK_TYPED( ModifyWidthHdl_Impl, Edit&, void); - DECL_LINK_TYPED( SyncHdl_Impl, Button*, void); - DECL_LINK_TYPED( RemoveAdjacentCellBorderHdl_Impl, Button*, void); + DECL_LINK( SelStyleHdl_Impl, ListBox&, void ); + DECL_LINK( SelColHdl_Impl, ListBox&, void ); + DECL_LINK( SelPreHdl_Impl, ValueSet*, void ); + DECL_LINK( SelSdwHdl_Impl, ValueSet*, void ); + DECL_LINK( LinesChanged_Impl, LinkParamNone*, void ); + DECL_LINK( ModifyDistanceHdl_Impl, Edit&, void); + DECL_LINK( ModifyWidthHdl_Impl, Edit&, void); + DECL_LINK( SyncHdl_Impl, Button*, void); + DECL_LINK( RemoveAdjacentCellBorderHdl_Impl, Button*, void); sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const; sal_uInt16 GetPresetStringId( sal_uInt16 nValueSetIdx ) const; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index c91fa99c4e97..6ca5756ab118 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -354,8 +354,8 @@ private: bool bInitialised; SaveInData* pCurrentSaveInData; - DECL_LINK_TYPED( SelectSaveInLocation, ListBox&, void ); - DECL_LINK_TYPED( AsyncInfoMsg, void*, void ); + DECL_LINK( SelectSaveInLocation, ListBox&, void ); + DECL_LINK( AsyncInfoMsg, void*, void ); protected: @@ -402,7 +402,7 @@ protected: SvxConfigPage( vcl::Window*, const SfxItemSet& ); - DECL_LINK_TYPED( MoveHdl, Button *, void ); + DECL_LINK( MoveHdl, Button *, void ); virtual SaveInData* CreateSaveInData( const css::uno::Reference< css::ui::XUIConfigurationManager >&, @@ -477,15 +477,15 @@ class SvxMenuConfigPage : public SvxConfigPage { private: bool m_bIsMenuBar; - DECL_LINK_TYPED( SelectMenu, ListBox&, void ); - DECL_LINK_TYPED( SelectMenuEntry, SvTreeListBox *, void ); - DECL_LINK_TYPED( NewMenuHdl, Button *, void ); - DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); - DECL_LINK_TYPED( AddSeparatorHdl, Button *, void ); - DECL_LINK_TYPED( DeleteCommandHdl, Button *, void ); - DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); + DECL_LINK( SelectMenu, ListBox&, void ); + DECL_LINK( SelectMenuEntry, SvTreeListBox *, void ); + DECL_LINK( NewMenuHdl, Button *, void ); + DECL_LINK( MenuSelectHdl, MenuButton *, void ); + DECL_LINK( EntrySelectHdl, MenuButton *, void ); + DECL_LINK( AddCommandsHdl, Button *, void ); + DECL_LINK( AddSeparatorHdl, Button *, void ); + DECL_LINK( DeleteCommandHdl, Button *, void ); + DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog&, void ); void Init() override; void UpdateButtonStates() override; @@ -521,9 +521,9 @@ class SvxMainMenuOrganizerDialog : public ModalDialog void UpdateButtonStates(); - DECL_LINK_TYPED( MoveHdl, Button *, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( MoveHdl, Button *, void ); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); public: SvxMainMenuOrganizerDialog ( @@ -571,18 +571,18 @@ class SvxToolbarConfigPage : public SvxConfigPage { private: - DECL_LINK_TYPED( SelectToolbar, ListBox&, void ); - DECL_LINK_TYPED( SelectToolbarEntry, SvTreeListBox*, void ); - DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( StyleChangeHdl, Button *, void ); - DECL_LINK_TYPED( NewToolbarHdl, Button *, void ); - DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); - DECL_LINK_TYPED( AddSeparatorHdl, Button *, void ); - DECL_LINK_TYPED( DeleteCommandHdl, Button *, void ); - DECL_LINK_TYPED( ResetTopLevelHdl, Button *, void ); - DECL_LINK_TYPED( AddFunctionHdl, SvxScriptSelectorDialog&, void ); - DECL_LINK_TYPED( MoveHdl, Button *, void ); + DECL_LINK( SelectToolbar, ListBox&, void ); + DECL_LINK( SelectToolbarEntry, SvTreeListBox*, void ); + DECL_LINK( ToolbarSelectHdl, MenuButton *, void ); + DECL_LINK( EntrySelectHdl, MenuButton *, void ); + DECL_LINK( StyleChangeHdl, Button *, void ); + DECL_LINK( NewToolbarHdl, Button *, void ); + DECL_LINK( AddCommandsHdl, Button *, void ); + DECL_LINK( AddSeparatorHdl, Button *, void ); + DECL_LINK( DeleteCommandHdl, Button *, void ); + DECL_LINK( ResetTopLevelHdl, Button *, void ); + DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog&, void ); + DECL_LINK( MoveHdl, Button *, void ); void UpdateButtonStates() override; short QueryReset() override; @@ -727,9 +727,9 @@ public: css::uno::Reference< css::graphic::XGraphic > GetSelectedIcon(); - DECL_LINK_TYPED( SelectHdl, ToolBox *, void ); - DECL_LINK_TYPED( ImportHdl, Button *, void ); - DECL_LINK_TYPED( DeleteHdl, Button *, void ); + DECL_LINK( SelectHdl, ToolBox *, void ); + DECL_LINK( ImportHdl, Button *, void ); + DECL_LINK( DeleteHdl, Button *, void ); }; class SvxIconReplacementDialog : public MessBox diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index b700b4507774..1dbda947bdd4 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -133,10 +133,10 @@ private: void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp ); bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); - DECL_LINK_TYPED( UpdateHdl_Impl, Idle *, void ); - DECL_LINK_TYPED( FontModifyEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( FontModifyListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( FontModifyComboBoxHdl_Impl, ComboBox&, void ); + DECL_LINK( UpdateHdl_Impl, Idle *, void ); + DECL_LINK( FontModifyEditHdl_Impl, Edit&, void ); + DECL_LINK( FontModifyListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( FontModifyComboBoxHdl_Impl, ComboBox&, void ); void FontModifyHdl_Impl(void*); public: @@ -222,11 +222,11 @@ private: bool FillItemSetColor_Impl( SfxItemSet& rSet ); void SelectHdl_Impl(ListBox*); - DECL_LINK_TYPED(SelectListBoxHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(CbClickHdl_Impl, Button*, void); - DECL_LINK_TYPED(TristClickHdl_Impl, Button*, void); - DECL_LINK_TYPED(UpdatePreview_Impl, ListBox&, void); - DECL_LINK_TYPED(ColorBoxSelectHdl_Impl, ListBox&, void); + DECL_LINK(SelectListBoxHdl_Impl, ListBox&, void); + DECL_LINK(CbClickHdl_Impl, Button*, void); + DECL_LINK(TristClickHdl_Impl, Button*, void); + DECL_LINK(UpdatePreview_Impl, ListBox&, void); + DECL_LINK(ColorBoxSelectHdl_Impl, ListBox&, void); public: virtual ~SvxCharEffectsPage() override; @@ -297,15 +297,15 @@ private: void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); void SetEscapement_Impl( SvxEscapement nEsc ); - DECL_LINK_TYPED( PositionHdl_Impl, Button*, void ); - DECL_LINK_TYPED( RotationHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FontModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( AutoPositionHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void ); - DECL_LINK_TYPED( KerningSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( KerningModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( LoseFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( ScaleWidthModifyHdl_Impl, Edit&, void ); + DECL_LINK( PositionHdl_Impl, Button*, void ); + DECL_LINK( RotationHdl_Impl, Button*, void ); + DECL_LINK( FontModifyHdl_Impl, Edit&, void ); + DECL_LINK( AutoPositionHdl_Impl, Button*, void ); + DECL_LINK( FitToLineHdl_Impl, Button*, void ); + DECL_LINK( KerningSelectHdl_Impl, ListBox&, void ); + DECL_LINK( KerningModifyHdl_Impl, Edit&, void ); + DECL_LINK( LoseFocusHdl_Impl, Control&, void ); + DECL_LINK( ScaleWidthModifyHdl_Impl, Edit&, void ); public: virtual ~SvxCharPositionPage() override; @@ -350,8 +350,8 @@ private: void SelectCharacter( ListBox* pBox ); void SetBracket( sal_Unicode cBracket, bool bStart ); - DECL_LINK_TYPED(TwoLinesHdl_Impl, Button*, void); - DECL_LINK_TYPED(CharacterMapHdl_Impl, ListBox&, void ); + DECL_LINK(TwoLinesHdl_Impl, Button*, void); + DECL_LINK(CharacterMapHdl_Impl, ListBox&, void ); public: virtual ~SvxCharTwoLinesPage() override; diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 362b9569f278..ab291494e7d3 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -57,8 +57,8 @@ private: void FillTypeLB(); - DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeAttrEditHdl_Impl, Edit&, void ); + DECL_LINK( ChangeAttrListBoxHdl_Impl, ListBox&, void ); void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index 0d48662e830c..41382bb45949 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -83,15 +83,15 @@ private: const SubsetMap* pSubsetMap; enum class Radix : sal_Int16 {decimal = 10, hexadecimal=16}; - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(FontSelectHdl, ListBox&, void); - DECL_LINK_TYPED(SubsetSelectHdl, ListBox&, void); - DECL_LINK_TYPED(CharDoubleClickHdl, SvxShowCharSet*,void); - DECL_LINK_TYPED(CharSelectHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(CharHighlightHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(CharPreSelectHdl, SvxShowCharSet*, void); - DECL_LINK_TYPED(DecimalCodeChangeHdl, Edit&, void); - DECL_LINK_TYPED(HexCodeChangeHdl, Edit&, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(FontSelectHdl, ListBox&, void); + DECL_LINK(SubsetSelectHdl, ListBox&, void); + DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*,void); + DECL_LINK(CharSelectHdl, SvxShowCharSet*, void); + DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void); + DECL_LINK(CharPreSelectHdl, SvxShowCharSet*, void); + DECL_LINK(DecimalCodeChangeHdl, Edit&, void); + DECL_LINK(HexCodeChangeHdl, Edit&, void); static void fillAllSubsets(ListBox &rListBox); void selectCharByCode(Radix radix); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 5cc0ae265a5b..b61fd63adb16 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -157,23 +157,23 @@ protected: private: // Handler for the Controls - DECL_LINK_TYPED( OnClickedFieldRadios, Button*, void ); - DECL_LINK_TYPED(OnClickedSearchAgain, Button *, void); - DECL_LINK_TYPED( OnClickedSpecialSettings, Button*, void ); + DECL_LINK( OnClickedFieldRadios, Button*, void ); + DECL_LINK(OnClickedSearchAgain, Button *, void); + DECL_LINK( OnClickedSpecialSettings, Button*, void ); - DECL_LINK_TYPED(OnSearchTextModified, Edit&, void); + DECL_LINK(OnSearchTextModified, Edit&, void); - DECL_LINK_TYPED( OnPositionSelected, ListBox&, void ); - DECL_LINK_TYPED( OnFieldSelected, ListBox&, void ); + DECL_LINK( OnPositionSelected, ListBox&, void ); + DECL_LINK( OnFieldSelected, ListBox&, void ); - DECL_LINK_TYPED( OnFocusGrabbed, Control&, void ); - DECL_LINK_TYPED( OnCheckBoxToggled, CheckBox&, void ); + DECL_LINK( OnFocusGrabbed, Control&, void ); + DECL_LINK( OnCheckBoxToggled, CheckBox&, void ); - DECL_LINK_TYPED( OnContextSelection, ListBox&, void ); + DECL_LINK( OnContextSelection, ListBox&, void ); - DECL_LINK_TYPED( OnSearchProgress, const FmSearchProgress*, void ); + DECL_LINK( OnSearchProgress, const FmSearchProgress*, void ); - DECL_LINK_TYPED( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI + DECL_LINK( OnDelayedPaint, Timer*, void ); ///< see EnableSearchUI void initCommon( const css::uno::Reference< css::sdbc::XResultSet >& _rxCursor ); }; diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 64343fbfa1f9..7fe1f00b1974 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -88,7 +88,7 @@ private: INetURLObject startUrl_; rtl::Reference< SearchThread > maSearchThread; - DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); + DECL_LINK( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -96,7 +96,7 @@ public: virtual ~SearchProgress() override; virtual void dispose() override; - DECL_LINK_TYPED( CleanUpHdl, void*, void ); + DECL_LINK( CleanUpHdl, void*, void ); virtual short Execute() override; virtual void StartExecuteModal( const Link<Dialog&,void>& rEndDialogHdl ) override; @@ -133,7 +133,7 @@ private: rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; - DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); + DECL_LINK( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -142,7 +142,7 @@ public: virtual ~TakeProgress() override; virtual void dispose() override; - DECL_LINK_TYPED( CleanUpHdl, void*, void ); + DECL_LINK( CleanUpHdl, void*, void ); void SetFile( const INetURLObject& rURL ) { m_pFtTakeFile->SetText( GetReducedString( rURL, 30 ) ); } virtual short Execute() override; @@ -158,9 +158,9 @@ private: GalleryTheme* pTheme; GalleryProgress aStatusProgress; - DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); - DECL_LINK_TYPED( TimeoutHdl, Idle*, void ); - DECL_LINK_TYPED( ActualizeHdl, const INetURLObject&, void ); + DECL_LINK( ClickCancelBtn, Button*, void ); + DECL_LINK( TimeoutHdl, Idle*, void ); + DECL_LINK( ActualizeHdl, const INetURLObject&, void ); public: ActualizeProgress( vcl::Window* pWindow, GalleryTheme* pThm ); @@ -188,7 +188,7 @@ private: VclPtr<ListBox> m_pLbResName; GalleryTheme* pThm; - DECL_LINK_TYPED( ClickOkHdl, Button*, void ); + DECL_LINK( ClickOkHdl, Button*, void ); public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); virtual ~GalleryIdDialog() override; @@ -278,16 +278,16 @@ class TPGalleryThemeProperties : public SfxTabPage void TakeFiles(); void DoPreview(); - DECL_LINK_TYPED( ClickPreviewHdl, Button*, void ); - DECL_LINK_TYPED( ClickSearchHdl, Button*, void ); - DECL_LINK_TYPED( ClickTakeHdl, Button*, void ); - DECL_LINK_TYPED( ClickTakeAllHdl, Button*, void ); - DECL_LINK_TYPED( SelectFoundHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectFileTypeHdl, ComboBox&, void ); - DECL_LINK_TYPED( DClickFoundHdl, ListBox&, void ); - DECL_LINK_TYPED( PreviewTimerHdl, Timer*, void ); - DECL_LINK_TYPED( EndSearchProgressHdl, Dialog&, void ); - DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_LINK( ClickPreviewHdl, Button*, void ); + DECL_LINK( ClickSearchHdl, Button*, void ); + DECL_LINK( ClickTakeHdl, Button*, void ); + DECL_LINK( ClickTakeAllHdl, Button*, void ); + DECL_LINK( SelectFoundHdl, ListBox&, void ); + DECL_LINK( SelectFileTypeHdl, ComboBox&, void ); + DECL_LINK( DClickFoundHdl, ListBox&, void ); + DECL_LINK( PreviewTimerHdl, Timer*, void ); + DECL_LINK( EndSearchProgressHdl, Dialog&, void ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); public: TPGalleryThemeProperties( vcl::Window* pWindow, const SfxItemSet& rSet ); diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 53874f2255bb..ad3803a960df 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -73,8 +73,8 @@ private: Size maSizePixel; bool bIsBitmap; - DECL_LINK_TYPED( ImplPreviewTimeoutHdl, Timer *, void ); - DECL_LINK_TYPED( ImplModifyHdl, LinkParamNone*, void); + DECL_LINK( ImplPreviewTimeoutHdl, Timer *, void ); + DECL_LINK( ImplModifyHdl, LinkParamNone*, void); protected: VclPtr<GraphicPreviewWindow> mpPreview; @@ -95,7 +95,7 @@ class GraphicFilterSmooth : public GraphicFilterDialog { private: VclPtr<NumericField> mpMtrRadius; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: @@ -113,8 +113,8 @@ private: VclPtr<MetricField> mpMtrWidth; VclPtr<MetricField> mpMtrHeight; VclPtr<CheckBox> mpCbxEdges; - DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, @@ -133,8 +133,8 @@ class GraphicFilterSolarize : public GraphicFilterDialog private: VclPtr<MetricField> mpMtrThreshold; VclPtr<CheckBox> mpCbxInvert; - DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: @@ -152,7 +152,7 @@ class GraphicFilterSepia : public GraphicFilterDialog { private: VclPtr<MetricField> mpMtrSepia; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); @@ -169,7 +169,7 @@ class GraphicFilterPoster : public GraphicFilterDialog { private: VclPtr<NumericField> mpNumPoster; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); public: GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 95cea405e05a..056e4cd0eb9b 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -68,9 +68,9 @@ private: bool mbReadOnly : 1; bool mbIsHTMLDoc : 1; - DECL_LINK_TYPED (ClickOkHdl_Impl, Button *, void ); - DECL_LINK_TYPED (ClickApplyHdl_Impl, Button *, void ); - DECL_LINK_TYPED (ClickCloseHdl_Impl, Button *, void ); + DECL_LINK (ClickOkHdl_Impl, Button *, void ); + DECL_LINK (ClickApplyHdl_Impl, Button *, void ); + DECL_LINK (ClickCloseHdl_Impl, Button *, void ); protected: virtual bool Close() override; diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index b4bedc9c18d5..5f1065ada287 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -49,7 +49,7 @@ private: // "name" fields unsigned nShortNameField; - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); bool GetData_Impl(); void SetData_Impl(); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 86f5119aae80..0c103cc22e71 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -94,7 +94,7 @@ private: protected: virtual short Ok() override; - DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); + DECL_LINK( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -156,12 +156,12 @@ class SvxTransparenceTabPage : public SvxTabPage XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - DECL_LINK_TYPED(ClickTransOffHdl_Impl, Button*, void ); - DECL_LINK_TYPED(ClickTransLinearHdl_Impl, Button*, void ); - DECL_LINK_TYPED(ClickTransGradientHdl_Impl, Button*, void ); - DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ModifiedTrgrEditHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ModifiedTrgrListBoxHdl_Impl, ListBox&, void); + DECL_LINK(ClickTransOffHdl_Impl, Button*, void ); + DECL_LINK(ClickTransLinearHdl_Impl, Button*, void ); + DECL_LINK(ClickTransGradientHdl_Impl, Button*, void ); + DECL_LINK(ModifyTransparentHdl_Impl, Edit&, void); + DECL_LINK(ModifiedTrgrEditHdl_Impl, Edit&, void); + DECL_LINK(ModifiedTrgrListBoxHdl_Impl, ListBox&, void); void ModifiedTrgrHdl_Impl(void*); void ActivateLinear(bool bActivate); @@ -239,15 +239,15 @@ private: MapUnit m_ePoolUnit; - DECL_LINK_TYPED(SelectDialogTypeHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ModifyColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyGradientHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void ); + DECL_LINK(SelectDialogTypeHdl_Impl, ListBox&, void); + DECL_LINK( ModifyColorHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyGradientHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyHatchingHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyBitmapHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyTileHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ModifyTileClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickScaleHdl_Impl, Button*, void ); + DECL_LINK( ModifyTileHdl_Impl, Edit&, void ); + DECL_LINK( ModifyTileClickHdl_Impl, Button*, void ); + DECL_LINK( ClickScaleHdl_Impl, Button*, void ); void ClickInvisibleHdl_Impl(); void ClickHatchingHdl_Impl(); void ClickGradientHdl_Impl(); @@ -318,9 +318,9 @@ private: SfxItemSet& m_rXFSet; MapUnit m_ePoolUnit; - DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ModifyShadowHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( SelectShadowHdl_Impl, ListBox&, void ); + DECL_LINK( ClickShadowHdl_Impl, Button*, void ); + DECL_LINK( ModifyShadowHdl_Impl, Edit&, void ); + DECL_LINK( SelectShadowHdl_Impl, ListBox&, void ); public: SvxShadowTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); @@ -389,16 +389,16 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeGradientHdl, ValueSet*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ChangeGradientHdl, ValueSet*, void ); void ChangeGradientHdl_Impl(); - DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeAutoStepHdl_Impl, CheckBox&, void ); - DECL_LINK_TYPED( ModifiedSliderHdl_Impl, Slider*, void ); + DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ModifiedEditHdl_Impl, Edit&, void ); + DECL_LINK( ModifiedListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeAutoStepHdl_Impl, CheckBox&, void ); + DECL_LINK( ModifiedSliderHdl_Impl, Slider*, void ); void ModifiedHdl_Impl(void*); void SetControlState_Impl( css::awt::GradientStyle eXGS ); @@ -470,18 +470,18 @@ private: MapUnit m_ePoolUnit; - DECL_LINK_TYPED( ChangeHatchHdl, ValueSet*, void ); + DECL_LINK( ChangeHatchHdl, ValueSet*, void ); void ChangeHatchHdl_Impl(); - DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ToggleHatchBackgroundColor_Impl, CheckBox&, void ); - DECL_LINK_TYPED( ModifiedBackgroundHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifiedSliderHdl_Impl, Slider*, void ); + DECL_LINK( ModifiedEditHdl_Impl, Edit&, void ); + DECL_LINK( ModifiedListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ToggleHatchBackgroundColor_Impl, CheckBox&, void ); + DECL_LINK( ModifiedBackgroundHdl_Impl, ListBox&, void ); + DECL_LINK( ModifiedSliderHdl_Impl, Slider*, void ); void ModifiedHdl_Impl(void*); - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); sal_Int32 SearchHatchList(const OUString& rHatchName); @@ -568,16 +568,16 @@ private: sal_Int64 nFilledHeightPercent; sal_Int64 nZoomedWidthPercent; sal_Int64 nZoomedHeightPercent; - DECL_LINK_TYPED( ModifyBitmapHdl, ValueSet*, void ); - DECL_LINK_TYPED( ClickScaleHdl, Button*, void ); - DECL_LINK_TYPED( ModifyBitmapStyleHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyBitmapSizeHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyBitmapPositionHdl, ListBox&, void ); - DECL_LINK_TYPED( ModifyPositionOffsetHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyTileOffsetHdl, Edit&, void ); - DECL_LINK_TYPED( ClickRenameHdl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickImportHdl, Button*, void ); + DECL_LINK( ModifyBitmapHdl, ValueSet*, void ); + DECL_LINK( ClickScaleHdl, Button*, void ); + DECL_LINK( ModifyBitmapStyleHdl, ListBox&, void ); + DECL_LINK( ModifyBitmapSizeHdl, Edit&, void ); + DECL_LINK( ModifyBitmapPositionHdl, ListBox&, void ); + DECL_LINK( ModifyPositionOffsetHdl, Edit&, void ); + DECL_LINK( ModifyTileOffsetHdl, Edit&, void ); + DECL_LINK( ClickRenameHdl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl, SvxPresetListBox*, void ); + DECL_LINK( ClickImportHdl, Button*, void ); void ClickBitmapHdl_Impl(); void CalculateBitmapPresetSize(); sal_Int32 SearchBitmapList(const OUString& rBitmapName); @@ -646,12 +646,12 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangePatternHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( ChangeColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ClickRenameHdl_Impl, SvxPresetListBox*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ChangePatternHdl_Impl, ValueSet*, void ); + DECL_LINK( ChangeColorHdl_Impl, ListBox&, void ); + DECL_LINK( ClickRenameHdl_Impl, SvxPresetListBox*, void ); + DECL_LINK( ClickDeleteHdl_Impl, SvxPresetListBox*, void ); public: SvxPatternTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); @@ -766,19 +766,19 @@ private: void ImpColorCountChanged(); void FillPaletteLB(); - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickWorkOnHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickWorkOnHdl_Impl, Button*, void ); + DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectPaletteLBHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectValSetHdl_Impl, ValueSet*, void ); - DECL_LINK_TYPED( SelectColorModeHdl_Impl, RadioButton&, void ); + DECL_LINK( SelectPaletteLBHdl, ListBox&, void ); + DECL_LINK( SelectValSetHdl_Impl, ValueSet*, void ); + DECL_LINK( SelectColorModeHdl_Impl, RadioButton&, void ); void ChangeColor(const Color &rNewColor); void SetColorModel(ColorModel eModel); void ChangeColorModel(); void UpdateColorValues(); static sal_Int32 SearchColorList(OUString const & aColorName); - DECL_LINK_TYPED( ModifiedHdl_Impl, Edit&, void ); + DECL_LINK( ModifiedHdl_Impl, Edit&, void ); void UpdateModified(); css::uno::Reference< css::uno::XComponentContext > m_context; diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index fc84623aa6b2..07f101f2c993 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -60,7 +60,7 @@ private: protected: virtual short Ok() override; - DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); + DECL_LINK( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -168,29 +168,29 @@ private: sal_Int32 m_nActLineWidth; // handler for gallery popup menu button + size - DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( MenuCreateHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); - - DECL_LINK_TYPED( ClickInvisibleHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeStartClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeStartListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeStartModifyHdl_Impl, Edit&, void ); + DECL_LINK( GraphicHdl_Impl, MenuButton *, void ); + DECL_LINK( MenuCreateHdl_Impl, MenuButton *, void ); + DECL_LINK( SizeHdl_Impl, Edit&, void ); + DECL_LINK( RatioHdl_Impl, Button*, void ); + + DECL_LINK( ClickInvisibleHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeStartClickHdl_Impl, Button*, void ); + DECL_LINK( ChangeStartListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeStartModifyHdl_Impl, Edit&, void ); void ChangeStartHdl_Impl(void*); - DECL_LINK_TYPED( ChangeEndListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeEndModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void ); + DECL_LINK( ChangeEndListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeEndModifyHdl_Impl, Edit&, void ); + DECL_LINK( ChangeEndClickHdl_Impl, Button*, void ); void ChangeEndHdl_Impl(void*); - DECL_LINK_TYPED( ChangePreviewListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangePreviewModifyHdl_Impl, Edit&, void ); + DECL_LINK( ChangePreviewListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangePreviewModifyHdl_Impl, Edit&, void ); void ChangePreviewHdl_Impl(void*); - DECL_LINK_TYPED( ChangeTransparentHdl_Impl, Edit&, void ); + DECL_LINK( ChangeTransparentHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeEdgeStyleHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeEdgeStyleHdl_Impl, ListBox&, void ); // LineCaps - DECL_LINK_TYPED( ChangeCapStyleHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeCapStyleHdl_Impl, ListBox&, void ); void FillXLSet_Impl(); @@ -285,18 +285,18 @@ private: void FillDash_Impl(); void FillDialog_Impl(); - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectLinestyleListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK( SelectLinestyleListBoxHdl_Impl, ListBox&, void ); void SelectLinestyleHdl_Impl(ListBox*); - DECL_LINK_TYPED( ChangePreviewHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeNumber1Hdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeNumber2Hdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeMetricHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectTypeListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangePreviewHdl_Impl, Edit&, void ); + DECL_LINK( ChangeNumber1Hdl_Impl, Edit&, void ); + DECL_LINK( ChangeNumber2Hdl_Impl, Edit&, void ); + DECL_LINK( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK( ClickSaveHdl_Impl, Button*, void ); + DECL_LINK( ChangeMetricHdl_Impl, Button*, void ); + DECL_LINK( SelectTypeListBoxHdl_Impl, ListBox&, void ); void SelectTypeHdl_Impl(ListBox*); void CheckChanges_Impl(); @@ -361,12 +361,12 @@ private: sal_uInt16 nDlgType; sal_Int32* pPosLineEndLb; - DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectLineEndHdl_Impl, ListBox&, void ); + DECL_LINK( ClickAddHdl_Impl, Button*, void ); + DECL_LINK( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK( ClickSaveHdl_Impl, Button*, void ); + DECL_LINK( SelectLineEndHdl_Impl, ListBox&, void ); void ChangePreviewHdl_Impl(); void CheckChanges_Impl(); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index 3a120616f54f..80b6638ece00 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -51,16 +51,16 @@ namespace svx sal_uLong m_nOldCount; bool m_bModified; - DECL_LINK_TYPED( NewHdl, Button*, void ); - DECL_LINK_TYPED( EditHdl, Button*, void ); - DECL_LINK_TYPED( DeleteHdl, Button*, void ); - DECL_LINK_TYPED( PathBoxDoubleClickHdl, SvTreeListBox*, bool); + DECL_LINK( NewHdl, Button*, void ); + DECL_LINK( EditHdl, Button*, void ); + DECL_LINK( DeleteHdl, Button*, void ); + DECL_LINK( PathBoxDoubleClickHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED( PathSelect_Impl, SvTreeListBox*, void); + DECL_LINK( PathSelect_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( NameValidator, const OUString&, bool); + DECL_LINK( HeaderSelect_Impl, HeaderBar *, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar *, void ); + DECL_LINK( NameValidator, const OUString&, bool); /** inserts a new entry in the tablistbox diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 07dc6d03e4c3..11dbed3de84a 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -36,7 +36,7 @@ private: Link<SvxNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); @@ -49,7 +49,7 @@ public: field is changed. The Link result determines whether the OK Button is enabled (> 0) or disabled (== 0). - @param rLink a Callback declared with DECL_LINK_TYPED and implemented with + @param rLink a Callback declared with DECL_LINK and implemented with IMPL_LINK, that is executed on modification. @param bCheckImmediately If true, the Link is called directly after @@ -85,7 +85,7 @@ private: // callback link for name uniqueness Link<SvxObjectNameDialog&,bool> aCheckNameHdl; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); public: // constructor @@ -138,8 +138,8 @@ private: VclPtr<FixedImage> pFtImage; Image* pImage; - DECL_LINK_TYPED(Button1Hdl, Button*, void); - DECL_LINK_TYPED(Button2Hdl, Button*, void); + DECL_LINK(Button1Hdl, Button*, void); + DECL_LINK(Button2Hdl, Button*, void); public: SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = nullptr ); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index bfbd63a293eb..a750bdb26597 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -95,13 +95,13 @@ class SvxGrfCropPage : public SfxTabPage virtual ~SvxGrfCropPage() override; virtual void dispose() override; - DECL_LINK_TYPED( ZoomHdl, Edit&, void ); - DECL_LINK_TYPED( SizeHdl, Edit&, void ); - DECL_LINK_TYPED( CropHdl, SpinField&, void ); - DECL_LINK_TYPED( CropLoseFocusHdl, Control&, void ); - DECL_LINK_TYPED( CropModifyHdl, Edit&, void ); - DECL_LINK_TYPED( OrigSizeHdl, Button*, void ); - DECL_LINK_TYPED( Timeout, Timer *, void ); + DECL_LINK( ZoomHdl, Edit&, void ); + DECL_LINK( SizeHdl, Edit&, void ); + DECL_LINK( CropHdl, SpinField&, void ); + DECL_LINK( CropLoseFocusHdl, Control&, void ); + DECL_LINK( CropModifyHdl, Edit&, void ); + DECL_LINK( OrigSizeHdl, Button*, void ); + DECL_LINK( Timeout, Timer *, void ); void CalcZoom(); void CalcMinMaxBorder(); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index bf29f12f9582..91c55eb3a2b1 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -79,8 +79,8 @@ namespace svx virtual void LoseFocus() override; virtual void Command( const CommandEvent& rCEvt ) override; - DECL_LINK_TYPED( SelectSuggestionListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectSuggestionValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectSuggestionListBoxHdl, ListBox&, void ); + DECL_LINK( SelectSuggestionValueSetHdl, ValueSet*, void ); void SelectSuggestionHdl(Control*); void SetHelpIds(); @@ -182,11 +182,11 @@ namespace svx void EnableRubySupport( bool bVal ); private: - DECL_LINK_TYPED( OnOption, Button*, void ); - DECL_LINK_TYPED( OnSuggestionModified, Edit&, void ); - DECL_LINK_TYPED( OnSuggestionSelected, SuggestionDisplay&, void ); - DECL_LINK_TYPED( OnConversionDirectionClicked, Button*, void ); - DECL_LINK_TYPED( ClickByCharacterHdl, Button*, void ); + DECL_LINK( OnOption, Button*, void ); + DECL_LINK( OnSuggestionModified, Edit&, void ); + DECL_LINK( OnSuggestionSelected, SuggestionDisplay&, void ); + DECL_LINK( OnConversionDirectionClicked, Button*, void ); + DECL_LINK( ClickByCharacterHdl, Button*, void ); /// fill the suggestion list box with suggestions for the actual input void FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions ); @@ -212,11 +212,11 @@ namespace svx HHDictList m_aDictList; css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( DictsLB_SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( NewDictHdl, Button*, void ); - DECL_LINK_TYPED( EditDictHdl, Button*, void ); - DECL_LINK_TYPED( DeleteDictHdl, Button*, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( DictsLB_SelectHdl, SvTreeListBox*, void ); + DECL_LINK( NewDictHdl, Button*, void ); + DECL_LINK( EditDictHdl, Button*, void ); + DECL_LINK( DeleteDictHdl, Button*, void ); void Init(); ///< reads settings from core and init controls public: @@ -236,8 +236,8 @@ namespace svx bool m_bEntered; - DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); + DECL_LINK( OKHdl, Button*, void ); + DECL_LINK( ModifyHdl, Edit&, void ); public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); virtual ~HangulHanjaNewDictDialog() override; @@ -291,16 +291,16 @@ namespace svx bool m_bModifiedSuggestions; bool m_bModifiedOriginal; - DECL_LINK_TYPED( OriginalModifyHdl, Edit&, void ); - DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EditModifyHdl1, Edit&, void ); - DECL_LINK_TYPED( EditModifyHdl2, Edit&, void ); - DECL_LINK_TYPED( EditModifyHdl3, Edit&, void ); - DECL_LINK_TYPED( EditModifyHdl4, Edit&, void ); + DECL_LINK( OriginalModifyHdl, Edit&, void ); + DECL_LINK( ScrollHdl, ScrollBar*, void ); + DECL_LINK( EditModifyHdl1, Edit&, void ); + DECL_LINK( EditModifyHdl2, Edit&, void ); + DECL_LINK( EditModifyHdl3, Edit&, void ); + DECL_LINK( EditModifyHdl4, Edit&, void ); - DECL_LINK_TYPED( BookLBSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( NewPBPushHdl, Button*, void ); - DECL_LINK_TYPED( DeletePBPushHdl, Button*, void ); + DECL_LINK( BookLBSelectHdl, ListBox&, void ); + DECL_LINK( NewPBPushHdl, Button*, void ); + DECL_LINK( DeletePBPushHdl, Button*, void ); void InitEditDictDialog( sal_uInt32 _nSelDict ); void UpdateOriginalLB(); diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx index 5fc81255614c..085213fc9eb1 100644 --- a/cui/source/inc/headertablistbox.hxx +++ b/cui/source/inc/headertablistbox.hxx @@ -30,7 +30,7 @@ private: VclPtr<HeaderBar> maHeaderBar; VclPtr<SvHeaderTabListBox> maListBox; protected: - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar*, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar*, void ); virtual bool Notify( NotifyEvent& rNEvt ) override; public: MacroEventListBox( vcl::Window* pParent, WinBits nStyle ); diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 7be89e1aee9f..82bf563f53cd 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -39,7 +39,7 @@ private: bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); - DECL_LINK_TYPED (ClickNewHdl_Impl, Button*, void ); + DECL_LINK (ClickNewHdl_Impl, Button*, void ); protected: void FillDlgFields(const OUString& rStrURL) override; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 59622ec19965..be739f471468 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -41,15 +41,15 @@ private: bool mbMarkWndOpen; - DECL_LINK_TYPED (ClickFileopenHdl_Impl, Button*, void ); - DECL_LINK_TYPED (ClickTargetHdl_Impl , Button*, void ); + DECL_LINK (ClickFileopenHdl_Impl, Button*, void ); + DECL_LINK (ClickTargetHdl_Impl , Button*, void ); - DECL_LINK_TYPED (ModifiedPathHdl_Impl , Edit&, void ); ///< Contents of combobox "Path" modified - DECL_LINK_TYPED (ModifiedTargetHdl_Impl, Edit&, void ); ///< Contents of editfield "Target" modified + DECL_LINK (ModifiedPathHdl_Impl , Edit&, void ); ///< Contents of combobox "Path" modified + DECL_LINK (ModifiedTargetHdl_Impl, Edit&, void ); ///< Contents of editfield "Target" modified - DECL_LINK_TYPED( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus + DECL_LINK( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus - DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void ); ///< Handler for timer -timeout + DECL_LINK( TimeoutHdl_Impl, Timer *, void ); ///< Handler for timer -timeout enum EPathType { Type_Unknown, Type_Invalid, Type_ExistsFile, Type_File, diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 42cf3c6c51c0..f10bf5a0b297 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -46,13 +46,13 @@ private: bool mbMarkWndOpen; - DECL_LINK_TYPED( Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP - DECL_LINK_TYPED( ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User - DECL_LINK_TYPED( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified - DECL_LINK_TYPED( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus - DECL_LINK_TYPED( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified + DECL_LINK( Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP + DECL_LINK( ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User + DECL_LINK( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified + DECL_LINK( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus + DECL_LINK( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified - DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout + DECL_LINK( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout void SetScheme(const OUString& rScheme); diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 9385d25f799d..349437d1ef2e 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -35,9 +35,9 @@ private: VclPtr<FixedText> m_pFtSubject; VclPtr<Edit> m_pEdSubject; - DECL_STATIC_LINK_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); + DECL_STATIC_LINK(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); ///< Button : Address book - DECL_LINK_TYPED (ModifiedReceiverHdl_Impl, Edit&, void ); ///< Combobox "receiver" modified + DECL_LINK (ModifiedReceiverHdl_Impl, Edit&, void ); ///< Combobox "receiver" modified void SetScheme(const OUString& rScheme); void RemoveImproperProtocol(const OUString& aProperScheme); diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index f497ab0f1ccc..b652f8c24b1b 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -86,9 +86,9 @@ protected: virtual void Move () override; - DECL_LINK_TYPED( ClickApplyHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DoubleClickApplyHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( ClickCloseHdl_Impl, Button*, void ); + DECL_LINK( ClickApplyHdl_Impl, Button*, void ); + DECL_LINK( DoubleClickApplyHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( ClickCloseHdl_Impl, Button*, void ); public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 2c2193e82565..4f24e11e0d04 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -97,7 +97,7 @@ protected: OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ); - DECL_LINK_TYPED (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script + DECL_LINK (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script static OUString GetSchemeFromURL( const OUString& rStrURL ); diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 7fc2a335527a..f5adb46d55d8 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -70,14 +70,14 @@ class SvxHyphenWordDialog : public SfxModalDialog void ContinueHyph_Impl( sal_Int32 nInsPos = -1 ); // continue by default sal_uInt16 GetHyphIndex_Impl(); - DECL_LINK_TYPED(Left_Impl, Button*, void); - DECL_LINK_TYPED(Right_Impl, Button*, void); - DECL_LINK_TYPED(CutHdl_Impl, Button*, void); - DECL_LINK_TYPED(ContinueHdl_Impl, Button*, void); - DECL_LINK_TYPED(DeleteHdl_Impl, Button*, void); - DECL_LINK_TYPED( HyphenateAllHdl_Impl, Button*, void ); - DECL_LINK_TYPED(CancelHdl_Impl, Button*, void); - DECL_LINK_TYPED(GetFocusHdl_Impl, Control&, void); + DECL_LINK(Left_Impl, Button*, void); + DECL_LINK(Right_Impl, Button*, void); + DECL_LINK(CutHdl_Impl, Button*, void); + DECL_LINK(ContinueHdl_Impl, Button*, void); + DECL_LINK(DeleteHdl_Impl, Button*, void); + DECL_LINK( HyphenateAllHdl_Impl, Button*, void ); + DECL_LINK(CancelHdl_Impl, Button*, void); + DECL_LINK(GetFocusHdl_Impl, Control&, void); public: SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang, diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index eb8a7432f576..66a61d114f41 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -120,11 +120,11 @@ private: bool bInOK; - DECL_LINK_TYPED( ChosePageHdl_Impl, SvtIconChoiceCtrl*, void ); - DECL_LINK_TYPED( OkHdl, Button*, void ); - DECL_LINK_TYPED( ApplyHdl, Button*, void) ; - DECL_LINK_TYPED( ResetHdl, Button*, void) ; - DECL_LINK_TYPED( CancelHdl, Button*, void ); + DECL_LINK( ChosePageHdl_Impl, SvtIconChoiceCtrl*, void ); + DECL_LINK( OkHdl, Button*, void ); + DECL_LINK( ApplyHdl, Button*, void) ; + DECL_LINK( ResetHdl, Button*, void) ; + DECL_LINK( CancelHdl, Button*, void ); IconChoicePageData* GetPageData ( sal_uInt16 nId ); void Start_Impl(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index b982ba8ff93b..40dffa18087c 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -69,9 +69,9 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl css::uno::Sequence< sal_Int8 > m_aIconMetaFile; OUString m_aIconMediaType; - DECL_LINK_TYPED(DoubleClickHdl, ListBox&, void); - DECL_LINK_TYPED(BrowseHdl, Button*, void); - DECL_LINK_TYPED(RadioHdl, Button*, void); + DECL_LINK(DoubleClickHdl, ListBox&, void); + DECL_LINK(BrowseHdl, Button*, void); + DECL_LINK(RadioHdl, Button*, void); void SelectDefault(); ListBox& GetObjectTypes() { return *m_pLbObjecttype; } @@ -115,8 +115,8 @@ private: VclPtr<NumericField> m_pNMMarginHeight; VclPtr<CheckBox> m_pCBMarginHeightDefault; - DECL_LINK_TYPED(OpenHdl, Button*, void ); - DECL_LINK_TYPED(CheckHdl, Button*, void ); + DECL_LINK(OpenHdl, Button*, void ); + DECL_LINK(CheckHdl, Button*, void ); void Init(); diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 52e9fd7ab717..7935a9f75a76 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -70,10 +70,10 @@ private: void SetupAnsatz_Impl( sal_uInt16 nType ); void SetupType_Impl( SdrCaptionType nType ); - DECL_LINK_TYPED( AnsatzSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( AnsatzRelSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( LineOptHdl_Impl, Button *, void ); - DECL_LINK_TYPED( SelectCaptTypeHdl_Impl, ValueSet*, void ); + DECL_LINK( AnsatzSelectHdl_Impl, ListBox&, void ); + DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox&, void ); + DECL_LINK( LineOptHdl_Impl, Button *, void ); + DECL_LINK( SelectCaptTypeHdl_Impl, ValueSet*, void ); const SfxItemSet& rOutAttrs; const SdrView* pView; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 3d1006a512fe..313b2cfa7646 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -64,15 +64,15 @@ class SvBaseLinksDlg : public ModalDialog bool bHtmlMode; Idle aUpdateIdle; - DECL_LINK_TYPED( LinksSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( LinksDoubleClickHdl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( AutomaticClickHdl, Button *, void ); - DECL_LINK_TYPED( ManualClickHdl, Button *, void ); - DECL_LINK_TYPED( UpdateNowClickHdl, Button *, void); - DECL_LINK_TYPED( ChangeSourceClickHdl, Button *, void ); - DECL_LINK_TYPED( BreakLinkClickHdl, Button *, void ); - DECL_LINK_TYPED( UpdateWaitingHdl, Idle *, void ); - DECL_LINK_TYPED( EndEditHdl, sfx2::SvBaseLink&, void ); + DECL_LINK( LinksSelectHdl, SvTreeListBox*, void ); + DECL_LINK( LinksDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( AutomaticClickHdl, Button *, void ); + DECL_LINK( ManualClickHdl, Button *, void ); + DECL_LINK( UpdateNowClickHdl, Button *, void); + DECL_LINK( ChangeSourceClickHdl, Button *, void ); + DECL_LINK( BreakLinkClickHdl, Button *, void ); + DECL_LINK( UpdateWaitingHdl, Idle *, void ); + DECL_LINK( EndEditHdl, sfx2::SvBaseLink&, void ); sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos ); OUString ImplGetStateStr( const sfx2::SvBaseLink& ); void SetType( sfx2::SvBaseLink& rLink, sal_uLong nPos, SfxLinkUpdateMode nType ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 056f337a53b5..66906fda727d 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -36,14 +36,14 @@ class SfxMacroTabPage_Impl; class SfxMacroTabPage : public SfxTabPage { SvxMacroTableDtor aTbl; - DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectGroup_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelectMacro_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectEvent_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectGroup_Impl, SvTreeListBox*, void ); + DECL_LINK( SelectMacro_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AssignDeleteHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); + DECL_LINK( AssignDeleteHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( AssignDeleteClickHdl_Impl, Button *, void ); bool AssignDeleteHdl(Control *); - DECL_LINK_TYPED( TimeOut_Impl, Idle*, void ); + DECL_LINK( TimeOut_Impl, Idle*, void ); protected: std::unique_ptr<SfxMacroTabPage_Impl> mpImpl; diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index fb9860012a11..8767b671360f 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -58,9 +58,9 @@ class SvxMacroTabPage_Impl; class SvxMacroTabPage_ : public SfxTabPage { - DECL_LINK_TYPED( SelectEvent_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void ); - DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( SelectEvent_Impl, SvTreeListBox*, void ); + DECL_LINK( AssignDeleteHdl_Impl, Button *, void ); + DECL_LINK( DoubleClickHdl_Impl, SvTreeListBox*, bool ); static long GenericHandler_Impl( SvxMacroTabPage_* pThis, PushButton* pBtn ); @@ -118,7 +118,7 @@ public: SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: - DECL_LINK_TYPED( OKHdl_Impl, Button *, void ); + DECL_LINK( OKHdl_Impl, Button *, void ); }; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index d2f632252991..1cece6f8cab7 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -60,10 +60,10 @@ private: void FillUnitLB(); - DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void ); + DECL_LINK( ClickAutoPosHdl_Impl, Button*, void ); + DECL_LINK( ChangeAttrEditHdl_Impl, Edit&, void ); + DECL_LINK( ChangeAttrListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( ChangeAttrClickHdl_Impl, Button*, void ); void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 03b86343f0cf..f059a55bcca1 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -43,10 +43,10 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(DelHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(CheckHdl_Impl, SvTreeListBox*, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(DelHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, SvTreeListBox*, void); + DECL_LINK(CheckHdl_Impl, SvTreeListBox*, void); public: SvxMultiPathDialog(vcl::Window* pParent); @@ -64,9 +64,9 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK_TYPED(AddHdl_Impl, Button*, void); - DECL_LINK_TYPED(DelHdl_Impl, Button*, void); - DECL_LINK_TYPED(SelectHdl_Impl, ListBox&, void); + DECL_LINK(AddHdl_Impl, Button*, void); + DECL_LINK(DelHdl_Impl, Button*, void); + DECL_LINK(SelectHdl_Impl, ListBox&, void); public: SvxPathSelectDialog(vcl::Window* pParent); diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index fac8bccfe8dd..0446cbf047e7 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -149,17 +149,17 @@ private: void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); bool Click_Impl(PushButton* pIB); // Handler - DECL_LINK_TYPED( LostFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); + DECL_LINK( LostFocusHdl_Impl, Control&, void ); + DECL_LINK( DoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( SelFormatListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( SelFormatTreeListBoxHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( SelFormatClickHdl_Impl, Button*, void ); void SelFormatHdl_Impl(void*); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OptEditHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( TimeHdl_Impl, Timer *, void); + DECL_LINK( ClickHdl_Impl, Button*, void ); + DECL_LINK( EditModifyHdl_Impl, Edit&, void ); + DECL_LINK( OptEditHdl_Impl, Edit&, void ); + DECL_LINK( OptClickHdl_Impl, Button*, void ); + DECL_LINK( TimeHdl_Impl, Timer *, void); void EditHdl_Impl(Edit*); void OptHdl_Impl(void*); }; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 6b7e70b771c3..101f62f28c0d 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -95,8 +95,8 @@ class SvxSingleNumPickTabPage : public SfxTabPage sal_uInt16 nNumItemId; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxSingleNumPickTabPage(vcl::Window* pParent, @@ -129,8 +129,8 @@ class SvxBulletPickTabPage : public SfxTabPage OUString sBulletCharFormatName; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxBulletPickTabPage(vcl::Window* pParent, const SfxItemSet& rSet); @@ -172,8 +172,8 @@ class SvxNumPickTabPage : public SfxTabPage protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); public: SvxNumPickTabPage(vcl::Window* pParent, @@ -217,9 +217,9 @@ class SvxBitmapPickTabPage : public SfxTabPage bool bPreset : 1; protected: - DECL_LINK_TYPED(NumSelectHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(DoubleClickHdl_Impl, ValueSet*, void); - DECL_LINK_TYPED(ClickAddBrowseHdl_Impl, Button*, void ); + DECL_LINK(NumSelectHdl_Impl, ValueSet*, void); + DECL_LINK(DoubleClickHdl_Impl, ValueSet*, void); + DECL_LINK(ClickAddBrowseHdl_Impl, Button*, void ); public: @@ -315,22 +315,22 @@ class SvxNumOptionsTabPage : public SfxTabPage void SwitchNumberType( sal_uInt8 nType, bool bBmp = false ); void CheckForStartValue_Impl(sal_uInt16 nNumberingType); - DECL_LINK_TYPED( NumberTypeSelectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( PopupActivateHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK_TYPED( BulletHdl_Impl, Button*, void); - DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); - DECL_LINK_TYPED( CharFmtHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( EditListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( AllLevelHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( OrientHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( BulColorHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( BulRelSizeHdl_Impl, Edit&, void); - DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void); + DECL_LINK( NumberTypeSelectHdl_Impl, ListBox&, void ); + DECL_LINK( LevelHdl_Impl, ListBox&, void ); + DECL_LINK( PopupActivateHdl_Impl, MenuButton *, void ); + DECL_LINK( GraphicHdl_Impl, MenuButton *, void ); + DECL_LINK( BulletHdl_Impl, Button*, void); + DECL_LINK( SizeHdl_Impl, Edit&, void ); + DECL_LINK( RatioHdl_Impl, Button*, void ); + DECL_LINK( CharFmtHdl_Impl, ListBox&, void ); + DECL_LINK( EditModifyHdl_Impl, Edit&, void ); + DECL_LINK( EditListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( AllLevelHdl_Impl, Edit&, void ); + DECL_LINK( OrientHdl_Impl, ListBox&, void ); + DECL_LINK( SameLevelHdl_Impl, Button*, void ); + DECL_LINK( BulColorHdl_Impl, ListBox&, void ); + DECL_LINK( BulRelSizeHdl_Impl, Edit&, void); + DECL_LINK( PreviewInvalidateHdl_Impl, Timer *, void); void EditModifyHdl_Impl(Edit*); public: @@ -410,23 +410,23 @@ class SvxNumPositionTabPage : public SfxTabPage void InitControls(); - DECL_LINK_TYPED( LevelHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( EditModifyHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( DistanceHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( DistanceFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( RelativeHdl_Impl, Button*, void ); - DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); + DECL_LINK( LevelHdl_Impl, ListBox&, void ); + DECL_LINK( EditModifyHdl_Impl, ListBox&, void); + DECL_LINK( DistanceHdl_Impl, SpinField&, void ); + DECL_LINK( DistanceFocusHdl_Impl, Control&, void ); + DECL_LINK( RelativeHdl_Impl, Button*, void ); + DECL_LINK( StandardHdl_Impl, Button*, void); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); - DECL_LINK_TYPED(LabelFollowedByHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( ListtabPosHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( ListtabPosFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( AlignAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( AlignAtFocusHdl_Impl, Control&, void ); - DECL_LINK_TYPED( IndentAtHdl_Impl, SpinField&, void ); - DECL_LINK_TYPED( IndentAtFocusHdl_Impl, Control&, void ); + DECL_LINK(LabelFollowedByHdl_Impl, ListBox&, void); + DECL_LINK( ListtabPosHdl_Impl, SpinField&, void ); + DECL_LINK( ListtabPosFocusHdl_Impl, Control&, void ); + DECL_LINK( AlignAtHdl_Impl, SpinField&, void ); + DECL_LINK( AlignAtFocusHdl_Impl, Control&, void ); + DECL_LINK( IndentAtHdl_Impl, SpinField&, void ); + DECL_LINK( IndentAtFocusHdl_Impl, Control&, void ); public: SvxNumPositionTabPage(vcl::Window* pParent, diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 8f00b697aed8..ce3070fb02e8 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -48,9 +48,9 @@ class SvxAsianLayoutPage : public SfxTabPage std::unique_ptr<SvxAsianLayoutPage_Impl> pImpl; - DECL_LINK_TYPED(LanguageHdl, ListBox&, void); - DECL_LINK_TYPED(ChangeStandardHdl, Button*, void); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(LanguageHdl, ListBox&, void); + DECL_LINK(ChangeStandardHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); public: SvxAsianLayoutPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 21bb74699162..4cfa42b73913 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -57,8 +57,8 @@ private: css::uno::Reference< css::linguistic2::XDictionary > xNewDic; - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); + DECL_LINK(OKHdl_Impl, Button*, void); + DECL_LINK(ModifyHdl_Impl, Edit&, void); public: SvxNewDictionaryDialog( vcl::Window* pParent ); @@ -120,12 +120,12 @@ private: bool bDoNothing; bool bDicIsReadonly; - DECL_LINK_TYPED(SelectBookHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SelectLangHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); - DECL_LINK_TYPED(NewDelActionHdl, SvxDictEdit&, bool); - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(SelectBookHdl_Impl, ListBox&, void); + DECL_LINK(SelectLangHdl_Impl, ListBox&, void); + DECL_LINK(SelectHdl, SvTreeListBox*, void); + DECL_LINK(NewDelButtonHdl, Button*, void); + DECL_LINK(NewDelActionHdl, SvxDictEdit&, bool); + DECL_LINK(ModifyHdl, Edit&, void); bool NewDelHdl(void*); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index b841937a96c2..3742d5291996 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -74,14 +74,14 @@ class SvxEditModulesDlg : public ModalDialog SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( UpDownHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK_TYPED( BackHdl_Impl, Button*, void ); - DECL_LINK_TYPED( LangSelectListBoxHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ); - DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( OpenURLHdl_Impl, FixedHyperlink&, void ); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( UpDownHdl_Impl, Button*, void ); + DECL_LINK( ClickHdl_Impl, Button*, void ); + DECL_LINK( BackHdl_Impl, Button*, void ); + DECL_LINK( LangSelectListBoxHdl_Impl, ListBox&, void ); + DECL_LINK( BoxCheckButtonHdl_Impl2, SvLBoxButtonData*, void ); + DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( OpenURLHdl_Impl, FixedHyperlink&, void ); void LangSelectHdl_Impl(ListBox*); public: @@ -138,12 +138,12 @@ private: void AddDicBoxEntry( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); - DECL_LINK_TYPED( SelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ClickHdl_Impl, Button *, void ); - DECL_LINK_TYPED( BoxDoubleClickHdl_Impl, SvTreeListBox*, bool ); - DECL_LINK_TYPED( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( PostDblClickHdl_Impl, void *, void); - DECL_LINK_TYPED( OpenURLHdl_Impl, FixedHyperlink&, void ); + DECL_LINK( SelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( ClickHdl_Impl, Button *, void ); + DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox*, bool ); + DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( PostDblClickHdl_Impl, void *, void); + DECL_LINK( OpenURLHdl_Impl, FixedHyperlink&, void ); void UpdateModulesBox_Impl(); void UpdateDicBox_Impl(); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index cb279f3a109c..914cbc74d1c5 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -53,15 +53,15 @@ private: void ChangeCurrentEntry( const OUString& _rFolder ); - DECL_LINK_TYPED( PathHdl_Impl, Button*, void); - DECL_LINK_TYPED( DoubleClickPathHdl_Impl, SvTreeListBox*, bool); - DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); + DECL_LINK( PathHdl_Impl, Button*, void); + DECL_LINK( DoubleClickPathHdl_Impl, SvTreeListBox*, bool); + DECL_LINK( StandardHdl_Impl, Button*, void); - DECL_LINK_TYPED( PathSelect_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED( HeaderSelect_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( HeaderEndDrag_Impl, HeaderBar *, void ); + DECL_LINK( PathSelect_Impl, SvTreeListBox*, void); + DECL_LINK( HeaderSelect_Impl, HeaderBar *, void ); + DECL_LINK( HeaderEndDrag_Impl, HeaderBar *, void ); - DECL_LINK_TYPED( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); + DECL_LINK( DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void ); void GetPathList( sal_uInt16 _nPathHandle, OUString& _rInternalPath, OUString& _rUserPath, OUString& _rWritablePath, bool& _rReadOnly ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 951d35179861..c0cd03089449 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -150,26 +150,26 @@ private: bool mbEnableDrawingLayerFillStyles : 1; void Init_Impl(); - DECL_LINK_TYPED( LayoutHdl_Impl, ListBox&, void); - DECL_LINK_TYPED( PaperBinHdl_Impl, Control&, void); - DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void ); + DECL_LINK( LayoutHdl_Impl, ListBox&, void); + DECL_LINK( PaperBinHdl_Impl, Control&, void); + DECL_LINK( SwapOrientation_Impl, Button*, void ); void SwapFirstValues_Impl( bool bSet ); - DECL_LINK_TYPED( BorderModify_Impl, Edit&, void); + DECL_LINK( BorderModify_Impl, Edit&, void); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK_TYPED( CenterHdl_Impl, Button*, void); + DECL_LINK( CenterHdl_Impl, Button*, void); void UpdateExample_Impl( bool bResetbackground = false ); - DECL_LINK_TYPED( PaperSizeSelect_Impl, ListBox&, void ); - DECL_LINK_TYPED( PaperSizeModify_Impl, Edit&, void); + DECL_LINK( PaperSizeSelect_Impl, ListBox&, void ); + DECL_LINK( PaperSizeModify_Impl, Edit&, void); - DECL_LINK_TYPED( FrameDirectionModify_Impl, ListBox&, void ); + DECL_LINK( FrameDirectionModify_Impl, ListBox&, void ); void ResetBackground_Impl( const SfxItemSet& rSet ); - DECL_LINK_TYPED( RangeHdl_Impl, Control&, void ); + DECL_LINK( RangeHdl_Impl, Control&, void ); void CalcMargin_Impl(); - DECL_LINK_TYPED( RegisterModify, Button*, void ); + DECL_LINK( RegisterModify, Button*, void ); // page direction /** Disables vertical page direction entries in the text flow listbox. */ diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index d16a057c5246..8b621f217bfe 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -90,9 +90,9 @@ private: void Init_Impl(); void UpdateExample_Impl(); - DECL_LINK_TYPED( LineDistHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); + DECL_LINK( LineDistHdl_Impl, ListBox&, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( AutoHdl_Impl, Button*, void ); protected: virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; @@ -102,7 +102,7 @@ public: virtual ~SvxStdParagraphTabPage() override; virtual void dispose() override; - DECL_LINK_TYPED(ELRLoseFocusHdl, Control&, void); + DECL_LINK(ELRLoseFocusHdl, Control&, void); static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pStdRanges; } @@ -153,9 +153,9 @@ class SvxParaAlignTabPage : public SfxTabPage VclPtr<VclFrame> m_pPropertiesFL; VclPtr<svx::FrameDirectionListBox> m_pTextDirectionLB; - DECL_LINK_TYPED(AlignHdl_Impl, Button*, void); - DECL_LINK_TYPED(LastLineHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(TextDirectionHdl_Impl, ListBox&, void); + DECL_LINK(AlignHdl_Impl, Button*, void); + DECL_LINK(LastLineHdl_Impl, ListBox&, void); + DECL_LINK(TextDirectionHdl_Impl, ListBox&, void); void UpdateExample_Impl(); @@ -256,14 +256,14 @@ private: bool bHtmlMode; sal_uInt16 nStdPos; - DECL_LINK_TYPED(PageBreakHdl_Impl, Button*, void); - DECL_LINK_TYPED(KeepTogetherHdl_Impl, Button*, void); - DECL_LINK_TYPED(WidowHdl_Impl, Button*, void); - DECL_LINK_TYPED(OrphanHdl_Impl, Button*, void); - DECL_LINK_TYPED(HyphenClickHdl_Impl, Button*, void); - DECL_LINK_TYPED(ApplyCollClickHdl_Impl, Button*, void); - DECL_LINK_TYPED( PageBreakPosHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( PageBreakTypeHdl_Impl, ListBox&, void ); + DECL_LINK(PageBreakHdl_Impl, Button*, void); + DECL_LINK(KeepTogetherHdl_Impl, Button*, void); + DECL_LINK(WidowHdl_Impl, Button*, void); + DECL_LINK(OrphanHdl_Impl, Button*, void); + DECL_LINK(HyphenClickHdl_Impl, Button*, void); + DECL_LINK(ApplyCollClickHdl_Impl, Button*, void); + DECL_LINK( PageBreakPosHdl_Impl, ListBox&, void ); + DECL_LINK( PageBreakTypeHdl_Impl, ListBox&, void ); virtual void PageCreated(const SfxAllItemSet& aSet) override; }; @@ -279,7 +279,7 @@ class SvxAsianTabPage : public SfxTabPage SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - DECL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, void ); + DECL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, Button*, void ); public: virtual ~SvxAsianTabPage() override; diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index b4d6c413569d..b43f4731d50a 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -50,8 +50,8 @@ class SvPasteObjectDialog : public ModalDialog FixedText& ObjectSource() { return *m_pFtObjectSource; } void SelectObject(); - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK_TYPED( DoubleClickHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); + DECL_LINK( DoubleClickHdl, ListBox&, void ); public: SvPasteObjectDialog( vcl::Window* pParent ); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index 4a2c53fc3303..9c351b1c9193 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -94,10 +94,10 @@ private: Link<SvxPostItDialog&,void> aPrevHdlLink; Link<SvxPostItDialog&,void> aNextHdlLink; - DECL_LINK_TYPED(Stamp, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); - DECL_LINK_TYPED(PrevHdl, Button*, void); - DECL_LINK_TYPED(NextHdl, Button*, void); + DECL_LINK(Stamp, Button*, void); + DECL_LINK(OKHdl, Button*, void); + DECL_LINK(PrevHdl, Button*, void); + DECL_LINK(NextHdl, Button*, void); }; #endif diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 428d6d831170..7a582ed20ccc 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -152,8 +152,8 @@ protected: const OUString m_renameErrStr; const OUString m_renameErrTitleStr; - DECL_LINK_TYPED( ScriptSelectHdl, SvTreeListBox *, void ); - DECL_LINK_TYPED( ButtonHdl, Button *, void ); + DECL_LINK( ScriptSelectHdl, SvTreeListBox *, void ); + DECL_LINK( ButtonHdl, Button *, void ); static bool getBoolProperty( css::uno::Reference< css::beans::XPropertySet >& xProps, OUString& propName ); void CheckButtons( css::uno::Reference< css::script::browse::XBrowseNode >& node ); @@ -185,7 +185,7 @@ private: OUString m_sMessage; - DECL_STATIC_LINK_TYPED( SvxScriptErrorDialog, ShowDialog, void*, void ); + DECL_STATIC_LINK( SvxScriptErrorDialog, ShowDialog, void*, void ); public: diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 6f8e20c97284..826a4ccefe34 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -92,7 +92,7 @@ friend class SvxConfigGroupListBox; SvxGroupInfoArr_Impl aArr; SvTreeListEntry* m_pDraggingEntry; - DECL_LINK_TYPED(TimerHdl, Timer *, void); + DECL_LINK(TimerHdl, Timer *, void); virtual void MouseMove( const MouseEvent& rMEvt ) override; public: @@ -187,9 +187,9 @@ class SvxScriptSelectorDialog : public ModalDialog bool m_bShowSlots; Link<SvxScriptSelectorDialog&,void> m_aAddHdl; - DECL_LINK_TYPED( ClickHdl, Button *, void ); - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( FunctionDoubleClickHdl, SvTreeListBox*, bool ); + DECL_LINK( ClickHdl, Button *, void ); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( FunctionDoubleClickHdl, SvTreeListBox*, bool ); void UpdateUI(); diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index 6fad2cda4f06..4fce7ae2550b 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -48,7 +48,7 @@ public: void SetColumns(const css::uno::Reference< css::container::XIndexContainer>& xCols); protected: - DECL_LINK_TYPED(OnClickedOk, Button*, void); + DECL_LINK(OnClickedOk, Button*, void); }; #endif // INCLUDED_CUI_SOURCE_INC_SHOWCOLS_HXX diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 3fc5b5e6dcaa..df85c2f73cb8 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -41,7 +41,7 @@ public: SvxSplitTableDlg(vcl::Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal ); virtual ~SvxSplitTableDlg() override; - DECL_LINK_TYPED( ClickHdl, Button *, void ); + DECL_LINK( ClickHdl, Button *, void ); virtual bool IsHorizontal() const override; virtual bool IsProportional() const override; diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 85f889920cc9..876111059e25 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -60,7 +60,7 @@ private: SearchAttrItemList& rList; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); }; // class SvxSearchSimilarityDialog --------------------------------------- diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index ebc4a7d74523..aa5f90a7175d 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -100,14 +100,14 @@ class SvxSwPosSizeTabPage : public SfxTabPage bool m_bIsInRightToLeft; - DECL_LINK_TYPED(RangeModifyHdl, Control&, void); - DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); - DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); - DECL_LINK_TYPED( PosHdl, ListBox&, void ); - DECL_LINK_TYPED( RelHdl, ListBox&, void ); - DECL_LINK_TYPED(MirrorHdl, Button*, void); - DECL_LINK_TYPED( ModifyHdl, Edit&, void ); - DECL_LINK_TYPED(ProtectHdl, Button*, void); + DECL_LINK(RangeModifyHdl, Control&, void); + DECL_LINK(RangeModifyClickHdl, Button*, void); + DECL_LINK(AnchorTypeHdl, Button*, void); + DECL_LINK( PosHdl, ListBox&, void ); + DECL_LINK( RelHdl, ListBox&, void ); + DECL_LINK(MirrorHdl, Button*, void); + DECL_LINK( ModifyHdl, Edit&, void ); + DECL_LINK(ProtectHdl, Button*, void); void InitPos(short nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, sal_uInt16 nV, sal_uInt16 nVRel, diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 6fd0c44485c2..77505c1090ab 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -107,17 +107,17 @@ private: void SetFillAndTabType_Impl(); // Handler - DECL_LINK_TYPED( NewHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( DelAllHdl_Impl, Button*, void ); + DECL_LINK( NewHdl_Impl, Button*, void ); + DECL_LINK( DelHdl_Impl, Button*, void ); + DECL_LINK( DelAllHdl_Impl, Button*, void ); - DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void ); - DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void ); + DECL_LINK( FillTypeCheckHdl_Impl, Button*, void ); + DECL_LINK( TabTypeCheckHdl_Impl, Button*, void ); - DECL_LINK_TYPED( SelectHdl_Impl, ComboBox&, void ); - DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( GetFillCharHdl_Impl, Control&, void ); - DECL_LINK_TYPED( GetDezCharHdl_Impl, Control&, void ); + DECL_LINK( SelectHdl_Impl, ComboBox&, void ); + DECL_LINK( ModifyHdl_Impl, Edit&, void ); + DECL_LINK( GetFillCharHdl_Impl, Control&, void ); + DECL_LINK( GetDezCharHdl_Impl, Control&, void ); virtual void PageCreated(const SfxAllItemSet& aSet) override; }; diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index 3bfb857094a6..8469f3601637 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -65,11 +65,11 @@ private: FieldUnit eFUnit; MapUnit eUnit; - DECL_LINK_TYPED( SelectEffectHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( ClickEndlessHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickAutoHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickPixelHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickDirectionHdl_Impl, Button*, void ); + DECL_LINK( SelectEffectHdl_Impl, ListBox&, void ); + DECL_LINK( ClickEndlessHdl_Impl, Button*, void ); + DECL_LINK( ClickAutoHdl_Impl, Button*, void ); + DECL_LINK( ClickPixelHdl_Impl, Button*, void ); + DECL_LINK( ClickDirectionHdl_Impl, Button*, void ); void SelectDirection( SdrTextAniDirection nValue ); sal_uInt16 GetSelectedDirection(); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index c60a743f5460..88b77845d134 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -70,8 +70,8 @@ private: bool bWordWrapTextEnabled; bool bFitToSizeEnabled; - DECL_LINK_TYPED( ClickFullWidthHdl_Impl, Button*, void ); - DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); + DECL_LINK( ClickFullWidthHdl_Impl, Button*, void ); + DECL_LINK( ClickHdl_Impl, Button*, void ); /** Return whether the text direction is from left to right (</sal_True>) or top to bottom (</sal_False>). diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index ab0f46517d2e..1efd4921ca30 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -45,7 +45,7 @@ public: virtual ~LookUpComboBox() override; virtual void dispose() override; - DECL_LINK_TYPED( ModifyTimer_Hdl, Idle *, void ); + DECL_LINK( ModifyTimer_Hdl, Idle *, void ); void init(SvxThesaurusDialog *pDialog); @@ -142,14 +142,14 @@ public: const OUString& getErrStr() const { return m_aErrStr; } // Handler - DECL_LINK_TYPED( ReplaceBtnHdl_Impl, Button *, void ); - DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void ); - DECL_LINK_TYPED( LanguageHdl_Impl, ListBox&, void ); - DECL_LINK_TYPED( WordSelectHdl_Impl, ComboBox&, void ); - DECL_LINK_TYPED( AlternativesSelectHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool ); - - DECL_STATIC_LINK_TYPED( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); + DECL_LINK( ReplaceBtnHdl_Impl, Button *, void ); + DECL_LINK( LeftBtnHdl_Impl, Button *, void ); + DECL_LINK( LanguageHdl_Impl, ListBox&, void ); + DECL_LINK( WordSelectHdl_Impl, ComboBox&, void ); + DECL_LINK( AlternativesSelectHdl_Impl, SvTreeListBox*, void ); + DECL_LINK( AlternativesDoubleClickHdl_Impl, SvTreeListBox*, bool ); + + DECL_STATIC_LINK( SvxThesaurusDialog, SelectFirstHdl_Impl, void*, void ); css::uno::Sequence< css::uno::Reference< css::linguistic2::XMeaning > > queryMeanings_Impl( OUString& rTerm, const css::lang::Locale& rLocale, const css::beans::PropertyValues& rProperties ) throw(css::lang::IllegalArgumentException, css::uno::RuntimeException); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index ee7f474c9a5c..1728a30c9b60 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -124,16 +124,16 @@ private: RectPoint meRP; - DECL_LINK_TYPED( ChangePosProtectHdl, Button*, void ); - DECL_LINK_TYPED( ChangeSizeProtectHdl, Button*, void ); + DECL_LINK( ChangePosProtectHdl, Button*, void ); + DECL_LINK( ChangeSizeProtectHdl, Button*, void ); void SetMinMaxPosition(); void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange); - DECL_LINK_TYPED( ChangeWidthHdl, Edit&, void ); - DECL_LINK_TYPED( ChangeHeightHdl, Edit&, void ); - DECL_LINK_TYPED( ClickSizeProtectHdl, Button*, void ); - DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); + DECL_LINK( ChangeWidthHdl, Edit&, void ); + DECL_LINK( ChangeHeightHdl, Edit&, void ); + DECL_LINK( ClickSizeProtectHdl, Button*, void ); + DECL_LINK( ClickAutoHdl, Button*, void ); public: SvxPositionSizeTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx index 832ab1a1ec89..c497b8367163 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -162,10 +162,10 @@ private: void InsertNodes( const VectorOfNodes& rNodeList ); protected: - DECL_STATIC_LINK_TYPED(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void ); - DECL_LINK_TYPED(ShowPageHdl_Impl, SvTreeListBox*, void); - DECL_LINK_TYPED(BackHdl_Impl, Button*, void); - DECL_LINK_TYPED(OKHdl_Impl, Button*, void); + DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, void ); + DECL_LINK(ShowPageHdl_Impl, SvTreeListBox*, void); + DECL_LINK(BackHdl_Impl, Button*, void); + DECL_LINK(OKHdl_Impl, Button*, void); void SelectHdl_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) override; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 7235e0e764bd..7620a46f687b 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -48,12 +48,12 @@ private: std::unique_ptr<SfxItemSet> mpOutSet; bool mbModified; - DECL_LINK_TYPED(UserHdl, Button*, void); - DECL_LINK_TYPED(SpinHdl, Edit&, void); - DECL_LINK_TYPED(ViewLayoutUserHdl, Button*, void); - DECL_LINK_TYPED(ViewLayoutSpinHdl, Edit&, void); - DECL_LINK_TYPED(ViewLayoutCheckHdl, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(UserHdl, Button*, void); + DECL_LINK(SpinHdl, Edit&, void); + DECL_LINK(ViewLayoutUserHdl, Button*, void); + DECL_LINK(ViewLayoutSpinHdl, Edit&, void); + DECL_LINK(ViewLayoutCheckHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: SvxZoomDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet); |