diff options
Diffstat (limited to 'cui/source/inc')
56 files changed, 251 insertions, 232 deletions
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index c2f0d59e16b0..3f676d8e23f6 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -171,17 +171,18 @@ private: css::uno::Reference< css::linguistic2::XSpellChecker1 > xSpell; - DECL_LINK(ChangeHdl, void *); - DECL_LINK(ChangeAllHdl, void *); - DECL_LINK( IgnoreAllHdl, Button * ); - DECL_LINK(IgnoreHdl, void *); - DECL_LINK( CheckGrammarHdl, CheckBox* ); - DECL_LINK( ExtClickHdl, Button * ); - DECL_LINK(CancelHdl, void *); + DECL_LINK_TYPED(ChangeHdl, Button*, void); + DECL_LINK(DoubleClickChangeHdl, 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( ModifyHdl, SentenceEditWindow_Impl *); - DECL_LINK(UndoHdl, void *); + DECL_LINK_TYPED(UndoHdl, Button*, void); DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void ); - DECL_LINK( AddToDictClickHdl, PushButton* ); + DECL_LINK_TYPED( AddToDictClickHdl, Button*, void ); DECL_LINK( LanguageSelectHdl, SvxLanguageBox* ); DECL_LINK( DialogUndoHdl, SpellUndoAction_Impl* ); DECL_LINK( HandleHyperlink, FixedHyperlink * ); diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 1ffabdced0ff..3928056c88a1 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -69,7 +69,7 @@ public: virtual ~AboutDialog(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK( HandleClick, PushButton* ); + DECL_LINK_TYPED( 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 9f05168476d0..ba7fc27e559f 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -147,13 +147,13 @@ private: OUString m_sModuleShortName; OUString m_sModuleUIName; - DECL_LINK(ChangeHdl, void *); - DECL_LINK(RemoveHdl, void *); + DECL_LINK_TYPED(ChangeHdl, Button *, void); + DECL_LINK_TYPED(RemoveHdl, Button *, void); DECL_LINK( SelectHdl, Control * ); - DECL_LINK(Save, void *); - DECL_LINK(Load, void *); - DECL_LINK(Default, void *); - DECL_LINK(RadioHdl, 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); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index a667eb9a902b..b520e48bc031 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -78,6 +78,7 @@ private: bool HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const; DECL_LINK( UpdateEnableHdl, void* ); + DECL_LINK_TYPED( UpdateEnableClickHdl, Button*, void ); private: VclPtr<ListBox> m_pLbHorAlign; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 50bd18daae62..2261a5824cfa 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -161,7 +161,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage SvLBoxButtonData* pCheckButtonData; DECL_LINK(SelectHdl, OfaACorrCheckListBox*); - DECL_LINK(EditHdl, void *); + DECL_LINK_TYPED(EditHdl, Button*, void); + DECL_LINK(DoubleClickEditHdl, void*); SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); @@ -252,7 +253,8 @@ private: bool bSWriter:1; DECL_LINK(SelectHdl, SvTabListBox*); - DECL_LINK(NewDelHdl, PushButton*); + DECL_LINK_TYPED(NewDelHdl, Button*, void); + DECL_LINK(NewDelActionHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); void RefillReplaceBox( bool bFromReset, @@ -312,7 +314,8 @@ private: CollatorWrapper* pCompareClass; LanguageType eLang; - DECL_LINK(NewDelHdl, void*); + DECL_LINK_TYPED(NewDelHdl, Button*, void); + DECL_LINK(NewDelActionHdl, void*); DECL_LINK(SelectHdl, ListBox*); DECL_LINK(ModifyHdl, Edit*); /// Box filled with new language @@ -380,8 +383,8 @@ private: sal_UCS4 cStartQuote; sal_UCS4 cEndQuote; - DECL_LINK( QuoteHdl, PushButton* ); - DECL_LINK( StdQuoteHdl, PushButton* ); + DECL_LINK_TYPED( QuoteHdl, Button*, void ); + DECL_LINK_TYPED( StdQuoteHdl, Button*, void ); OUString ChangeStringExt_Impl( sal_UCS4 ); @@ -453,7 +456,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; void CopyToClipboard() const; - DECL_LINK(DeleteHdl, void *); + DECL_LINK_TYPED(DeleteHdl, Button*, void); }; // class OfaSmartTagOptionsTabPage --------------------------------------------- @@ -496,7 +499,7 @@ private: Calls the displayPropertyPage function of the smart tag recognizer associated with the currently selected smart tag type. */ - DECL_LINK(ClickHdl, void *); + DECL_LINK_TYPED(ClickHdl, Button*, void); /** Handler for the list box diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx index 98933c9bdf5d..946d9c24a5de 100644 --- a/cui/source/inc/backgrnd.hxx +++ b/cui/source/inc/backgrnd.hxx @@ -134,9 +134,9 @@ private: DECL_LINK_TYPED( LoadIdleHdl_Impl, Idle*, void ); DECL_LINK(SelectHdl_Impl, void *); - DECL_LINK(BrowseHdl_Impl, void *); - DECL_LINK( RadioClickHdl_Impl, RadioButton* ); - DECL_LINK( FileClickHdl_Impl, CheckBox* ); + DECL_LINK_TYPED(BrowseHdl_Impl, Button*, void); + DECL_LINK_TYPED( RadioClickHdl_Impl, Button*, void ); + DECL_LINK_TYPED( FileClickHdl_Impl, Button*, void ); DECL_LINK(BackgroundColorHdl_Impl, void *); DECL_LINK( TblDestinationHdl_Impl, ListBox* ); }; diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index ff7780403bbb..2fe47b70afd3 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -123,7 +123,7 @@ private: DECL_LINK( LinesChanged_Impl, void* ); DECL_LINK( ModifyDistanceHdl_Impl, MetricField*); DECL_LINK( ModifyWidthHdl_Impl, void*); - DECL_LINK( SyncHdl_Impl, CheckBox*); + DECL_LINK_TYPED( SyncHdl_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 c8ac9f6d998d..511040dcead7 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -365,7 +365,7 @@ protected: SvxConfigPage( vcl::Window*, const SfxItemSet& ); - DECL_LINK( MoveHdl, Button * ); + DECL_LINK_TYPED( MoveHdl, Button *, void ); virtual SaveInData* CreateSaveInData( const css::uno::Reference< css::ui::XUIConfigurationManager >&, @@ -442,10 +442,10 @@ private: DECL_LINK( SelectMenu, ListBox * ); DECL_LINK( SelectMenuEntry, Control * ); - DECL_LINK( NewMenuHdl, Button * ); + DECL_LINK_TYPED( NewMenuHdl, Button *, void ); DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK( AddCommandsHdl, Button * ); + DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); void Init() SAL_OVERRIDE; @@ -482,7 +482,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog void UpdateButtonStates(); - DECL_LINK( MoveHdl, Button * ); + DECL_LINK_TYPED( MoveHdl, Button *, void ); DECL_LINK( ModifyHdl, Edit * ); DECL_LINK( SelectHdl, Control* ); @@ -536,10 +536,10 @@ private: DECL_LINK( SelectToolbarEntry, Control * ); DECL_LINK_TYPED( ToolbarSelectHdl, MenuButton *, void ); DECL_LINK_TYPED( EntrySelectHdl, MenuButton *, void ); - DECL_LINK( NewToolbarHdl, Button * ); - DECL_LINK( AddCommandsHdl, Button * ); + DECL_LINK_TYPED( NewToolbarHdl, Button *, void ); + DECL_LINK_TYPED( AddCommandsHdl, Button *, void ); DECL_LINK( AddFunctionHdl, SvxScriptSelectorDialog * ); - DECL_LINK( MoveHdl, Button * ); + DECL_LINK_TYPED( MoveHdl, Button *, void ); void UpdateButtonStates() SAL_OVERRIDE; short QueryReset() SAL_OVERRIDE; @@ -690,8 +690,8 @@ public: GetSelectedIcon(); DECL_LINK_TYPED( SelectHdl, ToolBox *, void ); - DECL_LINK( ImportHdl, PushButton * ); - DECL_LINK( DeleteHdl, PushButton * ); + DECL_LINK_TYPED( ImportHdl, Button *, void ); + DECL_LINK_TYPED( DeleteHdl, Button *, void ); }; class SvxIconReplacementDialog : public MessBox diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index a023a45d9b1e..42cc172fcb9b 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -215,8 +215,8 @@ private: bool FillItemSetColor_Impl( SfxItemSet& rSet ); DECL_LINK( SelectHdl_Impl, ListBox* ); - DECL_LINK(CbClickHdl_Impl, void *); - DECL_LINK(TristClickHdl_Impl, void *); + DECL_LINK_TYPED(CbClickHdl_Impl, Button*, void); + DECL_LINK_TYPED(TristClickHdl_Impl, Button*, void); DECL_LINK(UpdatePreview_Impl, void *); DECL_LINK( ColorBoxSelectHdl_Impl, ColorListBox* ); @@ -290,11 +290,11 @@ private: void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); void SetEscapement_Impl( sal_uInt16 nEsc ); - DECL_LINK( PositionHdl_Impl, RadioButton* ); - DECL_LINK( RotationHdl_Impl, RadioButton* ); + DECL_LINK_TYPED( PositionHdl_Impl, Button*, void ); + DECL_LINK_TYPED( RotationHdl_Impl, Button*, void ); DECL_LINK( FontModifyHdl_Impl, void *); - DECL_LINK( AutoPositionHdl_Impl, CheckBox* ); - DECL_LINK( FitToLineHdl_Impl, CheckBox* ); + DECL_LINK_TYPED( AutoPositionHdl_Impl, Button*, void ); + DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void ); DECL_LINK( KerningSelectHdl_Impl, void *); DECL_LINK( KerningModifyHdl_Impl, void *); DECL_LINK( LoseFocusHdl_Impl, MetricField* ); @@ -344,7 +344,7 @@ private: void SelectCharacter( ListBox* pBox ); void SetBracket( sal_Unicode cBracket, bool bStart ); - DECL_LINK(TwoLinesHdl_Impl, void *); + DECL_LINK_TYPED(TwoLinesHdl_Impl, Button*, void); DECL_LINK( CharacterMapHdl_Impl, ListBox* ); public: diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx index d06f55a33fd6..fb0a61f49cd8 100644 --- a/cui/source/inc/cuicharmap.hxx +++ b/cui/source/inc/cuicharmap.hxx @@ -81,7 +81,7 @@ private: bool bOne; const SubsetMap* pSubsetMap; - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); DECL_LINK(FontSelectHdl, void *); DECL_LINK(SubsetSelectHdl, void *); DECL_LINK(CharDoubleClickHdl, void *); diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index e9840c6a664a..f4d00a7faab6 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -157,9 +157,9 @@ protected: private: // Handler for the Controls - DECL_LINK( OnClickedFieldRadios, Button* ); - DECL_LINK(OnClickedSearchAgain, void *); - DECL_LINK( OnClickedSpecialSettings, Button* ); + DECL_LINK_TYPED( OnClickedFieldRadios, Button*, void ); + DECL_LINK_TYPED(OnClickedSearchAgain, Button *, void); + DECL_LINK_TYPED( OnClickedSpecialSettings, Button*, void ); DECL_LINK(OnSearchTextModified, void *); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 64c92e5c62d4..1883de8d57fe 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( ClickCancelBtn, void* ); + DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -133,7 +133,7 @@ private: rtl::Reference< TakeThread > maTakeThread; TokenList_impl maTakenList; - DECL_LINK( ClickCancelBtn, void* ); + DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); void Terminate(); public: @@ -158,7 +158,7 @@ private: GalleryTheme* pTheme; GalleryProgress aStatusProgress; - DECL_LINK( ClickCancelBtn, void* ); + DECL_LINK_TYPED( ClickCancelBtn, Button*, void ); DECL_LINK_TYPED( TimeoutHdl, Idle*, void ); DECL_LINK( ActualizeHdl, INetURLObject* ); @@ -188,7 +188,7 @@ private: VclPtr<ListBox> m_pLbResName; GalleryTheme* pThm; - DECL_LINK( ClickOkHdl, void* ); + DECL_LINK_TYPED( ClickOkHdl, Button*, void ); public: GalleryIdDialog( vcl::Window* pParent, GalleryTheme* pThm ); virtual ~GalleryIdDialog(); @@ -278,10 +278,10 @@ class TPGalleryThemeProperties : public SfxTabPage void TakeFiles(); void DoPreview(); - DECL_LINK( ClickPreviewHdl, void* ); - DECL_LINK( ClickSearchHdl, void* ); - DECL_LINK( ClickTakeHdl, void* ); - DECL_LINK( ClickTakeAllHdl, void* ); + 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( SelectFoundHdl, void* ); DECL_LINK( SelectFileTypeHdl, void* ); DECL_LINK( DClickFoundHdl, void* ); diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 22558265a411..0a27c27d347a 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -69,9 +69,9 @@ private: bool mbReadOnly : 1; bool mbIsHTMLDoc : 1; - DECL_LINK (ClickOkHdl_Impl, void * ); - DECL_LINK (ClickApplyHdl_Impl, void * ); - DECL_LINK (ClickCloseHdl_Impl, void * ); + DECL_LINK_TYPED (ClickOkHdl_Impl, Button *, void ); + DECL_LINK_TYPED (ClickApplyHdl_Impl, Button *, void ); + DECL_LINK_TYPED (ClickCloseHdl_Impl, Button *, void ); protected: virtual bool Close() SAL_OVERRIDE; diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index b48eecb57b84..e87e64ffe31e 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -71,7 +71,7 @@ private: protected: virtual short Ok() SAL_OVERRIDE; - DECL_LINK( CancelHdlImpl, void * ); + DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -140,9 +140,9 @@ class SvxTransparenceTabPage : public SvxTabPage XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - DECL_LINK(ClickTransOffHdl_Impl, void * ); - DECL_LINK(ClickTransLinearHdl_Impl, void * ); - DECL_LINK(ClickTransGradientHdl_Impl, void * ); + DECL_LINK_TYPED(ClickTransOffHdl_Impl, Button*, void ); + DECL_LINK_TYPED(ClickTransLinearHdl_Impl, Button*, void ); + DECL_LINK_TYPED(ClickTransGradientHdl_Impl, Button*, void ); DECL_LINK(ModifyTransparentHdl_Impl, void*); DECL_LINK(ModifiedTrgrHdl_Impl, void*); @@ -269,13 +269,15 @@ private: DECL_LINK( ModifyHatchingHdl_Impl, void * ); DECL_LINK( ToggleHatchBckgrdColorHdl_Impl, void * ); DECL_LINK( ModifyBitmapHdl_Impl, void * ); - DECL_LINK( ModifyStepCountHdl_Impl, void * ); + DECL_LINK( ModifyStepCountHdl_Impl, void* ); + DECL_LINK_TYPED( ModifyStepCountClickHdl_Impl, Button*, void ); //UUUU - DECL_LINK( ClickImportHdl_Impl, void * ); + DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void ); DECL_LINK( ModifyTileHdl_Impl, void * ); - DECL_LINK( ClickScaleHdl_Impl, void * ); + DECL_LINK_TYPED( ModifyTileClickHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickScaleHdl_Impl, Button*, void ); void ClickInvisibleHdl_Impl(); void ClickHatchingHdl_Impl(); void ClickGradientHdl_Impl(); @@ -347,7 +349,7 @@ private: SfxItemSet& m_rXFSet; SfxMapUnit m_ePoolUnit; - DECL_LINK( ClickShadowHdl_Impl, void * ); + DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void ); DECL_LINK( ModifyShadowHdl_Impl, void * ); public: @@ -418,13 +420,13 @@ private: XFillAttrSetItem m_aXFillAttr; SfxItemSet& m_rXFSet; - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK( ChangeGradientHdl_Impl, void * ); DECL_LINK( ModifiedHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); long CheckChanges_Impl(); void SetControlState_Impl( css::awt::GradientStyle eXGS ); @@ -498,11 +500,11 @@ private: DECL_LINK( ChangeHatchHdl_Impl, void * ); DECL_LINK( ModifiedHdl_Impl, void * ); - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + 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 ); long CheckChanges_Impl(); @@ -580,15 +582,15 @@ private: XFillAttrSetItem aXFillAttr; SfxItemSet& rXFSet; - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickImportHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK( ChangeBitmapHdl_Impl, void * ); DECL_LINK( ChangePixelColorHdl_Impl, void * ); DECL_LINK( ChangeBackgrndColorHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); long CheckChanges_Impl(); @@ -648,8 +650,8 @@ private: VclPtr<FixedText> m_pTableName; DECL_LINK( EmbedToggleHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); XPropertyListRef GetList(); bool GetEmbed(); @@ -712,10 +714,10 @@ private: void ImpColorCountChanged(); - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); - DECL_LINK( ClickWorkOnHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickWorkOnHdl_Impl, Button*, void ); DECL_LINK( SelectColorLBHdl_Impl, void * ); DECL_LINK( SelectValSetHdl_Impl, void * ); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index f2570fa0d5c8..c5204b9aa682 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -58,7 +58,7 @@ private: protected: virtual short Ok() SAL_OVERRIDE; - DECL_LINK( CancelHdlImpl, void * ); + DECL_LINK_TYPED( CancelHdlImpl, Button*, void ); void SavePalettes(); public: @@ -176,11 +176,13 @@ private: DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); DECL_LINK( MenuCreateHdl_Impl, MenuButton * ); DECL_LINK( SizeHdl_Impl, MetricField * ); - DECL_LINK( RatioHdl_Impl, CheckBox * ); + DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); DECL_LINK( ClickInvisibleHdl_Impl, void * ); DECL_LINK( ChangeStartHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeStartClickHdl_Impl, Button*, void ); DECL_LINK( ChangeEndHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void ); DECL_LINK( ChangePreviewHdl_Impl, void * ); DECL_LINK( ChangeTransparentHdl_Impl, void * ); @@ -283,16 +285,16 @@ private: void FillDash_Impl(); void FillDialog_Impl(); - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK( SelectLinestyleHdl_Impl, void * ); DECL_LINK( ChangePreviewHdl_Impl, void * ); DECL_LINK( ChangeNumber1Hdl_Impl, void * ); DECL_LINK( ChangeNumber2Hdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); - DECL_LINK( ChangeMetricHdl_Impl, void * ); + DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ChangeMetricHdl_Impl, Button*, void ); DECL_LINK( SelectTypeHdl_Impl, void * ); void CheckChanges_Impl(); @@ -357,11 +359,11 @@ private: sal_uInt16 nDlgType; sal_Int32* pPosLineEndLb; - DECL_LINK( ClickAddHdl_Impl, void * ); - DECL_LINK( ClickModifyHdl_Impl, void * ); - DECL_LINK( ClickDeleteHdl_Impl, void * ); - DECL_LINK( ClickLoadHdl_Impl, void * ); - DECL_LINK( ClickSaveHdl_Impl, void * ); + 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( SelectLineEndHdl_Impl, void * ); long ChangePreviewHdl_Impl( void* p ); diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx index d093de99cc68..2e0839395b1e 100644 --- a/cui/source/inc/dbregister.hxx +++ b/cui/source/inc/dbregister.hxx @@ -52,9 +52,10 @@ namespace svx bool m_bModified; #ifdef INCLUDED_CUI_SOURCE_INC_DBREGISTER_HXX - DECL_LINK( NewHdl, void * ); - DECL_LINK( EditHdl, void * ); - DECL_LINK( DeleteHdl, void * ); + DECL_LINK_TYPED( NewHdl, Button*, void ); + DECL_LINK_TYPED( EditHdl, Button*, void ); + DECL_LINK_TYPED( DeleteHdl, Button*, void ); + DECL_LINK(PathBoxDoubleClickHdl, void *); DECL_LINK(PathSelect_Impl, void *); diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 644b441db613..567988d1680e 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -139,8 +139,8 @@ private: VclPtr<FixedImage> pFtImage; Image* pImage; - DECL_LINK(Button1Hdl, void *); - DECL_LINK(Button2Hdl, void *); + DECL_LINK_TYPED(Button1Hdl, Button*, void); + DECL_LINK_TYPED(Button2Hdl, Button*, void); public: SvxMessDialog( vcl::Window* pWindow, const OUString& rText, const OUString& rDesc, Image* pImg = NULL ); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index b565def29229..f756d374a97c 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -100,7 +100,7 @@ class SvxGrfCropPage : public SfxTabPage DECL_LINK( CropHdl, const MetricField * ); DECL_LINK( CropLoseFocusHdl, MetricField * ); DECL_LINK( CropModifyHdl, MetricField * ); - DECL_LINK(OrigSizeHdl, void *); + DECL_LINK_TYPED(OrigSizeHdl, Button*, void); DECL_LINK_TYPED(Timeout, Timer *, void); void CalcZoom(); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index fd317ff5983b..e60d723c3eec 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -142,14 +142,14 @@ namespace svx public: void SetOptionsChangedHdl( const Link<>& _rHdl ); - void SetIgnoreHdl( const Link<>& _rHdl ); - void SetIgnoreAllHdl( const Link<>& _rHdl ); - void SetChangeHdl( const Link<>& _rHdl ); - void SetChangeAllHdl( const Link<>& _rHdl ); + void SetIgnoreHdl( const Link<Button*,void>& _rHdl ); + void SetIgnoreAllHdl( const Link<Button*,void>& _rHdl ); + void SetChangeHdl( const Link<Button*,void>& _rHdl ); + void SetChangeAllHdl( const Link<Button*,void>& _rHdl ); void SetClickByCharacterHdl( const Link<>& _rHdl ); - void SetConversionFormatChangedHdl( const Link<>& _rHdl ); - void SetFindHdl( const Link<>& _rHdl ); + void SetConversionFormatChangedHdl( const Link<Button*,void>& _rHdl ); + void SetFindHdl( const Link<Button*,void>& _rHdl ); OUString GetCurrentString( ) const; void SetCurrentString( @@ -180,11 +180,11 @@ namespace svx void EnableRubySupport( bool bVal ); private: - DECL_LINK( OnOption, void* ); + DECL_LINK_TYPED( OnOption, Button*, void ); DECL_LINK( OnSuggestionModified, void* ); DECL_LINK( OnSuggestionSelected, void* ); - DECL_LINK( OnConversionDirectionClicked, CheckBox* ); - DECL_LINK( ClickByCharacterHdl, CheckBox* ); + DECL_LINK_TYPED( OnConversionDirectionClicked, Button*, void ); + DECL_LINK_TYPED( ClickByCharacterHdl, Button*, void ); /// fill the suggestion list box with suggestions for the actual input void FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions ); @@ -210,11 +210,11 @@ namespace svx HHDictList m_aDictList; css::uno::Reference< css::linguistic2::XConversionDictionaryList > m_xConversionDictionaryList; - DECL_LINK( OkHdl, void* ); + DECL_LINK_TYPED( OkHdl, Button*, void ); DECL_LINK( DictsLB_SelectHdl, void* ); - DECL_LINK( NewDictHdl, void* ); - DECL_LINK( EditDictHdl, void* ); - DECL_LINK( DeleteDictHdl, void* ); + DECL_LINK_TYPED( NewDictHdl, Button*, void ); + DECL_LINK_TYPED( EditDictHdl, Button*, void ); + DECL_LINK_TYPED( DeleteDictHdl, Button*, void ); void Init(); ///< reads settings from core and init controls public: @@ -234,7 +234,7 @@ namespace svx bool m_bEntered; - DECL_LINK( OKHdl, void* ); + DECL_LINK_TYPED( OKHdl, Button*, void ); DECL_LINK( ModifyHdl, void* ); public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); @@ -297,8 +297,8 @@ namespace svx DECL_LINK( EditModifyHdl4, Edit* ); DECL_LINK( BookLBSelectHdl, void* ); - DECL_LINK( NewPBPushHdl, void* ); - DECL_LINK( DeletePBPushHdl, void* ); + DECL_LINK_TYPED( NewPBPushHdl, Button*, void ); + DECL_LINK_TYPED( DeletePBPushHdl, Button*, void ); void InitEditDictDialog( sal_uInt32 _nSelDict ); void UpdateOriginalLB(); diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx index 1df2992796d3..610c861dd9f0 100644 --- a/cui/source/inc/hldocntp.hxx +++ b/cui/source/inc/hldocntp.hxx @@ -36,10 +36,10 @@ private: VclPtr<PushButton> m_pBtCreate; VclPtr<ListBox> m_pLbDocTypes; - bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; + bool ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const; void FillDocumentList (); - DECL_LINK (ClickNewHdl_Impl , void * ); + DECL_LINK_TYPED (ClickNewHdl_Impl, Button*, void ); protected: void FillDlgFields(const OUString& rStrURL) SAL_OVERRIDE; diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 9214f8024a0f..e65dbaed1748 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -41,8 +41,8 @@ private: bool mbMarkWndOpen; - DECL_LINK (ClickFileopenHdl_Impl , void * ); - DECL_LINK (ClickTargetHdl_Impl , void * ); + DECL_LINK_TYPED (ClickFileopenHdl_Impl, Button*, void ); + DECL_LINK_TYPED (ClickTargetHdl_Impl , Button*, void ); DECL_LINK (ModifiedPathHdl_Impl , void * ); ///< Contens of combobox "Path" modified DECL_LINK (ModifiedTargetHdl_Impl, void * ); ///< Contens of editfield "Target" modified diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index a9252e102ed9..60216f581e9a 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -47,9 +47,9 @@ private: bool mbMarkWndOpen; - DECL_LINK (Click_SmartProtocol_Impl , void * ); ///< Radiobutton clicked: Type HTTP or FTP - DECL_LINK (ClickAnonymousHdl_Impl , void * ); ///< Checkbox : Anonymous User - DECL_LINK (ClickBrowseHdl_Impl , void * ); ///< Button : Browse + 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 (ClickBrowseHdl_Impl , Button*, void ); ///< Button : Browse DECL_LINK (ModifiedLoginHdl_Impl , void * ); ///< Contens of editfield "Login" modified DECL_LINK (LostFocusTargetHdl_Impl , void * ); ///< Combobox "Target" lost its focus DECL_LINK (ModifiedTargetHdl_Impl , void * ); ///< Contens of editfield "Target" modified diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 6c560279da8b..857e21dd5f8d 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -35,7 +35,7 @@ private: VclPtr<FixedText> m_pFtSubject; VclPtr<Edit> m_pEdSubject; - DECL_STATIC_LINK(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, void *); + DECL_STATIC_LINK_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); ///< Button : Address book DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 65b010cf66af..209fe82c6d69 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -86,8 +86,9 @@ protected: virtual void Move () SAL_OVERRIDE; - DECL_LINK (ClickApplyHdl_Impl, void * ); - DECL_LINK (ClickCloseHdl_Impl, void * ); + DECL_LINK_TYPED (ClickApplyHdl_Impl, Button*, void ); + DECL_LINK (DoubleClickApplyHdl_Impl, void* ); + DECL_LINK_TYPED (ClickCloseHdl_Impl, Button*, void ); public: SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent); diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx index 9933d6c1c439..8683ccb77fad 100644 --- a/cui/source/inc/hltpbase.hxx +++ b/cui/source/inc/hltpbase.hxx @@ -101,7 +101,7 @@ protected: OUString& aStrIntName, OUString& aStrFrame, SvxLinkInsertMode& eMode ); - DECL_LINK (ClickScriptHdl_Impl, void * ); ///< Button : Script + DECL_LINK_TYPED (ClickScriptHdl_Impl, Button*, void ); ///< Button : Script OUString aEmptyStr; diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 421737ea663f..29cc98576e8f 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -70,13 +70,13 @@ class SvxHyphenWordDialog : public SfxModalDialog void ContinueHyph_Impl( sal_Int32 nInsPos = -1 ); // continue by default sal_uInt16 GetHyphIndex_Impl(); - DECL_LINK(Left_Impl, void *); - DECL_LINK(Right_Impl, void *); - DECL_LINK(CutHdl_Impl, void *); - DECL_LINK(ContinueHdl_Impl, void *); - DECL_LINK(DeleteHdl_Impl, void *); - DECL_LINK( HyphenateAllHdl_Impl, Button* ); - DECL_LINK(CancelHdl_Impl, void *); + 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(GetFocusHdl_Impl, void *); public: diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 3e52b449d281..b34f4e396bde 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -142,10 +142,10 @@ private: bool bItemsReset; DECL_LINK ( ChosePageHdl_Impl, void * ); - DECL_LINK(OkHdl, void *); - DECL_LINK(ApplyHdl, void *); - DECL_LINK(ResetHdl, void *); - DECL_LINK(CancelHdl, 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); IconChoicePageData* GetPageData ( sal_uInt16 nId ); void Start_Impl(); diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index aa42ba5594ec..29ac1132220a 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -70,8 +70,8 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl OUString m_aIconMediaType; DECL_LINK(DoubleClickHdl, void*); - DECL_LINK(BrowseHdl, void *); - DECL_LINK(RadioHdl, void *); + DECL_LINK_TYPED(BrowseHdl, Button*, void); + DECL_LINK_TYPED(RadioHdl, Button*, void); void SelectDefault(); ListBox& GetObjectTypes() { return *m_pLbObjecttype; } @@ -103,7 +103,7 @@ private: INetURLObject* m_pURL; OUString m_aCommands; - DECL_LINK(BrowseHdl, void *); + DECL_LINK_TYPED(BrowseHdl, Button*, void); OUString GetPlugInFile() const { return m_pEdFileurl->GetText(); } OUString GetPlugInOptions() const { return m_pEdPluginsOptions->GetText(); } @@ -136,8 +136,8 @@ private: VclPtr<NumericField> m_pNMMarginHeight; VclPtr<CheckBox> m_pCBMarginHeightDefault; - DECL_LINK(OpenHdl, PushButton* ); - DECL_LINK(CheckHdl, CheckBox* ); + DECL_LINK_TYPED(OpenHdl, Button*, void ); + DECL_LINK_TYPED(CheckHdl, Button*, void ); void Init(); diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index 7995287a00ec..7355781b4482 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -67,7 +67,7 @@ private: void SetupType_Impl( sal_uInt16 nType ); DECL_LINK( AnsatzSelectHdl_Impl, ListBox * ); DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * ); - DECL_LINK( LineOptHdl_Impl, Button * ); + DECL_LINK_TYPED( LineOptHdl_Impl, Button *, void ); DECL_LINK( SelectCaptTypeHdl_Impl, void * ); const SfxItemSet& rOutAttrs; diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 1d32fc2cde74..9af5b0dacb01 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -66,11 +66,11 @@ class SvBaseLinksDlg : public ModalDialog DECL_LINK( LinksSelectHdl, SvTabListBox * ); DECL_LINK( LinksDoubleClickHdl, SvTabListBox * ); - DECL_LINK( AutomaticClickHdl, RadioButton * ); - DECL_LINK( ManualClickHdl, RadioButton * ); - DECL_LINK(UpdateNowClickHdl, void *); - DECL_LINK( ChangeSourceClickHdl, PushButton * ); - DECL_LINK( BreakLinkClickHdl, PushButton * ); + 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( EndEditHdl, sfx2::SvBaseLink* ); sfx2::SvBaseLink* GetSelEntry( sal_uLong* pPos ); diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx index 4edb69f67f02..3fb037e5f0cb 100644 --- a/cui/source/inc/macroass.hxx +++ b/cui/source/inc/macroass.hxx @@ -40,6 +40,7 @@ class _SfxMacroTabPage : public SfxTabPage DECL_DLLPRIVATE_LINK( SelectMacro_Impl, ListBox * ); DECL_DLLPRIVATE_LINK( AssignDeleteHdl_Impl, PushButton * ); + DECL_DLLPRIVATE_LINK_TYPED( AssignDeleteClickHdl_Impl, Button *, void ); DECL_DLLPRIVATE_LINK_TYPED( TimeOut_Impl, Idle*, void ); diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx index ab7492f4d63b..de7d4a70825d 100644 --- a/cui/source/inc/macropg.hxx +++ b/cui/source/inc/macropg.hxx @@ -58,7 +58,7 @@ class _SvxMacroTabPage_Impl; class _SvxMacroTabPage : public SfxTabPage { DECL_LINK( SelectEvent_Impl, SvTabListBox * ); - DECL_LINK( AssignDeleteHdl_Impl, PushButton * ); + DECL_LINK_TYPED( AssignDeleteHdl_Impl, Button *, void ); DECL_LINK( DoubleClickHdl_Impl, SvTabListBox * ); static long GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton* pBtn ); @@ -117,7 +117,7 @@ public: SvxMacroAssignSingleTabDialog(vcl::Window* pParent, const SfxItemSet& rOptionsSet); private: - DECL_DLLPRIVATE_LINK( OKHdl_Impl, Button * ); + DECL_DLLPRIVATE_LINK_TYPED( OKHdl_Impl, Button *, void ); }; diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 28dbdfdc7c28..81ffca5cb44b 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -60,8 +60,9 @@ private: void FillUnitLB(); - DECL_LINK( ClickAutoPosHdl_Impl, void * ); + DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void ); DECL_LINK( ChangeAttrHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void ); public: diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index ecc1395f6cad..566974177943 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -43,8 +43,8 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK(AddHdl_Impl, void *); - DECL_LINK(DelHdl_Impl, void *); + DECL_LINK_TYPED(AddHdl_Impl, Button*, void); + DECL_LINK_TYPED(DelHdl_Impl, Button*, void); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(CheckHdl_Impl, svx::SvxRadioButtonListBox*); @@ -64,8 +64,8 @@ private: VclPtr<PushButton> m_pAddBtn; VclPtr<PushButton> m_pDelBtn; - DECL_LINK(AddHdl_Impl, void *); - DECL_LINK(DelHdl_Impl, void *); + DECL_LINK_TYPED(AddHdl_Impl, Button*, void); + DECL_LINK_TYPED(DelHdl_Impl, Button*, void); DECL_LINK(SelectHdl_Impl, void *); public: diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index b27347651f68..f2a72c1d7088 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -149,13 +149,16 @@ private: void MakePreviewText( const OUString& rFormat ); void ChangePreviewText( sal_uInt16 nPos ); void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); + bool Click_Impl(PushButton* pIB); // Handler DECL_LINK( LostFocusHdl_Impl, Edit* ); DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* ); DECL_LINK( SelFormatHdl_Impl, void * ); - DECL_LINK( ClickHdl_Impl, PushButton* ); + DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); + DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); DECL_LINK( EditHdl_Impl, Edit* ); DECL_LINK( OptHdl_Impl, void * ); + DECL_LINK_TYPED( OptClickHdl_Impl, Button*, void ); DECL_LINK_TYPED(TimeHdl_Impl, Timer *, void); }; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 4b51379be685..37453a66a1aa 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -223,7 +223,7 @@ class SvxBitmapPickTabPage : public SfxTabPage protected: DECL_LINK(NumSelectHdl_Impl, void *); DECL_LINK(DoubleClickHdl_Impl, void *); - DECL_LINK(ClickAddBrowseHdl_Impl, void * ); + DECL_LINK_TYPED(ClickAddBrowseHdl_Impl, Button*, void ); public: @@ -321,19 +321,19 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * ); DECL_LINK( LevelHdl_Impl, ListBox * ); - DECL_LINK_TYPED(PopupActivateHdl_Impl, Menu *, bool); + DECL_LINK_TYPED( PopupActivateHdl_Impl, Menu *, bool); DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); - DECL_LINK(BulletHdl_Impl, void *); + DECL_LINK_TYPED( BulletHdl_Impl, Button*, void); DECL_LINK( SizeHdl_Impl, MetricField * ); - DECL_LINK( RatioHdl_Impl, CheckBox * ); - DECL_LINK(CharFmtHdl_Impl, void *); + DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); + DECL_LINK( CharFmtHdl_Impl, void *); DECL_LINK( EditModifyHdl_Impl, Edit * ); DECL_LINK( AllLevelHdl_Impl, NumericField * ); DECL_LINK( OrientHdl_Impl, ListBox * ); - DECL_LINK( SameLevelHdl_Impl, CheckBox * ); + DECL_LINK_TYPED( SameLevelHdl_Impl, Button*, void ); DECL_LINK( BulColorHdl_Impl, ColorListBox* ); DECL_LINK( BulRelSizeHdl_Impl, MetricField *); - DECL_LINK_TYPED(PreviewInvalidateHdl_Impl, Timer *, void); + DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void); public: SvxNumOptionsTabPage(vcl::Window* pParent, @@ -426,10 +426,10 @@ class SvxNumPositionTabPage : public SfxTabPage void InitControls(); DECL_LINK( LevelHdl_Impl, ListBox * ); - DECL_LINK(EditModifyHdl_Impl, void *); + DECL_LINK( EditModifyHdl_Impl, void *); DECL_LINK( DistanceHdl_Impl, MetricField * ); - DECL_LINK( RelativeHdl_Impl, CheckBox * ); - DECL_LINK(StandardHdl_Impl, void *); + DECL_LINK_TYPED( RelativeHdl_Impl, Button*, void ); + DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); void InitPosAndSpaceMode(); void ShowControlsDependingOnPosAndSpaceMode(); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 39d18ef48976..441f311e9919 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -49,7 +49,7 @@ class SvxAsianLayoutPage : public SfxTabPage SvxAsianLayoutPage_Impl* pImpl; DECL_LINK(LanguageHdl, void *); - DECL_LINK(ChangeStandardHdl, CheckBox*); + DECL_LINK_TYPED(ChangeStandardHdl, Button*, void); DECL_LINK(ModifyHdl, Edit*); public: diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index 7efb70d9e1e7..b8028ca9146a 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -59,7 +59,7 @@ private: css::uno::Reference< css::linguistic2::XDictionary > xNewDic; - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); DECL_LINK(ModifyHdl_Impl, void *); public: @@ -132,7 +132,8 @@ private: DECL_LINK(SelectBookHdl_Impl, void *); DECL_LINK(SelectLangHdl_Impl, void *); DECL_LINK(SelectHdl, SvTabListBox*); - DECL_LINK(NewDelHdl, PushButton*); + DECL_LINK_TYPED(NewDelHdl, Button*, void); + DECL_LINK(NewDelActionHdl, PushButton*); DECL_LINK(ModifyHdl, Edit*); diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index e09b39e277e6..50bce86b2262 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -75,9 +75,9 @@ class SvxEditModulesDlg : public ModalDialog SvTreeListEntry* CreateEntry(OUString& rTxt, sal_uInt16 nCol); DECL_LINK(SelectHdl_Impl, SvxCheckListBox *); - DECL_LINK(UpDownHdl_Impl, PushButton *); - DECL_LINK(ClickHdl_Impl, void *); - DECL_LINK(BackHdl_Impl, void *); + DECL_LINK_TYPED(UpDownHdl_Impl, Button*, void); + DECL_LINK_TYPED(ClickHdl_Impl, Button*, void); + DECL_LINK_TYPED(BackHdl_Impl, Button*, void); DECL_LINK( LangSelectHdl_Impl, ListBox* ); DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); DECL_LINK(OpenURLHdl_Impl, void *); @@ -137,7 +137,7 @@ private: static sal_uLong GetDicUserData( const css::uno::Reference< css::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx ); DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); - DECL_LINK( ClickHdl_Impl, PushButton * ); + DECL_LINK_TYPED( ClickHdl_Impl, Button *, void ); DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * ); DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); DECL_LINK(PostDblClickHdl_Impl, void *); diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 2b443b4ee6b5..5d23015e74db 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -53,8 +53,9 @@ private: void ChangeCurrentEntry( const OUString& _rFolder ); - DECL_LINK(PathHdl_Impl, void *); - DECL_LINK(StandardHdl_Impl, void *); + DECL_LINK_TYPED(PathHdl_Impl, Button*, void); + DECL_LINK(DoubleClickPathHdl_Impl, void *); + DECL_LINK_TYPED(StandardHdl_Impl, Button*, void); DECL_LINK(PathSelect_Impl, void *); DECL_LINK( HeaderSelect_Impl, HeaderBar * ); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index c7b6436e551d..0c39b832d57c 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -151,11 +151,11 @@ private: void Init_Impl(); DECL_LINK(LayoutHdl_Impl, void *); DECL_LINK(PaperBinHdl_Impl, void *); - DECL_LINK( SwapOrientation_Impl, RadioButton* ); + DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void ); void SwapFirstValues_Impl( bool bSet ); DECL_LINK(BorderModify_Impl, void *); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK(CenterHdl_Impl, void *); + DECL_LINK_TYPED(CenterHdl_Impl, Button*, void); void UpdateExample_Impl( bool bResetbackground = false ); DECL_LINK( PaperSizeSelect_Impl, ListBox* ); @@ -168,7 +168,7 @@ private: DECL_LINK(RangeHdl_Impl, void *); void CalcMargin_Impl(); - DECL_LINK( RegisterModify, CheckBox * ); + DECL_LINK_TYPED( 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 db939787629c..ee5c1dda81c2 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -83,8 +83,8 @@ private: long nAbst; long nWidth; long nMinFixDist; - bool bRelativeMode; - bool bNegativeIndents; + bool bRelativeMode; + bool bNegativeIndents; void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr ); void Init_Impl(); @@ -92,7 +92,7 @@ private: DECL_LINK( LineDistHdl_Impl, ListBox* ); DECL_LINK(ModifyHdl_Impl, void *); - DECL_LINK( AutoHdl_Impl, CheckBox* ); + DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); protected: virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; @@ -152,7 +152,7 @@ class SvxParaAlignTabPage : public SfxTabPage VclPtr<VclFrame> m_pPropertiesFL; VclPtr<svx::FrameDirectionListBox> m_pTextDirectionLB; - DECL_LINK(AlignHdl_Impl, void *); + DECL_LINK_TYPED(AlignHdl_Impl, Button*, void); DECL_LINK(LastLineHdl_Impl, void *); DECL_LINK(TextDirectionHdl_Impl, void *); @@ -253,12 +253,12 @@ private: bool bHtmlMode; sal_uInt16 nStdPos; - DECL_LINK(PageBreakHdl_Impl, void *); - DECL_LINK(KeepTogetherHdl_Impl, void *); - DECL_LINK(WidowHdl_Impl, void *); - DECL_LINK(OrphanHdl_Impl, void *); - DECL_LINK(HyphenClickHdl_Impl, void *); - DECL_LINK(ApplyCollClickHdl_Impl, void *); + 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( PageBreakPosHdl_Impl, ListBox* ); DECL_LINK( PageBreakTypeHdl_Impl, ListBox* ); @@ -276,7 +276,7 @@ class SvxAsianTabPage : public SfxTabPage SvxAsianTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); - DECL_STATIC_LINK( SvxAsianTabPage, ClickHdl_Impl, CheckBox* ); + DECL_STATIC_LINK_TYPED( SvxAsianTabPage, ClickHdl_Impl, Button*, void ); public: virtual ~SvxAsianTabPage(); diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx index b5d6c4cc9706..395190897541 100644 --- a/cui/source/inc/postdlg.hxx +++ b/cui/source/inc/postdlg.hxx @@ -94,10 +94,10 @@ private: Link<> aPrevHdlLink; Link<> aNextHdlLink; - DECL_LINK(Stamp, void *); - DECL_LINK(OKHdl, void *); - DECL_LINK(PrevHdl, void *); - DECL_LINK(NextHdl, void *); + DECL_LINK_TYPED(Stamp, Button*, void); + DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK_TYPED(PrevHdl, Button*, void); + DECL_LINK_TYPED(NextHdl, Button*, void); }; #endif diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 9c82f2acd8c7..a60cc4174837 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -157,7 +157,7 @@ protected: const OUString m_renameErrTitleStr; DECL_LINK( ScriptSelectHdl, SvTreeListBox * ); - DECL_LINK( ButtonHdl, Button * ); + DECL_LINK_TYPED( 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 ); diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx index 774851451ab0..ff7e5f21a731 100644 --- a/cui/source/inc/selector.hxx +++ b/cui/source/inc/selector.hxx @@ -184,7 +184,7 @@ class SvxScriptSelectorDialog : public ModelessDialog bool m_bShowSlots; Link<> m_aAddHdl; - DECL_LINK( ClickHdl, Button * ); + DECL_LINK_TYPED( ClickHdl, Button *, void ); DECL_LINK( SelectHdl, Control* ); DECL_LINK( FunctionDoubleClickHdl, Control* ); diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index 96c7022d774f..77f6d5023ab5 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(OnClickedOk, void *); + DECL_LINK_TYPED(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 9d727d1583f1..047feae4b315 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(); - DECL_LINK( ClickHdl, Button * ); + DECL_LINK_TYPED( ClickHdl, Button *, void ); virtual bool IsHorizontal() const SAL_OVERRIDE; virtual bool IsProportional() const SAL_OVERRIDE; diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index f1c6aefde1a9..87a3eeeb4370 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -60,7 +60,7 @@ private: SearchAttrItemList& rList; - DECL_LINK(OKHdl, void *); + DECL_LINK_TYPED(OKHdl, Button*, void); }; // class SvxSearchSimilarityDialog --------------------------------------- diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 67f416ee1c63..5c4245f8c0c0 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -99,12 +99,13 @@ class SvxSwPosSizeTabPage : public SfxTabPage DECL_LINK(RangeModifyHdl, void *); - DECL_LINK(AnchorTypeHdl, void *); + DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); + DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); DECL_LINK( PosHdl, ListBox * ); DECL_LINK( RelHdl, ListBox * ); - DECL_LINK(MirrorHdl, void *); + DECL_LINK_TYPED(MirrorHdl, Button*, void); DECL_LINK( ModifyHdl, Edit * ); - DECL_LINK(ProtectHdl, void *); + DECL_LINK_TYPED(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 d73e9635a813..c415eab9aaa6 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -107,12 +107,12 @@ private: void SetFillAndTabType_Impl(); // Handler - DECL_LINK( NewHdl_Impl, Button* ); - DECL_LINK(DelHdl_Impl, void *); - DECL_LINK(DelAllHdl_Impl, void *); + DECL_LINK_TYPED( NewHdl_Impl, Button*, void ); + DECL_LINK_TYPED(DelHdl_Impl, Button*, void ); + DECL_LINK_TYPED(DelAllHdl_Impl, Button*, void ); - DECL_LINK( FillTypeCheckHdl_Impl, RadioButton* ); - DECL_LINK( TabTypeCheckHdl_Impl, RadioButton* ); + DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void ); + DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void ); DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(ModifyHdl_Impl, void *); diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index e0d237850114..c0a1896bcc4b 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -66,10 +66,10 @@ private: SfxMapUnit eUnit; DECL_LINK( SelectEffectHdl_Impl, void * ); - DECL_LINK( ClickEndlessHdl_Impl, void * ); - DECL_LINK( ClickAutoHdl_Impl, void * ); - DECL_LINK( ClickPixelHdl_Impl, void * ); - DECL_LINK( ClickDirectionHdl_Impl, ImageButton * ); + 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 ); void SelectDirection( SdrTextAniDirection nValue ); sal_uInt16 GetSelectedDirection(); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 881f3fd4837c..c232882889c4 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -66,8 +66,8 @@ private: bool bWordWrapTextEnabled; bool bFitToSizeEnabled; - DECL_LINK( ClickFullWidthHdl_Impl, void * ); - DECL_LINK( ClickHdl_Impl, void * ); + DECL_LINK_TYPED( ClickFullWidthHdl_Impl, Button*, void ); + DECL_LINK_TYPED( 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 4aaa4da782ec..6fd929d430fa 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -142,8 +142,8 @@ public: OUString getErrStr() const { return m_aErrStr; } // Handler - DECL_LINK( ReplaceBtnHdl_Impl, Button * ); - DECL_LINK( LeftBtnHdl_Impl, Button * ); + DECL_LINK_TYPED( ReplaceBtnHdl_Impl, Button *, void ); + DECL_LINK_TYPED( LeftBtnHdl_Impl, Button *, void ); DECL_LINK( LanguageHdl_Impl, ListBox * ); DECL_LINK( WordSelectHdl_Impl, ComboBox * ); DECL_LINK( AlternativesSelectHdl_Impl, SvxCheckListBox * ); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 10bc6712d2f3..6a967756f2a9 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -130,16 +130,16 @@ private: RECT_POINT meRP; - DECL_LINK( ChangePosProtectHdl, void * ); - DECL_LINK( ChangeSizeProtectHdl, void * ); + DECL_LINK_TYPED( ChangePosProtectHdl, Button*, void ); + DECL_LINK_TYPED( ChangeSizeProtectHdl, Button*, void ); void SetMinMaxPosition(); void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange); DECL_LINK( ChangeWidthHdl, void * ); DECL_LINK( ChangeHeightHdl, void * ); - DECL_LINK( ClickSizeProtectHdl, void * ); - DECL_LINK( ClickAutoHdl, void * ); + DECL_LINK_TYPED( ClickSizeProtectHdl, Button*, void ); + DECL_LINK_TYPED( 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 4bb282dbccba..08a7d2fb1b7e 100644 --- a/cui/source/inc/treeopt.hxx +++ b/cui/source/inc/treeopt.hxx @@ -185,8 +185,8 @@ private: protected: DECL_STATIC_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox* ); DECL_LINK(ShowPageHdl_Impl, void *); - DECL_LINK(BackHdl_Impl, void *); - DECL_LINK(OKHdl_Impl, void *); + DECL_LINK_TYPED(BackHdl_Impl, Button*, void); + DECL_LINK_TYPED(OKHdl_Impl, Button*, void); void SelectHdl_Impl(); virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 55bb1dc2adc9..dcd7c41c81a4 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(UserHdl, RadioButton*); + DECL_LINK_TYPED(UserHdl, Button*, void); DECL_LINK(SpinHdl, void*); - DECL_LINK(ViewLayoutUserHdl, RadioButton*); + DECL_LINK_TYPED(ViewLayoutUserHdl, Button*, void); DECL_LINK(ViewLayoutSpinHdl, NumericField*); - DECL_LINK(ViewLayoutCheckHdl, CheckBox*); - DECL_LINK(OKHdl, Button*); + DECL_LINK_TYPED(ViewLayoutCheckHdl, Button*, void); + DECL_LINK_TYPED(OKHdl, Button*, void); public: SvxZoomDialog(vcl::Window* pParent, const SfxItemSet& rCoreSet); |