diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
| commit | bd205223ec029a875c662474bb6d423d3cdd1994 (patch) | |
| tree | 6531a292edb0d2a13103a4c55cbd10e7137b8a58 /sc | |
| parent | 32781c2d268ed94eb46318a0398385baf31368c4 (diff) | |
New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
for the problem.
Diffstat (limited to 'sc')
125 files changed, 322 insertions, 322 deletions
diff --git a/sc/inc/arealink.hxx b/sc/inc/arealink.hxx index e5574f4a8b4b..3343d8b3e561 100644 --- a/sc/inc/arealink.hxx +++ b/sc/inc/arealink.hxx @@ -85,7 +85,7 @@ public: const String& GetSource() const { return aSourceArea; } const ScRange& GetDestArea() const { return aDestArea; } - DECL_LINK( RefreshHdl, ScAreaLink* ); + DECL_LINK( RefreshHdl, void* ); DECL_LINK( AreaEndEditHdl, void* ); }; diff --git a/sc/inc/chartlis.hxx b/sc/inc/chartlis.hxx index c602f242a062..3a925192a01e 100644 --- a/sc/inc/chartlis.hxx +++ b/sc/inc/chartlis.hxx @@ -166,7 +166,7 @@ private: Timer aTimer; ScDocument* pDoc; - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK(TimerHdl, void *); // not implemented ScChartListenerCollection& operator=( const ScChartListenerCollection& ); diff --git a/sc/inc/chartlock.hxx b/sc/inc/chartlock.hxx index 16afcc78ced0..eec446f9ae27 100644 --- a/sc/inc/chartlock.hxx +++ b/sc/inc/chartlock.hxx @@ -77,7 +77,7 @@ private: Timer maTimer; std::auto_ptr< ScChartLockGuard > mapScChartLockGuard; - DECL_LINK( TimeoutHdl, Timer* ); + DECL_LINK(TimeoutHdl, void *); ScTemporaryChartLock(); ScTemporaryChartLock( const ScTemporaryChartLock& ); diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 8634847023c3..0a98818c7f42 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1618,7 +1618,7 @@ private: bool OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, sal_uInt16 nMaxTest ); - DECL_LINK( TrackTimeHdl, Timer* ); + DECL_LINK(TrackTimeHdl, void *); static ScRecursionHelper* CreateRecursionHelperInstance(); diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx index c44c8f1dc623..d5f6720f835c 100644 --- a/sc/inc/externalrefmgr.hxx +++ b/sc/inc/externalrefmgr.hxx @@ -83,7 +83,7 @@ private: ScExternalRefLink(); // disabled ScExternalRefLink(const ScExternalRefLink&); // disabled - DECL_LINK( ExternalRefEndEditHdl, ::sfx2::SvBaseLink* ); + DECL_LINK( ExternalRefEndEditHdl, void* ); sal_uInt16 mnFileId; String maFilterName; diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 70af96a0b65d..823eabaf932e 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -134,8 +134,8 @@ public: // moved by the application - DECL_LINK( IdleHandler, Timer* ); // Timer instead of idle - DECL_LINK( SpellTimerHdl, Timer* ); + DECL_LINK( IdleHandler, void* ); // Timer instead of idle + DECL_LINK( SpellTimerHdl, void* ); DECL_LINK( CalcFieldValueHdl, EditFieldInfo* ); void Execute( SfxRequest& rReq ); diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index 3e2b542a59a0..216bccd1c1c0 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -75,7 +75,7 @@ public: sal_Bool IsUsed() const; - DECL_LINK( RefreshHdl, ScTableLink* ); + DECL_LINK( RefreshHdl, void* ); DECL_LINK( TableEndEditHdl, ::sfx2::SvBaseLink* ); }; diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 7cd70c86b910..ab4abd016147 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -324,7 +324,7 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) } -IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScDocument, TrackTimeHdl) { if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln { diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index a9315720d1aa..9b0e48f0f3b4 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.cxx @@ -796,7 +796,7 @@ ScAppCfg::ScAppCfg() : aFormulaItem.SetCommitLink( LINK(this, ScAppCfg, FormulaCommitHdl) ); } -IMPL_LINK( ScAppCfg, LayoutCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, LayoutCommitHdl) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -828,7 +828,7 @@ IMPL_LINK( ScAppCfg, LayoutCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, InputCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, InputCommitHdl) { Sequence<OUString> aNames = GetInputPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -854,7 +854,7 @@ IMPL_LINK( ScAppCfg, InputCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, RevisionCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, RevisionCommitHdl) { Sequence<OUString> aNames = GetRevisionPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -883,7 +883,7 @@ IMPL_LINK( ScAppCfg, RevisionCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, ContentCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, ContentCommitHdl) { Sequence<OUString> aNames = GetContentPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -903,7 +903,7 @@ IMPL_LINK( ScAppCfg, ContentCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, SortListCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, SortListCommitHdl) { Sequence<OUString> aNames = GetSortListPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -923,7 +923,7 @@ IMPL_LINK( ScAppCfg, SortListCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, MiscCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, MiscCommitHdl) { Sequence<OUString> aNames = GetMiscPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -949,7 +949,7 @@ IMPL_LINK( ScAppCfg, MiscCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, CompatCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, CompatCommitHdl) { Sequence<OUString> aNames = GetCompatPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -968,7 +968,7 @@ IMPL_LINK( ScAppCfg, CompatCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAppCfg, FormulaCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAppCfg, FormulaCommitHdl) { Sequence<OUString> aNames = GetFormulaPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 28f2a86f9eb7..79da0c96faa8 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -661,7 +661,7 @@ void ScChartListenerCollection::StartTimer() aTimer.Start(); } -IMPL_LINK( ScChartListenerCollection, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScChartListenerCollection, TimerHdl) { if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) ) { diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index 39f1e58472f7..139ddbaa3b38 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.cxx @@ -187,7 +187,7 @@ void ScTemporaryChartLock::AlsoLockThisChart( const Reference< frame::XModel >& mapScChartLockGuard->AlsoLockThisChart( xModel ); } -IMPL_LINK( ScTemporaryChartLock, TimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScTemporaryChartLock, TimeoutHdl) { mapScChartLockGuard.reset(); return 0; diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index db5f952abbd0..e5d42b76756e 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.cxx @@ -398,7 +398,7 @@ ScDocCfg::ScDocCfg() : aDefaultsItem.SetCommitLink( LINK(this, ScDocCfg, DefaultsCommitHdl) ); } -IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDocCfg, CalcCommitHdl) { Sequence<OUString> aNames = GetCalcPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -454,7 +454,7 @@ IMPL_LINK( ScDocCfg, CalcCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDocCfg, LayoutCommitHdl) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -477,7 +477,7 @@ IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScDocCfg, DefaultsCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDocCfg, DefaultsCommitHdl) { Sequence<OUString> aNames = GetDefaultsPropertyNames(); Sequence<Any> aValues(aNames.getLength()); diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 4de68ce02c8a..7c40d2287a20 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.cxx @@ -586,7 +586,7 @@ ScViewCfg::ScViewCfg() : aGridItem.SetCommitLink( LINK( this, ScViewCfg, GridCommitHdl ) ); } -IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScViewCfg, LayoutCommitHdl) { Sequence<OUString> aNames = GetLayoutPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -633,7 +633,7 @@ IMPL_LINK( ScViewCfg, LayoutCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScViewCfg, DisplayCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScViewCfg, DisplayCommitHdl) { Sequence<OUString> aNames = GetDisplayPropertyNames(); Sequence<Any> aValues(aNames.getLength()); @@ -677,7 +677,7 @@ IMPL_LINK( ScViewCfg, DisplayCommitHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScViewCfg, GridCommitHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl) { const ScGridOptions& rGrid = GetGridOptions(); diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index bc52b65bcd3c..d5a08684c65c 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2142,7 +2142,7 @@ void ScInputHandler::SyncViews( EditView* pSourceView ) } } -IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScInputHandler, ModifyHdl) { if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) && pEngine && pEngine->GetUpdateMode() && pInputWin ) diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index ccfde4806877..3a53bb076348 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -1035,7 +1035,7 @@ void ScInputBarGroup::DecrementVerticalSize() } } -IMPL_LINK( ScInputBarGroup, ClickHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScInputBarGroup, ClickHdl) { Window *w=GetParent(); ScInputWindow *pParent; @@ -1110,7 +1110,7 @@ void ScInputBarGroup::TriggerToolboxLayout() } } -IMPL_LINK( ScInputBarGroup, Impl_ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScInputBarGroup, Impl_ScrollHdl) { aMultiTextWnd.DoScroll(); return 0; @@ -1792,7 +1792,7 @@ void ScTextWnd::StartEditEngine() pViewFrm->GetBindings().Invalidate( SID_ATTR_INSERT ); } -IMPL_LINK(ScTextWnd, NotifyHdl, EENotify*, EMPTYARG) +IMPL_LINK_NOARG(ScTextWnd, NotifyHdl) { if (pEditView && !bInputMode) { diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 3752b7c7df6c..dbddbe023429 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -1894,7 +1894,7 @@ void lcl_CheckNeedsRepaint( ScDocShell* pDocShell ) } } -IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScModule, IdleHandler) { if ( Application::AnyInput( VCL_INPUT_MOUSEANDKEYBOARD ) ) { @@ -1949,7 +1949,7 @@ IMPL_LINK( ScModule, IdleHandler, Timer*, EMPTYARG ) return 0; } -IMPL_LINK( ScModule, SpellTimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScModule, SpellTimerHdl) { if ( Application::AnyInput( VCL_INPUT_KEYBOARD ) ) { diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index c7501487a429..2e22761b9a1f 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -125,7 +125,7 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) // ----------------------------------------------------------------------- -IMPL_LINK( ScAttrDlg, OkHandler, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScAttrDlg, OkHandler) { ((Link&)GetOKButton().GetClickHdl()).Call( NULL ); diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index 4687bb804e31..54d7a4bf69ca 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.cxx @@ -595,7 +595,7 @@ sal_Bool ScConditionalFormatDlg::Close() // Handler: //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ScrollHdl) { SliderMoved(); return 0; @@ -619,7 +619,7 @@ sal_uInt16 ScConditionalFormatDlg::GetSliderPos() //---------------------------------------------------------------------------- // Enabled/Disabled Condition1-Controls -IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ClickCond1Hdl) { sal_Bool bChecked = aCbxCond1.IsChecked(); CondChecked( bChecked, aCbxCond1, aLbCond11, aLbCond12, aEdtCond11, aRbCond11, aFtCond1And, aEdtCond12, aRbCond12, @@ -630,7 +630,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond1Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Zellwert/Formel -IMPL_LINK( ScConditionalFormatDlg, ChangeCond11Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond11Hdl) { sal_uInt16 nPos = aLbCond11.GetSelectEntryPos(); @@ -657,7 +657,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond11Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // zwischen, gleich, groesser, ... -IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond12Hdl) { if( aLbCond12.IsVisible() ) { @@ -696,7 +696,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond12Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, ChangeCond1TemplateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond1TemplateHdl) { String aStyleName = aLbCond1Template.GetSelectEntry(); SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); @@ -714,7 +714,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond1TemplateHdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Enabled/Disabled Condition2-Controls -IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ClickCond2Hdl) { sal_Bool bChecked = aCbxCond2.IsChecked(); CondChecked( bChecked, aCbxCond2, aLbCond21, aLbCond22, aEdtCond21, aRbCond21, aFtCond2And, aEdtCond22, aRbCond22, @@ -725,7 +725,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond2Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Zellwert/Formel -IMPL_LINK( ScConditionalFormatDlg, ChangeCond21Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond21Hdl) { sal_uInt16 nPos = aLbCond21.GetSelectEntryPos(); @@ -752,7 +752,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond21Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // zwischen, gleich, groesser, ... -IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond22Hdl) { if( aLbCond22.IsVisible() ) { @@ -791,7 +791,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond22Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, ChangeCond2TemplateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond2TemplateHdl) { String aStyleName = aLbCond2Template.GetSelectEntry(); SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); @@ -809,7 +809,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond2TemplateHdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Enabled/Disabled Condition3-Controls -IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ClickCond3Hdl) { sal_Bool bChecked = aCbxCond3.IsChecked(); CondChecked( bChecked, aCbxCond3, aLbCond31, aLbCond32, aEdtCond31, aRbCond31, aFtCond3And, aEdtCond32, aRbCond32, @@ -822,7 +822,7 @@ IMPL_LINK( ScConditionalFormatDlg, ClickCond3Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // Zellwert/Formel -IMPL_LINK( ScConditionalFormatDlg, ChangeCond31Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond31Hdl) { sal_uInt16 nPos = aLbCond31.GetSelectEntryPos(); @@ -849,7 +849,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond31Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- // zwischen, gleich, groesser, ... -IMPL_LINK( ScConditionalFormatDlg, ChangeCond32Hdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond32Hdl) { if( aLbCond32.IsVisible() ) { @@ -888,7 +888,7 @@ IMPL_LINK( ScConditionalFormatDlg, ChangeCond32Hdl, void *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, ChangeCond3TemplateHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, ChangeCond3TemplateHdl) { String aStyleName = aLbCond3Template.GetSelectEntry(); SfxStyleSheetBase* pStyleSheet = pDoc->GetStyleSheetPool()->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); @@ -930,7 +930,7 @@ IMPL_LINK( ScConditionalFormatDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConditionalFormatDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScConditionalFormatDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); return 0; diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 9b2319735b81..fc6dd9a30d11 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -73,7 +73,7 @@ void ScMenuFloatingWindow::SubMenuItemData::reset() maTimer.Stop(); } -IMPL_LINK( ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) { mpParent->handleMenuTimeout(this); return 0; @@ -1018,7 +1018,7 @@ IMPL_LINK( ScCheckListMenuWindow, ButtonHdl, Button*, pBtn ) return 0; } -IMPL_LINK( ScCheckListMenuWindow, TriStateHdl, TriStateBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScCheckListMenuWindow, TriStateHdl) { switch (mePrevToggleAllState) { diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 6d5c8d75dde8..0daed040853f 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -407,7 +407,7 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) //---------------------------------------------------------------------------- -IMPL_LINK( ScConsolidateDlg, OkHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) { sal_uInt16 nDataAreaCount = aLbConsAreas.GetEntryCount(); diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index ea8c47fe57f7..1f482031f9a0 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -139,7 +139,7 @@ void ScDataPilotDatabaseDlg::GetValues( ScImportSourceDesc& rDesc ) rDesc.bNative = ( nSelect == DP_TYPELIST_SQLNAT ); } -IMPL_LINK( ScDataPilotDatabaseDlg, SelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataPilotDatabaseDlg, SelectHdl) { FillObjects(); return 0; diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index d5bffbe6763d..18850f80a1e7 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -432,7 +432,7 @@ sal_Bool ScDbNameDlg::IsRefInputMode() const // Handler: // ======== -IMPL_LINK( ScDbNameDlg, OkBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) { AddBtnHdl( 0 ); @@ -449,16 +449,16 @@ IMPL_LINK( ScDbNameDlg, OkBtnHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScDbNameDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl) { Close(); return 0; } -IMPL_LINK_INLINE_END( ScDbNameDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScDbNameDlg, CancelBtnHdl) //------------------------------------------------------------------------ -IMPL_LINK( ScDbNameDlg, AddBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) { String aNewName = aEdName.GetText(); String aNewArea = aEdAssign.GetText(); @@ -557,7 +557,7 @@ public: } -IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) { ::rtl::OUString aStrEntry = aEdName.GetText(); ScDBCollection::NamedDBs& rDBs = aLocalDbCol.getNamedDBs(); @@ -610,7 +610,7 @@ IMPL_LINK( ScDbNameDlg, RemoveBtnHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) { String theName = aEdName.GetText(); sal_Bool bNameFound = (COMBOBOX_ENTRY_NOTFOUND @@ -695,7 +695,7 @@ IMPL_LINK( ScDbNameDlg, NameModifyHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScDbNameDlg, AssModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl) { // hier parsen fuer Save() etc. diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index a69b7a1f9a53..089468746d9f 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -1027,13 +1027,13 @@ void ScDPHorFieldControl::HandleScroll() Redraw(); } -IMPL_LINK(ScDPHorFieldControl, ScrollHdl, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(ScDPHorFieldControl, ScrollHdl) { HandleScroll(); return 0; } -IMPL_LINK(ScDPHorFieldControl, EndScrollHdl, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(ScDPHorFieldControl, EndScrollHdl) { HandleScroll(); return 0; @@ -1303,13 +1303,13 @@ void ScDPRowFieldControl::HandleScroll() Redraw(); } -IMPL_LINK(ScDPRowFieldControl, ScrollHdl, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(ScDPRowFieldControl, ScrollHdl) { HandleScroll(); return 0; } -IMPL_LINK(ScDPRowFieldControl, EndScrollHdl, ScrollBar*, EMPTYARG) +IMPL_LINK_NOARG(ScDPRowFieldControl, EndScrollHdl) { HandleScroll(); return 0; diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 94e23f8f1cff..d3dc9057dd26 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -762,7 +762,7 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) //---------------------------------------------------------------------------- -IMPL_LINK( ScFilterDlg, MoreClickHdl, MoreButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScFilterDlg, MoreClickHdl) { if ( aBtnMore.GetState() ) pTimer->Start(); @@ -1178,7 +1178,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) } //---------------------------------------------------------------------------- -IMPL_LINK( ScFilterDlg, ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScFilterDlg, ScrollHdl) { SliderMoved(); return 0; diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index ffd23f35fb3a..51b8c8b84fd6 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -421,7 +421,7 @@ IMPL_LINK( ScDPFunctionDlg, SelectHdl, ListBox*, pLBox ) return 0; } -IMPL_LINK( ScDPFunctionDlg, DblClickHdl, MultiListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl) { maBtnOk.Click(); return 0; @@ -516,7 +516,7 @@ IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, RadioButton*, pBtn ) return 0; } -IMPL_LINK( ScDPSubtotalDlg, DblClickHdl, MultiListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl) { maBtnOk.Click(); return 0; diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index e3df3f0444eb..d4217659da86 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -1780,7 +1780,7 @@ IMPL_LINK( ScDPLayoutDlg, ClickHdl, PushButton *, pBtn ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, OkHdl) { rtl::OUString aOutPosStr = aEdOutPos.GetText(); ScAddress aAdrDest; @@ -1940,7 +1940,7 @@ IMPL_LINK( ScDPLayoutDlg, OkHdl, OKButton *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, CancelHdl, CancelButton *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, CancelHdl) { Close(); return 0; @@ -1948,7 +1948,7 @@ IMPL_LINK( ScDPLayoutDlg, CancelHdl, CancelButton *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, MoreClickHdl) { if ( aBtnMore.GetState() ) { @@ -1979,7 +1979,7 @@ IMPL_LINK( ScDPLayoutDlg, MoreClickHdl, MoreButton *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, EdModifyHdl) { rtl::OUString theCurPosStr = aEdOutPos.GetText(); sal_uInt16 nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() ); @@ -2005,7 +2005,7 @@ IMPL_LINK( ScDPLayoutDlg, EdModifyHdl, Edit *, EMPTYARG ) return 0; } -IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, EdInModifyHdl) { UpdateSrcRange(); return 0; @@ -2013,7 +2013,7 @@ IMPL_LINK( ScDPLayoutDlg, EdInModifyHdl, Edit *, EMPTYARG ) //---------------------------------------------------------------------------- -IMPL_LINK( ScDPLayoutDlg, SelAreaHdl, ListBox *, EMPTYARG ) +IMPL_LINK_NOARG(ScDPLayoutDlg, SelAreaHdl) { rtl::OUString aString; sal_uInt16 nSelPos = aLbOutPos.GetSelectEntryPos(); diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 238c202327a2..d8465839057b 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -207,7 +207,7 @@ void ScNewScenarioDlg::SetScenarioData( const rtl::OUString& rName, const rtl::O //------------------------------------------------------------------------ -IMPL_LINK( ScNewScenarioDlg, OkHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) { String aName ( aEdName.GetText() ); ScDocument* pDoc = ((ScTabViewShell*)SfxViewShell::Current())-> diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 17d0b2a68563..93d5cfcf6b15 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -687,7 +687,7 @@ IMPL_LINK( ScImportAsciiDlg, LbColTypeHdl, ListBox*, pListBox ) return 0; } -IMPL_LINK( ScImportAsciiDlg, UpdateTextHdl, ScCsvTableBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScImportAsciiDlg, UpdateTextHdl) { sal_Int32 nBaseLine = maTableBox.GetFirstVisLine(); sal_Int32 nRead = maTableBox.GetVisLineCount(); diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 418e9f052562..122151d8d0fa 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -96,7 +96,7 @@ void ScTextImportOptionsDlg::init() maLbCustomLang.Disable(); } -IMPL_LINK( ScTextImportOptionsDlg, OKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl) { EndDialog(RET_OK); return 0; diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index aecb2080f076..f2cc430b38e8 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -986,7 +986,7 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) // ----------------------------------------------------------------------- -IMPL_LINK( ScTabPageSortOptions, FillAlgorHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) { aLbAlgorithm.SetUpdateMode( false ); aLbAlgorithm.Clear(); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index f463b7d5b101..0de9c27b4428 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -579,7 +579,7 @@ void ScTPValidationValue::TidyListBoxes() } } -IMPL_LINK( ScTPValidationValue, EditSetFocusHdl, Edit *, EMPTYARG) +IMPL_LINK_NOARG(ScTPValidationValue, EditSetFocusHdl) { sal_uInt16 nPos=maLbAllow.GetSelectEntryPos(); @@ -606,7 +606,7 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd ) // ---------------------------------------------------------------------------- -IMPL_LINK( ScTPValidationValue, SelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl) { sal_uInt16 nLbPos = maLbAllow.GetSelectEntryPos(); bool bEnable = (nLbPos != SC_VALIDDLG_ALLOW_ANY); @@ -660,7 +660,7 @@ IMPL_LINK( ScTPValidationValue, SelectHdl, ListBox*, EMPTYARG ) return 0; } -IMPL_LINK( ScTPValidationValue, CheckHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) { maCbSort.Enable( maCbShow.IsChecked() ); return 0; @@ -854,7 +854,7 @@ sal_Bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) // ----------------------------------------------------------------------- -IMPL_LINK( ScTPValidationError, SelectActionHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) { ScValidErrorStyle eStyle = (ScValidErrorStyle) aLbAction.GetSelectEntryPos(); sal_Bool bMacro = ( eStyle == SC_VALERR_MACRO ); @@ -868,7 +868,7 @@ IMPL_LINK( ScTPValidationError, SelectActionHdl, ListBox*, EMPTYARG ) // ----------------------------------------------------------------------- -IMPL_LINK( ScTPValidationError, ClickSearchHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) { Window* pOld = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 832036f2c95e..c28f6d25ff09 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -504,14 +504,14 @@ sal_Bool ScAreaLink::Refresh( const String& rNewFile, const String& rNewFilter, } -IMPL_LINK( ScAreaLink, RefreshHdl, ScAreaLink*, EMPTYARG ) +IMPL_LINK_NOARG(ScAreaLink, RefreshHdl) { long nRes = Refresh( aFileName, aFilterName, aSourceArea, GetRefreshDelay() ) != 0; return nRes; } -IMPL_LINK( ScAreaLink, AreaEndEditHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScAreaLink, AreaEndEditHdl) { // #i76514# can't use link argument to access the dialog, // because it's the ScLinkedAreaDlg, not AbstractScLinkedAreaDlg diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 27138bc27a47..67a78ee81780 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -111,7 +111,7 @@ void ScAutoStyleList::AddInitial( const ScRange& rRange, const String& rStyle1, aInitTimer.Start(); } -IMPL_LINK( ScAutoStyleList, InitHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoStyleList, InitHdl) { boost::ptr_vector<ScAutoStyleInitData>::iterator iter; for (iter = aInitials.begin(); iter != aInitials.end(); ++iter) @@ -216,7 +216,7 @@ void ScAutoStyleList::StartTimer( sal_uLong nNow ) // Sekunden nTimerStart = nNow; } -IMPL_LINK( ScAutoStyleList, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl) { sal_uLong nNow = TimeNow(); AdjustEntries(aTimer.GetTimeout()); // eingestellte Wartezeit diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 3dbc96f5beb6..746d5133ccf6 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -1288,7 +1288,7 @@ void ScExternalRefLink::SetDoReferesh(bool b) mbDoRefresh = b; } -IMPL_LINK( ScExternalRefLink, ExternalRefEndEditHdl, ::sfx2::SvBaseLink*, EMPTYARG ) +IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) { return 0; } diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index f154f0affc00..1b65a7ea7585 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -438,7 +438,7 @@ sal_Bool ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, return true; } -IMPL_LINK( ScTableLink, RefreshHdl, ScTableLink*, EMPTYARG ) +IMPL_LINK_NOARG(ScTableLink, RefreshHdl) { long nRes = Refresh( aFileName, aFilterName, NULL, GetRefreshDelay() ) != 0; return nRes; diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 109a5e8771fa..7d0265104a63 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -164,7 +164,7 @@ void FuPoor::ForceScroll(const Point& aPixPos) |* \************************************************************************/ -IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(FuPoor, ScrollHdl) { Point aPosPixel = pWindow->GetPointerPosPixel(); @@ -285,7 +285,7 @@ void FuPoor::DoPaste() |* \************************************************************************/ -IMPL_LINK( FuPoor, DragTimerHdl, Timer *, EMPTYARG ) +IMPL_LINK_NOARG(FuPoor, DragTimerHdl) { // ExecuteDrag (und das damit verbundene Reschedule) direkt aus dem Timer // aufzurufen, bringt die VCL-Timer-Verwaltung durcheinander, wenn dabei @@ -298,7 +298,7 @@ IMPL_LINK( FuPoor, DragTimerHdl, Timer *, EMPTYARG ) return 0; } -IMPL_LINK( FuPoor, DragHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(FuPoor, DragHdl) { SdrHdl* pHdl = pView->PickHandle(aMDPos); diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 357bdc037f9c..703b2181dbe1 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -1048,7 +1048,7 @@ void ScFunctionDockWin::ToggleFloatingMode() aTimer.Start(); } -IMPL_LINK( ScFunctionDockWin, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScFunctionDockWin, TimerHdl) { CheckAlignment(eSfxOldAlignment,eSfxNewAlignment); SetSize(); diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index b1d183a9f5b3..a104fadd05d8 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -160,21 +160,21 @@ private: void InitFilter(); DECL_LINK( FilterHandle, SvxTPFilter* ); - DECL_LINK( RefHandle, SvxTPFilter* ); - DECL_LINK( FilterModified, SvxTPFilter* ); + DECL_LINK( RefHandle, void* ); + DECL_LINK( FilterModified, void* ); DECL_LINK( MinSizeHandle, SvxAcceptChgCtr*); DECL_LINK( RejectHandle, SvxTPView*); DECL_LINK( AcceptHandle, SvxTPView*); - DECL_LINK( RejectAllHandle, SvxTPView*); - DECL_LINK( AcceptAllHandle, SvxTPView*); + DECL_LINK( RejectAllHandle, void*); + DECL_LINK( AcceptAllHandle, void*); DECL_LINK( ExpandingHandle, SvxRedlinTable*); - DECL_LINK( SelectHandle, SvxRedlinTable*); + DECL_LINK( SelectHandle, void*); DECL_LINK( RefInfoHandle, String*); - DECL_LINK( UpdateSelectionHdl, Timer*); + DECL_LINK( UpdateSelectionHdl, void*); DECL_LINK( ChgTrackModHdl, ScChangeTrack*); - DECL_LINK( CommandHdl, Control*); - DECL_LINK( ReOpenTimerHdl, Timer*); + DECL_LINK( CommandHdl, void*); + DECL_LINK( ReOpenTimerHdl, void*); DECL_LINK( ColCompareHdl, SvSortData*); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 383f6b3726a6..270735bd45e1 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -133,7 +133,7 @@ private: Timer aTimer; String aDocName; // document on which the dialog was opened - DECL_LINK( UpdateFocusHdl, Timer* ); + DECL_LINK( UpdateFocusHdl, void* ); protected: diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index 3ff5138e08d2..823e3b7e4286 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -54,8 +54,8 @@ private: void ExecuteEntries(); void AdjustEntries(sal_uLong nDiff); void StartTimer(sal_uLong nNow); - DECL_LINK( TimerHdl, Timer* ); - DECL_LINK( InitHdl, Timer* ); + DECL_LINK( TimerHdl, void* ); + DECL_LINK( InitHdl, void* ); public: ScAutoStyleList(ScDocShell* pShell); diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx index 26660292c58f..41739e3e12af 100644 --- a/sc/source/ui/inc/cellsh.hxx +++ b/sc/source/ui/inc/cellsh.hxx @@ -71,7 +71,7 @@ private: void ExecuteSubtotals(SfxRequest& rReq); DECL_LINK( ClipboardChanged, TransferableDataHelper* ); - DECL_LINK( DialogClosed, AbstractScLinkedAreaDlg* ); + DECL_LINK( DialogClosed, void* ); RotateTransliteration m_aRotateCase; diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 4a1458aae95e..799308aca639 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -307,7 +307,7 @@ private: void cycleFocus(bool bReverse = false); DECL_LINK( ButtonHdl, Button* ); - DECL_LINK( TriStateHdl, TriStateBox* ); + DECL_LINK( TriStateHdl, void* ); DECL_LINK( CheckHdl, SvTreeListBox* ); private: diff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxx index 38e8807542a4..1bfaf7906312 100644 --- a/sc/source/ui/inc/condfrmt.hxx +++ b/sc/source/ui/inc/condfrmt.hxx @@ -165,10 +165,10 @@ private: DECL_LINK( ChangeCond3TemplateHdl, void * ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); + DECL_LINK( LoseFocusHdl, void* ); DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( NewBtnHdl, PushButton* ); - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( ScrollHdl, void* ); #endif // _CONDFRMT_CXX }; diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 74cdc5ce3a51..b2b3739c355e 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -182,9 +182,9 @@ private: void KeepHandler( bool bMine ); void KeepAllHandler( bool bMine ); - DECL_LINK( SelectHandle, SvxRedlinTable* ); - DECL_LINK( DeselectHandle, SvxRedlinTable* ); - DECL_LINK( UpdateSelectionHdl, Timer* ); + DECL_LINK( SelectHandle, void* ); + DECL_LINK( DeselectHandle, void* ); + DECL_LINK( UpdateSelectionHdl, void* ); DECL_LINK( KeepMineHandle, void* ); DECL_LINK( KeepOtherHandle, void* ); DECL_LINK( KeepAllMineHandle, void* ); diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 1de37c004126..90d7db25449e 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -113,7 +113,7 @@ class ScContentTree : public SvTreeListBox ScDocument* GetSourceDocument(); - DECL_LINK( ContentDoubleClickHdl, ScContentTree* ); + DECL_LINK( ContentDoubleClickHdl, void* ); DECL_STATIC_LINK( ScContentTree, ExecDragHdl, void* ); protected: diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index 648544ee117f..cacfd06b5233 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -54,7 +54,7 @@ private: CancelButton aBtnCancel; HelpButton aBtnHelp; - DECL_LINK( OkHdl, OKButton * ); + DECL_LINK(OkHdl, void *); }; diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 7c5c58b9bc5d..1519256e37c7 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -103,7 +103,7 @@ private: DECL_LINK( RowClickHdl, void * ); DECL_LINK( Range2DataModifyHdl, void * ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); + DECL_LINK( LoseFocusHdl, void* ); #endif }; diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index 588ef43cf72a..9c3159471731 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -56,7 +56,7 @@ private: void FillObjects(); - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK( SelectHdl, void* ); public: ScDataPilotDatabaseDlg( Window* pParent ); diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index 5600d2ccb11e..bfa376972445 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -88,15 +88,15 @@ private: void SetButtonState(); // Handler: - DECL_LINK( Impl_NewHdl, PushButton* ); - DECL_LINK( Impl_PrevHdl, PushButton* ); - DECL_LINK( Impl_NextHdl, PushButton* ); + DECL_LINK(Impl_NewHdl, void *); + DECL_LINK(Impl_PrevHdl, void *); + DECL_LINK(Impl_NextHdl, void *); - DECL_LINK( Impl_RestoreHdl, PushButton* ); - DECL_LINK( Impl_DeleteHdl, PushButton* ); - DECL_LINK( Impl_CloseHdl, PushButton* ); + DECL_LINK(Impl_RestoreHdl, void *); + DECL_LINK(Impl_DeleteHdl, void *); + DECL_LINK(Impl_CloseHdl, void *); - DECL_LINK( Impl_ScrollHdl, ScrollBar* ); + DECL_LINK(Impl_ScrollHdl, void *); DECL_LINK( Impl_DataModifyHdl, Edit* ); }; #endif // SC_DATAFDLG_HXX diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 480246708cba..5e1849221100 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -108,7 +108,7 @@ private: DECL_LINK( SetSelectionHdl, void* ); DECL_LINK( SelHdl, ListBox* ); DECL_LINK(SetSplitHdl,ScPrivatSplit*); - DECL_LINK( TimerHdl, Timer*); + DECL_LINK( TimerHdl, void*); protected: diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index 9c7d704f11e3..5602051462aa 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -291,8 +291,8 @@ private: bool GetFieldBtnPosSize(size_t nPos, Point& rPos, Size& rSize); void HandleScroll(); - DECL_LINK(ScrollHdl, ScrollBar*); - DECL_LINK(EndScrollHdl, ScrollBar*); + DECL_LINK(ScrollHdl, void*); + DECL_LINK(EndScrollHdl, void*); private: @@ -363,8 +363,8 @@ private: bool GetFieldBtnPosSize(size_t nPos, Point& rPos, Size& rSize); void HandleScroll(); - DECL_LINK(ScrollHdl, ScrollBar*); - DECL_LINK(EndScrollHdl, ScrollBar*); + DECL_LINK(ScrollHdl, void*); + DECL_LINK(EndScrollHdl, void*); private: diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index d473b23488ef..805897cd9cd7 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -174,8 +174,8 @@ private: DECL_LINK( ValModifyHdl, ComboBox* ); DECL_LINK( CheckBoxHdl, CheckBox* ); DECL_LINK( EndDlgHdl, Button* ); - DECL_LINK( MoreClickHdl, MoreButton* ); - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( MoreClickHdl, void* ); + DECL_LINK( ScrollHdl, void* ); // Hack: RefInput control DECL_LINK( TimeOutHdl, Timer* ); diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 5638b3bc6f68..71a20ec02683 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -65,11 +65,11 @@ protected: Dialog* pDialog; Timer aScrollTimer; // fuer Autoscrolling - DECL_LINK( ScrollHdl, Timer * ); + DECL_LINK( ScrollHdl, void * ); void ForceScroll(const Point& aPixPos); Timer aDragTimer; // fuer Drag&Drop - DECL_LINK( DragTimerHdl, Timer * ); + DECL_LINK( DragTimerHdl, void * ); DECL_LINK( DragHdl, void * ); sal_Bool bIsInDragMode; Point aMDPos; // Position von MouseButtonDown diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 477536a6ad14..ef9170f96568 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -203,7 +203,7 @@ private: bool bAutoMarkVisible:1; bool bListValButton:1; - DECL_LINK( PopupModeEndHdl, FloatingWindow* ); + DECL_LINK( PopupModeEndHdl, void* ); DECL_LINK( PopupSpellingHdl, SpellCallbackInfo* ); bool TestMouse( const MouseEvent& rMEvt, bool bAction ); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index b0facf100455..da12b53911bc 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -97,7 +97,7 @@ public: virtual void InsertAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); virtual void RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextData ); - DECL_LINK( NotifyHdl, EENotify* ); + DECL_LINK( NotifyHdl, void* ); protected: virtual void Paint( const Rectangle& rRec ); @@ -245,8 +245,8 @@ private: PushButton aButton; ScrollBar aScrollBar; long nVertOffset; - DECL_LINK( ClickHdl, PushButton* ); - DECL_LINK( Impl_ScrollHdl, ScrollBar* ); + DECL_LINK( ClickHdl, void* ); + DECL_LINK( Impl_ScrollHdl, void* ); }; diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 144fb2a7f381..2d2a3ec18355 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -106,12 +106,12 @@ private: void FillTables_Impl( ScDocument* pSrcDoc ); void DoEnable_Impl(); - DECL_LINK( BrowseHdl_Impl, PushButton* ); - DECL_LINK( ChoiceHdl_Impl, RadioButton* ); - DECL_LINK( SelectHdl_Impl, MultiListBox* ); - DECL_LINK( CountHdl_Impl, NumericField* ); - DECL_LINK( DoEnterHdl, PushButton* ); - DECL_LINK( BrowseTimeoutHdl, Timer* ); + DECL_LINK(BrowseHdl_Impl, void *); + DECL_LINK(ChoiceHdl_Impl, void *); + DECL_LINK(SelectHdl_Impl, void *); + DECL_LINK(CountHdl_Impl, void *); + DECL_LINK(DoEnterHdl, void *); + DECL_LINK(BrowseTimeoutHdl, void *); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); #endif }; diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index e3cf0e7c2d62..f441f469d022 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -68,10 +68,10 @@ private: SfxObjectShellRef aSourceRef; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > xSourceObject; - DECL_LINK( FileHdl, ComboBox* ); - DECL_LINK( BrowseHdl, PushButton* ); - DECL_LINK( RangeHdl, MultiListBox* ); - DECL_LINK( ReloadHdl, CheckBox* ); + DECL_LINK(FileHdl, void *); + DECL_LINK(BrowseHdl, void *); + DECL_LINK(RangeHdl, void *); + DECL_LINK(ReloadHdl, void *); DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper* ); void UpdateSourceRanges(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index c6e0e1b117e2..d3ca3ea09b87 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -65,8 +65,8 @@ private: long nCurrentValue; void CalcPositions(); - DECL_LINK( SetDefValHdl, CheckBox * ); - DECL_LINK( ModifyHdl, MetricField * ); + DECL_LINK(SetDefValHdl, void *); + DECL_LINK(ModifyHdl, void *); }; #endif // SC_MTRINDLG_HXX diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index b797bb370b08..783ed6b0dc7c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -216,7 +216,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); - DECL_LINK( ToolBoxDropdownClickHdl, ToolBox* ); + DECL_LINK( ToolBoxDropdownClickHdl, void* ); protected: virtual void Select(); diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index 01eeec8dbcd5..c8e78b1d4792 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -58,7 +58,7 @@ private: SdrObject* pObject; sal_Bool bVisible; - DECL_LINK( TimeHdl, Timer* ); + DECL_LINK( TimeHdl, void* ); public: ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 116097c30532..d46aefbc1b76 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -59,7 +59,7 @@ class ScRedlineOptionsTabPage : public SfxTabPage ColorListBox aMoveColorLB; FixedLine aChangedGB; String aAuthorStr; - DECL_LINK( ColorHdl, ColorListBox *pColorLB ); + DECL_LINK(ColorHdl, void *); public: diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index c7a06213c067..aaac8b81da98 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -209,13 +209,13 @@ private: DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( DelBtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( LoseFocusHdl, void* ); + DECL_LINK(ScrollHdl, void *); DECL_LINK( CursorUpHdl, ScCursorRefEdit* ); DECL_LINK( CursorDownHdl, ScCursorRefEdit* ); - DECL_LINK( CondModifyHdl, Edit* ); - DECL_LINK( TargetModifyHdl, Edit* ); - DECL_LINK( SelectHdl, ListBox* ); + DECL_LINK( CondModifyHdl, void* ); + DECL_LINK( TargetModifyHdl, void* ); + DECL_LINK( SelectHdl, void* ); }; diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 9fbedaffad07..434c474b5211 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -75,9 +75,9 @@ private: String maSelectLockedCells; String maSelectUnlockedCells; - DECL_LINK( OKHdl, OKButton* ); + DECL_LINK( OKHdl, void* ); DECL_LINK( CheckBoxHdl, CheckBox* ); - DECL_LINK( PasswordModifyHdl, Edit* ); + DECL_LINK( PasswordModifyHdl, void* ); }; #endif diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 8ccbe9c0fd14..76c60499ea11 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -87,7 +87,7 @@ private: sal_uInt16 FindBaseItemPos( const String& rEntry, sal_uInt16 nStartPos ) const; DECL_LINK( SelectHdl, ListBox* ); - DECL_LINK( DblClickHdl, MultiListBox* ); + DECL_LINK( DblClickHdl, void* ); private: FixedLine maFlFunc; @@ -131,7 +131,7 @@ public: private: void Init( const ScDPLabelData& rLabelData, const ScDPFuncData& rFuncData ); - DECL_LINK( DblClickHdl, MultiListBox* ); + DECL_LINK(DblClickHdl, void *); DECL_LINK( RadioClickHdl, RadioButton* ); DECL_LINK( ClickHdl, PushButton* ); diff --git a/sc/source/ui/inc/pvlaydlg.hxx b/sc/source/ui/inc/pvlaydlg.hxx index 5f460a4b564a..b4e3ae436198 100644 --- a/sc/source/ui/inc/pvlaydlg.hxx +++ b/sc/source/ui/inc/pvlaydlg.hxx @@ -245,12 +245,12 @@ private: // Handler DECL_LINK( ClickHdl, PushButton * ); - DECL_LINK( SelAreaHdl, ListBox * ); - DECL_LINK( MoreClickHdl, MoreButton * ); - DECL_LINK( EdModifyHdl, Edit * ); - DECL_LINK( EdInModifyHdl, Edit * ); - DECL_LINK( OkHdl, OKButton * ); - DECL_LINK( CancelHdl, CancelButton * ); + DECL_LINK( SelAreaHdl, void * ); + DECL_LINK( MoreClickHdl, void * ); + DECL_LINK( EdModifyHdl, void * ); + DECL_LINK( EdInModifyHdl, void * ); + DECL_LINK( OkHdl, void * ); + DECL_LINK( CancelHdl, void * ); DECL_LINK( GetFocusHdl, Control* ); }; diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 19250a728068..80a7d97a7328 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -113,9 +113,9 @@ private: String maTextHashGood; String maTextHashRegen; - DECL_LINK( OKHdl, OKButton* ); + DECL_LINK( OKHdl, void* ); DECL_LINK( RetypeBtnHdl, PushButton* ); - DECL_LINK( ScrollHdl, ScrollBar* ); + DECL_LINK( ScrollHdl, void* ); struct TableItem { @@ -164,10 +164,10 @@ private: RadioButton maBtnRemovePassword; - DECL_LINK( OKHdl, OKButton* ); + DECL_LINK( OKHdl, void* ); DECL_LINK( RadioBtnHdl, RadioButton* ); - DECL_LINK( CheckBoxHdl, CheckBox* ); - DECL_LINK( PasswordModifyHdl, Edit* ); + DECL_LINK( CheckBoxHdl, void* ); + DECL_LINK( PasswordModifyHdl, void* ); ScPassHashProtectable* mpProtected; }; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 4da9411f3477..35e01717c88f 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -71,7 +71,7 @@ private: const String aDefScenarioName; sal_Bool bIsEdit; - DECL_LINK( OkHdl, OKButton * ); + DECL_LINK(OkHdl, void *); DECL_LINK( EnableHdl, CheckBox * ); }; diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 133d310c664e..e63823010db7 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -126,7 +126,7 @@ private: DECL_LINK( RbSepFixHdl, RadioButton* ); DECL_LINK( SeparatorHdl, Control* ); DECL_LINK( LbColTypeHdl, ListBox* ); - DECL_LINK( UpdateTextHdl, ScCsvTableBox* ); + DECL_LINK(UpdateTextHdl, void *); DECL_LINK( ColTypeHdl, ScCsvTableBox* ); }; diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 0d28b9e6f5ea..6991346559ce 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -62,9 +62,9 @@ class ScSolverOptionsDialog : public ModalDialog String maEngine; com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> maProperties; - DECL_LINK( EngineSelectHdl, ListBox* ); - DECL_LINK( SettingsSelHdl, SvxCheckListBox* ); - DECL_LINK( SettingsDoubleClickHdl, SvTreeListBox* ); + DECL_LINK( EngineSelectHdl, void* ); + DECL_LINK( SettingsSelHdl, void* ); + DECL_LINK( SettingsDoubleClickHdl, void* ); DECL_LINK( ButtonHdl, PushButton* ); void ReadFromComponent(); diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 86eb96f15b70..a782c631cc25 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -101,7 +101,7 @@ private: DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); + DECL_LINK( LoseFocusHdl, void* ); #endif // _SOLVERDLG_CXX }; diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 7c1870aa6cad..538b1ef089ca 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -70,8 +70,8 @@ private: void FillColorValueSets_Impl(); - DECL_LINK( TabBgColorDblClickHdl_Impl, ValueSet* ); - DECL_LINK( TabBgColorOKHdl_Impl, OKButton* pBtn ); + DECL_LINK(TabBgColorDblClickHdl_Impl, void *); + DECL_LINK(TabBgColorOKHdl_Impl, void *); }; #endif // SC_TABBGCOLORDLG_HXX diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 4f43614adde8..8ab26f9d9282 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -105,7 +105,7 @@ private: DECL_LINK( BtnHdl, PushButton* ); DECL_LINK( GetFocusHdl, Control* ); - DECL_LINK( LoseFocusHdl, Control* ); + DECL_LINK( LoseFocusHdl, void* ); #endif // _TABOPDLG_CXX }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 09244bb10fd9..8879b07dbf43 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -190,7 +190,7 @@ private: void DoHSplit(long nSplitPos); void DoVSplit(long nSplitPos); - DECL_LINK( TimerHdl, Timer* ); + DECL_LINK( TimerHdl, void* ); void UpdateVarZoom(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 05e68387d8ba..585206544afd 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -200,11 +200,11 @@ private: void DoReadUserDataSequence( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rSettings ); - DECL_LINK( SimpleRefClose, String* ); + DECL_LINK( SimpleRefClose, void* ); DECL_LINK( SimpleRefDone, String* ); DECL_LINK( SimpleRefAborted, String* ); DECL_LINK( SimpleRefChange, String* ); - DECL_LINK( FormControlActivated, FmFormShell* ); + DECL_LINK( FormControlActivated, void* ); protected: virtual void Activate(sal_Bool bMDI); diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 82fa4a67fcb4..27be357cef3e 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -65,7 +65,7 @@ private: CheckBox maBtnConvertDate; - DECL_LINK( OKHdl, OKButton* ); + DECL_LINK(OKHdl, void *); DECL_LINK( RadioHdl, RadioButton* ); }; diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index 7369988ee4c1..ff71a2542008 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -56,7 +56,7 @@ private: void CheckPrefix(Edit* pEdit); void OnFocusPrefixInput(Edit* pEdit); - DECL_LINK( NumModifiedHdl, NumericField* ); + DECL_LINK(NumModifiedHdl, void *); DECL_LINK( PrefixModifiedHdl, Edit* ); DECL_LINK( PrefixEditOnFocusHdl, Edit* ); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 171b1a56af90..56c700ae6df6 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -67,9 +67,9 @@ private: #ifdef _TPHF_CXX private: - DECL_LINK( BtnHdl, PushButton* ); + DECL_LINK(BtnHdl, void *); DECL_LINK( HFEditHdl, void* ); - DECL_LINK( TurnOnHdl, CheckBox* ); + DECL_LINK(TurnOnHdl, void *); #endif }; diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 7c1a994e1080..da0931f2e2c1 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -111,7 +111,7 @@ private: Link aMLink; sal_uInt16 nSelected; - SC_DLLPRIVATE DECL_LINK( TimerHdl, Timer*); + SC_DLLPRIVATE DECL_LINK( TimerHdl, void*); protected: diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index d72b9f306e4e..91f59dba2e1c 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -106,9 +106,9 @@ private: private: //------------------------------------ // Handler: - DECL_LINK( PageDirHdl, RadioButton* ); + DECL_LINK(PageDirHdl, void *); DECL_LINK( PageNoHdl, CheckBox* ); - DECL_LINK( ScaleHdl, ListBox* ); + DECL_LINK(ScaleHdl, void *); }; #endif // SC_TPTABLE_HXX diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 015b9177a33f..8e915d19250c 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -141,7 +141,7 @@ class ScTpLayoutOptions : public SfxTabPage DECL_LINK( CBHdl, CheckBox* ); - DECL_LINK(MetricHdl, ListBox*); + DECL_LINK(MetricHdl, void *); DECL_LINK( AlignHdl, CheckBox* ); ScDocument *pDoc; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 4ec56be58d54..9598f3caba4e 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -196,8 +196,8 @@ private: void SetFirstFormula( const String& rFmlaStr ); void SetSecondFormula( const String& rFmlaStr ); - DECL_LINK( SelectHdl, ListBox* ); - DECL_LINK( CheckHdl, CheckBox* ); + DECL_LINK(SelectHdl, void *); + DECL_LINK(CheckHdl, void *); FixedText maFtAllow; ListBox maLbAllow; @@ -220,7 +220,7 @@ private: String maStrList; sal_Unicode mcFmlaSep; /// List separator in formulas. - DECL_LINK( EditSetFocusHdl, Edit *); + DECL_LINK(EditSetFocusHdl, void *); DECL_LINK( KillFocusHdl, Window *); void OnClick( Button *pBtn ); formula::RefEdit* m_pRefEdit; @@ -296,8 +296,8 @@ private: void Init(); // Handler ------------------------ - DECL_LINK( SelectActionHdl, ListBox * ); - DECL_LINK( ClickSearchHdl, PushButton * ); + DECL_LINK(SelectActionHdl, void *); + DECL_LINK(ClickSearchHdl, void *); public: ScTPValidationError( Window* pParent, const SfxItemSet& rArgSet ); diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 402cdab0fb24..f2ba7d536b0e 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -228,7 +228,7 @@ private: bool bPagebreak:1; // Seitenumbruch-Vorschaumodus bool bSelCtrlMouseClick:1; // special selection handling for ctrl-mouse-click - SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, EditStatus*); + SC_DLLPRIVATE DECL_LINK (EmptyEditHdl, void*); SC_DLLPRIVATE DECL_LINK (EditEngineHdl, EditStatus*); SC_DLLPRIVATE void CalcPPT(); diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index af74297043d1..488d1a20bb34 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -916,7 +916,7 @@ IMPL_LINK( ScAcceptChgDlg, MinSizeHandle, SvxAcceptChgCtr*, pCtr ) return 0; } -IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, RefHandle) { sal_uInt16 nId =ScSimpleRefDlgWrapper::GetChildWindowId(); @@ -1106,7 +1106,7 @@ void ScAcceptChgDlg::AcceptFiltered() } } -IMPL_LINK( ScAcceptChgDlg, RejectAllHandle, SvxTPView*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, RejectAllHandle) { SetPointer(Pointer(POINTER_WAIT)); bIgnoreMsg=true; @@ -1135,7 +1135,7 @@ IMPL_LINK( ScAcceptChgDlg, RejectAllHandle, SvxTPView*, EMPTYARG ) return 0; } -IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, AcceptAllHandle) { SetPointer(Pointer(POINTER_WAIT)); @@ -1161,7 +1161,7 @@ IMPL_LINK( ScAcceptChgDlg, AcceptAllHandle, SvxTPView*, EMPTYARG ) return 0; } -IMPL_LINK( ScAcceptChgDlg, SelectHandle, SvxRedlinTable*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, SelectHandle) { if(!bNoSelection) aSelectionTimer.Start(); @@ -1694,7 +1694,7 @@ IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack) return 0; } -IMPL_LINK( ScAcceptChgDlg, ReOpenTimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, ReOpenTimerHdl) { ScSimpleRefDlgWrapper::SetAutoReOpen(true); aAcceptChgCtr.ShowFilterPage(); @@ -1703,7 +1703,7 @@ IMPL_LINK( ScAcceptChgDlg, ReOpenTimerHdl, Timer*, EMPTYARG ) return 0; } -IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, UpdateSelectionHdl) { ScTabView* pTabView = pViewData->GetView(); @@ -1753,7 +1753,7 @@ IMPL_LINK( ScAcceptChgDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) return 0; } -IMPL_LINK( ScAcceptChgDlg, CommandHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl) { const CommandEvent aCEvt(pTheView->GetCommandEvent()); @@ -1929,7 +1929,7 @@ void ScAcceptChgDlg::InitFilter() } } -IMPL_LINK( ScAcceptChgDlg, FilterModified, SvxTPFilter*, EMPTYARG ) +IMPL_LINK_NOARG(ScAcceptChgDlg, FilterModified) { return 0; } diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index b0a4ad68575f..275bae5ad31a 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -898,7 +898,7 @@ void ScRefHandler::stateChanged(const StateChangedType nStateChange, const bool } } -IMPL_LINK( ScRefHandler, UpdateFocusHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl) { if (pActiveWin) { diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 3ef5ad488a88..f602f8f0fef5 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -555,7 +555,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) } } -IMPL_LINK( ScConflictsDlg, SelectHandle, SvxRedlinTable*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, SelectHandle) { if ( mbInSelectHdl || mbInDeselectHdl ) { @@ -570,7 +570,7 @@ IMPL_LINK( ScConflictsDlg, SelectHandle, SvxRedlinTable*, EMPTYARG ) return 0; } -IMPL_LINK( ScConflictsDlg, DeselectHandle, SvxRedlinTable*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, DeselectHandle) { if ( mbInDeselectHdl || mbInSelectHdl ) { @@ -584,7 +584,7 @@ IMPL_LINK( ScConflictsDlg, DeselectHandle, SvxRedlinTable*, EMPTYARG ) return 0; } -IMPL_LINK( ScConflictsDlg, UpdateSelectionHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, UpdateSelectionHdl) { if ( !mpViewData || !mpOwnDoc ) { @@ -673,28 +673,28 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) EndDialog( RET_OK ); } -IMPL_LINK( ScConflictsDlg, KeepMineHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, KeepMineHandle) { KeepHandler( true ); return 0; } -IMPL_LINK( ScConflictsDlg, KeepOtherHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, KeepOtherHandle) { KeepHandler( false ); return 0; } -IMPL_LINK( ScConflictsDlg, KeepAllMineHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, KeepAllMineHandle) { KeepAllHandler( true ); return 0; } -IMPL_LINK( ScConflictsDlg, KeepAllOthersHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScConflictsDlg, KeepAllOthersHandle) { KeepAllHandler( false ); diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index 8b3a9637ebe3..7cc948d6e0a8 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -75,12 +75,12 @@ ScColOrRowDlg::~ScColOrRowDlg() //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScColOrRowDlg, OkHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScColOrRowDlg, OkHdl) { EndDialog( aBtnCols.IsChecked() ? SCRET_COLS : SCRET_ROWS ); return 0; } -IMPL_LINK_INLINE_END( ScColOrRowDlg, OkHdl, OKButton *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScColOrRowDlg, OkHdl) diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 26d6a21ba4d2..1e933e3dc345 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -708,7 +708,7 @@ sal_Bool ScColRowNameRangesDlg::IsRefInputMode() const #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, OkBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl) { AddBtnHdl( 0 ); @@ -740,12 +740,12 @@ IMPL_LINK( ScColRowNameRangesDlg, OkBtnHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK_INLINE_START( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScColRowNameRangesDlg, CancelBtnHdl) { Close(); return 0; } -IMPL_LINK_INLINE_END( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScColRowNameRangesDlg, CancelBtnHdl) /************************************************************************* @@ -764,7 +764,7 @@ IMPL_LINK_INLINE_END( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl) { String aNewArea( aEdAssign.GetText() ); String aNewData( aEdAssign2.GetText() ); @@ -836,7 +836,7 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) { String aRangeStr = aLbRange.GetSelectEntry(); sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos(); @@ -914,7 +914,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl) { sal_uInt16 nSelectPos = aLbRange.GetSelectEntryPos(); sal_uInt16 nCnt = aLbRange.GetEntryCount(); @@ -999,7 +999,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl) { String aNewArea( aEdAssign.GetText() ); sal_Bool bValid = false; @@ -1048,7 +1048,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, Range2DataModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl) { String aNewData( aEdAssign2.GetText() ); if ( aNewData.Len() > 0 ) @@ -1086,7 +1086,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range2DataModifyHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl) { if ( !aBtnColHead.GetSavedValue() ) { @@ -1124,7 +1124,7 @@ IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG ) #* #************************************************************************/ -IMPL_LINK( ScColRowNameRangesDlg, RowClickHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl) { if ( !aBtnRowHead.GetSavedValue() ) { @@ -1162,7 +1162,7 @@ IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl ) } -IMPL_LINK( ScColRowNameRangesDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); return 0; diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 698eb7bc674a..9f0f3189175f 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -277,7 +277,7 @@ IMPL_LINK( ScDataFormDlg, Impl_DataModifyHdl, Edit*, pEdit) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_NewHdl) { ScViewData* pViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -311,7 +311,7 @@ IMPL_LINK( ScDataFormDlg, Impl_NewHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_PrevHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_PrevHdl) { if (pDoc) { @@ -324,7 +324,7 @@ IMPL_LINK( ScDataFormDlg, Impl_PrevHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_NextHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_NextHdl) { if (pDoc) { @@ -337,7 +337,7 @@ IMPL_LINK( ScDataFormDlg, Impl_NextHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_RestoreHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_RestoreHdl) { if (pDoc) { @@ -346,7 +346,7 @@ IMPL_LINK( ScDataFormDlg, Impl_RestoreHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_DeleteHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_DeleteHdl) { ScViewData* pViewData = pTabViewShell->GetViewData(); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -366,13 +366,13 @@ IMPL_LINK( ScDataFormDlg, Impl_DeleteHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScDataFormDlg, Impl_CloseHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_CloseHdl) { EndDialog( ); return 0; } -IMPL_LINK( ScDataFormDlg, Impl_ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScDataFormDlg, Impl_ScrollHdl) { long nOffset = aSlider.GetThumbPos(); nCurrentRow = nStartRow + nOffset + 1; diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index bdfd61a92b6d..7b0ec9af45f6 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -163,13 +163,13 @@ void ScDeleteContentsDlg::DisableObjects() //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScDeleteContentsDlg, DelAllHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl) { DisableChecks( aBtnDelAll.IsChecked() ); return 0; } -IMPL_LINK_INLINE_END( ScDeleteContentsDlg, DelAllHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScDeleteContentsDlg, DelAllHdl) ScDeleteContentsDlg::~ScDeleteContentsDlg() { diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 3ad18a385b45..c045587dcce5 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -319,7 +319,7 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) //---------------------------------------------------------------------------- -IMPL_LINK( ScFillSeriesDlg, OKHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) { if ( aBtnLeft.IsChecked() ) theFillDir = FILL_TO_LEFT; else if ( aBtnRight.IsChecked() ) theFillDir = FILL_TO_RIGHT; diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 180f16bb8647..ad88914d9fd9 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -317,14 +317,14 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) //------------------------------------------------------------------------ -IMPL_LINK( ScInsertContentsDlg, InsAllHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl) { DisableChecks( aBtnInsAll.IsChecked() ); return 0; } -IMPL_LINK( ScInsertContentsDlg, LinkBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl) { TestModes(); diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 70d681ceacdb..03119c05187b 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -272,7 +272,7 @@ const String* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) // Handler: //------------------------------------------------------------------------ -IMPL_LINK( ScInsertTableDlg, CountHdl_Impl, NumericField*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) { nTableCount = static_cast<SCTAB>(aNfCount.GetValue()); if ( nTableCount==1) @@ -297,7 +297,7 @@ IMPL_LINK( ScInsertTableDlg, CountHdl_Impl, NumericField*, EMPTYARG ) } //------------------------------------------------------------------------ -IMPL_LINK( ScInsertTableDlg, ChoiceHdl_Impl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) { if ( aBtnNew.IsChecked() ) SetNewTable_Impl(); @@ -310,7 +310,7 @@ IMPL_LINK( ScInsertTableDlg, ChoiceHdl_Impl, RadioButton*, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScInsertTableDlg, BrowseHdl_Impl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) { if ( pDocInserter ) delete pDocInserter; @@ -322,7 +322,7 @@ IMPL_LINK( ScInsertTableDlg, BrowseHdl_Impl, PushButton*, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScInsertTableDlg, SelectHdl_Impl, MultiListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl) { DoEnable_Impl(); return 0; @@ -338,7 +338,7 @@ void ScInsertTableDlg::DoEnable_Impl() aBtnOk.Disable(); } -IMPL_LINK( ScInsertTableDlg, DoEnterHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, DoEnterHdl) { if(nTableCount > 1 || rDoc.ValidTabName(aEdName.GetText())) { @@ -352,7 +352,7 @@ IMPL_LINK( ScInsertTableDlg, DoEnterHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScInsertTableDlg, BrowseTimeoutHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScInsertTableDlg, BrowseTimeoutHdl) { bMustClose = true; BrowseHdl_Impl( &aBtnBrowse ); diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index c59719f6a8f5..fc8c6ce88190 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -80,12 +80,12 @@ String ScSelEntryDlg::GetSelectEntry() const //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScSelEntryDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScSelEntryDlg, DblClkHdl) { EndDialog( RET_OK ); return 0; } -IMPL_LINK_INLINE_END( ScSelEntryDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScSelEntryDlg, DblClkHdl) //------------------------------------------------------------------------ diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 6298afcc6146..234df1b5c273 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -107,7 +107,7 @@ short ScLinkedAreaDlg::Execute() #define FILTERNAME_HTML "HTML (StarCalc)" #define FILTERNAME_QUERY "calc_HTML_WebQuery" -IMPL_LINK( ScLinkedAreaDlg, BrowseHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScLinkedAreaDlg, BrowseHdl) { if ( !pDocInserter ) pDocInserter = new sfx2::DocumentInserter( @@ -116,7 +116,7 @@ IMPL_LINK( ScLinkedAreaDlg, BrowseHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScLinkedAreaDlg, FileHdl, ComboBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScLinkedAreaDlg, FileHdl) { rtl::OUString aEntered = aCbUrl.GetURL(); if (pSourceShell) @@ -210,13 +210,13 @@ void ScLinkedAreaDlg::InitFromOldLink( const String& rFile, const String& rFilte UpdateEnable(); } -IMPL_LINK( ScLinkedAreaDlg, RangeHdl, MultiListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl) { UpdateEnable(); return 0; } -IMPL_LINK( ScLinkedAreaDlg, ReloadHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl) { UpdateEnable(); return 0; diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index ae535590eec5..91eb54c7bec5 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -160,7 +160,7 @@ void ScMetricInputDlg::CalcPositions() //------------------------------------------------------------------------ // Handler: -IMPL_LINK( ScMetricInputDlg, SetDefValHdl, CheckBox *, EMPTYARG ) +IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) { if ( aBtnDefVal.IsChecked() ) { @@ -174,12 +174,12 @@ IMPL_LINK( ScMetricInputDlg, SetDefValHdl, CheckBox *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScMetricInputDlg, ModifyHdl, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl) { aBtnDefVal.Check( nDefaultValue == aEdValue.GetValue() ); return 0; } -IMPL_LINK_INLINE_END( ScMetricInputDlg, ModifyHdl, MetricField *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScMetricInputDlg, ModifyHdl) diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 831905d1ea55..4287e20fcbe1 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -283,7 +283,7 @@ IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, void *, pBtn ) return 0; } -IMPL_LINK( ScMoveTableDlg, OkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScMoveTableDlg, OkHdl) { sal_uInt16 nDocSel = aLbDoc.GetSelectEntryPos(); sal_uInt16 nDocLast = aLbDoc.GetEntryCount()-1; diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 0cb5e3a1707c..fb34d8584107 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -625,7 +625,7 @@ IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScOptSolverDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl) { mbDlgLostFocus = !IsActive(); return 0; @@ -663,7 +663,7 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) //---------------------------------------------------------------------------- -IMPL_LINK( ScOptSolverDlg, TargetModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl) { // modify handler for the target edit: // select "Value of" if something is input into the edit @@ -672,7 +672,7 @@ IMPL_LINK( ScOptSolverDlg, TargetModifyHdl, Edit*, EMPTYARG ) return 0; } -IMPL_LINK( ScOptSolverDlg, CondModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, CondModifyHdl) { // modify handler for the condition edits, just to enable/disable "delete" buttons ReadConditions(); @@ -680,7 +680,7 @@ IMPL_LINK( ScOptSolverDlg, CondModifyHdl, Edit*, EMPTYARG ) return 0; } -IMPL_LINK( ScOptSolverDlg, SelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, SelectHdl) { // select handler for operator list boxes, just to enable/disable "delete" buttons ReadConditions(); @@ -688,7 +688,7 @@ IMPL_LINK( ScOptSolverDlg, SelectHdl, ListBox*, EMPTYARG ) return 0; } -IMPL_LINK( ScOptSolverDlg, ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScOptSolverDlg, ScrollHdl) { ReadConditions(); nScrollPos = maScrollBar.GetThumbPos(); diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 0d8ed83d701c..2ed31823c4a0 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -146,13 +146,13 @@ IMPL_LINK( ScTableProtectionDlg, CheckBoxHdl, CheckBox*, pBtn ) return 0; } -IMPL_LINK( ScTableProtectionDlg, OKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTableProtectionDlg, OKHdl) { EndDialog(RET_OK); return 0; } -IMPL_LINK( ScTableProtectionDlg, PasswordModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(ScTableProtectionDlg, PasswordModifyHdl) { String aPass1 = maPassword1Edit.GetText(); String aPass2 = maPassword2Edit.GetText(); diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index c18910293a1e..d12e5836c5db 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -332,7 +332,7 @@ void ScRetypePassDlg::CheckHashStatus() maBtnOk.Disable(); } -IMPL_LINK( ScRetypePassDlg, OKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassDlg, OKHdl) { EndDialog(RET_OK); return 0; @@ -394,7 +394,7 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, PushButton*, pBtn ) return 0; } -IMPL_LINK( ScRetypePassDlg, ScrollHdl, ScrollBar*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassDlg, ScrollHdl) { ResetTableRows(); return 0; @@ -498,7 +498,7 @@ void ScRetypePassInputDlg::CheckPasswordInput() maBtnOk.Enable(bPassGood); } -IMPL_LINK( ScRetypePassInputDlg, OKHdl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassInputDlg, OKHdl) { EndDialog(RET_OK); return 0; @@ -530,13 +530,13 @@ IMPL_LINK( ScRetypePassInputDlg, RadioBtnHdl, RadioButton*, pBtn ) return 0; } -IMPL_LINK( ScRetypePassInputDlg, CheckBoxHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl) { CheckPasswordInput(); return 0; } -IMPL_LINK( ScRetypePassInputDlg, PasswordModifyHdl, Edit*, EMPTYARG ) +IMPL_LINK_NOARG(ScRetypePassInputDlg, PasswordModifyHdl) { CheckPasswordInput(); return 0; diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 074cbe392185..cb8198cb2dda 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -197,7 +197,7 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) { if ( bCoreDataChanged ) ScGlobal::GetOrCreateAutoFormat()->Save(); @@ -205,7 +205,7 @@ IMPL_LINK_INLINE_START( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG ) EndDialog( RET_OK ); return 0; } -IMPL_LINK_INLINE_END( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScAutoFormatDlg, DblClkHdl) //------------------------------------------------------------------------ @@ -240,7 +240,7 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) //------------------------------------------------------------------------ -IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) { if ( !bFmtInserted && pSelFmtData ) { @@ -314,7 +314,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScAutoFormatDlg, RemoveHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) { if ( (nIndex > 0) && (aLbFormat.GetEntryCount() > 0) ) { @@ -352,7 +352,7 @@ IMPL_LINK( ScAutoFormatDlg, RemoveHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) { sal_Bool bOk = false; while( !bOk ) @@ -439,7 +439,7 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) //------------------------------------------------------------------------ -IMPL_LINK( ScAutoFormatDlg, SelFmtHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) { nIndex = aLbFormat.GetSelectEntryPos(); UpdateChecks(); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 48911952bf76..8c5052042bda 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -100,7 +100,7 @@ ScShareDocumentDlg::~ScShareDocumentDlg() { } -IMPL_LINK( ScShareDocumentDlg, ToggleHandle, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScShareDocumentDlg, ToggleHandle) { maFtWarning.Enable( maCbShare.IsChecked() ); diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 067ee1a510f7..e56f66024e60 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -95,12 +95,12 @@ sal_uInt16 ScShowTabDlg::GetSelectEntryPos(sal_uInt16 nPos) const //------------------------------------------------------------------------ -IMPL_LINK_INLINE_START( ScShowTabDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScShowTabDlg, DblClkHdl) { EndDialog( RET_OK ); return 0; } -IMPL_LINK_INLINE_END( ScShowTabDlg, DblClkHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScShowTabDlg, DblClkHdl) ScShowTabDlg::~ScShowTabDlg() { diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index bcf543efa1e3..982064e2ac3d 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -227,7 +227,7 @@ void ScSimpleRefDlg::RefInputDone( sal_Bool bForced) //------------------------------------------------------------------------ // Handler: // ======== -IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) { bAutoReOpen=false; String aResult=aEdAssign.GetText(); @@ -239,7 +239,7 @@ IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG ) } //------------------------------------------------------------------------ -IMPL_LINK( ScSimpleRefDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) { bAutoReOpen=false; String aResult=aEdAssign.GetText(); diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index d3cd0989f8bb..06f1d75e87cb 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -371,13 +371,13 @@ IMPL_LINK( ScSolverOptionsDialog, ButtonHdl, PushButton*, pBtn ) return 0; } -IMPL_LINK( ScSolverOptionsDialog, SettingsDoubleClickHdl, SvTreeListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsDoubleClickHdl) { EditOption(); return 0; } -IMPL_LINK( ScSolverOptionsDialog, EngineSelectHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScSolverOptionsDialog, EngineSelectHdl) { sal_uInt16 nSelectPos = maLbEngine.GetSelectEntryPos(); if ( nSelectPos < maImplNames.getLength() ) @@ -393,7 +393,7 @@ IMPL_LINK( ScSolverOptionsDialog, EngineSelectHdl, ListBox*, EMPTYARG ) return 0; } -IMPL_LINK( ScSolverOptionsDialog, SettingsSelHdl, SvxCheckListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) { sal_Bool bCheckbox = false; diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index d51785cf45db..caef25513e2f 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -304,7 +304,7 @@ IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScSolverDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); return 0; diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 7ca031d6049d..a3802f4f303b 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -140,7 +140,7 @@ void ScTabBgColorDlg::FillColorValueSets_Impl() aTabBgColorSet.Resize(); } -IMPL_LINK( ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorDblClickHdl_Impl) /* Handler, called when color selection is changed */ @@ -152,7 +152,7 @@ IMPL_LINK( ScTabBgColorDlg, TabBgColorDblClickHdl_Impl, ValueSet*, EMPTYARG ) return 0; } -IMPL_LINK( ScTabBgColorDlg, TabBgColorOKHdl_Impl, OKButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabBgColorDlg, TabBgColorOKHdl_Impl) { // Handler, called when the OK button is pushed diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 9fc476041e7f..e9fb8d6b9124 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -358,7 +358,7 @@ IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) //---------------------------------------------------------------------------- -IMPL_LINK( ScTabOpDlg, LoseFocusHdl, Control*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); return 0; diff --git a/sc/source/ui/namedlg/namedefdlg.cxx b/sc/source/ui/namedlg/namedefdlg.cxx index 4b989474085d..a9795d560a08 100644 --- a/sc/source/ui/namedlg/namedefdlg.cxx +++ b/sc/source/ui/namedlg/namedefdlg.cxx @@ -369,37 +369,37 @@ void ScNameDefDlg::MorePushed() MoveWindow(maFlDiv, nPixel); } -IMPL_LINK( ScNameDefDlg, CancelBtnHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScNameDefDlg, CancelBtnHdl) { CancelPushed(); return 0; } -IMPL_LINK( ScNameDefDlg, AddBtnHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScNameDefDlg, AddBtnHdl) { AddPushed(); return 0; }; -IMPL_LINK( ScNameDefDlg, NameModifyHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScNameDefDlg, NameModifyHdl) { IsNameValid(); return 0; } -IMPL_LINK( ScNameDefDlg, EdModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDefDlg, EdModifyHdl) { IsNameValid(); return 0; } -IMPL_LINK( ScNameDefDlg, AssignGetFocusHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDefDlg, AssignGetFocusHdl) { EdModifyHdl( &maEdRange ); return 0; } -IMPL_LINK( ScNameDefDlg, MoreBtnHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScNameDefDlg, MoreBtnHdl) { MorePushed(); return 0; diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 7baccb528f48..72d95ba88cff 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -544,54 +544,54 @@ void ScNameDlg::GetRangeNames(boost::ptr_map<rtl::OUString, ScRangeName>& rRange maRangeMap.swap(rRangeMap); } -IMPL_LINK( ScNameDlg, OkBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, OkBtnHdl) { Close(); return 0; } -IMPL_LINK( ScNameDlg, CancelBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, CancelBtnHdl) { CancelPushed(); return 0; } -IMPL_LINK( ScNameDlg, AddBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, AddBtnHdl) { return AddPushed(); } -IMPL_LINK( ScNameDlg, RemoveBtnHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, RemoveBtnHdl) { RemovePushed(); return 0; } -IMPL_LINK( ScNameDlg, EdModifyHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, EdModifyHdl) { NameModified(); return 0; } -IMPL_LINK( ScNameDlg, AssignGetFocusHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, AssignGetFocusHdl) { EdModifyHdl( &maEdAssign ); return 0; } -IMPL_LINK( ScNameDlg, SelectionChangedHdl_Impl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, SelectionChangedHdl_Impl) { SelectionChanged(); return 0; } -IMPL_LINK( ScNameDlg, ScopeChangedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, ScopeChangedHdl) { ScopeChanged(); return 0; } -IMPL_LINK( ScNameDlg, MoreBtnHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScNameDlg, MoreBtnHdl) { MorePushed(); return 0; diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index b94d8ae2db3d..d806d3bcdf6d 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -265,7 +265,7 @@ void CalculateItemSize(const long& rTableSize, long& rItemNameSize, long& rItemR } -IMPL_LINK( ScRangeManagerTable, HeaderEndDragHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScRangeManagerTable, HeaderEndDragHdl) { long aTableSize = maHeaderBar.GetSizePixel().Width(); long aItemNameSize = maHeaderBar.GetItemSize(ITEMID_NAME); @@ -289,7 +289,7 @@ IMPL_LINK( ScRangeManagerTable, HeaderEndDragHdl, void*, EMPTYARG) return 0; } -IMPL_LINK( ScRangeManagerTable, ScrollHdl, void*, EMPTYARG) +IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl) { CheckForFormulaString(); return 0; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 6b9b620af35c..0e4d4ac93b28 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -278,7 +278,7 @@ String lcl_GetDBAreaRange( ScDocument* pDoc, const String& rDBName ) return aRet; } -IMPL_LINK( ScContentTree, ContentDoubleClickHdl, ScContentTree *, EMPTYARG ) +IMPL_LINK_NOARG(ScContentTree, ContentDoubleClickHdl) { sal_uInt16 nType; sal_uLong nChild; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 7dc61361e085..c6d4afa0eed4 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -454,7 +454,7 @@ void CommandToolBox::Click() //------------------------------------------------------------------------ -IMPL_LINK( CommandToolBox, ToolBoxDropdownClickHdl, ToolBox*, EMPTYARG ) +IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl) { // Das Popupmenue fuer den Dropmodus muss im Click (Button Down) // statt im Select (Button Up) aufgerufen werden. diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index fa1ea3bc69ed..7e2d8031798e 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -216,7 +216,7 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet& /* rSet */ ) } -IMPL_LINK( ScRedlineOptionsTabPage, ColorHdl, ColorListBox *, EMPTYARG ) +IMPL_LINK_NOARG(ScRedlineOptionsTabPage, ColorHdl) { return 0; } diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index ba294c542377..73f046bee774 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -150,7 +150,7 @@ void ScTpDefaultsOptions::OnFocusPrefixInput(Edit* pEdit) } -IMPL_LINK( ScTpDefaultsOptions, NumModifiedHdl, NumericField*, EMPTYARG ) +IMPL_LINK_NOARG(ScTpDefaultsOptions, NumModifiedHdl) { CheckNumSheets(); return 0; diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index c237288e1b9b..0300020cc35e 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -655,7 +655,7 @@ int ScTpLayoutOptions::DeactivatePage( SfxItemSet* pSetP ) return SfxTabPage::LEAVE_PAGE; } -IMPL_LINK(ScTpLayoutOptions, MetricHdl, ListBox*, EMPTYARG) +IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl) { const sal_uInt16 nMPos = aUnitLB.GetSelectEntryPos(); if(nMPos != USHRT_MAX) diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 72fbfc28ebd7..cb0b575bda46 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -180,7 +180,7 @@ void ScHFPage::DeactivatePage() // Handler: //------------------------------------------------------------------ -IMPL_LINK( ScHFPage, TurnOnHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) { SvxHFPage::TurnOnHdl( &aTurnOnBox ); @@ -195,7 +195,7 @@ IMPL_LINK( ScHFPage, TurnOnHdl, CheckBox*, EMPTYARG ) //------------------------------------------------------------------ -IMPL_LINK( ScHFPage, BtnHdl, PushButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScHFPage, BtnHdl) { // Wenn der Bearbeiten-Dialog direkt aus dem Click-Handler des Buttons // aufgerufen wird, funktioniert im Bearbeiten-Dialog unter OS/2 das @@ -206,7 +206,7 @@ IMPL_LINK( ScHFPage, BtnHdl, PushButton*, EMPTYARG ) return 0; } -IMPL_LINK( ScHFPage, HFEditHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScHFPage, HFEditHdl) { SfxViewShell* pViewSh = SfxViewShell::Current(); diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 0d6211ac9da5..eb8ea2b625bc 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -429,7 +429,7 @@ long ScExtIButton::PreNotify( NotifyEvent& rNEvt ) return ImageButton::PreNotify(rNEvt ); } -IMPL_LINK( ScExtIButton, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScExtIButton, TimerHdl) { StartPopup(); return 0; diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 88d34347ed64..4c6a29b97eb0 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -422,7 +422,7 @@ void ScTablePage::DataChanged( const DataChangedEvent& rDCEvt ) // Handler: //------------------------------------------------------------------------ -IMPL_LINK( ScTablePage, PageDirHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(ScTablePage, PageDirHdl) { ShowImage(); return 0; @@ -446,7 +446,7 @@ IMPL_LINK( ScTablePage, PageNoHdl, CheckBox*, pBtn ) //------------------------------------------------------------------------ -IMPL_LINK( ScTablePage, ScaleHdl, ListBox*, EMPTYARG ) +IMPL_LINK_NOARG(ScTablePage, ScaleHdl) { // controls for "Reduce/enlarge" bool bPercent = (aLbScaleMode.GetSelectEntryPos() == SC_TPTABLE_SCALE_PERCENT); diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 1e1f98308247..8f76bf6837c0 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2418,7 +2418,7 @@ void ScCellShell::ExecuteSubtotals(SfxRequest& rReq) delete pDlg; } -IMPL_LINK( ScCellShell, DialogClosed, AbstractScLinkedAreaDlg*, EMPTYARG ) +IMPL_LINK_NOARG(ScCellShell, DialogClosed) { OSL_ENSURE( pImpl->m_pLinkedDlg, "ScCellShell::DialogClosed(): invalid request" ); OSL_ENSURE( pImpl->m_pRequest, "ScCellShell::DialogClosed(): invalid request" ); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 02200bbbc2bc..0d020fc6a5de 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -531,7 +531,7 @@ void ScGridWindow::ClickExtern() } } -IMPL_LINK( ScGridWindow, PopupModeEndHdl, FloatingWindow*, EMPTYARG ) +IMPL_LINK_NOARG(ScGridWindow, PopupModeEndHdl) { if (pFilterBox) pFilterBox->SetCancelled(); // nicht mehr auswaehlen diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 4d28f7c85442..233afcd811a7 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -82,7 +82,7 @@ ScNoteMarker::~ScNoteMarker() delete pModel; } -IMPL_LINK( ScNoteMarker, TimeHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScNoteMarker, TimeHdl) { if (!bVisible) { diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 8e8124aedc4f..a2784e14cfa9 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -359,7 +359,7 @@ void ScTabView::ResetTimer() pTimerWindow = NULL; } -IMPL_LINK( ScTabView, TimerHdl, Timer*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabView, TimerHdl) { if (pTimerWindow) pTimerWindow->MouseMove( aTimerMEvt ); @@ -897,7 +897,7 @@ void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ ) ::std::swap( rBorder.Left(), rBorder.Right() ); } -IMPL_LINK( ScTabView, TabBarResize, void*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabView, TabBarResize) { sal_Bool bHScrollMode = aViewData.IsHScrollMode(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index f8e2ab84d788..cf93d15309bb 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1018,7 +1018,7 @@ void ScTabViewShell::SetFormShellAtTop( sal_Bool bSet ) } } -IMPL_LINK( ScTabViewShell, FormControlActivated, FmFormShell*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabViewShell, FormControlActivated) { // a form control got the focus, so the form shell has to be on top SetFormShellAtTop( sal_True ); @@ -1125,7 +1125,7 @@ void ScTabViewShell::StopEditShell() // close handler to ensure function of dialog: -IMPL_LINK( ScTabViewShell, SimpleRefClose, String*, EMPTYARG ) +IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose) { SfxInPlaceClient* pClient = GetIPClient(); if ( pClient && pClient->IsObjectInPlaceActive() ) diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index a220fdf010f6..a0f4cdf987e8 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1088,11 +1088,11 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // needed, wenn position changed } -IMPL_LINK_INLINE_START( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_START(ScViewData, EmptyEditHdl) { return 0; } -IMPL_LINK_INLINE_END( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG ) +IMPL_LINK_NOARG_INLINE_END(ScViewData, EmptyEditHdl) IMPL_LINK( ScViewData, EditEngineHdl, EditStatus *, pStatus ) { diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 68abbec64ff9..c8a90e8081c5 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -1534,7 +1534,7 @@ void lcl_Pivot( FixedText& aTimeText ) // 30 } } -IMPL_LINK(MyWindow, CountHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, CountHdl) { long nCount = aCountField.GetValue(); @@ -1645,7 +1645,7 @@ IMPL_LINK(MyWindow, CountHdl, PushButton*, EMPTYARG) //----------------------------------------------------------------------- -IMPL_LINK(MyWindow, TextHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, TextHdl) { sal_uInt16 nCol = (sal_uInt16)aColField.GetValue(); sal_uInt16 nRow = (sal_uInt16)aRowField.GetValue(); @@ -1694,7 +1694,7 @@ IMPL_LINK(MyWindow, TextHdl, PushButton*, EMPTYARG) //----------------------------------------------------------------------- -IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, BlaHdl) { aTimeText.SetText("..."); @@ -1768,7 +1768,7 @@ IMPL_LINK(MyWindow, BlaHdl, PushButton*, EMPTYARG) //----------------------------------------------------------------------- -IMPL_LINK(MyWindow, TabHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, TabHdl) { String aResult; @@ -1861,7 +1861,7 @@ void lcl_FillCells(XCellCollectionRef xColl) } } -IMPL_LINK(MyWindow, ViewHdl, PushButton*, EMPTYARG) +IMPL_LINK_NOARG(MyWindow, ViewHdl) { XSpreadsheetDocumentRef xDoc = lcl_GetDocument(); // Calc-Model XInterfaceRef xInt = lcl_GetView(); |