diff options
Diffstat (limited to 'cui/source/inc')
28 files changed, 89 insertions, 74 deletions
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 717762349810..40497fbd3fff 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -64,11 +64,11 @@ private: std::set< sal_uInt16 > m_aIgnoreErrorsAt; sal_uInt16 m_nErrorStart; sal_uInt16 m_nErrorEnd; - bool m_bIsUndoEditMode; + bool m_bIsUndoEditMode; - Link<> m_aModifyLink; + Link<Edit&,void> m_aModifyLink; - void CallModifyLink() {m_aModifyLink.Call(this);} + void CallModifyLink() {m_aModifyLink.Call(*this);} inline SpellDialog* GetSpellDialog() const; protected: @@ -77,7 +77,7 @@ protected: public: SentenceEditWindow_Impl(vcl::Window* pParent, WinBits nBits); - void SetModifyHdl(const Link<>& rLink) override { m_aModifyLink = rLink;} + void SetModifyHdl(const Link<Edit&,void>& rLink) override { m_aModifyLink = rLink;} void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd ); void SetText( const OUString& rStr ) override; @@ -179,7 +179,7 @@ private: 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_TYPED( ModifyHdl, Edit&, void); DECL_LINK_TYPED(UndoHdl, Button*, void); DECL_LINK_TYPED( AddToDictSelectHdl, MenuButton*, void ); DECL_LINK_TYPED( AddToDictClickHdl, Button*, void ); diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index 073b728d2845..bf83041a8381 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -255,7 +255,7 @@ private: DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); bool NewDelHdl(void*); void RefillReplaceBox( bool bFromReset, @@ -318,7 +318,7 @@ private: DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); DECL_LINK_TYPED(NewDelActionHdl, AutoCorrEdit&, bool); DECL_LINK_TYPED(SelectHdl, ListBox&, void); - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); bool NewDelHdl(void*); /// Box filled with new language void RefillReplaceBoxes(bool bFromReset, diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 1817195fd132..3fd76592ffb9 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -122,8 +122,8 @@ private: DECL_LINK_TYPED( SelPreHdl_Impl, ValueSet*, void ); DECL_LINK_TYPED( SelSdwHdl_Impl, ValueSet*, void ); DECL_LINK_TYPED( LinesChanged_Impl, LinkParamNone*, void ); - DECL_LINK( ModifyDistanceHdl_Impl, MetricField*); - DECL_LINK( ModifyWidthHdl_Impl, void*); + DECL_LINK_TYPED( ModifyDistanceHdl_Impl, Edit&, void); + DECL_LINK_TYPED( ModifyWidthHdl_Impl, Edit&, void); DECL_LINK_TYPED( SyncHdl_Impl, Button*, void); sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index e768576f1857..a85d6252da00 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -483,7 +483,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog void UpdateButtonStates(); DECL_LINK_TYPED( MoveHdl, Button *, void ); - DECL_LINK( ModifyHdl, Edit * ); + DECL_LINK_TYPED( ModifyHdl, Edit&, void ); DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); public: diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index a2e8746772c5..180950612bb6 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -133,9 +133,10 @@ private: bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp ); DECL_LINK_TYPED( UpdateHdl_Impl, Idle *, void ); - DECL_LINK( FontModifyHdl_Impl, void* ); + DECL_LINK_TYPED( FontModifyEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( FontModifyListBoxHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( FontModifyComboBoxHdl_Impl, ComboBox&, void ); + void FontModifyHdl_Impl(void*); public: using SfxTabPage::ActivatePage; @@ -297,13 +298,13 @@ private: DECL_LINK_TYPED( PositionHdl_Impl, Button*, void ); DECL_LINK_TYPED( RotationHdl_Impl, Button*, void ); - DECL_LINK( FontModifyHdl_Impl, 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( KerningModifyHdl_Impl, void *); + DECL_LINK_TYPED( KerningSelectHdl_Impl, ListBox&, void ); + DECL_LINK_TYPED( KerningModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( LoseFocusHdl_Impl, Control&, void ); - DECL_LINK( ScaleWidthModifyHdl_Impl, void *); + DECL_LINK_TYPED( ScaleWidthModifyHdl_Impl, Edit&, void ); public: virtual ~SvxCharPositionPage(); diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index abf5a02635d8..1b481f92907c 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -57,8 +57,9 @@ private: void FillTypeLB(); - DECL_LINK( ChangeAttrHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); + void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index da70430e3c6c..a9b537e0c6d2 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -161,7 +161,7 @@ private: DECL_LINK_TYPED(OnClickedSearchAgain, Button *, void); DECL_LINK_TYPED( OnClickedSpecialSettings, Button*, void ); - DECL_LINK(OnSearchTextModified, void *); + DECL_LINK_TYPED(OnSearchTextModified, Edit&, void); DECL_LINK_TYPED( OnPositionSelected, ListBox&, void ); DECL_LINK_TYPED( OnFieldSelected, ListBox&, void ); diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 021e6a348541..9d7be2deeb35 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -95,6 +95,7 @@ class GraphicFilterSmooth : public GraphicFilterDialog { private: VclPtr<NumericField> mpMtrRadius; + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: @@ -113,6 +114,7 @@ private: VclPtr<MetricField> mpMtrHeight; VclPtr<CheckBox> mpCbxEdges; DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: GraphicFilterMosaic(vcl::Window* pParent, const Graphic& rGraphic, @@ -132,6 +134,7 @@ private: VclPtr<MetricField> mpMtrThreshold; VclPtr<CheckBox> mpCbxInvert; DECL_LINK_TYPED(CheckBoxModifyHdl, CheckBox&, void); + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: @@ -149,6 +152,7 @@ class GraphicFilterSepia : public GraphicFilterDialog { private: VclPtr<MetricField> mpMtrSepia; + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: GraphicFilterSepia( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nSepiaPercent ); @@ -165,6 +169,7 @@ class GraphicFilterPoster : public GraphicFilterDialog { private: VclPtr<NumericField> mpNumPoster; + DECL_LINK_TYPED(EditModifyHdl, Edit&, void); public: GraphicFilterPoster( vcl::Window* pParent, const Graphic& rGraphic, sal_uInt16 nPosterColorCount ); diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx index 62da72139f40..f7761c9f3d4d 100644 --- a/cui/source/inc/cuioptgenrl.hxx +++ b/cui/source/inc/cuioptgenrl.hxx @@ -50,7 +50,7 @@ private: unsigned nNameRow; unsigned nShortNameField; - DECL_LINK( ModifyHdl_Impl, Edit * ); + DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); bool GetAddress_Impl(); void SetAddress_Impl(); diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 95a7163f9522..671d4220da95 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -143,9 +143,10 @@ class SvxTransparenceTabPage : public SvxTabPage 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*); + DECL_LINK_TYPED(ModifyTransparentHdl_Impl, Edit&, void); + DECL_LINK_TYPED(ModifiedTrgrEditHdl_Impl, Edit&, void); DECL_LINK_TYPED(ModifiedTrgrListBoxHdl_Impl, ListBox&, void); + void ModifiedTrgrHdl_Impl(void*); void ActivateLinear(bool bActivate); void ActivateGradient(bool bActivate); @@ -271,13 +272,14 @@ private: DECL_LINK_TYPED( ModifyHatchingHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ToggleHatchBckgrdColorHdl_Impl, CheckBox&, void ); DECL_LINK_TYPED( ModifyBitmapHdl_Impl, ListBox&, void ); - DECL_LINK( ModifyStepCountHdl_Impl, void* ); + DECL_LINK_TYPED( ModifyStepCountEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ModifyStepCountClickHdl_Impl, Button*, void ); + void ModifyStepCountHdl_Impl(void*); //UUUU DECL_LINK_TYPED( ClickImportHdl_Impl, Button*, void ); - DECL_LINK( ModifyTileHdl_Impl, void * ); + DECL_LINK_TYPED( ModifyTileHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ModifyTileClickHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickScaleHdl_Impl, Button*, void ); void ClickInvisibleHdl_Impl(); @@ -353,7 +355,7 @@ private: SfxMapUnit m_ePoolUnit; DECL_LINK_TYPED( ClickShadowHdl_Impl, Button*, void ); - DECL_LINK( ModifyShadowHdl_Impl, void * ); + DECL_LINK_TYPED( ModifyShadowHdl_Impl, Edit&, void ); DECL_LINK_TYPED( SelectShadowHdl_Impl, ListBox&, void ); public: @@ -428,10 +430,11 @@ private: DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK_TYPED( ChangeGradientHdl_Impl, ListBox&, void ); - DECL_LINK( ModifiedHdl_Impl, void * ); + DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ClickLoadHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickSaveHdl_Impl, Button*, void ); + void ModifiedHdl_Impl(void*); long CheckChanges_Impl(); void SetControlState_Impl( css::awt::GradientStyle eXGS ); @@ -504,8 +507,9 @@ private: SfxMapUnit m_ePoolUnit; DECL_LINK_TYPED( ChangeHatchHdl_Impl, ListBox&, void ); - DECL_LINK( ModifiedHdl_Impl, void * ); + DECL_LINK_TYPED( ModifiedEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ModifiedListBoxHdl_Impl, ListBox&, void ); + void ModifiedHdl_Impl(void*); DECL_LINK_TYPED( ClickAddHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickModifyHdl_Impl, Button*, void ); DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); @@ -729,7 +733,7 @@ private: DECL_LINK_TYPED( SelectValSetHdl_Impl, ValueSet*, void ); DECL_LINK_TYPED( SelectColorModelHdl_Impl, ListBox&, void ); void ChangeColor(const Color &rNewColor); - DECL_LINK( ModifiedHdl_Impl, void * ); + DECL_LINK_TYPED( ModifiedHdl_Impl, Edit&, void ); long CheckChanges_Impl(); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 3ad9556d69d4..e25562eef712 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -173,22 +173,22 @@ private: // handler for gallery popup menu button + size DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); DECL_LINK_TYPED( MenuCreateHdl_Impl, MenuButton *, void ); - DECL_LINK( SizeHdl_Impl, MetricField * ); + 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( ChangeStartModifyHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeStartModifyHdl_Impl, Edit&, void ); void ChangeStartHdl_Impl(void*); DECL_LINK_TYPED( ChangeEndListBoxHdl_Impl, ListBox&, void ); - DECL_LINK( ChangeEndModifyHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeEndModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ChangeEndClickHdl_Impl, Button*, void ); void ChangeEndHdl_Impl(void*); DECL_LINK_TYPED( ChangePreviewListBoxHdl_Impl, ListBox&, void ); - DECL_LINK( ChangePreviewModifyHdl_Impl, void* ); + DECL_LINK_TYPED( ChangePreviewModifyHdl_Impl, Edit&, void ); void ChangePreviewHdl_Impl(void*); - DECL_LINK( ChangeTransparentHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeTransparentHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ChangeEdgeStyleHdl_Impl, ListBox&, void ); @@ -293,9 +293,9 @@ private: DECL_LINK_TYPED( ClickDeleteHdl_Impl, Button*, void ); DECL_LINK_TYPED( SelectLinestyleListBoxHdl_Impl, ListBox&, void ); void SelectLinestyleHdl_Impl(ListBox*); - DECL_LINK( ChangePreviewHdl_Impl, void * ); - DECL_LINK( ChangeNumber1Hdl_Impl, void * ); - DECL_LINK( ChangeNumber2Hdl_Impl, void * ); + 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 ); diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index 9b5289820ba0..ec765293c2ef 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -36,7 +36,7 @@ private: Link<SvxNameDialog&,bool> aCheckNameHdl; - DECL_LINK(ModifyHdl, void *); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); public: SvxNameDialog( vcl::Window* pWindow, const OUString& rName, const OUString& rDesc ); @@ -85,7 +85,7 @@ private: // callback link for name uniqueness Link<SvxObjectNameDialog&,bool> aCheckNameHdl; - DECL_LINK(ModifyHdl, void *); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); public: // constructor diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 49ad01f2a9fd..d2497117c405 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -95,13 +95,13 @@ class SvxGrfCropPage : public SfxTabPage virtual ~SvxGrfCropPage(); virtual void dispose() override; - DECL_LINK( ZoomHdl, MetricField * ); - DECL_LINK( SizeHdl, MetricField * ); + 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( CropModifyHdl, MetricField * ); - DECL_LINK_TYPED(OrigSizeHdl, Button*, void); - DECL_LINK_TYPED(Timeout, Timer *, void); + DECL_LINK_TYPED( CropModifyHdl, Edit&, void ); + DECL_LINK_TYPED( OrigSizeHdl, Button*, void ); + DECL_LINK_TYPED( Timeout, Timer *, void ); void CalcZoom(); void CalcMinMaxBorder(); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index da6f675d7110..271d5a0e2834 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -183,7 +183,7 @@ namespace svx private: DECL_LINK_TYPED( OnOption, Button*, void ); - DECL_LINK( OnSuggestionModified, 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 ); @@ -237,7 +237,7 @@ namespace svx bool m_bEntered; DECL_LINK_TYPED( OKHdl, Button*, void ); - DECL_LINK( ModifyHdl, void* ); + DECL_LINK_TYPED( ModifyHdl, Edit&, void ); public: HangulHanjaNewDictDialog( vcl::Window* _pParent ); virtual ~HangulHanjaNewDictDialog(); @@ -291,12 +291,12 @@ namespace svx bool m_bModifiedSuggestions; bool m_bModifiedOriginal; - DECL_LINK( OriginalModifyHdl, void* ); + DECL_LINK_TYPED( OriginalModifyHdl, Edit&, void ); DECL_LINK_TYPED( ScrollHdl, ScrollBar*, void ); - DECL_LINK( EditModifyHdl1, Edit* ); - DECL_LINK( EditModifyHdl2, Edit* ); - DECL_LINK( EditModifyHdl3, Edit* ); - DECL_LINK( EditModifyHdl4, Edit* ); + 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_TYPED( BookLBSelectHdl, ListBox&, void ); DECL_LINK_TYPED( NewPBPushHdl, Button*, void ); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index 0aea2dc4dd5a..4589c46bfb3e 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -44,8 +44,8 @@ private: 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 + 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_TYPED( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index d964caea5334..f70b8f7d2d74 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -50,9 +50,9 @@ private: 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_TYPED( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified DECL_LINK_TYPED( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus - DECL_LINK (ModifiedTargetHdl_Impl , void * ); ///< Contens of editfield "Target" modified + DECL_LINK_TYPED( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout diff --git a/cui/source/inc/hlmailtp.hxx b/cui/source/inc/hlmailtp.hxx index 3c128ffd6688..df5235ec8e6a 100644 --- a/cui/source/inc/hlmailtp.hxx +++ b/cui/source/inc/hlmailtp.hxx @@ -37,7 +37,7 @@ private: DECL_STATIC_LINK_TYPED(SvxHyperlinkMailTp, ClickAdrBookHdl_Impl, Button*, void); ///< Button : Address book - DECL_LINK (ModifiedReceiverHdl_Impl, void * ); ///< Combobox "receiver" modified + DECL_LINK_TYPED (ModifiedReceiverHdl_Impl, Edit&, void ); ///< Combobox "receiver" modified void SetScheme(const OUString& rScheme); void RemoveImproperProtocol(const OUString& aProperScheme); diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 6e985c33c854..bc1e5ce32a75 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -61,9 +61,10 @@ private: void FillUnitLB(); DECL_LINK_TYPED( ClickAutoPosHdl_Impl, Button*, void ); - DECL_LINK( ChangeAttrHdl_Impl, void * ); + DECL_LINK_TYPED( ChangeAttrEditHdl_Impl, Edit&, void ); DECL_LINK_TYPED( ChangeAttrListBoxHdl_Impl, ListBox&, void ); DECL_LINK_TYPED( ChangeAttrClickHdl_Impl, Button*, void ); + void ChangeAttrHdl_Impl(void*); public: diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 8fa538433390..f936e1f71f9b 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -158,10 +158,12 @@ private: DECL_LINK_TYPED( SelFormatClickHdl_Impl, Button*, void ); void SelFormatHdl_Impl(void*); DECL_LINK_TYPED( ClickHdl_Impl, Button*, void ); - DECL_LINK( EditHdl_Impl, Edit* ); - DECL_LINK( OptHdl_Impl, 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); + void EditHdl_Impl(Edit*); + void OptHdl_Impl(void*); }; #endif diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 8ffba711cc7c..8d83f106dfb4 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -325,17 +325,18 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK_TYPED( PopupActivateHdl_Impl, Menu *, bool); DECL_LINK_TYPED( GraphicHdl_Impl, MenuButton *, void ); DECL_LINK_TYPED( BulletHdl_Impl, Button*, void); - DECL_LINK( SizeHdl_Impl, MetricField * ); + DECL_LINK_TYPED( SizeHdl_Impl, Edit&, void ); DECL_LINK_TYPED( RatioHdl_Impl, Button*, void ); DECL_LINK_TYPED( CharFmtHdl_Impl, ListBox&, void ); - DECL_LINK( EditModifyHdl_Impl, Edit* ); + DECL_LINK_TYPED( EditModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( EditListBoxHdl_Impl, ListBox&, void ); - DECL_LINK( AllLevelHdl_Impl, NumericField * ); + 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( BulRelSizeHdl_Impl, MetricField *); + DECL_LINK_TYPED( BulRelSizeHdl_Impl, Edit&, void); DECL_LINK_TYPED( PreviewInvalidateHdl_Impl, Timer *, void); + void EditModifyHdl_Impl(Edit*); public: SvxNumOptionsTabPage(vcl::Window* pParent, diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 5d5189f0e74a..d3cb6140365e 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -50,7 +50,7 @@ class SvxAsianLayoutPage : public SfxTabPage DECL_LINK_TYPED(LanguageHdl, ListBox&, void); DECL_LINK_TYPED(ChangeStandardHdl, Button*, void); - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK_TYPED(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 d64d80b82dd0..7f4d665e0d83 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -60,7 +60,7 @@ private: css::linguistic2::XDictionary > xNewDic; DECL_LINK_TYPED(OKHdl_Impl, Button*, void); - DECL_LINK(ModifyHdl_Impl, void *); + DECL_LINK_TYPED(ModifyHdl_Impl, Edit&, void); public: SvxNewDictionaryDialog( vcl::Window* pParent, @@ -134,7 +134,7 @@ private: DECL_LINK_TYPED(SelectHdl, SvTreeListBox*, void); DECL_LINK_TYPED(NewDelButtonHdl, Button*, void); DECL_LINK_TYPED(NewDelActionHdl, SvxDictEdit&, bool); - DECL_LINK(ModifyHdl, Edit*); + DECL_LINK_TYPED(ModifyHdl, Edit&, void); bool NewDelHdl(void*); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 3da4a8955114..be03c3abbc08 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -153,13 +153,13 @@ private: DECL_LINK_TYPED( PaperBinHdl_Impl, Control&, void); DECL_LINK_TYPED( SwapOrientation_Impl, Button*, void ); void SwapFirstValues_Impl( bool bSet ); - DECL_LINK( BorderModify_Impl, void *); + DECL_LINK_TYPED( BorderModify_Impl, Edit&, void); void InitHeadFoot_Impl( const SfxItemSet& rSet ); DECL_LINK_TYPED( CenterHdl_Impl, Button*, void); void UpdateExample_Impl( bool bResetbackground = false ); DECL_LINK_TYPED( PaperSizeSelect_Impl, ListBox&, void ); - DECL_LINK( PaperSizeModify_Impl, void *); + DECL_LINK_TYPED( PaperSizeModify_Impl, Edit&, void); DECL_LINK_TYPED( FrameDirectionModify_Impl, ListBox&, void ); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index f71e9f4010d6..df2f87b1ec2c 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -91,7 +91,7 @@ private: void UpdateExample_Impl(); DECL_LINK_TYPED( LineDistHdl_Impl, ListBox&, void ); - DECL_LINK(ModifyHdl_Impl, void *); + DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( AutoHdl_Impl, Button*, void ); protected: diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 12c686519a81..602dd555ae3f 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -106,7 +106,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage DECL_LINK_TYPED( PosHdl, ListBox&, void ); DECL_LINK_TYPED( RelHdl, ListBox&, void ); DECL_LINK_TYPED(MirrorHdl, Button*, void); - DECL_LINK( ModifyHdl, Edit * ); + DECL_LINK_TYPED( ModifyHdl, Edit&, void ); DECL_LINK_TYPED(ProtectHdl, Button*, void); void InitPos(short nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index 0aede59214a8..82dbb831a9f0 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -108,14 +108,14 @@ private: // Handler DECL_LINK_TYPED( NewHdl_Impl, Button*, void ); - DECL_LINK_TYPED(DelHdl_Impl, Button*, void ); - DECL_LINK_TYPED(DelAllHdl_Impl, Button*, void ); + DECL_LINK_TYPED( DelHdl_Impl, Button*, void ); + DECL_LINK_TYPED( DelAllHdl_Impl, Button*, void ); DECL_LINK_TYPED( FillTypeCheckHdl_Impl, Button*, void ); DECL_LINK_TYPED( TabTypeCheckHdl_Impl, Button*, void ); DECL_LINK_TYPED( SelectHdl_Impl, ComboBox&, void ); - DECL_LINK(ModifyHdl_Impl, void *); + DECL_LINK_TYPED( ModifyHdl_Impl, Edit&, void ); DECL_LINK_TYPED( GetFillCharHdl_Impl, Control&, void ); DECL_LINK_TYPED( GetDezCharHdl_Impl, Control&, void ); diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index f79897f94e28..3490963393f5 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -137,8 +137,8 @@ private: void SetMinMaxPosition(); void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange); - DECL_LINK( ChangeWidthHdl, void * ); - DECL_LINK( ChangeHeightHdl, void * ); + DECL_LINK_TYPED( ChangeWidthHdl, Edit&, void ); + DECL_LINK_TYPED( ChangeHeightHdl, Edit&, void ); DECL_LINK_TYPED( ClickSizeProtectHdl, Button*, void ); DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index 818d381c0a10..6b6000edee3e 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -49,9 +49,9 @@ private: bool mbModified; DECL_LINK_TYPED(UserHdl, Button*, void); - DECL_LINK(SpinHdl, void*); + DECL_LINK_TYPED(SpinHdl, Edit&, void); DECL_LINK_TYPED(ViewLayoutUserHdl, Button*, void); - DECL_LINK(ViewLayoutSpinHdl, NumericField*); + DECL_LINK_TYPED(ViewLayoutSpinHdl, Edit&, void); DECL_LINK_TYPED(ViewLayoutCheckHdl, Button*, void); DECL_LINK_TYPED(OKHdl, Button*, void); |