diff options
Diffstat (limited to 'include')
26 files changed, 57 insertions, 57 deletions
diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index 67e50766b6cf..dff6a3119ea4 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -41,7 +41,7 @@ private: DECL_DLLPRIVATE_LINK_TYPED( OKHdl, ComboBox&, void ); DECL_DLLPRIVATE_LINK_TYPED( OKClickHdl, Button *, void ); - DECL_DLLPRIVATE_LINK( ModifyHdl, ComboBox * ); + DECL_DLLPRIVATE_LINK_TYPED( ModifyHdl, Edit&, void ); public: SfxNewStyleDlg( vcl::Window* pParent, SfxStyleSheetBasePool& ); diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 212dc88ae09b..35e15d8b53a0 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -76,8 +76,9 @@ private: SfxShowExtras mnExtras; bool mbAsciiOnly; - DECL_DLLPRIVATE_LINK(EditModifyHdl, Edit*); + DECL_DLLPRIVATE_LINK_TYPED(EditModifyHdl, Edit&, void); DECL_DLLPRIVATE_LINK_TYPED(OKHdl, Button *, void); + void ModifyHdl(Edit*); void SetPasswdText(); diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 03638028e4bf..40f0d181d78a 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -80,7 +80,7 @@ private: DECL_LINK_TYPED(OpenRegionHdl, void*, void); DECL_LINK_TYPED(OpenTemplateHdl, ThumbnailViewItem*, void); - DECL_LINK(SearchUpdateHdl, void*); + DECL_LINK_TYPED(SearchUpdateHdl, Edit&, void); void OnTemplateImport (); void OnTemplateSearch (); diff --git a/include/svtools/GraphicExportOptionsDialog.hxx b/include/svtools/GraphicExportOptionsDialog.hxx index 34fd5968c589..420b3ba21e33 100644 --- a/include/svtools/GraphicExportOptionsDialog.hxx +++ b/include/svtools/GraphicExportOptionsDialog.hxx @@ -56,9 +56,9 @@ private: double getViewWidthInch(); double getViewHeightInch(); - DECL_LINK( widthModifiedHandle, void* ); - DECL_LINK( heightModifiedHandle, void* ); - DECL_LINK( resolutionModifiedHandle, void* ); + DECL_LINK_TYPED( widthModifiedHandle, Edit&, void ); + DECL_LINK_TYPED( heightModifiedHandle, Edit&, void ); + DECL_LINK_TYPED( resolutionModifiedHandle, Edit&, void ); public: GraphicExportOptionsDialog( vcl::Window* pWindow, const css::uno::Reference<css::lang::XComponent>& rxSourceDocument ); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 6fcd3c608bc5..f6825808b6de 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -85,10 +85,10 @@ private: DECL_LINK_TYPED ( OKHdl, Button *, void ); DECL_LINK_TYPED ( DelHdl, Button *, void ); DECL_LINK_TYPED ( EditHdl, DetailsContainer*, void ); - DECL_LINK ( ModifyHdl, void* ); + DECL_LINK_TYPED ( ModifyHdl, Edit&, void ); DECL_LINK_TYPED ( SelectTypeHdl, ListBox&, void ); - DECL_LINK ( EditLabelHdl, void * ); - DECL_LINK ( EditUsernameHdl, void * ); + DECL_LINK_TYPED ( EditLabelHdl, Edit&, void ); + DECL_LINK_TYPED ( EditUsernameHdl, Edit&, void ); }; diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index 80d9bcc539ee..3e71209d77e4 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -61,7 +61,7 @@ class DetailsContainer protected: void notifyChange( ); - DECL_LINK ( ValueChangeHdl, void * ); + DECL_LINK_TYPED ( ValueChangeHdl, Edit&, void ); }; class HostDetailsContainer : public DetailsContainer diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 991f9b18f990..e1c7c1047b4b 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -147,7 +147,7 @@ namespace svt virtual void SetModified() = 0; virtual bool IsModified() const = 0; virtual void ClearModified() = 0; - virtual void SetModifyHdl( const Link<>& _rLink ) = 0; + virtual void SetModifyHdl( const Link<Edit&,void>& _rLink ) = 0; }; @@ -182,7 +182,7 @@ namespace svt virtual void SetModified() override; virtual bool IsModified() const override; virtual void ClearModified() override; - virtual void SetModifyHdl( const Link<>& _rLink ) override; + virtual void SetModifyHdl( const Link<Edit&,void>& _rLink ) override; }; #include <svtools/editimplementation.hxx> @@ -252,7 +252,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK(ModifyHdl, void*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); }; @@ -273,7 +273,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK(ModifyHdl, void*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); }; @@ -360,7 +360,7 @@ namespace svt protected: virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: - DECL_LINK(ModifyHdl, void*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); }; @@ -673,10 +673,10 @@ namespace svt SVT_DLLPRIVATE void implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp); SVT_DLLPRIVATE void impl_construct(); - DECL_DLLPRIVATE_LINK_TYPED(ModifyHdl, LinkParamNone*, void ); - DECL_DLLPRIVATE_LINK_TYPED(StartEditHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED(EndEditHdl, void*, void ); - DECL_DLLPRIVATE_LINK_TYPED(CellModifiedHdl, void*, void ); + DECL_DLLPRIVATE_LINK_TYPED( ModifyHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK_TYPED( StartEditHdl, void*, void ); + DECL_DLLPRIVATE_LINK_TYPED( EndEditHdl, void*, void ); + DECL_DLLPRIVATE_LINK_TYPED( CellModifiedHdl, void*, void ); }; diff --git a/include/svtools/editimplementation.hxx b/include/svtools/editimplementation.hxx index f6a98a6ad80d..c43c44d66db2 100644 --- a/include/svtools/editimplementation.hxx +++ b/include/svtools/editimplementation.hxx @@ -129,7 +129,7 @@ void GenericEditImplementation< EDIT >::ClearModified() template <class EDIT> -void GenericEditImplementation< EDIT >::SetModifyHdl( const Link<>& _rLink ) +void GenericEditImplementation< EDIT >::SetModifyHdl( const Link<Edit&,void>& _rLink ) { m_rEdit.SetModifyHdl( _rLink ); } diff --git a/include/svtools/filectrl.hxx b/include/svtools/filectrl.hxx index 741e3c509409..14fe9466a84f 100644 --- a/include/svtools/filectrl.hxx +++ b/include/svtools/filectrl.hxx @@ -86,7 +86,7 @@ public: void SetText( const OUString& rStr ) override; OUString GetText() const override; - void SetEditModifyHdl( const Link<>& rLink ); + void SetEditModifyHdl( const Link<Edit&,void>& rLink ); }; #endif diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index eeafb52b0d8c..e7b4897bbe9e 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -63,9 +63,9 @@ private: void Initialize(); - DECL_LINK( NewWidthModifiedHdl, void* ); - DECL_LINK( NewHeightModifiedHdl, void* ); - DECL_LINK( ResolutionModifiedHdl, void* ); + DECL_LINK_TYPED( NewWidthModifiedHdl, Edit&, void ); + DECL_LINK_TYPED( NewHeightModifiedHdl, Edit&, void ); + DECL_LINK_TYPED( ResolutionModifiedHdl, Edit&, void ); DECL_LINK_TYPED( ToggleCompressionRB, RadioButton&, void ); DECL_LINK_TYPED( ToggleReduceResolutionRB, CheckBox&, void ); diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 7a9898cac659..ab9d01ee779d 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -197,9 +197,9 @@ private: DECL_LINK_TYPED( SelDateHdl, ListBox&, void ); DECL_LINK_TYPED( RowEnableHdl, Button*, void ); DECL_LINK_TYPED( TimeHdl, Button*, void ); - DECL_LINK( ModifyHdl, void* ); + DECL_LINK_TYPED( ModifyHdl, Edit&, void ); DECL_LINK_TYPED( ModifyListBoxHdl, ListBox&, void ); - DECL_LINK( ModifyDate, void* ); + DECL_LINK_TYPED( ModifyDate, Edit&, void ); DECL_LINK_TYPED( RefHandle, Button*, void ); protected: diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 6699557db01d..bcc5c0345268 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -159,7 +159,7 @@ private: void ImplSetFieldLink( const Link<>& rLink ); - DECL_LINK( LinkedFieldModifyHdl, NumericField* ); + DECL_LINK_TYPED( LinkedFieldModifyHdl, Edit&, void ); DECL_LINK_TYPED( LinkedFieldFocusHdl, Control&, void ); void LinkedFieldModifyHdl(); DECL_LINK_TYPED(SpinFieldHdl, SpinField&, void); diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index be0c2db98651..0fff7e1fa168 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -195,7 +195,7 @@ private: DECL_LINK_TYPED( ClickHdl, Button*, void ); DECL_LINK_TYPED( ClickColorHdl, Button*, void ); DECL_LINK_TYPED( SelectHdl, ListBox&, void ); - DECL_LINK( ModifyHdl, void * ); + DECL_LINK_TYPED( ModifyHdl, Edit&, void ); void ClickLight(PushButton &rBtn); DECL_LINK_TYPED( ChangeSelectionCallbackHdl, SvxLightCtl3D*, void ); diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 86932b20d50f..e56e6226596f 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -147,7 +147,7 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxFontWorkDialog : public SfxDockingWindow DECL_LINK_TYPED( SelectAdjustHdl_Impl, ToolBox *, void ); DECL_LINK_TYPED( SelectShadowHdl_Impl, ToolBox *, void ); - DECL_LINK( ModifyInputHdl_Impl, void * ); + DECL_LINK_TYPED( ModifyInputHdl_Impl, Edit&, void ); DECL_LINK_TYPED( InputTimoutHdl_Impl, Idle *, void ); DECL_LINK_TYPED( ColorSelectHdl_Impl, ListBox&, void ); diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 11a911fdeba6..06b2eec8166d 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -94,10 +94,10 @@ protected: bool mbEnableDrawingLayerFillStyles : 1; void InitHandler(); - DECL_LINK_TYPED( TurnOnHdl, Button*, void); - DECL_LINK(DistModify, void *); - DECL_LINK(HeightModify, void *); - DECL_LINK(BorderModify, void *); + DECL_LINK_TYPED(TurnOnHdl, Button*, void); + DECL_LINK_TYPED(DistModify, Edit&, void); + DECL_LINK_TYPED(HeightModify, Edit&, void); + DECL_LINK_TYPED(BorderModify, Edit&, void); DECL_LINK_TYPED(BackgroundHdl, Button*, void); void UpdateExample(); diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 0a34caef522a..dd8a047be38a 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -122,7 +122,7 @@ class SVX_DLLPUBLIC SvxIMapDlg : public SfxModelessDialog // SfxFloatingWindow DECL_LINK_TYPED( InfoHdl, IMapWindow&, void ); DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void ); DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void ); - DECL_LINK( URLModifyHdl, void* ); + DECL_LINK_TYPED( URLModifyHdl, Edit&, void ); DECL_LINK_TYPED( URLModifyComboBoxHdl, ComboBox&, void ); DECL_LINK_TYPED( URLLoseFocusHdl, Control&, void ); DECL_LINK_TYPED( UpdateHdl, Idle *, void ); diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index f9dca8c760cc..10591848477c 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -181,7 +181,7 @@ private: SVX_DLLPRIVATE virtual void ImplSaveValue() override; SVX_DLLPRIVATE virtual sal_Int32 ImplGetSavedValue() const override; - DECL_LINK( EditModifyHdl, SvxLanguageComboBox* ); + DECL_LINK_TYPED( EditModifyHdl, Edit&, void ); }; #endif diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 43b139029ecf..beafc874b897 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -142,9 +142,9 @@ private: bool bAttrModified; DECL_LINK_TYPED( ClickRotateHdl_Impl, Button*, void ); - DECL_LINK( ChangeDrawHdl_Impl, MetricField * ); + DECL_LINK_TYPED( ChangeDrawHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ChangeGridsnapHdl_Impl, Button*, void ); - DECL_LINK( ChangeDivisionHdl_Impl, NumericField * ); + DECL_LINK_TYPED( ChangeDivisionHdl_Impl, Edit&, void ); }; #endif diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 109b055b0688..e8dcfe7d9686 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -48,7 +48,7 @@ private: bool bEmpty; DECL_LINK_TYPED(ButtonHdl, Button*, void); - DECL_LINK(EditModifyHdl, void *); + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: SvxPasswordDialog( vcl::Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index cb1485c8101c..e0ddcf0e2bb6 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -135,7 +135,7 @@ class SvxRubyDialog : public SfxModelessDialog DECL_LINK_TYPED(PositionHdl_Impl, ListBox&, void); DECL_LINK_TYPED(AdjustHdl_Impl, ListBox&, void); DECL_LINK_TYPED(CharStyleHdl_Impl, ListBox&, void); - DECL_LINK(EditModifyHdl_Impl, Edit*); + DECL_LINK_TYPED(EditModifyHdl_Impl, Edit&, void); DECL_LINK_TYPED(EditScrollHdl_Impl, sal_Int32, bool); DECL_LINK_TYPED(EditJumpHdl_Impl, sal_Int32, void); diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index 169972679d3b..4c67637756b7 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -162,7 +162,7 @@ protected: DECL_LINK_TYPED(SelectFillTypeHdl, ListBox&, void ); DECL_LINK_TYPED(SelectFillAttrHdl, ListBox&, void ); DECL_LINK_TYPED(ChangeTrgrTypeHdl_Impl, ListBox&, void); - DECL_LINK(ModifyTransparentHdl_Impl, void*); + DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void); DECL_LINK_TYPED(ModifyTransSliderHdl, Slider*, void); // for transparency gradient diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index b2372de1042b..eda36c9d5528 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -170,7 +170,7 @@ private: DECL_LINK_TYPED(ChangeLineStyleHdl, ListBox&, void); DECL_LINK_TYPED(ToolboxWidthSelectHdl, ToolBox*, void); - DECL_LINK(ChangeTransparentHdl , void *); + DECL_LINK_TYPED(ChangeTransparentHdl, Edit&, void ); DECL_LINK_TYPED(ChangeStartHdl, ListBox&, void); DECL_LINK_TYPED(ChangeEndHdl, ListBox&, void); DECL_LINK_TYPED(ChangeEdgeStyleHdl, ListBox&, void); diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 84f219dfd3a0..b27a0478bf64 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -230,7 +230,7 @@ private: mutable sal_Int32 nTransliterationFlags; - DECL_LINK( ModifyHdl_Impl, ComboBox* ); + DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( FlagHdl_Impl, Button*, void ); DECL_LINK_TYPED( CommandHdl_Impl, Button*, void ); DECL_LINK_TYPED(TemplateHdl_Impl, Button*, void); diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx index 7a6023684860..3f015be0ca85 100644 --- a/include/vcl/edit.hxx +++ b/include/vcl/edit.hxx @@ -102,8 +102,8 @@ private: mbIsSubEdit:1, mbInMBDown:1, mbActivePopup:1; - Link<> maModifyHdl; - Link<> maUpdateDataHdl; + Link<Edit&,void> maModifyHdl; + Link<Edit&,void> maUpdateDataHdl; css::uno::Reference<css::i18n::XExtendedInputSequenceChecker> mxISC; @@ -246,9 +246,9 @@ public: const OUString& GetSavedValue() const { return maSaveValue; } bool IsValueChangedFromSaved() const { return maSaveValue != GetText(); } - virtual void SetModifyHdl( const Link<>& rLink ) { maModifyHdl = rLink; } - virtual const Link<>& GetModifyHdl() const { return maModifyHdl; } - virtual void SetUpdateDataHdl( const Link<>& rLink ) { maUpdateDataHdl = rLink; } + virtual void SetModifyHdl( const Link<Edit&,void>& rLink ) { maModifyHdl = rLink; } + virtual const Link<Edit&,void>& GetModifyHdl() const { return maModifyHdl; } + virtual void SetUpdateDataHdl( const Link<Edit&,void>& rLink ) { maUpdateDataHdl = rLink; } void SetSubEdit( Edit* pEdit ); Edit* GetSubEdit() const { return mpSubEdit; } diff --git a/include/vcl/slider.hxx b/include/vcl/slider.hxx index 98e93d80f76e..e418357de6d4 100644 --- a/include/vcl/slider.hxx +++ b/include/vcl/slider.hxx @@ -57,7 +57,7 @@ private: Link<Slider*,void> maSlideHdl; Link<Slider*,void> maEndSlideHdl; - DECL_LINK(LinkedFieldModifyHdl, NumericField*); + DECL_LINK_TYPED(LinkedFieldModifyHdl, Edit&, void); DECL_LINK_TYPED(LinkedFieldLoseFocusHdl, Control&, void); DECL_LINK_TYPED(LinkedFieldSpinnerHdl, SpinField&, void); @@ -77,7 +77,6 @@ private: SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction = true ); SAL_DLLPRIVATE long ImplDoSlide( long nNewPos ); SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType ); - SAL_DLLPRIVATE void ImplSetFieldLink(const Link<>& rLink); SAL_DLLPRIVATE void ImplUpdateLinkedField(); public: diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx index 90ddc3a685d0..2d577f7ab05a 100644 --- a/include/vcl/vclmedit.hxx +++ b/include/vcl/vclmedit.hxx @@ -33,13 +33,13 @@ class ExtTextView; class VCL_DLLPUBLIC VclMultiLineEdit : public Edit { private: - ImpVclMEdit* pImpVclMEdit; + ImpVclMEdit* pImpVclMEdit; - OUString aSaveValue; - Link<> aModifyHdlLink; + OUString aSaveValue; + Link<Edit&,void> aModifyHdlLink; - Timer* pUpdateDataTimer; - Link<> aUpdateDataHdlLink; + Timer* pUpdateDataTimer; + Link<Edit&,void> aUpdateDataHdlLink; protected: @@ -109,10 +109,10 @@ public: void SaveValue() { aSaveValue = GetText(); } const OUString& GetSavedValue() const { return aSaveValue; } - void SetModifyHdl( const Link<>& rLink ) override { aModifyHdlLink = rLink; } - const Link<>& GetModifyHdl() const override { return aModifyHdlLink; } + void SetModifyHdl( const Link<Edit&,void>& rLink ) override { aModifyHdlLink = rLink; } + const Link<Edit&,void>& GetModifyHdl() const override { return aModifyHdlLink; } - void SetUpdateDataHdl( const Link<>& rLink ) override { aUpdateDataHdlLink = rLink; } + void SetUpdateDataHdl( const Link<Edit&,void>& rLink ) override { aUpdateDataHdlLink = rLink; } virtual void Resize() override; virtual void GetFocus() override; |