From e85b2333bce7b1dcae73861df6d90b48b9f4efe5 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 24 Sep 2015 13:53:17 +0200 Subject: convert Link<> to typed Change-Id: I59d325c3b051690303a5841907317122fa1ec98b Reviewed-on: https://gerrit.libreoffice.org/18825 Tested-by: Jenkins Reviewed-by: Noel Grandin --- cui/source/dialogs/cuifmsearch.cxx | 3 +-- cui/source/dialogs/hangulhanjadlg.cxx | 4 ++-- cui/source/dialogs/hldoctp.cxx | 4 +--- cui/source/dialogs/hlinettp.cxx | 3 +-- cui/source/dialogs/hyphen.cxx | 3 +-- cui/source/inc/chardlg.hxx | 2 +- cui/source/inc/cuifmsearch.hxx | 2 +- cui/source/inc/grfpage.hxx | 2 +- cui/source/inc/hldoctp.hxx | 4 ++-- cui/source/inc/hlinettp.hxx | 10 +++++----- cui/source/inc/hyphen.hxx | 2 +- cui/source/inc/numfmt.hxx | 2 +- cui/source/inc/numpages.hxx | 1 + cui/source/inc/page.hxx | 12 ++++++------ cui/source/inc/paragrph.hxx | 2 +- cui/source/inc/swpossizetabpage.hxx | 2 +- cui/source/inc/tabstpge.hxx | 4 ++-- cui/source/options/optcolor.cxx | 19 +++++++++---------- cui/source/options/optgdlg.cxx | 6 +++++- cui/source/options/optgdlg.hxx | 1 + cui/source/options/optinet2.cxx | 6 +++--- cui/source/options/optinet2.hxx | 2 +- cui/source/tabpages/chardlg.cxx | 10 +++++----- cui/source/tabpages/grfpage.cxx | 14 +++++++------- cui/source/tabpages/numfmt.cxx | 8 ++++---- cui/source/tabpages/numpages.cxx | 17 +++++++++++------ cui/source/tabpages/page.cxx | 31 ++++++++++++++----------------- cui/source/tabpages/paragrph.cxx | 17 ++++++++--------- cui/source/tabpages/swpossizetabpage.cxx | 28 +++++++++++++--------------- cui/source/tabpages/tabstpge.cxx | 14 ++++++-------- 30 files changed, 116 insertions(+), 119 deletions(-) (limited to 'cui') diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 8b3803186db0..b0d80cf2ba40 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -404,10 +404,9 @@ IMPL_LINK_NOARG(FmSearchDialog, OnSearchTextModified) return 0; } -IMPL_LINK(FmSearchDialog, OnFocusGrabbed, ComboBox*,) +IMPL_LINK_NOARG_TYPED(FmSearchDialog, OnFocusGrabbed, Control&, void) { m_pcmbSearchText->SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) ); - return 0; } IMPL_LINK(FmSearchDialog, OnPositionSelected, ListBox*, pBox) diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 36570b951304..0ef8e1fd24eb 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -1380,9 +1380,9 @@ namespace svx void SuggestionEdit::DoJump( bool _bUp ) { - const Link<>& rLoseFocusHdl = GetLoseFocusHdl(); + const Link& rLoseFocusHdl = GetLoseFocusHdl(); if( rLoseFocusHdl.IsSet() ) - rLoseFocusHdl.Call( this ); + rLoseFocusHdl.Call( *this ); m_pScrollBar->SetThumbPos( m_pScrollBar->GetThumbPos() + ( _bUp? -1 : 1 ) ); ( static_cast< HangulHanjaEditDictDialog* >( GetParentDialog() ) )->UpdateScrollbar(); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index 764d5f382602..f7c27b39e36b 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -315,13 +315,11 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedTargetHdl_Impl) |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkDocTp, LostFocusPathHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkDocTp, LostFocusPathHdl_Impl, Control&, void) { maStrURL = GetCurrentURL(); m_pFtFullURL->SetText( maStrURL ); - - return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index c58df74f8278..3f8a73256211 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -383,10 +383,9 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, Button*, v |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, Control&, void) { RefreshMarkWindow(); - return 0L; } /************************************************************************* diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx index 9b7dd37e194c..5d00a0803242 100644 --- a/cui/source/dialogs/hyphen.cxx +++ b/cui/source/dialogs/hyphen.cxx @@ -428,10 +428,9 @@ IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, Right_Impl, Button*, void) } -IMPL_LINK_NOARG(SvxHyphenWordDialog, GetFocusHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxHyphenWordDialog, GetFocusHdl_Impl, Control&, void) { m_pWordEdit->SetSelection( Selection( m_nOldPos, m_nOldPos + 1 ) ); - return 0; } diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 4d5506ec54b6..f750d0eda0b9 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -299,7 +299,7 @@ private: DECL_LINK_TYPED( FitToLineHdl_Impl, Button*, void ); DECL_LINK( KerningSelectHdl_Impl, void *); DECL_LINK( KerningModifyHdl_Impl, void *); - DECL_LINK( LoseFocusHdl_Impl, MetricField* ); + DECL_LINK_TYPED( LoseFocusHdl_Impl, Control&, void ); DECL_LINK( ScaleWidthModifyHdl_Impl, void *); public: diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 42a9fab92c1c..c41ea5c886e3 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -166,7 +166,7 @@ private: DECL_LINK( OnPositionSelected, ListBox* ); DECL_LINK( OnFieldSelected, ListBox* ); - DECL_LINK( OnFocusGrabbed, ComboBox* ); + DECL_LINK_TYPED( OnFocusGrabbed, Control&, void ); DECL_LINK_TYPED( OnCheckBoxToggled, CheckBox&, void ); DECL_LINK( OnContextSelection, ListBox* ); diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index f756d374a97c..6449dfa7d7e1 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -98,7 +98,7 @@ class SvxGrfCropPage : public SfxTabPage DECL_LINK( ZoomHdl, MetricField * ); DECL_LINK( SizeHdl, MetricField * ); DECL_LINK( CropHdl, const MetricField * ); - DECL_LINK( CropLoseFocusHdl, MetricField * ); + DECL_LINK_TYPED( CropLoseFocusHdl, Control&, void ); DECL_LINK( CropModifyHdl, MetricField * ); DECL_LINK_TYPED(OrigSizeHdl, Button*, void); DECL_LINK_TYPED(Timeout, Timer *, void); diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx index e65dbaed1748..6a301b62d2d0 100644 --- a/cui/source/inc/hldoctp.hxx +++ b/cui/source/inc/hldoctp.hxx @@ -47,9 +47,9 @@ private: DECL_LINK (ModifiedPathHdl_Impl , void * ); ///< Contens of combobox "Path" modified DECL_LINK (ModifiedTargetHdl_Impl, void * ); ///< Contens of editfield "Target" modified - DECL_LINK (LostFocusPathHdl_Impl, void * ); ///< Combobox "path" lost its focus + DECL_LINK_TYPED( LostFocusPathHdl_Impl, Control&, void ); ///< Combobox "path" lost its focus - DECL_LINK_TYPED(TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout + DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void ); ///< Handler for timer -timeout enum EPathType { Type_Unknown, Type_Invalid, Type_ExistsFile, Type_File, diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index 60216f581e9a..e1febf0d4e9f 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -47,14 +47,14 @@ private: bool mbMarkWndOpen; - DECL_LINK_TYPED (Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP - DECL_LINK_TYPED (ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User - DECL_LINK_TYPED (ClickBrowseHdl_Impl , Button*, 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_TYPED( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus DECL_LINK (ModifiedTargetHdl_Impl , void * ); ///< Contens of editfield "Target" modified - DECL_LINK_TYPED(TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout + DECL_LINK_TYPED( TimeoutHdl_Impl, Timer *, void); ///< Handler for timer -timeout void SetScheme(const OUString& rScheme); diff --git a/cui/source/inc/hyphen.hxx b/cui/source/inc/hyphen.hxx index 29cc98576e8f..b515ca74f9c7 100644 --- a/cui/source/inc/hyphen.hxx +++ b/cui/source/inc/hyphen.hxx @@ -77,7 +77,7 @@ class SvxHyphenWordDialog : public SfxModalDialog 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 *); + DECL_LINK_TYPED(GetFocusHdl_Impl, Control&, void); public: SvxHyphenWordDialog( const OUString &rWord, LanguageType nLang, diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 3ce1a6765bd2..f004a7633a66 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -151,7 +151,7 @@ private: void AddAutomaticLanguage_Impl(LanguageType eAutoLang, bool bSelect); bool Click_Impl(PushButton* pIB); // Handler - DECL_LINK( LostFocusHdl_Impl, Edit* ); + DECL_LINK_TYPED( LostFocusHdl_Impl, Control&, void ); DECL_LINK_TYPED( DoubleClickHdl_Impl, SvTreeListBox*, bool ); DECL_LINK( SelFormatHdl_Impl, void * ); DECL_LINK_TYPED( SelFormatListBoxHdl_Impl, SvTreeListBox*, void ); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 790915fc703e..5b96a904a21e 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -429,6 +429,7 @@ class SvxNumPositionTabPage : public SfxTabPage DECL_LINK( LevelHdl_Impl, ListBox * ); DECL_LINK( EditModifyHdl_Impl, void *); DECL_LINK( DistanceHdl_Impl, MetricField * ); + DECL_LINK_TYPED( DistanceFocusHdl_Impl, Control&, void ); DECL_LINK_TYPED( RelativeHdl_Impl, Button*, void ); DECL_LINK_TYPED( StandardHdl_Impl, Button*, void); diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 0c39b832d57c..1d55426a4545 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -149,23 +149,23 @@ private: bool mbEnableDrawingLayerFillStyles : 1; void Init_Impl(); - DECL_LINK(LayoutHdl_Impl, void *); - DECL_LINK(PaperBinHdl_Impl, void *); + DECL_LINK( LayoutHdl_Impl, void *); + 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( BorderModify_Impl, void *); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK_TYPED(CenterHdl_Impl, Button*, void); + DECL_LINK_TYPED( CenterHdl_Impl, Button*, void); void UpdateExample_Impl( bool bResetbackground = false ); DECL_LINK( PaperSizeSelect_Impl, ListBox* ); - DECL_LINK(PaperSizeModify_Impl, void *); + DECL_LINK( PaperSizeModify_Impl, void *); DECL_LINK( FrameDirectionModify_Impl, ListBox* ); void ResetBackground_Impl( const SfxItemSet& rSet ); - DECL_LINK(RangeHdl_Impl, void *); + DECL_LINK_TYPED( RangeHdl_Impl, Control&, void ); void CalcMargin_Impl(); DECL_LINK_TYPED( RegisterModify, Button*, void ); diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index 12e23f4dce93..fdb840c71334 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -102,7 +102,7 @@ public: virtual ~SvxStdParagraphTabPage(); virtual void dispose() SAL_OVERRIDE; - DECL_LINK(ELRLoseFocusHdl, void *); + DECL_LINK_TYPED(ELRLoseFocusHdl, Control&, void); static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pStdRanges; } diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index 5c4245f8c0c0..10f63451d0e2 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -98,7 +98,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage - DECL_LINK(RangeModifyHdl, void *); + DECL_LINK_TYPED(RangeModifyHdl, Control&, void); DECL_LINK_TYPED(RangeModifyClickHdl, Button*, void); DECL_LINK_TYPED(AnchorTypeHdl, Button*, void); DECL_LINK( PosHdl, ListBox * ); diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index c415eab9aaa6..455caa2777ef 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -116,8 +116,8 @@ private: DECL_LINK(SelectHdl_Impl, void *); DECL_LINK(ModifyHdl_Impl, void *); - DECL_LINK( GetFillCharHdl_Impl, Edit* ); - DECL_LINK( GetDezCharHdl_Impl, Edit* ); + DECL_LINK_TYPED( GetFillCharHdl_Impl, Control&, void ); + DECL_LINK_TYPED( GetDezCharHdl_Impl, Control&, void ); virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE; }; diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 830b89864776..76a2ec3172f4 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -177,7 +177,7 @@ public: virtual void dispose() SAL_OVERRIDE; public: - void SetLinks (Link const&, Link<> const&, Link<> const&); + void SetLinks (Link const&, Link<> const&, Link const&); unsigned GetEntryHeight () const { return vEntries[0]->GetHeight(); } void Update (EditableColorConfig const*, EditableExtendedColorConfig const*); void ScrollHdl(const ScrollBar&); @@ -219,7 +219,7 @@ private: void SetAppearance(Wallpaper const& aTextWall, ColorListBox const& aSampleList); void SetTextColor (Color C) { m_pText->SetTextColor(C); } public: - void SetLinks (Link const&, Link<> const&, Link<> const&); + void SetLinks (Link const&, Link<> const&, Link const&); void Update (ColorConfigEntry, ColorConfigValue const&); void Update (ExtendedColorConfigValue const&); void ColorChanged (ColorConfigEntry, ColorConfigValue&); @@ -415,7 +415,7 @@ void ColorConfigWindow_Impl::Entry::SetAppearance( // SetLinks() void ColorConfigWindow_Impl::Entry::SetLinks( Link const& aCheckLink, Link<> const& aColorLink, - Link<> const& aGetFocusLink) + Link const& aGetFocusLink) { m_pColorList->SetSelectHdl(aColorLink); m_pColorList->SetGetFocusHdl(aGetFocusLink); @@ -689,7 +689,7 @@ void ColorConfigWindow_Impl::Init(ScrollBar *pVScroll, HeaderBar *pHeaderHB) // SetLinks() void ColorConfigWindow_Impl::SetLinks ( - Link const& aCheckLink, Link<> const& aColorLink, Link<> const& aGetFocusLink + Link const& aCheckLink, Link<> const& aColorLink, Link const& aGetFocusLink ) { for (unsigned i = 0; i != vEntries.size(); ++i) vEntries[i]->SetLinks(aCheckLink, aColorLink, aGetFocusLink); @@ -847,7 +847,7 @@ class ColorConfigCtrl_Impl : public VclVBox DECL_LINK_TYPED(ScrollHdl, ScrollBar*, void); DECL_LINK_TYPED(ClickHdl, Button*, void); DECL_LINK(ColorHdl, ColorListBox*); - DECL_LINK(ControlFocusHdl, Control*); + DECL_LINK_TYPED(ControlFocusHdl, Control&, void); virtual bool PreNotify (NotifyEvent& rNEvt) SAL_OVERRIDE; virtual void Command (CommandEvent const& rCEvt) SAL_OVERRIDE; @@ -901,7 +901,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(vcl::Window* pParent) Link aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl); Link<> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl); - Link<> aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl); + Link aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl); m_pScrollWindow->SetLinks(aCheckLink, aColorLink, aGetFocusLink); m_pHeaderHB->Show(); @@ -1013,14 +1013,14 @@ IMPL_LINK(ColorConfigCtrl_Impl, ColorHdl, ColorListBox*, pBox) m_pScrollWindow->ColorHdl(pColorConfig, pExtColorConfig, pBox); return 0; } -IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl) +IMPL_LINK_TYPED(ColorConfigCtrl_Impl, ControlFocusHdl, Control&, rCtrl, void) { // determine whether a control is completely visible // and make it visible - long aCtrlPosY = pCtrl->GetPosPixel().Y(); + long aCtrlPosY = rCtrl.GetPosPixel().Y(); unsigned const nWinHeight = m_pScrollWindow->GetSizePixel().Height(); unsigned const nEntryHeight = m_pScrollWindow->GetEntryHeight(); - if ((GetFocusFlags::Tab & pCtrl->GetGetFocusFlags()) && + if ((GetFocusFlags::Tab & rCtrl.GetGetFocusFlags()) && (aCtrlPosY < 0 || nWinHeight < aCtrlPosY + nEntryHeight) ) { long nThumbPos = m_pVScroll->GetThumbPos(); @@ -1039,7 +1039,6 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, Control*, pCtrl) m_pVScroll->SetThumbPos(nThumbPos); ScrollHdl(m_pVScroll); } - return 0; }; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 2feda57c3cbb..5c582919fb78 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -290,7 +290,7 @@ OfaMiscTabPage::OfaMiscTabPage(vcl::Window* pParent, const SfxItemSet& rSet) Link<> aLink = LINK( this, OfaMiscTabPage, TwoFigureConfigHdl ); m_pYearValueField->SetDownHdl( aLink ); m_pYearValueField->SetUpHdl( aLink ); - m_pYearValueField->SetLoseFocusHdl( aLink ); + m_pYearValueField->SetLoseFocusHdl( LINK( this, OfaMiscTabPage, TwoFigureConfigFocusHdl ) ); m_pYearValueField->SetFirstHdl( aLink ); TwoFigureConfigHdl(m_pYearValueField); @@ -434,6 +434,10 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd ) return 0; } +IMPL_LINK_TYPED( OfaMiscTabPage, TwoFigureConfigFocusHdl, Control&, rControl, void ) +{ + TwoFigureConfigHdl(static_cast(&rControl)); +} IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd ) { sal_Int64 nNum = m_pYearValueField->GetValue(); diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index baafb9d79329..ae66faa9b637 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -60,6 +60,7 @@ private: DECL_LINK( TwoFigureHdl, NumericField* ); DECL_LINK( TwoFigureConfigHdl, NumericField* ); + DECL_LINK_TYPED( TwoFigureConfigFocusHdl, Control&, void ); #ifdef WNT DECL_LINK( OnFileDlgToggled, void* ); #endif diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index 4891a4550e73..5c17f39066c2 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -182,7 +182,7 @@ SvxProxyTabPage::SvxProxyTabPage(vcl::Window* pParent, const SfxItemSet& rSet) get(m_pNoProxyForED, "noproxy"); get(m_pNoProxyDescFT, "noproxydesc"); - Link<> aLink = LINK( this, SvxProxyTabPage, LoseFocusHdl_Impl ); + Link aLink = LINK( this, SvxProxyTabPage, LoseFocusHdl_Impl ); m_pHttpPortED->SetLoseFocusHdl( aLink ); m_pHttpsPortED->SetLoseFocusHdl( aLink ); m_pFtpPortED->SetLoseFocusHdl( aLink ); @@ -541,13 +541,13 @@ IMPL_LINK( SvxProxyTabPage, ProxyHdl_Impl, ListBox *, pBox ) -IMPL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit *, pEdit ) +IMPL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, void ) { + Edit* pEdit = static_cast(&rControl); OUString aValue = pEdit->GetText(); if ( !comphelper::string::isdigitAsciiString(aValue) || (long)aValue.toInt32() > USHRT_MAX ) pEdit->SetText( OUString('0') ); - return 0; } diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index 0c5da70c3cee..32804fb4a9d9 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -96,7 +96,7 @@ private: void RestoreConfigDefaults_Impl(); DECL_LINK( ProxyHdl_Impl, ListBox * ); - DECL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Edit * ); + DECL_STATIC_LINK_TYPED( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, void ); public: SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 3127082839dd..9048d44aa02f 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -2720,9 +2720,9 @@ void SvxCharPositionPage::Initialize() m_pHighLowMF->SetModifyHdl( aLink ); m_pFontSizeMF->SetModifyHdl( aLink ); - aLink = LINK( this, SvxCharPositionPage, LoseFocusHdl_Impl ); - m_pHighLowMF->SetLoseFocusHdl( aLink ); - m_pFontSizeMF->SetLoseFocusHdl( aLink ); + Link aLink3 = LINK( this, SvxCharPositionPage, LoseFocusHdl_Impl ); + m_pHighLowMF->SetLoseFocusHdl( aLink3 ); + m_pFontSizeMF->SetLoseFocusHdl( aLink3 ); m_pHighLowRB->SetClickHdl( LINK( this, SvxCharPositionPage, AutoPositionHdl_Impl ) ); m_pFitToLineCB->SetClickHdl( LINK( this, SvxCharPositionPage, FitToLineHdl_Impl ) ); @@ -2911,8 +2911,9 @@ IMPL_LINK_NOARG(SvxCharPositionPage, KerningModifyHdl_Impl) -IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField ) +IMPL_LINK_TYPED( SvxCharPositionPage, LoseFocusHdl_Impl, Control&, rControl, void ) { + MetricField* pField = static_cast(&rControl); bool bHigh = m_pHighPosBtn->IsChecked(); bool bLow = m_pLowPosBtn->IsChecked(); DBG_ASSERT( bHigh || bLow, "normal position is not valid" ); @@ -2931,7 +2932,6 @@ IMPL_LINK( SvxCharPositionPage, LoseFocusHdl_Impl, MetricField*, pField ) else m_nSuperProp = (sal_uInt8)m_pFontSizeMF->GetValue(); } - return 0; } diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index 1ef5ae44a712..9988726f86a6 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -111,11 +111,11 @@ SvxGrfCropPage::SvxGrfCropPage ( vcl::Window *pParent, const SfxItemSet &rSet ) m_pTopMF->SetModifyHdl( aLk ); m_pBottomMF->SetModifyHdl( aLk ); - aLk = LINK(this, SvxGrfCropPage, CropLoseFocusHdl); - m_pLeftMF->SetLoseFocusHdl( aLk ); - m_pRightMF->SetLoseFocusHdl( aLk ); - m_pTopMF->SetLoseFocusHdl( aLk ); - m_pBottomMF->SetLoseFocusHdl( aLk ); + Link aLk2 = LINK(this, SvxGrfCropPage, CropLoseFocusHdl); + m_pLeftMF->SetLoseFocusHdl( aLk2 ); + m_pRightMF->SetLoseFocusHdl( aLk2 ); + m_pTopMF->SetLoseFocusHdl( aLk2 ); + m_pBottomMF->SetLoseFocusHdl( aLk2 ); m_pOrigSizePB->SetClickHdl( LINK(this, SvxGrfCropPage, OrigSizeHdl) ); @@ -740,12 +740,12 @@ IMPL_LINK_NOARG_TYPED(SvxGrfCropPage, Timeout, Timer *, void) } -IMPL_LINK( SvxGrfCropPage, CropLoseFocusHdl, MetricField*, pField ) +IMPL_LINK_TYPED( SvxGrfCropPage, CropLoseFocusHdl, Control&, rControl, void ) { + MetricField* pField = static_cast(&rControl); aTimer.Stop(); CropHdl(pField); pLastCropField = 0; - return 0; } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index 2c2a725db5d9..e8b45bbb1a6f 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -356,9 +356,9 @@ void SvxNumberFormatTabPage::Init_Impl() m_pIbInfo->SetClickHdl( HDL( ClickHdl_Impl ) ); UpdateThousandEngineeringText(); - aLink = LINK( this, SvxNumberFormatTabPage, LostFocusHdl_Impl); + Link aLink2 = LINK( this, SvxNumberFormatTabPage, LostFocusHdl_Impl); - m_pEdComment->SetLoseFocusHdl( aLink); + m_pEdComment->SetLoseFocusHdl( aLink2); aResetWinTimer.SetTimeoutHdl(LINK( this, SvxNumberFormatTabPage, TimeHdl_Impl)); aResetWinTimer.SetTimeout( 10); @@ -1636,8 +1636,9 @@ IMPL_LINK_NOARG_TYPED(SvxNumberFormatTabPage, TimeHdl_Impl, Timer *, void) #* #************************************************************************/ -IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd) +IMPL_LINK_TYPED( SvxNumberFormatTabPage, LostFocusHdl_Impl, Control&, rControl, void) { + Edit* pEd = static_cast(&rControl); if (pEd == m_pEdComment) { aResetWinTimer.Start(); @@ -1652,7 +1653,6 @@ IMPL_LINK( SvxNumberFormatTabPage, LostFocusHdl_Impl, Edit *, pEd) m_pEdComment->SetText(m_pLbCategory->GetEntry(1)); // String for user defined } } - return 0; } /************************************************************************* diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index fc8e3fd07380..3877183e4921 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2792,18 +2792,19 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, m_pAlign2LB->SetDropDownLineCount( m_pAlign2LB->GetEntryCount() ); Link<> aLk = LINK(this, SvxNumPositionTabPage, DistanceHdl_Impl); + Link aLk2 = LINK(this, SvxNumPositionTabPage, DistanceFocusHdl_Impl); m_pDistBorderMF->SetUpHdl(aLk); m_pDistBorderMF->SetDownHdl(aLk); - m_pDistBorderMF->SetLoseFocusHdl(aLk); + m_pDistBorderMF->SetLoseFocusHdl(aLk2); m_pDistNumMF->SetUpHdl(aLk); m_pDistNumMF->SetDownHdl(aLk); - m_pDistNumMF->SetLoseFocusHdl(aLk); + m_pDistNumMF->SetLoseFocusHdl(aLk2); m_pIndentMF->SetUpHdl(aLk); m_pIndentMF->SetDownHdl(aLk); - m_pIndentMF->SetLoseFocusHdl(aLk); + m_pIndentMF->SetLoseFocusHdl(aLk2); m_pLabelFollowedByLB->SetDropDownLineCount( m_pLabelFollowedByLB->GetEntryCount() ); m_pLabelFollowedByLB->SetSelectHdl( LINK(this, SvxNumPositionTabPage, LabelFollowedByHdl_Impl) ); @@ -2811,17 +2812,17 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(vcl::Window* pParent, aLk = LINK(this, SvxNumPositionTabPage, ListtabPosHdl_Impl); m_pListtabMF->SetUpHdl(aLk); m_pListtabMF->SetDownHdl(aLk); - m_pListtabMF->SetLoseFocusHdl(aLk); + m_pListtabMF->SetLoseFocusHdl(aLk2); aLk = LINK(this, SvxNumPositionTabPage, AlignAtHdl_Impl); m_pAlignedAtMF->SetUpHdl(aLk); m_pAlignedAtMF->SetDownHdl(aLk); - m_pAlignedAtMF->SetLoseFocusHdl(aLk); + m_pAlignedAtMF->SetLoseFocusHdl(aLk2); aLk = LINK(this, SvxNumPositionTabPage, IndentAtHdl_Impl); m_pIndentAtMF->SetUpHdl(aLk); m_pIndentAtMF->SetDownHdl(aLk); - m_pIndentAtMF->SetLoseFocusHdl(aLk); + m_pIndentAtMF->SetLoseFocusHdl(aLk2); m_pLevelLB->EnableMultiSelection(true); m_pLevelLB->SetSelectHdl(LINK(this, SvxNumPositionTabPage, LevelHdl_Impl)); @@ -3388,6 +3389,10 @@ IMPL_LINK( SvxNumPositionTabPage, LevelHdl_Impl, ListBox *, pBox ) return 0; } +IMPL_LINK_TYPED( SvxNumPositionTabPage, DistanceFocusHdl_Impl, Control&, rControl, void ) +{ + DistanceHdl_Impl(static_cast(&rControl)); +} IMPL_LINK( SvxNumPositionTabPage, DistanceHdl_Impl, MetricField *, pFld ) { if(bInInintControl) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 0fcf338a9d42..fc90d1fa01d7 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -428,13 +428,13 @@ void SvxPageDescPage::Init_Impl() m_pTopMarginEdit->SetModifyHdl( aLink ); m_pBottomMarginEdit->SetModifyHdl( aLink ); - aLink = LINK( this, SvxPageDescPage, RangeHdl_Impl ); - m_pPaperWidthEdit->SetLoseFocusHdl( aLink ); - m_pPaperHeightEdit->SetLoseFocusHdl( aLink ); - m_pLeftMarginEdit->SetLoseFocusHdl( aLink ); - m_pRightMarginEdit->SetLoseFocusHdl( aLink ); - m_pTopMarginEdit->SetLoseFocusHdl( aLink ); - m_pBottomMarginEdit->SetLoseFocusHdl( aLink ); + Link aLink2 = LINK( this, SvxPageDescPage, RangeHdl_Impl ); + m_pPaperWidthEdit->SetLoseFocusHdl( aLink2 ); + m_pPaperHeightEdit->SetLoseFocusHdl( aLink2 ); + m_pLeftMarginEdit->SetLoseFocusHdl( aLink2 ); + m_pRightMarginEdit->SetLoseFocusHdl( aLink2 ); + m_pTopMarginEdit->SetLoseFocusHdl( aLink2 ); + m_pBottomMarginEdit->SetLoseFocusHdl( aLink2 ); m_pHorzBox->SetClickHdl( LINK( this, SvxPageDescPage, CenterHdl_Impl ) ); m_pVertBox->SetClickHdl( LINK( this, SvxPageDescPage, CenterHdl_Impl ) ); @@ -637,7 +637,7 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) // display background and border in the example ResetBackground_Impl( *rSet ); //! UpdateExample_Impl(); - RangeHdl_Impl( 0 ); + RangeHdl_Impl( *m_pPaperWidthEdit ); InitHeadFoot_Impl( *rSet ); @@ -952,11 +952,11 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl) -IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxPageDescPage, PaperBinHdl_Impl, Control&, void) { if ( m_pPaperTrayBox->GetEntryCount() > 1 ) // already filled - return 0; + return; OUString aOldName = m_pPaperTrayBox->GetSelectEntry(); m_pPaperTrayBox->SetUpdateMode( false ); @@ -983,8 +983,6 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl) } m_pPaperTrayBox->SelectEntry( aOldName ); m_pPaperTrayBox->SetUpdateMode( true ); - - return 0; } @@ -1012,7 +1010,7 @@ IMPL_LINK( SvxPageDescPage, PaperSizeSelect_Impl, ListBox *, pBox ) CalcMargin_Impl(); - RangeHdl_Impl( 0 ); + RangeHdl_Impl( *m_pPaperWidthEdit ); UpdateExample_Impl( true ); if ( eMode == SVX_PAGE_MODE_PRESENTATION ) @@ -1106,7 +1104,7 @@ IMPL_LINK_TYPED( SvxPageDescPage, SwapOrientation_Impl, Button *, pBtn, void ) CalcMargin_Impl(); PaperSizeSelect_Impl( m_pPaperSizeBox ); - RangeHdl_Impl( 0 ); + RangeHdl_Impl( *m_pPaperWidthEdit ); SwapFirstValues_Impl( bBorderModified ); UpdateExample_Impl( true ); } @@ -1476,7 +1474,7 @@ void SvxPageDescPage::ActivatePage( const SfxItemSet& rSet ) InitHeadFoot_Impl( rSet ); UpdateExample_Impl(); ResetBackground_Impl( rSet ); - RangeHdl_Impl( 0 ); + RangeHdl_Impl( *m_pPaperWidthEdit ); } @@ -1535,7 +1533,7 @@ SfxTabPage::sfxpg SvxPageDescPage::DeactivatePage( SfxItemSet* _pSet ) -IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl) +IMPL_LINK_NOARG_TYPED(SvxPageDescPage, RangeHdl_Impl, Control&, void) { // example window long nHHeight = m_pBspWin->GetHdHeight(); @@ -1599,7 +1597,6 @@ IMPL_LINK_NOARG(SvxPageDescPage, RangeHdl_Impl) // Right nMax = nW - nBL - MINBODY - aBorder.Width() - nHFLeft - nHFRight; m_pRightMarginEdit->SetMax(m_pRightMarginEdit->Normalize(nMax), FUNIT_TWIP); - return 0; } diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 71bbb4b60944..d4617e22548b 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -155,7 +155,7 @@ sal_uInt16 GetHtmlMode_Impl(const SfxItemSet& rSet) } -IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl) +IMPL_LINK_NOARG_TYPED(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void) { SfxItemPool* pPool = GetItemSet().GetPool(); DBG_ASSERT( pPool, "Wo ist der Pool" ); @@ -190,7 +190,6 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl) if ( aTmp.isEmpty() ) m_pRightIndent->SetEmptyFieldValue(); - return 0; } VclPtr SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) @@ -580,7 +579,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet ) // this sets the min/max limits; do this _after_ setting the values, // because for Impress the min of first-line indent depends on value of // left-indent! - ELRLoseFocusHdl( NULL ); + ELRLoseFocusHdl( *m_pFLineIndent ); m_pAutoCB->SaveValue(); m_pContextualCB->SaveValue(); m_pLineDist->SaveValue(); @@ -614,7 +613,7 @@ void SvxStdParagraphTabPage::EnableRelativeMode() SfxTabPage::sfxpg SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet ) { - ELRLoseFocusHdl( NULL ); + ELRLoseFocusHdl( *m_pFLineIndent ); if ( _pSet ) FillItemSet( _pSet ); @@ -847,12 +846,12 @@ void SvxStdParagraphTabPage::Init_Impl() m_pLineDist->SetSelectHdl( LINK( this, SvxStdParagraphTabPage, LineDistHdl_Impl ) ); - Link<> aLink = LINK( this, SvxStdParagraphTabPage, ELRLoseFocusHdl ); - m_pFLineIndent->SetLoseFocusHdl( aLink ); - m_pLeftIndent->SetLoseFocusHdl( aLink ); - m_pRightIndent->SetLoseFocusHdl( aLink ); + Link aLink2 = LINK( this, SvxStdParagraphTabPage, ELRLoseFocusHdl ); + m_pFLineIndent->SetLoseFocusHdl( aLink2 ); + m_pLeftIndent->SetLoseFocusHdl( aLink2 ); + m_pRightIndent->SetLoseFocusHdl( aLink2 ); - aLink = LINK( this, SvxStdParagraphTabPage, ModifyHdl_Impl ); + Link<> aLink = LINK( this, SvxStdParagraphTabPage, ModifyHdl_Impl ); m_pFLineIndent->SetModifyHdl( aLink ); m_pLeftIndent->SetModifyHdl( aLink ); m_pRightIndent->SetModifyHdl( aLink ); diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 997e55ac4046..b51ef9553ed3 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -557,14 +557,14 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(vcl::Window* pParent, const SfxItemSet& SetExchangeSupport(); - Link<> aLk = LINK(this, SvxSwPosSizeTabPage, RangeModifyHdl); - m_pWidthMF->SetLoseFocusHdl( aLk ); - m_pHeightMF->SetLoseFocusHdl( aLk ); - m_pHoriByMF->SetLoseFocusHdl( aLk ); - m_pVertByMF->SetLoseFocusHdl( aLk ); + Link aLk3 = LINK(this, SvxSwPosSizeTabPage, RangeModifyHdl); + m_pWidthMF->SetLoseFocusHdl( aLk3 ); + m_pHeightMF->SetLoseFocusHdl( aLk3 ); + m_pHoriByMF->SetLoseFocusHdl( aLk3 ); + m_pVertByMF->SetLoseFocusHdl( aLk3 ); m_pFollowCB->SetClickHdl( LINK(this, SvxSwPosSizeTabPage, RangeModifyClickHdl) ); - aLk = LINK(this, SvxSwPosSizeTabPage, ModifyHdl); + Link<> aLk = LINK(this, SvxSwPosSizeTabPage, ModifyHdl); m_pWidthMF->SetModifyHdl( aLk ); m_pHeightMF->SetModifyHdl( aLk ); m_pHoriByMF->SetModifyHdl( aLk ); @@ -1075,7 +1075,7 @@ void SvxSwPosSizeTabPage::Reset( const SfxItemSet* rSet) // #i18732# m_pFollowCB->SaveValue(); - RangeModifyHdl(m_pWidthMF); // initially set maximum values + RangeModifyHdl(*m_pWidthMF); // initially set maximum values } } @@ -1138,12 +1138,12 @@ short SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyClickHdl, Button*, void) { - RangeModifyHdl(NULL); + RangeModifyHdl(*m_pWidthMF); } -IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl) +IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void) { if(m_bPositioningDisabled) - return 0; + return; SvxSwFrameValidation aVal; aVal.nAnchorType = GetAnchorType(); @@ -1220,8 +1220,6 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl) m_pVertByMF->SetMax(m_pVertByMF->Normalize(aVal.nMaxVPos), FUNIT_TWIP); if ( aVal.nVPos != nAtVertPosVal ) m_pVertByMF->SetValue(m_pVertByMF->Normalize(aVal.nVPos), FUNIT_TWIP); - - return 0; } IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void) @@ -1235,7 +1233,7 @@ IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, AnchorTypeHdl, Button*, void) short nId = GetAnchorType(); InitPos( nId, USHRT_MAX, 0, USHRT_MAX, 0, LONG_MAX, LONG_MAX); - RangeModifyHdl(0); + RangeModifyHdl(*m_pWidthMF); if(m_bHtmlMode) { @@ -1277,7 +1275,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, RelHdl, ListBox *, pLB ) } } if (pLB) // only if the hanlder has been called by a change of the controller - RangeModifyHdl(0); + RangeModifyHdl(*m_pWidthMF); return 0; @@ -1307,7 +1305,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, PosHdl, ListBox *, pLB ) m_pVertByFT->Enable( bEnable ); } - RangeModifyHdl( 0 ); + RangeModifyHdl( *m_pWidthMF ); short nRel = 0; if (pLB->GetSelectEntryCount()) diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 7f3fbb8fa097..b0cd52c44e6e 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -216,8 +216,8 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet) NewHdl_Impl( 0 ); // Call the LoseFocus-Handler first - GetDezCharHdl_Impl(m_pDezChar); - GetFillCharHdl_Impl(m_pFillChar); + GetDezCharHdl_Impl(*m_pDezChar); + GetFillCharHdl_Impl(*m_pFillChar); FillUpWithDefTabs_Impl(nDefDist, aNewTabs); SfxItemPool* pPool = rSet->GetPool(); @@ -628,9 +628,9 @@ IMPL_LINK_TYPED( SvxTabulatorTabPage, FillTypeCheckHdl_Impl, Button *, pBox, voi } } -IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit ) +IMPL_LINK_TYPED( SvxTabulatorTabPage, GetFillCharHdl_Impl, Control&, rControl, void ) { - OUString aChar( pEdit->GetText() ); + OUString aChar( static_cast(rControl).GetText() ); if ( !aChar.isEmpty() ) aAktTab.GetFill() = aChar[0]; @@ -641,12 +641,11 @@ IMPL_LINK( SvxTabulatorTabPage, GetFillCharHdl_Impl, Edit *, pEdit ) aNewTabs.Remove( nPos ); aNewTabs.Insert( aAktTab ); } - return 0; } -IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit ) +IMPL_LINK_TYPED( SvxTabulatorTabPage, GetDezCharHdl_Impl, Control&, rControl, void ) { - OUString aChar( pEdit->GetText() ); + OUString aChar( static_cast(&rControl)->GetText() ); if ( !aChar.isEmpty() && ( aChar[0] >= ' ')) aAktTab.GetDecimal() = aChar[0]; @@ -656,7 +655,6 @@ IMPL_LINK( SvxTabulatorTabPage, GetDezCharHdl_Impl, Edit *, pEdit ) aNewTabs.Remove( nPos ); aNewTabs.Insert( aAktTab ); } - return 0; } IMPL_LINK_NOARG(SvxTabulatorTabPage, SelectHdl_Impl) -- cgit