diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 07:56:12 +0200 |
| commit | 106ea87205cfba1bc39dc99ad8c3ee5f8fe350fb (patch) | |
| tree | e55ab4706654d10a5f9b75acfdecec72fda804c3 /svtools | |
| parent | 36efdec23b86fe28c79fe672bb6862fb57b6e09a (diff) | |
Remove _TYPED suffix from tools/link.hxx macros
...which was introduced with 3ead3ad52f9bb2f9d1d6cf8dfc73a0a25e6778ed "Gradually
typed Link" to distinguish the new, typed versions from the old, untyped ones,
but is no longer necessary since 382eb1a23c390154619c385414bdbe6f6e461173
"remove untyped Link<>" removed the old versions.
Change-Id: I494025df486a16a45861fcd8192dfe0275b1103c
Diffstat (limited to 'svtools')
61 files changed, 186 insertions, 186 deletions
diff --git a/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx index db5c83956b1c..da1047e6d0d1 100644 --- a/svtools/inc/roadmap.hxx +++ b/svtools/inc/roadmap.hxx @@ -91,7 +91,7 @@ protected: void Select(); private: - DECL_LINK_TYPED(ImplClickHdl, HyperLabel*, void); + DECL_LINK(ImplClickHdl, HyperLabel*, void); RoadmapItem* GetByIndex( ItemIndex _nItemIndex ); const RoadmapItem* GetByIndex( ItemIndex _nItemIndex ) const; diff --git a/svtools/inc/table/tablecontrol.hxx b/svtools/inc/table/tablecontrol.hxx index 4f6f2891a956..761f4948a8af 100644 --- a/svtools/inc/table/tablecontrol.hxx +++ b/svtools/inc/table/tablecontrol.hxx @@ -165,7 +165,7 @@ namespace svt { namespace table private: - DECL_DLLPRIVATE_LINK_TYPED( ImplSelectHdl, LinkParamNone*, void ); + DECL_DLLPRIVATE_LINK( ImplSelectHdl, LinkParamNone*, void ); private: TableControl( const TableControl& ) = delete; diff --git a/svtools/qa/unit/GraphicObjectTest.cxx b/svtools/qa/unit/GraphicObjectTest.cxx index 88041df09bd8..43cf3b7d491f 100644 --- a/svtools/qa/unit/GraphicObjectTest.cxx +++ b/svtools/qa/unit/GraphicObjectTest.cxx @@ -52,7 +52,7 @@ public: } private: - DECL_LINK_TYPED(getLinkStream, const GraphicObject*, SvStream*); + DECL_LINK(getLinkStream, const GraphicObject*, SvStream*); private: CPPUNIT_TEST_SUITE(GraphicObjectTest); @@ -73,7 +73,7 @@ const Graphic lcl_loadGraphic(const rtl::OUString &rUrl) return Graphic(aImage.GetBitmapEx()); } -IMPL_LINK_NOARG_TYPED(GraphicObjectTest, getLinkStream, const GraphicObject*, SvStream*) +IMPL_LINK_NOARG(GraphicObjectTest, getLinkStream, const GraphicObject*, SvStream*) { return GRFMGR_AUTOSWAPSTREAM_LINK; } diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 5245edcb1cd1..dc22ff3a391d 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1285,7 +1285,7 @@ sal_uInt16 BrowseBox::FrozenColCount() const } -IMPL_LINK_TYPED(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) +IMPL_LINK(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) { if ( pBar->GetDelta() == 0 ) @@ -1304,7 +1304,7 @@ IMPL_LINK_TYPED(BrowseBox, ScrollHdl, ScrollBar*, pBar, void) } -IMPL_LINK_NOARG_TYPED(BrowseBox, EndScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(BrowseBox, EndScrollHdl, ScrollBar*, void) { if ( getDataWindow()->bNoScrollBack ) @@ -1315,7 +1315,7 @@ IMPL_LINK_NOARG_TYPED(BrowseBox, EndScrollHdl, ScrollBar*, void) } -IMPL_LINK_TYPED( BrowseBox, StartDragHdl, HeaderBar*, pBar, void ) +IMPL_LINK( BrowseBox, StartDragHdl, HeaderBar*, pBar, void ) { pBar->SetDragSize( pDataWin->GetOutputSizePixel().Height() ); } diff --git a/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx index ceb5c3acf2f4..51f0c0e45d57 100644 --- a/svtools/source/brwbox/datwin.cxx +++ b/svtools/source/brwbox/datwin.cxx @@ -483,7 +483,7 @@ void BrowserDataWin::MouseMove( const MouseEvent& rEvt ) } -IMPL_LINK_NOARG_TYPED(BrowserDataWin, RepeatedMouseMove, Timer *, void) +IMPL_LINK_NOARG(BrowserDataWin, RepeatedMouseMove, Timer *, void) { GetParent()->MouseMove( BrowserMouseEvent( this, aRepeatEvt ) ); } diff --git a/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx index 266349b8434b..e8d0f8e774e8 100644 --- a/svtools/source/brwbox/datwin.hxx +++ b/svtools/source/brwbox/datwin.hxx @@ -134,7 +134,7 @@ public: virtual void Command( const CommandEvent& rEvt ) override; virtual void MouseButtonDown( const MouseEvent& rEvt ) override; virtual void MouseMove( const MouseEvent& rEvt ) override; - DECL_LINK_TYPED( RepeatedMouseMove, Timer *, void ); + DECL_LINK( RepeatedMouseMove, Timer *, void ); virtual void MouseButtonUp( const MouseEvent& rEvt ) override; virtual void KeyInput( const KeyEvent& rEvt ) override; diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 9bdd524f3af5..0271ff821527 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -70,7 +70,7 @@ namespace svt GetComboBox().SetModifyHdl( LINK(this, ComboBoxCellController, ModifyHdl) ); } - IMPL_LINK_NOARG_TYPED(ComboBoxCellController, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(ComboBoxCellController, ModifyHdl, Edit&, void) { callModifyHdl(); } @@ -208,7 +208,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(ListBoxCellController, ListBoxSelectHdl, ListBox&, void) + IMPL_LINK_NOARG(ListBoxCellController, ListBoxSelectHdl, ListBox&, void) { callModifyHdl(); } @@ -252,7 +252,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(CheckBoxControl, OnClick, Button*, void) + IMPL_LINK_NOARG(CheckBoxControl, OnClick, Button*, void) { m_aClickLink.Call(pBox); m_aModifyLink.Call(nullptr); @@ -351,7 +351,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(CheckBoxCellController, ModifyHdl, LinkParamNone*, void) + IMPL_LINK_NOARG(CheckBoxCellController, ModifyHdl, LinkParamNone*, void) { callModifyHdl(); } @@ -441,7 +441,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditCellController, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(EditCellController, ModifyHdl, Edit&, void) { callModifyHdl(); } @@ -497,7 +497,7 @@ namespace svt return GetSpinWindow().IsModified(); } - IMPL_LINK_NOARG_TYPED(SpinCellController, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(SpinCellController, ModifyHdl, Edit&, void) { callModifyHdl(); } diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index f56e06c527ba..be82911c6cbb 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -249,7 +249,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditBrowseBox, StartEditHdl, void*, void) + IMPL_LINK_NOARG(EditBrowseBox, StartEditHdl, void*, void) { nStartEvent = nullptr; if (IsEditing()) @@ -1069,7 +1069,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditBrowseBox, EndEditHdl, void*, void) + IMPL_LINK_NOARG(EditBrowseBox, EndEditHdl, void*, void) { nEndEvent = nullptr; @@ -1079,7 +1079,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditBrowseBox, ModifyHdl, LinkParamNone*, void) + IMPL_LINK_NOARG(EditBrowseBox, ModifyHdl, LinkParamNone*, void) { if (nCellModifiedEvent) Application::RemoveUserEvent(nCellModifiedEvent); @@ -1087,7 +1087,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(EditBrowseBox, CellModifiedHdl, void*, void) + IMPL_LINK_NOARG(EditBrowseBox, CellModifiedHdl, void*, void) { nCellModifiedEvent = nullptr; CellModified(); diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index 1f8eb4361311..12dda23476ab 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -97,7 +97,7 @@ public: void SettingsChanged(); bool GetAutoDetectSystemHC() {return m_bAutoDetectSystemHC;} - DECL_LINK_TYPED( DataChangedEventListener, VclSimpleEvent&, void ); + DECL_LINK( DataChangedEventListener, VclSimpleEvent&, void ); void ImplUpdateApplicationSettings(); }; @@ -335,7 +335,7 @@ void ColorConfig_Impl::SettingsChanged() NotifyListeners(0); } -IMPL_LINK_TYPED( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) +IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) { if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index f800ff6f3584..96e61e566572 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -130,7 +130,7 @@ public: static void LockBroadcast(); static void UnlockBroadcast(); - DECL_LINK_TYPED( DataChangedEventListener, VclSimpleEvent&, void ); + DECL_LINK( DataChangedEventListener, VclSimpleEvent&, void ); }; uno::Sequence< OUString> ExtendedColorConfig_Impl::GetPropertyNames(const OUString& rScheme) @@ -526,7 +526,7 @@ void ExtendedColorConfig_Impl::UnlockBroadcast() m_bLockBroadcast = false; } -IMPL_LINK_TYPED( ExtendedColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) +IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) { if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) { diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 3edd360176c2..82df75ef8f51 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -202,7 +202,7 @@ public: const Reference< XCommandEnvironment >& GetCommandEnvironment() const { return mxCmdEnv; } - DECL_LINK_TYPED(ResetQuickSearch_Impl, Timer *, void); + DECL_LINK(ResetQuickSearch_Impl, Timer *, void); virtual VclPtr<PopupMenu> CreateContextMenu() override; virtual void ExecuteContextMenuAction( sal_uInt16 nSelectedPopentry ) override; @@ -405,7 +405,7 @@ public: void onTimeout(); protected: - DECL_LINK_TYPED( SelectionMultiplexer, SvTreeListBox*, void ); + DECL_LINK( SelectionMultiplexer, SvTreeListBox*, void ); // IEnumerationResultHandler overridables virtual void enumerationDone( ::svt::EnumerationResult eResult ) override; @@ -554,7 +554,7 @@ void ViewTabListBox_Impl::dispose() } -IMPL_LINK_NOARG_TYPED(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void) +IMPL_LINK_NOARG(ViewTabListBox_Impl, ResetQuickSearch_Impl, Timer *, void) { ::osl::MutexGuard aGuard( maMutex ); @@ -1258,7 +1258,7 @@ void SvtFileView::EndInplaceEditing() return mpImpl->EndEditing(); } -IMPL_LINK_TYPED( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar, void ) { DBG_ASSERT( pBar, "no headerbar" ); sal_uInt16 nItemID = pBar->GetCurItemId(); @@ -1300,7 +1300,7 @@ IMPL_LINK_TYPED( SvtFileView, HeaderSelect_Impl, HeaderBar*, pBar, void ) } -IMPL_LINK_TYPED( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) +IMPL_LINK( SvtFileView, HeaderEndDrag_Impl, HeaderBar*, pBar, void ) { if ( !pBar->IsItemMode() ) { @@ -1717,7 +1717,7 @@ void SvtFileView_Impl::FilterFolderContent_Impl( const OUString &rFilter ) } -IMPL_LINK_TYPED( SvtFileView_Impl, SelectionMultiplexer, SvTreeListBox*, _pSource, void ) +IMPL_LINK( SvtFileView_Impl, SelectionMultiplexer, SvTreeListBox*, _pSource, void ) { if (!mnSuspendSelectCallback) m_aSelectHandler.Call( _pSource ); diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index b83ef89724c4..243428181aa6 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -217,14 +217,14 @@ class SvxIconChoiceCtrl_Impl void ResetVirtSize(); void CheckScrollBars(); - DECL_LINK_TYPED( ScrollUpDownHdl, ScrollBar*, void ); - DECL_LINK_TYPED( ScrollLeftRightHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EditTimeoutHdl, Idle *, void); - DECL_LINK_TYPED( UserEventHdl, void*, void ); - DECL_LINK_TYPED( AutoArrangeHdl, Idle*, void ); - DECL_LINK_TYPED( DocRectChangedHdl, Idle*, void ); - DECL_LINK_TYPED( VisRectChangedHdl, Idle*, void ); - DECL_LINK_TYPED( CallSelectHdlHdl, Idle*, void ); + DECL_LINK( ScrollUpDownHdl, ScrollBar*, void ); + DECL_LINK( ScrollLeftRightHdl, ScrollBar*, void ); + DECL_LINK( EditTimeoutHdl, Idle *, void); + DECL_LINK( UserEventHdl, void*, void ); + DECL_LINK( AutoArrangeHdl, Idle*, void ); + DECL_LINK( DocRectChangedHdl, Idle*, void ); + DECL_LINK( VisRectChangedHdl, Idle*, void ); + DECL_LINK( CallSelectHdlHdl, Idle*, void ); void AdjustScrollBars(); void PositionScrollBars( long nRealWidth, long nRealHeight ); @@ -302,7 +302,7 @@ class SvxIconChoiceCtrl_Impl void VisRectChanged() { aVisRectChangedIdle.Start(); } void SetOrigin( const Point& ); - DECL_LINK_TYPED(TextEditEndedHdl, LinkParamNone*, void); + DECL_LINK(TextEditEndedHdl, LinkParamNone*, void); void ShowFocus ( Rectangle& rRect ); void DrawFocusRect(vcl::RenderContext& rRenderContext); diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index c51f0f2815c7..62d7d7f03714 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -64,9 +64,9 @@ class IcnViewEdit_Impl : public MultiLineEdit bool bGrabFocus; void CallCallBackHdl_Impl(); - DECL_LINK_TYPED(Timeout_Impl, Idle *, void); - DECL_LINK_TYPED( ReturnHdl_Impl, Accelerator&, void ); - DECL_LINK_TYPED( EscapeHdl_Impl, Accelerator&, void ); + DECL_LINK(Timeout_Impl, Idle *, void); + DECL_LINK( ReturnHdl_Impl, Accelerator&, void ); + DECL_LINK( EscapeHdl_Impl, Accelerator&, void ); public: @@ -240,7 +240,7 @@ void SvxIconChoiceCtrl_Impl::SetStyle( WinBits nWinStyle ) } } -IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar, void ) { StopEntryEditing(); // arrow up: delta=-1; arrow down: delta=+1 @@ -248,7 +248,7 @@ IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollUpDownHdl, ScrollBar*, pScrollBar bEndScrollInvalidate = true; } -IMPL_LINK_TYPED( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( SvxIconChoiceCtrl_Impl, ScrollLeftRightHdl, ScrollBar*, pScrollBar, void ) { StopEntryEditing(); // arrow left: delta=-1; arrow right: delta=+1 @@ -2654,18 +2654,18 @@ void SvxIconChoiceCtrl_Impl::ClearSelectedRectList() aSelectedRectList.clear(); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, AutoArrangeHdl, Idle *, void) { aAutoArrangeIdle.Stop(); Arrange( IsAutoArrange(), 0, 0 ); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, VisRectChangedHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, VisRectChangedHdl, Idle *, void) { aVisRectChangedIdle.Stop(); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, DocRectChangedHdl, Idle *, void) { aDocRectChangedIdle.Stop(); } @@ -2678,7 +2678,7 @@ bool SvxIconChoiceCtrl_Impl::IsTextHit( SvxIconChoiceCtrlEntry* pEntry, const Po return false; } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, EditTimeoutHdl, Idle *, void) { SvxIconChoiceCtrlEntry* pEntry = GetCurEntry(); if( bEntryEditingEnabled && pEntry && @@ -2857,7 +2857,7 @@ bool SvxIconChoiceCtrl_Impl::IsMnemonicChar( sal_Unicode cChar, sal_uLong& rPos } -IMPL_LINK_TYPED(SvxIconChoiceCtrl_Impl, UserEventHdl, void*, nId, void ) +IMPL_LINK(SvxIconChoiceCtrl_Impl, UserEventHdl, void*, nId, void ) { if( nId == EVENTID_ADJUST_SCROLLBARS ) { @@ -2923,7 +2923,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry ) LINK( this, SvxIconChoiceCtrl_Impl, TextEditEndedHdl ) ); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, TextEditEndedHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, TextEditEndedHdl, LinkParamNone*, void) { DBG_ASSERT(pEdit,"TextEditEnded: pEdit not set"); if( !pEdit ) @@ -3079,19 +3079,19 @@ void IcnViewEdit_Impl::CallCallBackHdl_Impl() } } -IMPL_LINK_NOARG_TYPED(IcnViewEdit_Impl, Timeout_Impl, Idle *, void) +IMPL_LINK_NOARG(IcnViewEdit_Impl, Timeout_Impl, Idle *, void) { CallCallBackHdl_Impl(); } -IMPL_LINK_NOARG_TYPED( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator&, void ) +IMPL_LINK_NOARG( IcnViewEdit_Impl, ReturnHdl_Impl, Accelerator&, void ) { bCanceled = false; bGrabFocus = true; CallCallBackHdl_Impl(); } -IMPL_LINK_NOARG_TYPED( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator&, void ) +IMPL_LINK_NOARG( IcnViewEdit_Impl, EscapeHdl_Impl, Accelerator&, void ) { bCanceled = true; bGrabFocus = true; @@ -3499,7 +3499,7 @@ void SvxIconChoiceCtrl_Impl::CallSelectHandler( SvxIconChoiceCtrlEntry* ) aCallSelectHdlIdle.Start(); } -IMPL_LINK_NOARG_TYPED(SvxIconChoiceCtrl_Impl, CallSelectHdlHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIconChoiceCtrl_Impl, CallSelectHdlHdl, Idle *, void) { pHdlEntry = nullptr; pView->ClickIcon(); diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index 88a8cb3c11c2..ef479e626c5f 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -399,7 +399,7 @@ void SvSimpleTable::Command( const CommandEvent& rCEvt ) SvHeaderTabListBox::Command(rCEvt); } -IMPL_LINK_TYPED( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr, void) +IMPL_LINK( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { @@ -407,7 +407,7 @@ IMPL_LINK_TYPED( SvSimpleTable, StartDragHdl, HeaderBar*, pCtr, void) } } -IMPL_LINK_TYPED( SvSimpleTable, DragHdl, HeaderBar*, pCtr, void) +IMPL_LINK( SvSimpleTable, DragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { @@ -415,7 +415,7 @@ IMPL_LINK_TYPED( SvSimpleTable, DragHdl, HeaderBar*, pCtr, void) } } -IMPL_LINK_TYPED( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr, void) +IMPL_LINK( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { @@ -423,7 +423,7 @@ IMPL_LINK_TYPED( SvSimpleTable, EndDragHdl, HeaderBar*, pCtr, void) } } -IMPL_LINK_TYPED( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr, void) +IMPL_LINK( SvSimpleTable, HeaderBarClick, HeaderBar*, pCtr, void) { if(pCtr==aHeaderBar.get()) { @@ -473,7 +473,7 @@ sal_Int32 SvSimpleTable::ColCompare(SvTreeListEntry* pLeft,SvTreeListEntry* pRig return nCompare; } -IMPL_LINK_TYPED( SvSimpleTable, CompareHdl, const SvSortData&, rData, sal_Int32) +IMPL_LINK( SvSimpleTable, CompareHdl, const SvSortData&, rData, sal_Int32) { SvTreeListEntry* pLeft = const_cast<SvTreeListEntry*>(rData.pLeft); SvTreeListEntry* pRight = const_cast<SvTreeListEntry*>(rData.pRight); diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index d364a3b0b635..605d227997f5 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -298,7 +298,7 @@ void SvImpLBox::Clear() // Paint, navigate, scroll // ********************************************************************* -IMPL_LINK_NOARG_TYPED(SvImpLBox, EndScrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(SvImpLBox, EndScrollHdl, ScrollBar*, void) { if( nFlags & LBoxFlags::EndScrollSetVisSize ) { @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(SvImpLBox, EndScrollHdl, ScrollBar*, void) // handler for vertical scrollbar -IMPL_LINK_TYPED( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar, void ) +IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar, void ) { DBG_ASSERT(!bInVScrollHdl,"Scroll handler out-paces itself!"); long nDelta = pScrollBar->GetDelta(); @@ -710,7 +710,7 @@ void SvImpLBox::UpdateAll( bool bInvalidateCompleteView ) pView->Invalidate( GetVisibleArea() ); } -IMPL_LINK_TYPED( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar, void ) +IMPL_LINK( SvImpLBox, ScrollLeftRightHdl, ScrollBar *, pScrollBar, void ) { long nDelta = pScrollBar->GetDelta(); if( nDelta ) @@ -2888,7 +2888,7 @@ void SvImpLBox::BeginDrag() } } -IMPL_LINK_NOARG_TYPED(SvImpLBox, BeginDragHdl, Idle *, void) +IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl, Idle *, void) { pView->StartDrag( 0, aAsyncBeginDragPos ); } @@ -3100,7 +3100,7 @@ void SvImpLBox::SetCurEntry( SvTreeListEntry* pEntry ) pView->Select( pEntry ); } -IMPL_LINK_NOARG_TYPED(SvImpLBox, EditTimerCall, Idle *, void) +IMPL_LINK_NOARG(SvImpLBox, EditTimerCall, Idle *, void) { if( pView->IsInplaceEditingEnabled() ) { @@ -3311,7 +3311,7 @@ bool SvImpLBox::IsNowExpandable() const return IsExpandable() && !pView->IsExpanded( pCursor ); } -IMPL_LINK_TYPED(SvImpLBox, MyUserEvent, void*, pArg, void ) +IMPL_LINK(SvImpLBox, MyUserEvent, void*, pArg, void ) { nCurUserEvent = nullptr; if( !pArg ) diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 9b585688a856..e33e31a5e421 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -603,12 +603,12 @@ void SvHeaderTabListBox::Clear() m_aAccessibleChildren.clear(); } -IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, ScrollHdl_Impl, SvTreeListBox*, void) +IMPL_LINK_NOARG(SvHeaderTabListBox, ScrollHdl_Impl, SvTreeListBox*, void) { m_pImpl->m_pHeaderBar->SetOffset( -GetXOffset() ); } -IMPL_LINK_NOARG_TYPED(SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, void) +IMPL_LINK_NOARG(SvHeaderTabListBox, CreateAccessibleHdl_Impl, HeaderBar*, void) { vcl::Window* pParent = m_pImpl->m_pHeaderBar->GetAccessibleParentWindow(); DBG_ASSERT( pParent, "SvHeaderTabListBox..CreateAccessibleHdl_Impl - accessible parent not found" ); diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index d4b15b260652..ba4abb0cb895 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -151,13 +151,13 @@ void SvInplaceEdit2::Hide() } -IMPL_LINK_NOARG_TYPED(SvInplaceEdit2, ReturnHdl_Impl, Accelerator&, void) +IMPL_LINK_NOARG(SvInplaceEdit2, ReturnHdl_Impl, Accelerator&, void) { bCanceled = false; CallCallBackHdl_Impl(); } -IMPL_LINK_NOARG_TYPED(SvInplaceEdit2, EscapeHdl_Impl, Accelerator&, void) +IMPL_LINK_NOARG(SvInplaceEdit2, EscapeHdl_Impl, Accelerator&, void) { bCanceled = true; CallCallBackHdl_Impl(); @@ -205,7 +205,7 @@ void SvInplaceEdit2::LoseFocus() } } -IMPL_LINK_NOARG_TYPED(SvInplaceEdit2, Timeout_Impl, Idle *, void) +IMPL_LINK_NOARG(SvInplaceEdit2, Timeout_Impl, Idle *, void) { CallCallBackHdl_Impl(); } @@ -423,7 +423,7 @@ bool SvTreeListBox::IsEntryMnemonicsEnabled() const return mpImpl->m_bEntryMnemonicsEnabled; } -IMPL_LINK_TYPED( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry, SvTreeListEntry* ) +IMPL_LINK( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry, SvTreeListEntry* ) { return CloneEntry(pEntry); } @@ -943,7 +943,7 @@ void SvTreeListBox::EditText( const OUString& rStr, const Rectangle& rRect, rSel ); } -IMPL_LINK_NOARG_TYPED(SvTreeListBox, TextEditEndedHdl_Impl, SvInplaceEdit2&, void) +IMPL_LINK_NOARG(SvTreeListBox, TextEditEndedHdl_Impl, SvInplaceEdit2&, void) { if ( nImpFlags & SvTreeListBoxFlags::EDTEND_CALLED ) // avoid nesting return; @@ -1313,7 +1313,7 @@ void SvTreeListBox::RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ) SortLBoxes::get().erase( nVal ); } -IMPL_LINK_TYPED( SvTreeListBox, DragFinishHdl_Impl, sal_Int8, nAction, void ) +IMPL_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8, nAction, void ) { sal_uLong nVal = reinterpret_cast<sal_uLong>(this); std::set<sal_uLong> &rSortLBoxes = SortLBoxes::get(); @@ -1711,7 +1711,7 @@ const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry return pItem->GetBitmap1( ); } -IMPL_LINK_TYPED( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData, void ) +IMPL_LINK( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData, void ) { pHdlEntry = pData->GetActEntry(); CheckButtonHdl(); @@ -3497,7 +3497,7 @@ void SvTreeListBox::RequestHelp( const HelpEvent& rHEvt ) Control::RequestHelp( rHEvt ); } -IMPL_LINK_TYPED( SvTreeListBox, DefaultCompare, const SvSortData&, rData, sal_Int32 ) +IMPL_LINK( SvTreeListBox, DefaultCompare, const SvSortData&, rData, sal_Int32 ) { const SvTreeListEntry* pLeft = rData.pLeft; const SvTreeListEntry* pRight = rData.pRight; diff --git a/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx index 5eeea8a103e9..1038b9090678 100644 --- a/svtools/source/control/asynclink.cxx +++ b/svtools/source/control/asynclink.cxx @@ -63,7 +63,7 @@ AsynchronLink::~AsynchronLink() delete _pMutex; } -IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_Idle, Idle*, void ) +IMPL_LINK_NOARG( AsynchronLink, HandleCall_Idle, Idle*, void ) { if( _pMutex ) _pMutex->acquire(); _nEventId = nullptr; @@ -71,7 +71,7 @@ IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_Idle, Idle*, void ) Call_Impl( _pArg ); } -IMPL_LINK_NOARG_TYPED( AsynchronLink, HandleCall_PostUserEvent, void*, void ) +IMPL_LINK_NOARG( AsynchronLink, HandleCall_PostUserEvent, void*, void ) { HandleCall_Idle(nullptr); } diff --git a/svtools/source/control/autocmpledit.cxx b/svtools/source/control/autocmpledit.cxx index 0ebcac4364db..99f11b27194a 100644 --- a/svtools/source/control/autocmpledit.cxx +++ b/svtools/source/control/autocmpledit.cxx @@ -28,7 +28,7 @@ void AutocompleteEdit::ClearEntries() m_aMatching.clear(); } -IMPL_LINK_NOARG_TYPED(AutocompleteEdit, AutoCompleteHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(AutocompleteEdit, AutoCompleteHdl_Impl, Edit&, void) { if( Application::AnyInput( VclInputFlags::KEYBOARD ) ) return; diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx index f743b2fc56ba..7ed6d4671ea0 100644 --- a/svtools/source/control/breadcrumb.cxx +++ b/svtools/source/control/breadcrumb.cxx @@ -282,7 +282,7 @@ bool Breadcrumb::showField( unsigned int nIndex, unsigned int nWidthMax ) return true; } -IMPL_LINK_TYPED( Breadcrumb, ClickLinkHdl, FixedHyperlink&, rLink, void ) +IMPL_LINK( Breadcrumb, ClickLinkHdl, FixedHyperlink&, rLink, void ) { m_sClickedURL = rLink.GetURL(); m_aClickHdl.Call( this ); diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index 2f8abea7738a..0ef2b5e22886 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -1298,7 +1298,7 @@ void Calendar::ImplEndTracking( bool bCancel ) } } -IMPL_LINK_NOARG_TYPED( Calendar, ScrollHdl, Timer*, void ) +IMPL_LINK_NOARG( Calendar, ScrollHdl, Timer*, void ) { bool bPrevIn = (mnDragScrollHitTest & CALENDAR_HITTEST_PREV) != 0; bool bNextIn = (mnDragScrollHitTest & CALENDAR_HITTEST_NEXT) != 0; @@ -2175,7 +2175,7 @@ void CalendarField::dispose() DateField::dispose(); } -IMPL_LINK_TYPED( CalendarField, ImplSelectHdl, Calendar*, pCalendar, void ) +IMPL_LINK( CalendarField, ImplSelectHdl, Calendar*, pCalendar, void ) { if ( !pCalendar->IsTravelSelect() ) { @@ -2192,7 +2192,7 @@ IMPL_LINK_TYPED( CalendarField, ImplSelectHdl, Calendar*, pCalendar, void ) } } -IMPL_LINK_TYPED( CalendarField, ImplClickHdl, Button*, pButton, void ) +IMPL_LINK( CalendarField, ImplClickHdl, Button*, pButton, void ) { PushButton* pBtn = static_cast<PushButton*>(pButton); mpFloatWin->EndPopupMode(); @@ -2220,7 +2220,7 @@ IMPL_LINK_TYPED( CalendarField, ImplClickHdl, Button*, pButton, void ) } } -IMPL_LINK_NOARG_TYPED(CalendarField, ImplPopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(CalendarField, ImplPopupModeEndHdl, FloatingWindow*, void) { EndDropDown(); GrabFocus(); diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index dd4b05c47ce5..9164832a321b 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -172,7 +172,7 @@ void FileControl::Resize() } -IMPL_LINK_NOARG_TYPED(FileControl, ButtonHdl, Button*, void) +IMPL_LINK_NOARG(FileControl, ButtonHdl, Button*, void) { ImplBrowseFile( ); } diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 68c5d50f96de..c2218b123b37 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -106,7 +106,7 @@ class SvtMatchContext_Impl: public salhelper::Thread css::uno::Reference< css::ucb::XCommandProcessor > processor_; sal_Int32 commandId_; - DECL_LINK_TYPED( Select_Impl, void*, void ); + DECL_LINK( Select_Impl, void*, void ); virtual ~SvtMatchContext_Impl() override; virtual void execute() override; @@ -207,7 +207,7 @@ void SvtMatchContext_Impl::execute( ) // Cancellable does not discard the information gained so far, it // inserts all collected completions into the listbox. -IMPL_LINK_NOARG_TYPED( SvtMatchContext_Impl, Select_Impl, void*, void ) +IMPL_LINK_NOARG( SvtMatchContext_Impl, Select_Impl, void*, void ) { // avoid recursion through cancel button { @@ -1093,7 +1093,7 @@ bool SvtURLBox::PreNotify( NotifyEvent& rNEvt ) return ComboBox::PreNotify( rNEvt ); } -IMPL_LINK_NOARG_TYPED(SvtURLBox, AutoCompleteHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl, Edit&, void) { TryAutoComplete(); } diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index 9eba20679a18..640e98da9de0 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -635,7 +635,7 @@ bool ORoadmap::PreNotify(NotifyEvent& _rNEvt) return Window::PreNotify( _rNEvt ); } -IMPL_LINK_TYPED(ORoadmap, ImplClickHdl, HyperLabel*, CurHyperLabel, void) +IMPL_LINK(ORoadmap, ImplClickHdl, HyperLabel*, CurHyperLabel, void) { SelectRoadmapItemByID( CurHyperLabel->GetID() ); } diff --git a/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx index 6691a238b9f9..ae3484defafd 100644 --- a/svtools/source/control/scrwin.cxx +++ b/svtools/source/control/scrwin.cxx @@ -112,7 +112,7 @@ Size ScrollableWindow::GetOutputSizePixel() const } -IMPL_LINK_TYPED( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) +IMPL_LINK( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) { // notify the start of scrolling, if not already scrolling if ( !bScrolling ) @@ -135,7 +135,7 @@ IMPL_LINK_TYPED( ScrollableWindow, EndScrollHdl, ScrollBar *, pScroll, void ) } -IMPL_LINK_TYPED( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll, void ) +IMPL_LINK( ScrollableWindow, ScrollHdl, ScrollBar *, pScroll, void ) { // notify the start of scrolling, if not already scrolling if ( !bScrolling ) diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 5d6c352137dd..2d7c5d83c96d 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -388,8 +388,8 @@ private: Idle maLoseFocusIdle; bool mbPostEvt; - DECL_LINK_TYPED( ImplEndEditHdl, void*, void ); - DECL_LINK_TYPED( ImplEndTimerHdl, Idle*, void ); + DECL_LINK( ImplEndEditHdl, void*, void ); + DECL_LINK( ImplEndTimerHdl, Idle*, void ); public: TabBarEdit( TabBar* pParent, WinBits nWinStyle = 0 ); @@ -451,7 +451,7 @@ void TabBarEdit::LoseFocus() Edit::LoseFocus(); } -IMPL_LINK_TYPED( TabBarEdit, ImplEndEditHdl, void*, pCancel, void ) +IMPL_LINK( TabBarEdit, ImplEndEditHdl, void*, pCancel, void ) { ResetPostEvent(); maLoseFocusIdle.Stop(); @@ -468,7 +468,7 @@ IMPL_LINK_TYPED( TabBarEdit, ImplEndEditHdl, void*, pCancel, void ) GetParent()->EndEditMode( pCancel != nullptr ); } -IMPL_LINK_NOARG_TYPED(TabBarEdit, ImplEndTimerHdl, Idle *, void) +IMPL_LINK_NOARG(TabBarEdit, ImplEndTimerHdl, Idle *, void) { if ( HasFocus() ) return; @@ -907,7 +907,7 @@ void TabBar::ImplShowPage( sal_uInt16 nPos ) } } -IMPL_LINK_TYPED( TabBar, ImplClickHdl, Button*, pButton, void ) +IMPL_LINK( TabBar, ImplClickHdl, Button*, pButton, void ) { ImplTabButton* pBtn = static_cast<ImplTabButton*>(pButton); EndEditMode(); @@ -944,7 +944,7 @@ IMPL_LINK_TYPED( TabBar, ImplClickHdl, Button*, pButton, void ) SetFirstPageId(GetPageId(nNewPos)); } -IMPL_LINK_NOARG_TYPED(TabBar, ImplAddClickHandler, Button*, void) +IMPL_LINK_NOARG(TabBar, ImplAddClickHandler, Button*, void) { AddTabClick(); } diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index 0d1578405d67..214416b3af1a 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -398,7 +398,7 @@ ToolbarMenuEntry* ToolbarMenu_Impl::implGetEntry( int nEntry ) const } -IMPL_LINK_NOARG_TYPED( ToolbarMenu, HighlightHdl, ValueSet*, void ) +IMPL_LINK_NOARG( ToolbarMenu, HighlightHdl, ValueSet*, void ) { mpImpl->notifyHighlightedEntry(); } diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 3cde3c617fe6..30484f470437 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -56,7 +56,7 @@ ToolbarMenuAcc::~ToolbarMenuAcc() } -IMPL_LINK_TYPED( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void ) { /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper * might have been destroyed by the previous VCLEventListener (if no AT tool diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx index 2e6c0d04f96e..2a164149e1c9 100644 --- a/svtools/source/control/toolbarmenuimp.hxx +++ b/svtools/source/control/toolbarmenuimp.hxx @@ -159,7 +159,7 @@ public: virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); private: EventListenerVector mxEventListeners; diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index 32311ec085b2..7b5cfbaca102 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1129,7 +1129,7 @@ bool ValueSet::ImplHasAccessibleListeners() return( pAcc && pAcc->HasAccessibleListeners() ); } -IMPL_LINK_TYPED( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar, void ) +IMPL_LINK( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar, void ) { sal_uInt16 nNewFirstLine = (sal_uInt16)pScrollBar->GetThumbPos(); if ( nNewFirstLine != mnFirstLine ) @@ -1140,7 +1140,7 @@ IMPL_LINK_TYPED( ValueSet,ImplScrollHdl, ScrollBar*, pScrollBar, void ) } } -IMPL_LINK_NOARG_TYPED(ValueSet, ImplTimerHdl, Timer *, void) +IMPL_LINK_NOARG(ValueSet, ImplTimerHdl, Timer *, void) { ImplTracking( GetPointerPosPixel(), true ); } diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index 837a13cf986f..893ccb7b7252 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -247,7 +247,7 @@ void PlaceEditDialog::UpdateLabel( ) } } -IMPL_LINK_TYPED( PlaceEditDialog, OKHdl, Button*, /*pBtn*/, void) +IMPL_LINK( PlaceEditDialog, OKHdl, Button*, /*pBtn*/, void) { if ( m_xCurrentDetails.get() ) { @@ -282,13 +282,13 @@ IMPL_LINK_TYPED( PlaceEditDialog, OKHdl, Button*, /*pBtn*/, void) } } -IMPL_LINK_TYPED( PlaceEditDialog, DelHdl, Button*, /*pButton*/, void) +IMPL_LINK( PlaceEditDialog, DelHdl, Button*, /*pButton*/, void) { // ReUsing existing symbols... EndDialog( RET_NO ); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditHdl, DetailsContainer*, void ) +IMPL_LINK_NOARG( PlaceEditDialog, EditHdl, DetailsContainer*, void ) { UpdateLabel( ); @@ -297,18 +297,18 @@ IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditHdl, DetailsContainer*, void ) m_pBTOk->Enable( !sName.isEmpty( ) && !sUrl.isEmpty( ) ); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, ModifyHdl, Edit&, void ) +IMPL_LINK_NOARG( PlaceEditDialog, ModifyHdl, Edit&, void ) { EditHdl(nullptr); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditLabelHdl, Edit&, void ) +IMPL_LINK_NOARG( PlaceEditDialog, EditLabelHdl, Edit&, void ) { bLabelChanged = true; EditHdl(nullptr); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditUsernameHdl, Edit&, void ) +IMPL_LINK_NOARG( PlaceEditDialog, EditUsernameHdl, Edit&, void ) { for ( std::vector< std::shared_ptr< DetailsContainer > >::iterator it = m_aDetailsContainers.begin( ); it != m_aDetailsContainers.end( ); ++it ) @@ -320,7 +320,7 @@ IMPL_LINK_NOARG_TYPED( PlaceEditDialog, EditUsernameHdl, Edit&, void ) EditHdl(nullptr); } -IMPL_LINK_NOARG_TYPED( PlaceEditDialog, SelectTypeHdl, ListBox&, void ) +IMPL_LINK_NOARG( PlaceEditDialog, SelectTypeHdl, ListBox&, void ) { if ( m_pLBServerType->GetSelectEntry() == "--------------------" ) { diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 2e46c3438c61..eccf31907481 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -76,7 +76,7 @@ void DetailsContainer::notifyChange( ) m_aChangeHdl.Call( this ); } -IMPL_LINK_NOARG_TYPED( DetailsContainer, ValueChangeHdl, Edit&, void ) +IMPL_LINK_NOARG( DetailsContainer, ValueChangeHdl, Edit&, void ) { notifyChange( ); } @@ -184,7 +184,7 @@ bool DavDetailsContainer::verifyScheme( const OUString& rScheme ) return bValid; } -IMPL_LINK_TYPED( DavDetailsContainer, ToggledDavsHdl, CheckBox&, rCheckBox, void ) +IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, CheckBox&, rCheckBox, void ) { // Change default port if needed bool bCheckedDavs = rCheckBox.IsChecked(); @@ -396,7 +396,7 @@ void CmisDetailsContainer::selectRepository( ) } } -IMPL_LINK_NOARG_TYPED( CmisDetailsContainer, RefreshReposHdl, Button*, void ) +IMPL_LINK_NOARG( CmisDetailsContainer, RefreshReposHdl, Button*, void ) { Reference< XComponentContext > xContext = ::comphelper::getProcessComponentContext(); Reference< XPasswordContainer2 > xMasterPasswd = PasswordContainer::create( xContext ); @@ -490,7 +490,7 @@ IMPL_LINK_NOARG_TYPED( CmisDetailsContainer, RefreshReposHdl, Button*, void ) {} } -IMPL_LINK_NOARG_TYPED( CmisDetailsContainer, SelectRepoHdl, ListBox&, void ) +IMPL_LINK_NOARG( CmisDetailsContainer, SelectRepoHdl, ListBox&, void ) { selectRepository( ); } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index e82d2a4b9a59..c8a94315a120 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -777,7 +777,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_TYPED(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar, void) + IMPL_LINK(AddressBookSourceDialog, OnFieldScroll, ScrollBar*, _pScrollBar, void) { implScrollFields( _pScrollBar->GetThumbPos(), true, true ); } @@ -972,7 +972,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_TYPED(AddressBookSourceDialog, OnFieldSelect, ListBox&, _rListbox, void) + IMPL_LINK(AddressBookSourceDialog, OnFieldSelect, ListBox&, _rListbox, void) { // the index of the affected list box in our array sal_IntPtr nListBoxIndex = reinterpret_cast<sal_IntPtr>(_rListbox.GetEntryData(0)); @@ -1097,7 +1097,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_NOARG_TYPED(AddressBookSourceDialog, OnDelayedInitialize, void*, void) + IMPL_LINK_NOARG(AddressBookSourceDialog, OnDelayedInitialize, void*, void) { // load the initial data from the configuration loadConfiguration(); @@ -1110,7 +1110,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_TYPED(AddressBookSourceDialog, OnComboSelect, ComboBox&, _rBox, void) + IMPL_LINK(AddressBookSourceDialog, OnComboSelect, ComboBox&, _rBox, void) { if (&_rBox == m_pDatasource) resetTables(); @@ -1119,14 +1119,14 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_STATIC_LINK_TYPED( + IMPL_STATIC_LINK( AddressBookSourceDialog, OnComboGetFocus, Control&, _rBox, void) { static_cast<ComboBox&>(_rBox).SaveValue(); } - IMPL_LINK_TYPED(AddressBookSourceDialog, OnComboLoseFocus, Control&, rControl, void) + IMPL_LINK(AddressBookSourceDialog, OnComboLoseFocus, Control&, rControl, void) { ComboBox* _pBox = static_cast<ComboBox*>(&rControl); if ( _pBox->IsValueChangedFromSaved() ) @@ -1139,7 +1139,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_NOARG_TYPED(AddressBookSourceDialog, OnOkClicked, Button*, void) + IMPL_LINK_NOARG(AddressBookSourceDialog, OnOkClicked, Button*, void) { OUString sSelectedDS = lcl_getSelectedDataSource(*m_pDatasource); if ( m_pImpl->bWorkingPersistent ) @@ -1165,7 +1165,7 @@ void AssignmentPersistentData::ImplCommit() } - IMPL_LINK_NOARG_TYPED(AddressBookSourceDialog, OnAdministrateDatasources, Button*, void) + IMPL_LINK_NOARG(AddressBookSourceDialog, OnAdministrateDatasources, Button*, void) { // create the dialog object Reference< XExecutableDialog > xAdminDialog; diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 2608486fc8c6..11075849cf3a 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -281,7 +281,7 @@ void PrinterSetupDialog::ImplSetInfo() } -IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplStatusHdl, Timer *, void) { QueueInfo aInfo; ImplPrnDlgUpdateQueueInfo(m_pLbName, aInfo); @@ -289,7 +289,7 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplStatusHdl, Timer *, void) } -IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) { if ( !mpTempPrinter ) mpTempPrinter = VclPtr<Printer>::Create( mpPrinter->GetJobSetup() ); @@ -297,7 +297,7 @@ IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplPropertiesHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void) +IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void) { mpTempPrinter = ImplPrnDlgListBoxSelect(m_pLbName, m_pBtnProperties, mpPrinter, mpTempPrinter ); diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index c5b3f0025129..fc8e6e30bcf6 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -80,20 +80,20 @@ public: ModalDialog::dispose(); } private: - DECL_LINK_TYPED(hdlYes, Button*, void); - DECL_LINK_TYPED(hdlNo, Button*, void); + DECL_LINK(hdlYes, Button*, void); + DECL_LINK(hdlNo, Button*, void); VclPtr<vcl::Window> reason_; VclPtr<PushButton> btnYes_; VclPtr<PushButton> btnNo_; }; -IMPL_LINK_NOARG_TYPED(RestartDialog, hdlYes, Button*, void) +IMPL_LINK_NOARG(RestartDialog, hdlYes, Button*, void) { EndDialog(RET_OK); } -IMPL_LINK_NOARG_TYPED(RestartDialog, hdlNo, Button*, void) +IMPL_LINK_NOARG(RestartDialog, hdlNo, Button*, void) { EndDialog(); } diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 377bb27527ac..5b38e6403aa4 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -430,7 +430,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(RoadmapWizard, OnRoadmapItemSelected, LinkParamNone*, void) + IMPL_LINK_NOARG(RoadmapWizard, OnRoadmapItemSelected, LinkParamNone*, void) { RoadmapTypes::ItemId nCurItemId = m_pImpl->pRoadmap->GetCurrentRoadmapItemID(); diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index c7cab7046020..dde11dced207 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -399,7 +399,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(OWizardMachine, OnFinish, Button*, void) + IMPL_LINK_NOARG(OWizardMachine, OnFinish, Button*, void) { if ( isTravelingSuspended() ) return; @@ -610,7 +610,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(OWizardMachine, OnPrevPage, Button*, void) + IMPL_LINK_NOARG(OWizardMachine, OnPrevPage, Button*, void) { if ( isTravelingSuspended() ) return; @@ -619,7 +619,7 @@ namespace svt } - IMPL_LINK_NOARG_TYPED(OWizardMachine, OnNextPage, Button*, void) + IMPL_LINK_NOARG(OWizardMachine, OnNextPage, Button*, void) { if ( isTravelingSuspended() ) return; diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index f04fcb9da442..f8b04d233568 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -119,7 +119,7 @@ void WizardDialog::queue_resize(StateChangedType /*eReason*/) maWizardLayoutIdle.Start(); } -IMPL_LINK_NOARG_TYPED( WizardDialog, ImplHandleWizardLayoutTimerHdl, Idle*, void ) +IMPL_LINK_NOARG( WizardDialog, ImplHandleWizardLayoutTimerHdl, Idle*, void ) { ImplPosCtrls(); ImplPosTabPage(); diff --git a/svtools/source/filter/GraphicExportOptionsDialog.cxx b/svtools/source/filter/GraphicExportOptionsDialog.cxx index b8a9723218be..33fbeafde44a 100644 --- a/svtools/source/filter/GraphicExportOptionsDialog.cxx +++ b/svtools/source/filter/GraphicExportOptionsDialog.cxx @@ -62,7 +62,7 @@ void GraphicExportOptionsDialog::initialize() mSize100mm = mRenderer.getDocumentSizeIn100mm(mCurrentPage); } -IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, widthModifiedHandle, Edit&, void ) +IMPL_LINK_NOARG( GraphicExportOptionsDialog, widthModifiedHandle, Edit&, void ) { mResolution = mpWidth->GetValue() / getViewWidthInch(); @@ -70,7 +70,7 @@ IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, widthModifiedHandle, Edit&, v updateResolution(); } -IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, heightModifiedHandle, Edit&, void ) +IMPL_LINK_NOARG( GraphicExportOptionsDialog, heightModifiedHandle, Edit&, void ) { mResolution = mpHeight->GetValue() / getViewHeightInch(); @@ -78,7 +78,7 @@ IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, heightModifiedHandle, Edit&, updateResolution(); } -IMPL_LINK_NOARG_TYPED( GraphicExportOptionsDialog, resolutionModifiedHandle, Edit&, void ) +IMPL_LINK_NOARG( GraphicExportOptionsDialog, resolutionModifiedHandle, Edit&, void ) { mResolution = mpResolution->GetText().toInt32(); diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index 12c705af4481..9f965471dc24 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -977,20 +977,20 @@ void ExportDialog::dispose() |* stores values set in the ini-file |* \************************************************************************/ -IMPL_LINK_NOARG_TYPED(ExportDialog, SelectHdl, Edit&, void) +IMPL_LINK_NOARG(ExportDialog, SelectHdl, Edit&, void) { updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, SelectListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ExportDialog, SelectListBoxHdl, ListBox&, void) { updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdl, Button*, void) +IMPL_LINK_NOARG(ExportDialog, UpdateHdl, Button*, void) { updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeX, Edit&, void) +IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeX, Edit&, void) { double fRatio = static_cast< double >( maOriginalSize.Height ) / maOriginalSize.Width; @@ -1022,7 +1022,7 @@ IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeX, Edit&, void) updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) +IMPL_LINK_NOARG(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) { double fRatio = static_cast< double >( maOriginalSize.Width ) / maOriginalSize.Height; @@ -1054,7 +1054,7 @@ IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlMtfSizeY, Edit&, void) updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlNfResolution, Edit&, void) +IMPL_LINK_NOARG(ExportDialog, UpdateHdlNfResolution, Edit&, void) { sal_Int32 nResolution = mpNfResolution->GetValue(); if ( mpLbResolution->GetSelectEntryPos() == 0 ) // pixels / cm @@ -1067,13 +1067,13 @@ IMPL_LINK_NOARG_TYPED(ExportDialog, UpdateHdlNfResolution, Edit&, void) updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, SbCompressionUpdateHdl, Slider*, void) +IMPL_LINK_NOARG(ExportDialog, SbCompressionUpdateHdl, Slider*, void) { mpNfCompression->SetValue( mpSbCompression->GetThumbPos() ); updateControls(); } -IMPL_LINK_NOARG_TYPED(ExportDialog, OK, Button*, void) +IMPL_LINK_NOARG(ExportDialog, OK, Button*, void) { // writing config parameter diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 5a435b0b7372..ec9452239cfb 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -138,15 +138,15 @@ private: mxPage; - DECL_LINK_TYPED( UpdateHdl, Button*, void ); - DECL_LINK_TYPED( SelectListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectHdl, Edit&, void ); - DECL_LINK_TYPED( UpdateHdlMtfSizeX, Edit&, void ); - DECL_LINK_TYPED( UpdateHdlMtfSizeY, Edit&, void ); - DECL_LINK_TYPED( UpdateHdlNfResolution, Edit&, void ); - DECL_LINK_TYPED( SbCompressionUpdateHdl, Slider*, void ); - - DECL_LINK_TYPED( OK, Button*, void ); + DECL_LINK( UpdateHdl, Button*, void ); + DECL_LINK( SelectListBoxHdl, ListBox&, void ); + DECL_LINK( SelectHdl, Edit&, void ); + DECL_LINK( UpdateHdlMtfSizeX, Edit&, void ); + DECL_LINK( UpdateHdlMtfSizeY, Edit&, void ); + DECL_LINK( UpdateHdlNfResolution, Edit&, void ); + DECL_LINK( SbCompressionUpdateHdl, Slider*, void ); + + DECL_LINK( OK, Button*, void ); void setupSizeControls(); void createFilterOptions(); diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 4669f218fa65..6e637d4ac708 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -1259,7 +1259,7 @@ GraphicCacheEntry* GraphicCache::ImplGetCacheEntry( const GraphicObject& rObj ) return pRet; } -IMPL_LINK_TYPED( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer, void ) +IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer, void ) { pTimer->Stop(); diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index 88b6406e9dc5..eaffeb40d219 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -48,7 +48,7 @@ private: GraphicCacheEntry* ImplGetCacheEntry( const GraphicObject& rObj ); - DECL_LINK_TYPED( ReleaseTimeoutHdl, Timer*, void ); + DECL_LINK( ReleaseTimeoutHdl, Timer*, void ); public: diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 780acab62b26..3392814cc4d9 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1057,7 +1057,7 @@ void GraphicObject::SetSwapState() } } -IMPL_LINK_NOARG_TYPED(GraphicObject, ImplAutoSwapOutHdl, Timer *, void) +IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl, Timer *, void) { if( !IsSwappedOut() ) { diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx index 22821f794fcb..7a20d452590e 100644 --- a/svtools/source/hatchwindow/documentcloser.cxx +++ b/svtools/source/hatchwindow/documentcloser.cxx @@ -77,7 +77,7 @@ class MainThreadFrameCloserRequest : m_xFrame( xFrame ) {} - DECL_STATIC_LINK_TYPED( MainThreadFrameCloserRequest, worker, void*, void ); + DECL_STATIC_LINK( MainThreadFrameCloserRequest, worker, void*, void ); static void Start( MainThreadFrameCloserRequest* pRequest ); }; @@ -98,7 +98,7 @@ void MainThreadFrameCloserRequest::Start( MainThreadFrameCloserRequest* pMTReque } -IMPL_STATIC_LINK_TYPED( MainThreadFrameCloserRequest, worker, void*, p, void ) +IMPL_STATIC_LINK( MainThreadFrameCloserRequest, worker, void*, p, void ) { MainThreadFrameCloserRequest* pMTRequest = static_cast<MainThreadFrameCloserRequest*>(p); if ( pMTRequest ) diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 71a4fe34948e..b29b49d13756 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -148,9 +148,9 @@ private: std::vector< short > aContextBmpWidthVector; - DECL_LINK_TYPED(EditTimerCall, Idle *, void); + DECL_LINK(EditTimerCall, Idle *, void); - DECL_LINK_TYPED( BeginDragHdl, Idle*, void ); + DECL_LINK( BeginDragHdl, Idle*, void ); void InvalidateEntriesFrom( long nY ) const; bool IsLineVisible( long nY ) const; @@ -159,9 +159,9 @@ private: void DrawNet(vcl::RenderContext& rRenderContext); // ScrollBar-Handler - DECL_LINK_TYPED( ScrollUpDownHdl, ScrollBar*, void ); - DECL_LINK_TYPED( ScrollLeftRightHdl, ScrollBar*, void ); - DECL_LINK_TYPED( EndScrollHdl, ScrollBar*, void ); + DECL_LINK( ScrollUpDownHdl, ScrollBar*, void ); + DECL_LINK( ScrollLeftRightHdl, ScrollBar*, void ); + DECL_LINK( EndScrollHdl, ScrollBar*, void ); void SetNodeBmpYOffset( const Image& ); void SetNodeBmpTabDistance(); @@ -242,7 +242,7 @@ protected: void ShowVerSBar(); void StopUserEvent(); - DECL_LINK_TYPED( MyUserEvent, void*, void); + DECL_LINK( MyUserEvent, void*, void); public: SvImpLBox( SvTreeListBox* pView, SvTreeList*, WinBits nWinStyle ); diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index b9d37d9bcd0b..d99f46efdb39 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -115,7 +115,7 @@ public: class VCLXFileControl : public css::awt::XTextComponent, public css::awt::XTextLayoutConstrains, public VCLXWindow { protected: - DECL_LINK_TYPED(ModifyHdl, Edit&, void); + DECL_LINK(ModifyHdl, Edit&, void); void ModifyHdl(); TextListenerMultiplexer maTextListeners; diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index f476026a5b23..bec1e4f5a292 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -78,7 +78,7 @@ class AsyncAccelExec : public cppu::WeakImplHelper<css::lang::XEventListener> const css::uno::Reference< css::frame::XDispatch >& xDispatch, const css::util::URL& rURL); - DECL_LINK_TYPED(impl_ts_asyncCallback, LinkParamNone*, void); + DECL_LINK(impl_ts_asyncCallback, LinkParamNone*, void); }; @@ -456,7 +456,7 @@ void AsyncAccelExec::execAsync() m_aAsyncCallback.Post(); } -IMPL_LINK_NOARG_TYPED(AsyncAccelExec, impl_ts_asyncCallback, LinkParamNone*, void) +IMPL_LINK_NOARG(AsyncAccelExec, impl_ts_asyncCallback, LinkParamNone*, void) { if (m_xDispatch.is()) { diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index aa1f6043d94c..ea5e81845f6d 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -102,7 +102,7 @@ namespace svt } - IMPL_LINK_TYPED( DialogController, OnWindowEvent, VclWindowEvent&, _rEvent, void ) + IMPL_LINK( DialogController, OnWindowEvent, VclWindowEvent&, _rEvent, void ) { if ( m_pImpl->pEventFilter->payAttentionTo( _rEvent ) ) impl_updateAll( _rEvent ); diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx index 17361fcd095d..c2ac214ebb47 100644 --- a/svtools/source/misc/filechangedchecker.cxx +++ b/svtools/source/misc/filechangedchecker.cxx @@ -76,7 +76,7 @@ bool FileChangedChecker::hasFileChanged() return false; } -IMPL_LINK_NOARG_TYPED(FileChangedChecker, TimerHandler, Idle *, void) +IMPL_LINK_NOARG(FileChangedChecker, TimerHandler, Idle *, void) { // If the file has changed, then update the graphic in the doc OSL_TRACE("Timeout Called"); diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx index cb754802f351..b749400a0e26 100644 --- a/svtools/source/svrtf/svparser.cxx +++ b/svtools/source/svrtf/svparser.cxx @@ -615,7 +615,7 @@ void SvParser::BuildWhichTable( std::vector<sal_uInt16> &rWhichMap, } -IMPL_LINK_NOARG_TYPED( SvParser, NewDataRead, LinkParamNone*, void ) +IMPL_LINK_NOARG( SvParser, NewDataRead, LinkParamNone*, void ) { switch( eState ) { diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 8edd4b1c310a..5627b0ddd91c 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -640,7 +640,7 @@ namespace svt { namespace table } - IMPL_LINK_NOARG_TYPED(TableControl, ImplSelectHdl, LinkParamNone*, void) + IMPL_LINK_NOARG(TableControl, ImplSelectHdl, LinkParamNone*, void) { Select(); } diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 08a4d2927354..dacd04450f51 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -2379,7 +2379,7 @@ namespace svt { namespace table } - IMPL_LINK_NOARG_TYPED( TableControl_Impl, OnUpdateScrollbars, void*, void ) + IMPL_LINK_NOARG( TableControl_Impl, OnUpdateScrollbars, void*, void ) { // TODO: can't we simply use lcl_updateScrollbar here, so the scrollbars ranges are updated, instead of // doing a complete re-layout? @@ -2387,7 +2387,7 @@ namespace svt { namespace table } - IMPL_LINK_TYPED( TableControl_Impl, OnScroll, ScrollBar*, _pScrollbar, void ) + IMPL_LINK( TableControl_Impl, OnScroll, ScrollBar*, _pScrollbar, void ) { DBG_ASSERT( ( _pScrollbar == m_pVScroll ) || ( _pScrollbar == m_pHScroll ), "TableControl_Impl::OnScroll: where did this come from?" ); diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index 02b36268ea4b..47a71a356da9 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -448,8 +448,8 @@ namespace svt { namespace table /// invalidates the window area occupied by the given column void impl_invalidateColumn( ColPos const i_column ); - DECL_LINK_TYPED( OnScroll, ScrollBar*, void ); - DECL_LINK_TYPED( OnUpdateScrollbars, void*, void ); + DECL_LINK( OnScroll, ScrollBar*, void ); + DECL_LINK( OnUpdateScrollbars, void*, void ); }; //see seleng.hxx, seleng.cxx, FunctionSet overridables, part of selection engine diff --git a/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx index d8ecef4fff67..43d34379da18 100644 --- a/svtools/source/uno/generictoolboxcontroller.cxx +++ b/svtools/source/uno/generictoolboxcontroller.cxx @@ -167,7 +167,7 @@ throw ( RuntimeException, std::exception ) } } -IMPL_STATIC_LINK_TYPED( GenericToolboxController, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( GenericToolboxController, ExecuteHdl_Impl, void*, p, void ) { ExecuteInfo* pExecuteInfo = static_cast<ExecuteInfo*>(p); try diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 821feba1c371..7f1b54b49fc5 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -309,7 +309,7 @@ void OGenericUnoDialog::destroyDialog() } -IMPL_LINK_TYPED( OGenericUnoDialog, OnDialogDying, VclWindowEvent&, _rEvent, void ) +IMPL_LINK( OGenericUnoDialog, OnDialogDying, VclWindowEvent&, _rEvent, void ) { OSL_ENSURE( _rEvent.GetWindow() == m_pDialog, "OGenericUnoDialog::OnDialogDying: where does this come from?" ); if ( _rEvent.GetId() == VCLEVENT_OBJECT_DYING ) diff --git a/svtools/source/uno/popupmenucontrollerbase.cxx b/svtools/source/uno/popupmenucontrollerbase.cxx index 527ad0591f08..aacc8e988a77 100644 --- a/svtools/source/uno/popupmenucontrollerbase.cxx +++ b/svtools/source/uno/popupmenucontrollerbase.cxx @@ -148,7 +148,7 @@ void PopupMenuControllerBase::dispatchCommand( const OUString& sCommandURL, cons } -IMPL_STATIC_LINK_TYPED( PopupMenuControllerBase, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, void*, p, void ) { PopupMenuControllerBaseDispatchInfo* pDispatchInfo = static_cast<PopupMenuControllerBaseDispatchInfo*>(p); pDispatchInfo->mxDispatch->dispatch( pDispatchInfo->maURL, pDispatchInfo->maArgs ); diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index 39e651c5ab5a..b32824204d73 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -42,7 +42,7 @@ public: ~PopupWindowControllerImpl(); void SetPopupWindow( vcl::Window* pPopupWindow, ToolBox* pToolBox ); - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); private: VclPtr<vcl::Window> mpPopupWindow; @@ -77,7 +77,7 @@ void PopupWindowControllerImpl::SetPopupWindow( vcl::Window* pPopupWindow, ToolB } } -IMPL_LINK_TYPED( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWindowEvent, void ) +IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWindowEvent, void ) { switch( rWindowEvent.GetId() ) { diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index eb455e56df97..e0635714d706 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -759,7 +759,7 @@ throw( css::uno::Exception, std::exception) } -IMPL_STATIC_LINK_TYPED( ToolboxController, ExecuteHdl_Impl, void*, p, void ) +IMPL_STATIC_LINK( ToolboxController, ExecuteHdl_Impl, void*, p, void ) { DispatchInfo* pDispatchInfo = static_cast<DispatchInfo*>(p); pDispatchInfo->mxDispatch->dispatch( pDispatchInfo->maURL, pDispatchInfo->maArgs ); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index f76931725980..ece1379a07de 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -94,9 +94,9 @@ public: virtual bool EditingEntry( SvTreeListEntry* pEntry, Selection& ) override; virtual bool EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText ) override; - DECL_LINK_TYPED(OnSelectionChangeHdl, SvTreeListBox*, void); - DECL_LINK_TYPED(OnExpandingHdl, SvTreeListBox*, bool); - DECL_LINK_TYPED(OnExpandedHdl, SvTreeListBox*, void); + DECL_LINK(OnSelectionChangeHdl, SvTreeListBox*, void); + DECL_LINK(OnExpandingHdl, SvTreeListBox*, bool); + DECL_LINK(OnExpandedHdl, SvTreeListBox*, void); private: rtl::Reference< TreeControlPeer > mxPeer; @@ -1429,14 +1429,14 @@ void UnoTreeListBoxImpl::dispose() } -IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnSelectionChangeHdl, SvTreeListBox*, void) { if( mxPeer.is() ) mxPeer->onSelectionChanged(); } -IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) +IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); @@ -1448,7 +1448,7 @@ IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandingHdl, SvTreeListBox*, bool) } -IMPL_LINK_NOARG_TYPED(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl, SvTreeListBox*, void) { UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( GetHdlEntry() ); if( pEntry && mxPeer.is() ) diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index f76fab042dee..ab1d20f9332b 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -721,7 +721,7 @@ sal_Int16 VCLXFileControl::getMaxTextLen() throw(css::uno::RuntimeException, std } -IMPL_LINK_NOARG_TYPED(VCLXFileControl, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG(VCLXFileControl, ModifyHdl, Edit&, void) { ModifyHdl(); } |