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 /svx | |
| 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 'svx')
129 files changed, 513 insertions, 513 deletions
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx index 87d8c246b25f..ca6365d686e5 100644 --- a/svx/inc/GalleryControl.hxx +++ b/svx/inc/GalleryControl.hxx @@ -58,7 +58,7 @@ private: virtual void Resize() override; virtual void GetFocus() override; - DECL_LINK_TYPED(SplitHdl, Splitter*, void); + DECL_LINK(SplitHdl, Splitter*, void); protected: void ThemeSelectionHasChanged(); diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 13f6b068e66a..b753fd16aa3a 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -126,10 +126,10 @@ private: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK_TYPED( SelectObjectHdl, GalleryListView*, void ); - DECL_LINK_TYPED( SelectObjectValueSetHdl, ValueSet*, void ); - DECL_LINK_TYPED( SelectTbxHdl, ToolBox*, void ); - DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); + DECL_LINK( SelectObjectHdl, GalleryListView*, void ); + DECL_LINK( SelectObjectValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectTbxHdl, ToolBox*, void ); + DECL_LINK( MiscHdl, LinkParamNone*, void ); private: @@ -172,7 +172,7 @@ public: const css::uno::Reference< css::frame::XDispatch > &rxDispatch, const css::util::URL &rURL ); - DECL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, void ); + DECL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, void*, void ); }; #endif diff --git a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx index 5528315fe20f..42fcf21369c1 100644 --- a/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx +++ b/svx/inc/sdr/overlay/overlaymanagerbuffered.hxx @@ -52,7 +52,7 @@ namespace sdr bool mbRefreshWithPreRendering : 1; // link for timer - DECL_LINK_TYPED(ImpBufferTimerHandler, Idle*, void); + DECL_LINK(ImpBufferTimerHandler, Idle*, void); // Internal methods for buffering void ImpPrepareBufferDevice(); diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx index fd1c675b3686..86db5f7d29ff 100644 --- a/svx/inc/svdibrow.hxx +++ b/svx/inc/svdibrow.hxx @@ -102,9 +102,9 @@ class SdrItemBrowser: public FloatingWindow { SdrView* pView; bool bDirty; static vcl::Window* ImpGetViewWin(SdrView& rView); - DECL_LINK_TYPED(IdleHdl, Idle *, void); - DECL_LINK_TYPED(ChangedHdl, SdrItemBrowserControl&, void); - DECL_LINK_TYPED(SetDirtyHdl, SdrItemBrowserControl&, void); + DECL_LINK(IdleHdl, Idle *, void); + DECL_LINK(ChangedHdl, SdrItemBrowserControl&, void); + DECL_LINK(SetDirtyHdl, SdrItemBrowserControl&, void); public: SdrItemBrowser(SdrView& rView); virtual ~SdrItemBrowser() override; diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx index 81233727bb9b..2b0de95c021d 100644 --- a/svx/inc/tbunosearchcontrollers.hxx +++ b/svx/inc/tbunosearchcontrollers.hxx @@ -113,7 +113,7 @@ public: // XStatusListener virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; - DECL_LINK_TYPED(EditModifyHdl, Edit&, void); + DECL_LINK(EditModifyHdl, Edit&, void); private: diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 14032e30cddd..6ecb7978f64d 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -479,7 +479,7 @@ void AccFrameSelector::NotifyFocusListeners(bool bGetFocus) } -IMPL_LINK_TYPED( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, void ) +IMPL_LINK( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, void ) { vcl::Window* pWindow = rEvent.GetWindow(); DBG_ASSERT( pWindow, "AccFrameSelector::WindowEventListener: no window!" ); diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 3d81a9e7b495..d8d0ebc3f281 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -169,11 +169,11 @@ public: void SetExecState( bool bState ) { bExecState = bState; } bool IsExecReady() const { return bExecState; } - DECL_LINK_TYPED( PipetteHdl, ToolBox*, void ); - DECL_LINK_TYPED( CbxHdl, Button*, void); - DECL_LINK_TYPED( CbxTransHdl, Button*, void ); - DECL_LINK_TYPED( FocusLbHdl, Control&, void ); - DECL_LINK_TYPED(ExecHdl, Button*, void); + DECL_LINK( PipetteHdl, ToolBox*, void ); + DECL_LINK( CbxHdl, Button*, void); + DECL_LINK( CbxTransHdl, Button*, void ); + DECL_LINK( FocusLbHdl, Control&, void ); + DECL_LINK(ExecHdl, Button*, void); }; @@ -187,7 +187,7 @@ MaskData::MaskData( SvxBmpMask* pBmpMask, SfxBindings& rBind ) : { } -IMPL_LINK_TYPED( MaskData, PipetteHdl, ToolBox*, pTbx, void ) +IMPL_LINK( MaskData, PipetteHdl, ToolBox*, pTbx, void ) { SfxBoolItem aBItem( SID_BMPMASK_PIPETTE, pTbx->IsItemChecked( pTbx->GetItemId(0) ) ); @@ -196,7 +196,7 @@ IMPL_LINK_TYPED( MaskData, PipetteHdl, ToolBox*, pTbx, void ) { &aBItem }); } -IMPL_LINK_TYPED( MaskData, CbxHdl, Button*, pButton, void ) +IMPL_LINK( MaskData, CbxHdl, Button*, pButton, void ) { CheckBox* pCbx = static_cast<CheckBox*>(pButton); bIsReady = pMask->m_pCbx1->IsChecked() || pMask->m_pCbx2->IsChecked() || @@ -230,7 +230,7 @@ IMPL_LINK_TYPED( MaskData, CbxHdl, Button*, pButton, void ) } -IMPL_LINK_TYPED( MaskData, CbxTransHdl, Button*, pButton, void ) +IMPL_LINK( MaskData, CbxTransHdl, Button*, pButton, void ) { CheckBox* pCbx = static_cast<CheckBox*>(pButton); bIsReady = pCbx->IsChecked(); @@ -291,7 +291,7 @@ IMPL_LINK_TYPED( MaskData, CbxTransHdl, Button*, pButton, void ) } -IMPL_LINK_TYPED( MaskData, FocusLbHdl, Control&, rControl, void ) +IMPL_LINK( MaskData, FocusLbHdl, Control&, rControl, void ) { ColorLB* pLb = static_cast<ColorLB*>(&rControl); // MT: bFireFox as API parameter is ugly, find better solution???? @@ -302,7 +302,7 @@ IMPL_LINK_TYPED( MaskData, FocusLbHdl, Control&, rControl, void ) } -IMPL_LINK_NOARG_TYPED(MaskData, ExecHdl, Button*, void) +IMPL_LINK_NOARG(MaskData, ExecHdl, Button*, void) { SfxBoolItem aBItem( SID_BMPMASK_EXEC, true ); rBindings.GetDispatcher()->ExecuteList(SID_BMPMASK_EXEC, OWN_CALLMODE, diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 0eca974eca16..faedbde8feb0 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -433,7 +433,7 @@ bool SvxSuperContourDlg::IsRedoPossible() const // Click handler for ToolBox -IMPL_LINK_TYPED( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void ) +IMPL_LINK( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void ) { sal_uInt16 nNewItemId = pTbx->GetCurItemId(); @@ -539,7 +539,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, Tbx1ClickHdl, ToolBox*, pTbx, void ) m_pContourWnd->QueueIdleUpdate(); } -IMPL_LINK_TYPED( SvxSuperContourDlg, MousePosHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxSuperContourDlg, MousePosHdl, GraphCtrl*, pWnd, void ) { OUString aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); @@ -554,7 +554,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, MousePosHdl, GraphCtrl*, pWnd, void ) m_pStbStatus->SetItemText( 2, aStr ); } -IMPL_LINK_TYPED( SvxSuperContourDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxSuperContourDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) { OUString aStr; const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); @@ -569,7 +569,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) m_pStbStatus->SetItemText( 3, aStr ); } -IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, UpdateHdl, Idle *, void) +IMPL_LINK_NOARG(SvxSuperContourDlg, UpdateHdl, Idle *, void) { aUpdateIdle.Stop(); @@ -594,7 +594,7 @@ IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, UpdateHdl, Idle *, void) m_pContourWnd->QueueIdleUpdate(); } -IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, CreateHdl, Idle *, void) +IMPL_LINK_NOARG(SvxSuperContourDlg, CreateHdl, Idle *, void) { aCreateIdle.Stop(); @@ -607,7 +607,7 @@ IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, CreateHdl, Idle *, void) LeaveWait(); } -IMPL_LINK_TYPED( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrView* pView = pWnd->GetSdrView(); @@ -662,7 +662,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, StateHdl, GraphCtrl*, pWnd, void ) } } -IMPL_LINK_TYPED( SvxSuperContourDlg, PipetteHdl, ContourWindow&, rWnd, void ) +IMPL_LINK( SvxSuperContourDlg, PipetteHdl, ContourWindow&, rWnd, void ) { const Color& rOldLineColor = m_pStbStatus->GetLineColor(); const Color& rOldFillColor = m_pStbStatus->GetFillColor(); @@ -684,7 +684,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, PipetteHdl, ContourWindow&, rWnd, void ) m_pStbStatus->SetFillColor( rOldFillColor ); } -IMPL_LINK_TYPED( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void ) +IMPL_LINK( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void ) { if ( rWnd.IsClickValid() ) { @@ -729,7 +729,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, PipetteClickHdl, ContourWindow&, rWnd, void m_pStbStatus->Invalidate(); } -IMPL_LINK_TYPED( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow&, rWnd, void ) +IMPL_LINK( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow&, rWnd, void ) { m_pTbx1->CheckItem(mnWorkSpaceId, false); m_pTbx1->CheckItem(mnSelectId); @@ -739,7 +739,7 @@ IMPL_LINK_TYPED( SvxSuperContourDlg, WorkplaceClickHdl, ContourWindow&, rWnd, vo Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxSuperContourDlg, MiscHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SvxSuperContourDlg, MiscHdl, LinkParamNone*, void) { SvtMiscOptions aMiscOptions; m_pTbx1->SetOutStyle( aMiscOptions.GetToolboxStyle() ); diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 710a77ad728b..caf0c31ef5d6 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -669,7 +669,7 @@ void SvxShowCharSet::SelectCharacter( sal_UCS4 cNew ) } -IMPL_LINK_NOARG_TYPED(SvxShowCharSet, VscrollHdl, ScrollBar*, void) +IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl, ScrollBar*, void) { if( nSelectedIndex < FirstInView() ) { diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx index 9dcc2c561b23..059cb552a06b 100644 --- a/svx/source/dialog/compressgraphicdialog.cxx +++ b/svx/source/dialog/compressgraphicdialog.cxx @@ -294,7 +294,7 @@ void CompressGraphicsDialog::Compress(SvStream& aStream) rFilter.ExportGraphic( aScaledGraphic, "none", aStream, nFilterFormat, &aFilterData ); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewWidthModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewWidthModifiedHdl, Edit&, void ) { fprintf(stderr, "NewWidthModifiedHdl\n"); @@ -305,29 +305,29 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewWidthModifiedHdl, Edit&, void Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, EndSlideHdl, Slider*, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, EndSlideHdl, Slider*, void ) { Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewInterpolationModifiedHdl, ListBox&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewInterpolationModifiedHdl, ListBox&, void ) { Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewQualityModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewQualityModifiedHdl, Edit&, void ) { m_pQualitySlider->SetThumbPos(m_pQualityMF->GetValue()); Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewCompressionModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewCompressionModifiedHdl, Edit&, void ) { m_pCompressionSlider->SetThumbPos(m_pCompressionMF->GetValue()); Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewHeightModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, NewHeightModifiedHdl, Edit&, void ) { m_dResolution = m_pMFNewHeight->GetValue() / GetViewHeightInch(); @@ -336,7 +336,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, NewHeightModifiedHdl, Edit&, void Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ResolutionModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, ResolutionModifiedHdl, Edit&, void ) { m_dResolution = (double) m_pResolutionLB->GetText().toInt32(); @@ -345,7 +345,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ResolutionModifiedHdl, Edit&, voi Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleCompressionRB, RadioButton&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleCompressionRB, RadioButton&, void ) { bool choice = m_pLosslessRB->IsChecked(); m_pCompressionMF->Enable(choice); @@ -355,7 +355,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleCompressionRB, RadioButton& Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleReduceResolutionRB, CheckBox&, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleReduceResolutionRB, CheckBox&, void ) { bool choice = m_pReduceResolutionCB->IsChecked(); m_pMFNewWidth->Enable(choice); @@ -365,7 +365,7 @@ IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, ToggleReduceResolutionRB, CheckBo Update(); } -IMPL_LINK_NOARG_TYPED( CompressGraphicsDialog, CalculateClickHdl, Button*, void ) +IMPL_LINK_NOARG( CompressGraphicsDialog, CalculateClickHdl, Button*, void ) { sal_Int32 aSize = 0; diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index be0fd4adf6a4..75c53ece5c0a 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -83,16 +83,16 @@ class SvxSuperContourDlg : public SvxContourDlg virtual bool Close() override; - DECL_LINK_TYPED( Tbx1ClickHdl, ToolBox*, void ); - DECL_LINK_TYPED( MousePosHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( GraphSizeHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( UpdateHdl, Idle *, void ); - DECL_LINK_TYPED( CreateHdl, Idle *, void ); - DECL_LINK_TYPED( StateHdl, GraphCtrl*, void ); - DECL_LINK_TYPED( PipetteHdl, ContourWindow&, void ); - DECL_LINK_TYPED( PipetteClickHdl, ContourWindow&, void ); - DECL_LINK_TYPED( WorkplaceClickHdl, ContourWindow&, void ); - DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); + DECL_LINK( Tbx1ClickHdl, ToolBox*, void ); + DECL_LINK( MousePosHdl, GraphCtrl*, void ); + DECL_LINK( GraphSizeHdl, GraphCtrl*, void ); + DECL_LINK( UpdateHdl, Idle *, void ); + DECL_LINK( CreateHdl, Idle *, void ); + DECL_LINK( StateHdl, GraphCtrl*, void ); + DECL_LINK( PipetteHdl, ContourWindow&, void ); + DECL_LINK( PipetteClickHdl, ContourWindow&, void ); + DECL_LINK( WorkplaceClickHdl, ContourWindow&, void ); + DECL_LINK( MiscHdl, LinkParamNone*, void ); public: diff --git a/svx/source/dialog/crashreportdlg.cxx b/svx/source/dialog/crashreportdlg.cxx index 3d6b61acb7d9..d31a8636b44e 100644 --- a/svx/source/dialog/crashreportdlg.cxx +++ b/svx/source/dialog/crashreportdlg.cxx @@ -53,7 +53,7 @@ void CrashReportDialog::dispose() Dialog::dispose(); } -IMPL_LINK_TYPED(CrashReportDialog, BtnHdl, Button*, pBtn, void) +IMPL_LINK(CrashReportDialog, BtnHdl, Button*, pBtn, void) { if (pBtn == mpBtnSend.get()) { diff --git a/svx/source/dialog/crashreportdlg.hxx b/svx/source/dialog/crashreportdlg.hxx index fba81d8af39a..602d706d7a8e 100644 --- a/svx/source/dialog/crashreportdlg.hxx +++ b/svx/source/dialog/crashreportdlg.hxx @@ -37,7 +37,7 @@ private: OUString maSuccessMsg; - DECL_LINK_TYPED(BtnHdl, Button*, void); + DECL_LINK(BtnHdl, Button*, void); }; #endif diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 40de9bac9d45..005284fc65c4 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -501,7 +501,7 @@ void SvxTPView::EnableUndo(bool bFlag) } -IMPL_LINK_TYPED( SvxTPView, PbClickHdl, Button*, pButton, void ) +IMPL_LINK( SvxTPView, PbClickHdl, Button*, pButton, void ) { PushButton* pPushB = static_cast<PushButton*>(pButton); if (pPushB == m_pAccept) @@ -896,13 +896,13 @@ void SvxTPFilter::ShowAction(bool bShow) } -IMPL_LINK_NOARG_TYPED( SvxTPFilter, SelDateHdl, ListBox&, void ) +IMPL_LINK_NOARG( SvxTPFilter, SelDateHdl, ListBox&, void ) { ShowDateFields(static_cast<SvxRedlinDateMode>(m_pLbDate->GetSelectEntryPos())); bModified=true; } -IMPL_LINK_TYPED( SvxTPFilter, RowEnableHdl, Button*, pButton, void ) +IMPL_LINK( SvxTPFilter, RowEnableHdl, Button*, pButton, void ) { CheckBox* pCB = static_cast<CheckBox*>(pButton); if (pCB == m_pCbDate) @@ -938,7 +938,7 @@ IMPL_LINK_TYPED( SvxTPFilter, RowEnableHdl, Button*, pButton, void ) bModified=true; } -IMPL_LINK_TYPED( SvxTPFilter, TimeHdl, Button*, pButton, void ) +IMPL_LINK( SvxTPFilter, TimeHdl, Button*, pButton, void ) { ImageButton* pIB = static_cast<ImageButton*>(pButton); Date aDate( Date::SYSTEM ); @@ -955,11 +955,11 @@ IMPL_LINK_TYPED( SvxTPFilter, TimeHdl, Button*, pButton, void ) } bModified=true; } -IMPL_LINK_NOARG_TYPED( SvxTPFilter, ModifyHdl, Edit&, void) +IMPL_LINK_NOARG( SvxTPFilter, ModifyHdl, Edit&, void) { bModified=true; } -IMPL_LINK_NOARG_TYPED( SvxTPFilter, ModifyListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG( SvxTPFilter, ModifyListBoxHdl, ListBox&, void) { bModified=true; } @@ -1010,7 +1010,7 @@ void SvxTPFilter::Disable() Enable( false ); } -IMPL_LINK_TYPED( SvxTPFilter, ModifyDate, Edit&, rTF, void) +IMPL_LINK( SvxTPFilter, ModifyDate, Edit&, rTF, void) { Date aDate( Date::SYSTEM ); tools::Time aTime(0); @@ -1050,7 +1050,7 @@ IMPL_LINK_TYPED( SvxTPFilter, ModifyDate, Edit&, rTF, void) ModifyHdl(*m_pDfDate); } -IMPL_LINK_TYPED( SvxTPFilter, RefHandle, Button*, pRef, void ) +IMPL_LINK( SvxTPFilter, RefHandle, Button*, pRef, void ) { if(pRef!=nullptr) { diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 7067ab718163..50b9f089966b 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -415,15 +415,15 @@ void DialControl::SetLinkedField( NumericField* pField, sal_Int32 nDecimalPlaces rField.SetLoseFocusHdl( LINK( this, DialControl, LinkedFieldFocusHdl ) ); } } -IMPL_LINK_NOARG_TYPED( DialControl, LinkedFieldModifyHdl, Edit&, void ) +IMPL_LINK_NOARG( DialControl, LinkedFieldModifyHdl, Edit&, void ) { LinkedFieldModifyHdl(); } -IMPL_LINK_NOARG_TYPED( DialControl, LinkedFieldFocusHdl, Control&, void ) +IMPL_LINK_NOARG( DialControl, LinkedFieldFocusHdl, Control&, void ) { LinkedFieldModifyHdl(); } -IMPL_LINK_NOARG_TYPED(DialControl, SpinFieldHdl, SpinField&, void) +IMPL_LINK_NOARG(DialControl, SpinFieldHdl, SpinField&, void) { LinkedFieldModifyHdl(); } diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 85f04d524964..67bbd780c1db 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1222,7 +1222,7 @@ void SvxLightCtl3D::LoseFocus() maLightControl->HideFocus(); } -IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ScrollBarMove, ScrollBar*, void) +IMPL_LINK_NOARG(SvxLightCtl3D, ScrollBarMove, ScrollBar*, void) { const sal_Int32 nHor(maHorScroller->GetThumbPos()); const sal_Int32 nVer(maVerScroller->GetThumbPos()); @@ -1237,7 +1237,7 @@ IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ScrollBarMove, ScrollBar*, void) } } -IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ButtonPress, Button*, void) +IMPL_LINK_NOARG(SvxLightCtl3D, ButtonPress, Button*, void) { if(SvxPreviewObjectType::SPHERE == GetSvx3DLightControl().GetObjectType()) { @@ -1249,7 +1249,7 @@ IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, ButtonPress, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, InternalInteractiveChange, Svx3DLightControl*, void) +IMPL_LINK_NOARG(SvxLightCtl3D, InternalInteractiveChange, Svx3DLightControl*, void) { double fHor(0.0), fVer(0.0); @@ -1263,7 +1263,7 @@ IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, InternalInteractiveChange, Svx3DLightContro } } -IMPL_LINK_NOARG_TYPED(SvxLightCtl3D, InternalSelectionChange, Svx3DLightControl*, void) +IMPL_LINK_NOARG(SvxLightCtl3D, InternalSelectionChange, Svx3DLightControl*, void) { CheckSelection(); diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 8cd751052267..2f968ccfeb56 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -672,7 +672,7 @@ void SaveDialog::dispose() Dialog::dispose(); } -IMPL_LINK_NOARG_TYPED(SaveDialog, OKButtonHdl, Button*, void) +IMPL_LINK_NOARG(SaveDialog, OKButtonHdl, Button*, void) { // start crash-save with progress ScopedVclPtrInstance< SaveProgressDialog > pProgress(this, m_pCore); @@ -1146,7 +1146,7 @@ void RecoveryDialog::end() m_bWaitForCore = false; } -IMPL_LINK_NOARG_TYPED(RecoveryDialog, NextButtonHdl, Button*, void) +IMPL_LINK_NOARG(RecoveryDialog, NextButtonHdl, Button*, void) { switch (m_eRecoveryState) { @@ -1166,7 +1166,7 @@ IMPL_LINK_NOARG_TYPED(RecoveryDialog, NextButtonHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(RecoveryDialog, CancelButtonHdl, Button*, void) +IMPL_LINK_NOARG(RecoveryDialog, CancelButtonHdl, Button*, void) { switch (m_eRecoveryState) { @@ -1306,7 +1306,7 @@ const OUString& BrokenRecoveryDialog::getSaveDirURL() } -IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, OkButtonHdl, Button*, void) +IMPL_LINK_NOARG(BrokenRecoveryDialog, OkButtonHdl, Button*, void) { OUString sPhysicalPath = comphelper::string::strip(m_pSaveDirED->GetText(), ' '); OUString sURL; @@ -1319,13 +1319,13 @@ IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, OkButtonHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, CancelButtonHdl, Button*, void) +IMPL_LINK_NOARG(BrokenRecoveryDialog, CancelButtonHdl, Button*, void) { EndDialog(); } -IMPL_LINK_NOARG_TYPED(BrokenRecoveryDialog, SaveButtonHdl, Button*, void) +IMPL_LINK_NOARG(BrokenRecoveryDialog, SaveButtonHdl, Button*, void) { impl_askForSavePath(); } diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index ade3e1c2deb3..123b4e6c0db6 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -631,7 +631,7 @@ void SvxFontWorkDialog::SetShadowYVal_Impl(const XFormTextShadowYValItem* pItem) } } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectStyleHdl_Impl, ToolBox *, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, SelectStyleHdl_Impl, ToolBox *, void) { sal_uInt16 nId = m_pTbxStyle->GetCurItemId(); @@ -661,7 +661,7 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectStyleHdl_Impl, ToolBox *, void) } } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectAdjustHdl_Impl, ToolBox *, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, SelectAdjustHdl_Impl, ToolBox *, void) { sal_uInt16 nId = m_pTbxAdjust->GetCurItemId(); @@ -690,7 +690,7 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectAdjustHdl_Impl, ToolBox *, void) } } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void) { sal_uInt16 nId = m_pTbxShadow->GetCurItemId(); @@ -732,12 +732,12 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, SelectShadowHdl_Impl, ToolBox *, void) } } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, ModifyInputHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, ModifyInputHdl_Impl, Edit&, void) { aInputIdle.Start(); } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void) { // Possibly set the Metric system again. This should be done with a // listen, this is however not possible at the moment due to compatibility @@ -791,7 +791,7 @@ IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, InputTimoutHdl_Impl, Idle *, void) { &aDistItem, &aStartItem, &aShadowXItem, &aShadowYItem }); } -IMPL_LINK_NOARG_TYPED(SvxFontWorkDialog, ColorSelectHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxFontWorkDialog, ColorSelectHdl_Impl, ListBox&, void) { XFormTextShadowColorItem aItem( "", m_pShadowColorLB->GetSelectEntryColor() ); GetBindings().GetDispatcher()->ExecuteList(SID_FORMTEXT_SHDWCOLOR, diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index 9d7adf3af4ae..37a330fdbd37 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -764,7 +764,7 @@ void GraphCtrl::SetObjKind( const SdrObjKind _eObjKind ) QueueIdleUpdate(); } -IMPL_LINK_TYPED( GraphCtrl, UpdateHdl, Idle *, , void ) +IMPL_LINK( GraphCtrl, UpdateHdl, Idle *, , void ) { mbInIdleUpdate = true; aUpdateLink.Call( this ); diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 026780ea3307..bc70898c7306 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -494,7 +494,7 @@ void SvxHFPage::InitHandler() m_pBackgroundBtn->SetClickHdl(LINK(this,SvxHFPage, BackgroundHdl)); } -IMPL_LINK_TYPED( SvxHFPage, TurnOnHdl, Button *, pButton, void ) +IMPL_LINK( SvxHFPage, TurnOnHdl, Button *, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); if ( m_pTurnOnBox->IsChecked() ) @@ -559,22 +559,22 @@ IMPL_LINK_TYPED( SvxHFPage, TurnOnHdl, Button *, pButton, void ) UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxHFPage, DistModify, Edit&, void) +IMPL_LINK_NOARG(SvxHFPage, DistModify, Edit&, void) { UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxHFPage, HeightModify, Edit&, void) +IMPL_LINK_NOARG(SvxHFPage, HeightModify, Edit&, void) { UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxHFPage, BorderModify, Edit&, void) +IMPL_LINK_NOARG(SvxHFPage, BorderModify, Edit&, void) { UpdateExample(); } -IMPL_LINK_NOARG_TYPED(SvxHFPage, BackgroundHdl, Button*, void) +IMPL_LINK_NOARG(SvxHFPage, BackgroundHdl, Button*, void) { if(!pBBSet) { @@ -1050,7 +1050,7 @@ DeactivateRC SvxHFPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -IMPL_LINK_NOARG_TYPED(SvxHFPage, RangeFocusHdl, Control&, void) +IMPL_LINK_NOARG(SvxHFPage, RangeFocusHdl, Control&, void) { RangeHdl(); } diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 944215309d73..adecbebdee6a 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -343,7 +343,7 @@ void SvxIMapDlg::KeyInput( const KeyEvent& rKEvt ) // Click-handler for ToolBox -IMPL_LINK_TYPED( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void ) +IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx, void ) { sal_uInt16 nNewItemId = pTbx->GetCurItemId(); @@ -595,7 +595,7 @@ void SvxIMapDlg::SetActiveTool( sal_uInt16 nId ) m_pTbxIMapDlg1->CheckItem( mnPolyEditId, bEditMode ); } -IMPL_LINK_TYPED( SvxIMapDlg, InfoHdl, IMapWindow&, rWnd, void ) +IMPL_LINK( SvxIMapDlg, InfoHdl, IMapWindow&, rWnd, void ) { OUString aStr; const NotifyInfo& rInfo = rWnd.GetInfo(); @@ -661,7 +661,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, InfoHdl, IMapWindow&, rWnd, void ) } } -IMPL_LINK_TYPED( SvxIMapDlg, MousePosHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxIMapDlg, MousePosHdl, GraphCtrl*, pWnd, void ) { const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Point& rMousePos = pWnd->GetMousePos(); @@ -674,7 +674,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, MousePosHdl, GraphCtrl*, pWnd, void ) m_pStbStatus->SetItemText( 2, aStr ); } -IMPL_LINK_TYPED( SvxIMapDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxIMapDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) { const FieldUnit eFieldUnit = GetBindings().GetDispatcher()->GetModule()->GetFieldUnit(); const Size& rSize = pWnd->GetGraphicSize(); @@ -688,11 +688,11 @@ IMPL_LINK_TYPED( SvxIMapDlg, GraphSizeHdl, GraphCtrl*, pWnd, void ) } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLModifyComboBoxHdl, ComboBox&, void) +IMPL_LINK_NOARG(SvxIMapDlg, URLModifyComboBoxHdl, ComboBox&, void) { URLModifyHdl(*m_pURLBox); } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxIMapDlg, URLModifyHdl, Edit&, void) { NotifyInfo aNewInfo; @@ -703,7 +703,7 @@ IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLModifyHdl, Edit&, void) pIMapWnd->ReplaceActualIMapInfo( aNewInfo ); } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLLoseFocusHdl, Control&, void) +IMPL_LINK_NOARG(SvxIMapDlg, URLLoseFocusHdl, Control&, void) { NotifyInfo aNewInfo; const OUString aURLText( m_pURLBox->GetText() ); @@ -729,7 +729,7 @@ IMPL_LINK_NOARG_TYPED(SvxIMapDlg, URLLoseFocusHdl, Control&, void) pIMapWnd->ReplaceActualIMapInfo( aNewInfo ); } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, UpdateHdl, Idle *, void) +IMPL_LINK_NOARG(SvxIMapDlg, UpdateHdl, Idle *, void) { pOwnData->aIdle.Stop(); @@ -759,7 +759,7 @@ IMPL_LINK_NOARG_TYPED(SvxIMapDlg, UpdateHdl, Idle *, void) pIMapWnd->QueueIdleUpdate(); } -IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) +IMPL_LINK( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) { const SdrObject* pObj = pWnd->GetSelectedSdrObject(); const SdrModel* pModel = pWnd->GetSdrModel(); @@ -811,7 +811,7 @@ IMPL_LINK_TYPED( SvxIMapDlg, StateHdl, GraphCtrl*, pWnd, void ) pIMapWnd->QueueIdleUpdate(); } -IMPL_LINK_NOARG_TYPED(SvxIMapDlg, MiscHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl, LinkParamNone*, void) { if (m_pTbxIMapDlg1) { diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index cbe50ac633a8..5d8147b1d01e 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -704,7 +704,7 @@ void IMapWindow::DoPropertyDialog() } } -IMPL_LINK_TYPED( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool ) +IMPL_LINK( IMapWindow, MenuSelectHdl, Menu*, pMenu, bool ) { if (!pMenu) return false; diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 970662bdd529..9492cabb6fad 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -87,7 +87,7 @@ class IMapWindow : public GraphCtrl, public DropTargetHelper css::uno::Reference< css::frame::XFrame > mxDocumentFrame; - DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); + DECL_LINK( MenuSelectHdl, Menu*, bool ); protected: diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 11655fd32960..69be7aaa7c94 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -677,7 +677,7 @@ sal_Int32 SvxLanguageComboBox::ImplGetSavedValue() const } -IMPL_LINK_NOARG_TYPED( SvxLanguageComboBox, EditModifyHdl, Edit&, void ) +IMPL_LINK_NOARG( SvxLanguageComboBox, EditModifyHdl, Edit&, void ) { EditedAndValid eOldState = meEditedAndValid; OUString aStr( vcl::I18nHelper::filterFormattingChars( GetText())); diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 36efa3272519..4dca17dfc149 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -309,7 +309,7 @@ DeactivateRC SvxGridTabPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -IMPL_LINK_TYPED( SvxGridTabPage, ChangeDrawHdl_Impl, Edit&, rField, void ) +IMPL_LINK( SvxGridTabPage, ChangeDrawHdl_Impl, Edit&, rField, void ) { bAttrModified = true; if( pCbxSynchronize->IsChecked() ) @@ -322,7 +322,7 @@ IMPL_LINK_TYPED( SvxGridTabPage, ChangeDrawHdl_Impl, Edit&, rField, void ) } -IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void) { if( pCbxRotate->IsChecked() ) pMtrFldAngle->Enable(); @@ -331,7 +331,7 @@ IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ClickRotateHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxGridTabPage, ChangeDivisionHdl_Impl, Edit&, rField, void ) +IMPL_LINK( SvxGridTabPage, ChangeDivisionHdl_Impl, Edit&, rField, void ) { bAttrModified = true; if( pCbxSynchronize->IsChecked() ) @@ -344,7 +344,7 @@ IMPL_LINK_TYPED( SvxGridTabPage, ChangeDivisionHdl_Impl, Edit&, rField, void ) } -IMPL_LINK_NOARG_TYPED(SvxGridTabPage, ChangeGridsnapHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl, Button*, void) { bAttrModified = true; } diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index b8f9432ae377..e969cc272fa9 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -48,7 +48,7 @@ struct OrientationHelper_Impl void ShowDependentWindows(); - DECL_LINK_TYPED( ClickHdl, Button*, void ); + DECL_LINK( ClickHdl, Button*, void ); }; @@ -97,7 +97,7 @@ void OrientationHelper_Impl::ShowDependentWindows() aIt->first->Show( mbVisible ); } -IMPL_LINK_NOARG_TYPED(OrientationHelper_Impl, ClickHdl, Button*, void) +IMPL_LINK_NOARG(OrientationHelper_Impl, ClickHdl, Button*, void) { EnableDependentWindows(); } diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 5dc973ed2f45..10b54deb49a8 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -23,7 +23,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void) +IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl, Button*, void) { bool bOK = true; short nRet = RET_OK; @@ -50,7 +50,7 @@ IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, ButtonHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxPasswordDialog, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(SvxPasswordDialog, EditModifyHdl, Edit&, void) { if ( !bEmpty ) { diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 65e11f6c5e1b..b7a3e3d359dc 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -542,7 +542,7 @@ void SvxRubyDialog::GetCurrentText(OUString& rBase, OUString& rRuby) rRuby = aEditArr[nCurrentEdit * 2 + 1]->GetText(); } -IMPL_LINK_TYPED(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll, void) +IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll, void) { long nPos = pScroll->GetThumbPos(); if (GetLastPos() != nPos) @@ -557,7 +557,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, pScroll, void) m_pPreviewWin->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxRubyDialog, ApplyHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl, Button*, void) { const Sequence<PropertyValues>& aRubyValues = m_pImpl->GetRubyValues(); if (!aRubyValues.getLength()) @@ -585,12 +585,12 @@ IMPL_LINK_NOARG_TYPED(SvxRubyDialog, ApplyHdl_Impl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(SvxRubyDialog, CloseHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxRubyDialog, CloseHdl_Impl, Button*, void) { Close(); } -IMPL_LINK_NOARG_TYPED(SvxRubyDialog, StylistHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl, Button*, void) { std::unique_ptr<SfxPoolItem> pState; SfxItemState eState = pBindings->QueryState(SID_STYLE_DESIGNER, pState); @@ -601,7 +601,7 @@ IMPL_LINK_NOARG_TYPED(SvxRubyDialog, StylistHdl_Impl, Button*, void) } } -IMPL_LINK_TYPED(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, void) { AssertOneEntry(); sal_Int16 nAdjust = rBox.GetSelectEntryPos(); @@ -620,7 +620,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, AdjustHdl_Impl, ListBox&, rBox, void) m_pPreviewWin->Invalidate(); } -IMPL_LINK_TYPED(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void) +IMPL_LINK(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void) { AssertOneEntry(); bool bAbove = !rBox.GetSelectEntryPos(); @@ -639,7 +639,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, PositionHdl_Impl, ListBox&, rBox, void) m_pPreviewWin->Invalidate(); } -IMPL_LINK_NOARG_TYPED(SvxRubyDialog, CharStyleHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(SvxRubyDialog, CharStyleHdl_Impl, ListBox&, void) { AssertOneEntry(); OUString sStyleName; @@ -661,7 +661,7 @@ IMPL_LINK_NOARG_TYPED(SvxRubyDialog, CharStyleHdl_Impl, ListBox&, void) } } -IMPL_LINK_TYPED(SvxRubyDialog, EditModifyHdl_Impl, Edit&, rEdit, void) +IMPL_LINK(SvxRubyDialog, EditModifyHdl_Impl, Edit&, rEdit, void) { for (sal_uInt16 i = 0; i < 8; i++) { @@ -674,7 +674,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, EditModifyHdl_Impl, Edit&, rEdit, void) m_pPreviewWin->Invalidate(); } -IMPL_LINK_TYPED(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32, nParam, bool) +IMPL_LINK(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32, nParam, bool) { bool bRet = false; if (m_pScrollSB->IsEnabled()) @@ -702,7 +702,7 @@ IMPL_LINK_TYPED(SvxRubyDialog, EditScrollHdl_Impl, sal_Int32, nParam, bool) return bRet; } -IMPL_LINK_TYPED(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32, nParam, void) +IMPL_LINK(SvxRubyDialog, EditJumpHdl_Impl, sal_Int32, nParam, void) { sal_uInt16 nIndex = USHRT_MAX; for (sal_uInt16 i = 0; i < 8; i++) diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 9cc4cbddfd96..e69b91c3ec72 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -1120,12 +1120,12 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet, } -IMPL_LINK_TYPED( SvxSearchDialog, LBSelectHdl_Impl, ListBox&, rCtrl, void ) +IMPL_LINK( SvxSearchDialog, LBSelectHdl_Impl, ListBox&, rCtrl, void ) { ClickHdl_Impl(&rCtrl); } -IMPL_LINK_TYPED( SvxSearchDialog, FlagHdl_Impl, Button *, pCtrl, void ) +IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, Button *, pCtrl, void ) { ClickHdl_Impl(pCtrl); } @@ -1267,7 +1267,7 @@ void SvxSearchDialog::ClickHdl_Impl(void* pCtrl) } -IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) +IMPL_LINK( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) { bool bInclusive = ( m_pLayoutBtn->GetText() == aLayoutStr ); @@ -1447,7 +1447,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void ) } -IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) +IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) { if ( !bSet ) SetModifyFlag_Impl( &rEd ); @@ -1489,7 +1489,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void ) } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, TemplateHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl, Button*, void) { if ( pImpl->bSaveToModule ) SaveToModule_Impl(); @@ -1897,7 +1897,7 @@ void SvxSearchDialog::SetItem_Impl( const SvxSearchItem* pItem ) } -IMPL_LINK_TYPED( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) +IMPL_LINK( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) { sal_Int32 nTxtLen = m_pSearchAttrText->GetText().getLength(); Control* pCtrl = &rControl; @@ -1956,13 +1956,13 @@ IMPL_LINK_TYPED( SvxSearchDialog, FocusHdl_Impl, Control&, rControl, void ) } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, LoseFocusHdl_Impl, Control&, void) +IMPL_LINK_NOARG(SvxSearchDialog, LoseFocusHdl_Impl, Control&, void) { SaveToModule_Impl(); } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxSearchDialog, FormatHdl_Impl, Button*, void) { SfxObjectShell* pSh = SfxObjectShell::Current(); @@ -2053,7 +2053,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, FormatHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) { SvtModuleOptions::EFactory eFactory = getModule(rBindings); bool bWriterApp = @@ -2095,7 +2095,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void) } -IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void) +IMPL_LINK_NOARG(SvxSearchDialog, AttributeHdl_Impl, Button*, void) { if ( !pSearchList || !pImpl->pRanges ) return; @@ -2111,7 +2111,7 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, AttributeHdl_Impl, Button*, void) } -IMPL_LINK_TYPED( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void ) +IMPL_LINK( SvxSearchDialog, TimeoutHdl_Impl, Timer *, pTimer, void ) { SfxViewShell* pViewShell = SfxViewShell::Current(); diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index dca1640f82d6..02fb2e535f26 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -520,7 +520,7 @@ void SvxBmpNumValueSet::UserDraw(const UserDrawEvent& rUDEvt) } } -IMPL_LINK_NOARG_TYPED(SvxBmpNumValueSet, FormatHdl_Impl, Idle *, void) +IMPL_LINK_NOARG(SvxBmpNumValueSet, FormatHdl_Impl, Idle *, void) { // only when a graphics was not there, it needs to be formatted if (bGrfNotFound) diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 48aa1c068ae1..9cd586654e31 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -3346,14 +3346,14 @@ void SvxRuler::Notify(SfxBroadcaster&, const SfxHint& rHint) } -IMPL_LINK_TYPED( SvxRuler, MenuSelect, Menu *, pMenu, bool ) +IMPL_LINK( SvxRuler, MenuSelect, Menu *, pMenu, bool ) { /* Handler of the context menus for switching the unit of measurement */ SetUnit(FieldUnit(pMenu->GetCurItemId())); return false; } -IMPL_LINK_TYPED( SvxRuler, TabMenuSelect, Menu *, pMenu, bool ) +IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu, bool ) { /* Handler of the tab menu for setting the type */ if(mxTabStopItem.get() && mxTabStopItem->Count() > mxRulerImpl->nIdx) diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 948e84fd7f44..0422f84e41b6 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2210,7 +2210,7 @@ void Svx3DWin::Resize() SfxDockingWindow::Resize(); } -IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void) +IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl, Button*, void) { bUpdate = !m_pBtnUpdate->IsChecked(); m_pBtnUpdate->Check( bUpdate ); @@ -2232,7 +2232,7 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickUpdateHdl, Button*, void) } -IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void) +IMPL_LINK_NOARG(Svx3DWin, ClickAssignHdl, Button*, void) { SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings); if (pDispatcher != nullptr) @@ -2244,7 +2244,7 @@ IMPL_LINK_NOARG_TYPED(Svx3DWin, ClickAssignHdl, Button*, void) } -IMPL_LINK_TYPED( Svx3DWin, ClickViewTypeHdl, Button*, pBtn, void ) +IMPL_LINK( Svx3DWin, ClickViewTypeHdl, Button*, pBtn, void ) { if( pBtn ) @@ -2352,7 +2352,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickViewTypeHdl, Button*, pBtn, void ) } -IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void ) +IMPL_LINK( Svx3DWin, ClickHdl, Button *, pButton, void ) { PushButton* pBtn = static_cast<PushButton*>(pButton); if( pBtn ) @@ -2510,7 +2510,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickHdl, Button *, pButton, void ) } -IMPL_LINK_TYPED( Svx3DWin, ClickColorHdl, Button *, pBtn, void) +IMPL_LINK( Svx3DWin, ClickColorHdl, Button *, pBtn, void) { SvColorDialog aColorDlg( this ); ColorLB* pLb; @@ -2538,7 +2538,7 @@ IMPL_LINK_TYPED( Svx3DWin, ClickColorHdl, Button *, pBtn, void) } -IMPL_LINK_TYPED( Svx3DWin, SelectHdl, ListBox&, rListBox, void ) +IMPL_LINK( Svx3DWin, SelectHdl, ListBox&, rListBox, void ) { bool bUpdatePreview = false; @@ -2635,7 +2635,7 @@ IMPL_LINK_TYPED( Svx3DWin, SelectHdl, ListBox&, rListBox, void ) } -IMPL_LINK_TYPED( Svx3DWin, ModifyHdl, Edit&, rField, void ) +IMPL_LINK( Svx3DWin, ModifyHdl, Edit&, rField, void ) { bool bUpdatePreview = false; @@ -2689,7 +2689,7 @@ void Svx3DWin::ClickLight(PushButton& rBtn) } -IMPL_LINK_NOARG_TYPED(Svx3DWin, ChangeSelectionCallbackHdl, SvxLightCtl3D*, void) +IMPL_LINK_NOARG(Svx3DWin, ChangeSelectionCallbackHdl, SvxLightCtl3D*, void) { const sal_uInt32 nLight(m_pCtlLightPreview->GetSvx3DLightControl().GetSelectedLight()); PushButton* pBtn = nullptr; diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index 63d5264a405f..185205a0de45 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -45,7 +45,7 @@ E3dObjFactory::~E3dObjFactory() // Generate chart internal objects -IMPL_STATIC_LINK_TYPED( E3dObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) +IMPL_STATIC_LINK( E3dObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject* ) { if ( aParams.nInventor == E3dInventor ) { diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 6b3e88bbc03d..a1efee19d1d4 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -375,7 +375,7 @@ sal_Int8 FmGridHeader::ExecuteDrop( const ExecuteDropEvent& _rEvt ) return DND_ACTION_LINK; } -IMPL_LINK_NOARG_TYPED( FmGridHeader, OnAsyncExecuteDrop, void*, void ) +IMPL_LINK_NOARG( FmGridHeader, OnAsyncExecuteDrop, void*, void ) { OUString sCommand, sFieldName,sURL; sal_Int32 nCommandType = CommandType::COMMAND; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 3fb86a223a3a..dcc54523cde0 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -2794,7 +2794,7 @@ void FmXGridPeer::DisConnectFromDispatcher() } -IMPL_LINK_TYPED(FmXGridPeer, OnQueryGridSlotState, DbGridControlNavigationBarState, nSlot, int) +IMPL_LINK(FmXGridPeer, OnQueryGridSlotState, DbGridControlNavigationBarState, nSlot, int) { if (!m_pStateCache) return -1; // unspecified @@ -2816,7 +2816,7 @@ IMPL_LINK_TYPED(FmXGridPeer, OnQueryGridSlotState, DbGridControlNavigationBarSta } -IMPL_LINK_TYPED(FmXGridPeer, OnExecuteGridSlot, DbGridControlNavigationBarState, nSlot, bool) +IMPL_LINK(FmXGridPeer, OnExecuteGridSlot, DbGridControlNavigationBarState, nSlot, bool) { if (!m_pDispatchers) return false; // not handled diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 90e019f8f969..63c6024bdda9 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3094,7 +3094,7 @@ void DbFilterField::UpdateFromField(const Reference< XColumn >& /*_rxField*/, co } -IMPL_LINK_NOARG_TYPED(DbFilterField, OnClick, VclPtr<CheckBox>, void) +IMPL_LINK_NOARG(DbFilterField, OnClick, VclPtr<CheckBox>, void) { TriState eState = static_cast<CheckBoxControl*>(m_pWindow.get())->GetBox().GetState(); OUString aText; @@ -3376,7 +3376,7 @@ void SAL_CALL FmXGridCell::removePaintListener( const Reference< awt::XPaintList } -IMPL_LINK_TYPED( FmXGridCell, OnWindowEvent, VclWindowEvent&, _rEvent, void ) +IMPL_LINK( FmXGridCell, OnWindowEvent, VclWindowEvent&, _rEvent, void ) { ENSURE_OR_THROW( _rEvent.GetWindow(), "illegal window" ); onWindowEvent( _rEvent.GetId(), *_rEvent.GetWindow(), _rEvent.GetData() ); @@ -4311,7 +4311,7 @@ void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Wind } -IMPL_LINK_NOARG_TYPED(FmXListBoxCell, OnDoubleClick, ListBox&, void) +IMPL_LINK_NOARG(FmXListBoxCell, OnDoubleClick, ListBox&, void) { if (m_pBox) { @@ -4673,7 +4673,7 @@ void SAL_CALL FmXFilterCell::setMaxTextLen( sal_Int16 /*nLen*/ ) throw( RuntimeE } -IMPL_LINK_NOARG_TYPED(FmXFilterCell, OnCommit, DbFilterField&, void) +IMPL_LINK_NOARG(FmXFilterCell, OnCommit, DbFilterField&, void) { ::comphelper::OInterfaceIteratorHelper2 aIt( m_aTextListeners ); css::awt::TextEvent aEvt; diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index cc5d93f3f4aa..454a5b227322 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -551,7 +551,7 @@ sal_uInt16 DbGridControl::NavigationBar::ArrangeControls() return nX; } -IMPL_LINK_TYPED(DbGridControl::NavigationBar, OnClick, Button *, pButton, void ) +IMPL_LINK(DbGridControl::NavigationBar, OnClick, Button *, pButton, void ) { DbGridControl* pParent = static_cast<DbGridControl*>(GetParent()); @@ -2894,7 +2894,7 @@ void DbGridControl::Command(const CommandEvent& rEvt) } } -IMPL_LINK_NOARG_TYPED(DbGridControl, OnDelete, void*, void) +IMPL_LINK_NOARG(DbGridControl, OnDelete, void*, void) { m_nDeleteEvent = nullptr; DeleteSelectedRows(); @@ -3498,7 +3498,7 @@ void DbGridControl::implAdjustInSolarThread(bool _bRows) } } -IMPL_LINK_TYPED(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat, void) +IMPL_LINK(DbGridControl, OnAsyncAdjust, void*, pAdjustWhat, void) { m_nAsynAdjustEvent = nullptr; diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 019bbc08a9c3..1648940a5334 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -70,7 +70,7 @@ namespace svx void impl_onLocationModified(); OUString impl_getCurrentURL() const; - DECL_LINK_TYPED( OnControlAction, VclWindowEvent&, void ); + DECL_LINK( OnControlAction, VclWindowEvent&, void ); private: const Reference<XComponentContext> m_xContext; @@ -196,7 +196,7 @@ namespace svx } - IMPL_LINK_TYPED( DatabaseLocationInputController_Impl, OnControlAction, VclWindowEvent&, _rEvent, void ) + IMPL_LINK( DatabaseLocationInputController_Impl, OnControlAction, VclWindowEvent&, _rEvent, void ) { if ( ( _rEvent.GetWindow() == &m_rBrowseButton ) && ( _rEvent.GetId() == VCLEVENT_BUTTON_CLICK ) diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 650cb12a91d7..115e96dfa524 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -389,12 +389,12 @@ namespace svxform TabPage::dispose(); } - IMPL_LINK_NOARG_TYPED(XFormsPage, TbxSelectHdl, ToolBox *, void) + IMPL_LINK_NOARG(XFormsPage, TbxSelectHdl, ToolBox *, void) { DoToolBoxAction( m_pToolBox->GetCurItemId() ); } - IMPL_LINK_NOARG_TYPED(XFormsPage, ItemSelectHdl, SvTreeListBox*, void) + IMPL_LINK_NOARG(XFormsPage, ItemSelectHdl, SvTreeListBox*, void) { EnableMenuItems( nullptr ); } @@ -1451,7 +1451,7 @@ namespace svxform } - IMPL_LINK_TYPED( DataNavigatorWindow, ModelSelectListBoxHdl, ListBox&, rBox, void ) + IMPL_LINK( DataNavigatorWindow, ModelSelectListBoxHdl, ListBox&, rBox, void ) { ModelSelectHdl(&rBox); } @@ -1468,7 +1468,7 @@ namespace svxform } } - IMPL_LINK_TYPED( DataNavigatorWindow, MenuSelectHdl, MenuButton *, pBtn, void ) + IMPL_LINK( DataNavigatorWindow, MenuSelectHdl, MenuButton *, pBtn, void ) { bool bIsDocModified = false; Reference< css::xforms::XFormsUIHelper1 > xUIHelper; @@ -1770,7 +1770,7 @@ namespace svxform return m_pTabCtrl->GetPagePos(nId) >= 3; } - IMPL_LINK_TYPED( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn, void ) + IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, MenuButton *, pBtn, void ) { Menu* pMenu = pBtn->GetPopupMenu(); @@ -1794,7 +1794,7 @@ namespace svxform } } - IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, ActivatePageHdl, TabControl*, void) + IMPL_LINK_NOARG(DataNavigatorWindow, ActivatePageHdl, TabControl*, void) { sal_uInt16 nId = 0; XFormsPage* pPage = GetCurrentPage( nId ); @@ -1806,7 +1806,7 @@ namespace svxform } } - IMPL_LINK_NOARG_TYPED(DataNavigatorWindow, UpdateHdl, Timer *, void) + IMPL_LINK_NOARG(DataNavigatorWindow, UpdateHdl, Timer *, void) { ModelSelectHdl( nullptr ); } @@ -2336,7 +2336,7 @@ namespace svxform } - IMPL_LINK_TYPED( AddDataItemDialog, CheckHdl, Button *, pButton, void ) + IMPL_LINK( AddDataItemDialog, CheckHdl, Button *, pButton, void ) { CheckBox* pBox = static_cast<CheckBox*>(pButton); // Condition buttons are only enable if their check box is checked @@ -2370,7 +2370,7 @@ namespace svxform } - IMPL_LINK_TYPED( AddDataItemDialog, ConditionHdl, Button *, pButton, void ) + IMPL_LINK( AddDataItemDialog, ConditionHdl, Button *, pButton, void ) { PushButton* pBtn = static_cast<PushButton*>(pButton); OUString sTemp, sPropName; @@ -2449,7 +2449,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddDataItemDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(AddDataItemDialog, OKHdl, Button*, void) { bool bIsHandleBinding = ( DITBinding == m_eItemType ); bool bIsHandleText = ( DITText == m_eItemType ); @@ -2813,7 +2813,7 @@ namespace svxform ModalDialog::dispose(); } - IMPL_LINK_NOARG_TYPED(AddConditionDialog, EditHdl, Button*, void) + IMPL_LINK_NOARG(AddConditionDialog, EditHdl, Button*, void) { Reference< XNameContainer > xNameContnr; try @@ -2837,7 +2837,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddConditionDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(AddConditionDialog, OKHdl, Button*, void) { /*!!! try @@ -2854,13 +2854,13 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddConditionDialog, ModifyHdl, Edit&, void) + IMPL_LINK_NOARG(AddConditionDialog, ModifyHdl, Edit&, void) { m_aResultIdle.Start(); } - IMPL_LINK_NOARG_TYPED(AddConditionDialog, ResultHdl, Idle *, void) + IMPL_LINK_NOARG(AddConditionDialog, ResultHdl, Idle *, void) { OUString sCondition = comphelper::string::strip(m_pConditionED->GetText(), ' '); OUString sResult; @@ -2936,7 +2936,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED( NamespaceItemDialog, SelectHdl, SvTreeListBox *, void) + IMPL_LINK_NOARG( NamespaceItemDialog, SelectHdl, SvTreeListBox *, void) { bool bEnable = ( m_pNamespacesList->FirstSelected() != nullptr ); m_pEditNamespaceBtn->Enable( bEnable ); @@ -2944,7 +2944,7 @@ namespace svxform } - IMPL_LINK_TYPED( NamespaceItemDialog, ClickHdl, Button *, pButton, void ) + IMPL_LINK( NamespaceItemDialog, ClickHdl, Button *, pButton, void ) { PushButton* pBtn = static_cast<PushButton*>(pButton); if ( m_pAddNamespaceBtn == pBtn ) @@ -2994,7 +2994,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NamespaceItemDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(NamespaceItemDialog, OKHdl, Button*, void) { try { @@ -3084,7 +3084,7 @@ namespace svxform ModalDialog::dispose(); } - IMPL_LINK_NOARG_TYPED(ManageNamespaceDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(ManageNamespaceDialog, OKHdl, Button*, void) { OUString sPrefix = m_pPrefixED->GetText(); @@ -3152,7 +3152,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddSubmissionDialog, RefHdl, Button*, void) + IMPL_LINK_NOARG(AddSubmissionDialog, RefHdl, Button*, void) { ScopedVclPtrInstance< AddConditionDialog > aDlg(this, PN_BINDING_EXPR, m_xTempBinding ); aDlg->SetCondition( m_pRefED->GetText() ); @@ -3161,7 +3161,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(AddSubmissionDialog, OKHdl, Button*, void) + IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl, Button*, void) { OUString sName(m_pNameED->GetText()); if(sName.isEmpty()) { @@ -3392,7 +3392,7 @@ namespace svxform ModalDialog::dispose(); } - IMPL_LINK_NOARG_TYPED(AddInstanceDialog, FilePickerHdl, Button*, void) + IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl, Button*, void) { ::sfx2::FileDialogHelper aDlg( css::ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE ); diff --git a/svx/source/form/delayedevent.cxx b/svx/source/form/delayedevent.cxx index 57845711a496..f17c3dcae461 100644 --- a/svx/source/form/delayedevent.cxx +++ b/svx/source/form/delayedevent.cxx @@ -37,7 +37,7 @@ namespace svxform m_nEventId = nullptr; } - IMPL_LINK_TYPED( DelayedEvent, OnCall, void*, _pArg, void ) + IMPL_LINK( DelayedEvent, OnCall, void*, _pArg, void ) { m_nEventId = nullptr; m_aHandler.Call( _pArg ); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 10dc8b7a4975..d1a3773a8b68 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1212,7 +1212,7 @@ bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rN } -IMPL_LINK_TYPED( FmFilterNavigator, OnRemove, void*, p, void ) +IMPL_LINK( FmFilterNavigator, OnRemove, void*, p, void ) { SvTreeListEntry* pEntry = static_cast<SvTreeListEntry*>(p); // now remove the entry @@ -1220,7 +1220,7 @@ IMPL_LINK_TYPED( FmFilterNavigator, OnRemove, void*, p, void ) } -IMPL_LINK_NOARG_TYPED(FmFilterNavigator, OnDropActionTimer, Timer *, void) +IMPL_LINK_NOARG(FmFilterNavigator, OnDropActionTimer, Timer *, void) { if (--m_aTimerCounter > 0) return; diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 498bfb3a6c6f..35570dacc333 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -481,7 +481,7 @@ void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const } -IMPL_LINK_NOARG_TYPED( FmPropBrw, OnAsyncGetFocus, void*, void ) +IMPL_LINK_NOARG( FmPropBrw, OnAsyncGetFocus, void*, void ) { if (m_xBrowserComponentWindow.is()) m_xBrowserComponentWindow->setFocus(); diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index 84733dcfd42d..dc244543556f 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -108,7 +108,7 @@ namespace } } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( FmFormObjFactory, MakeObject, SdrObjCreatorParams, aParams, SdrObject*) { SdrObject* pNewObj = nullptr; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index db93df68ab94..0b1a0eba7339 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -134,7 +134,7 @@ namespace svxform void impl_doFireScriptEvent_nothrow( ::osl::ClearableMutexGuard& _rGuard, const ScriptEvent& _rEvent, Any* _pSynchronousResult ); private: - DECL_LINK_TYPED( OnAsyncScriptEvent, void*, void ); + DECL_LINK( OnAsyncScriptEvent, void*, void ); }; class FormScriptingEnvironment: @@ -876,7 +876,7 @@ namespace svxform } }; - IMPL_LINK_TYPED( FormScriptListener, OnAsyncScriptEvent, void*, p, void ) + IMPL_LINK( FormScriptListener, OnAsyncScriptEvent, void*, p, void ) { ScriptEvent* _pEvent = static_cast<ScriptEvent*>(p); OSL_PRECOND( _pEvent != nullptr, "FormScriptListener::OnAsyncScriptEvent: invalid event!" ); diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index e3d8259c6f5d..1ad1630136b8 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -991,7 +991,7 @@ void FmXFormShell::LockSlotInvalidation(bool bLock) } -IMPL_LINK_NOARG_TYPED(FmXFormShell, OnInvalidateSlots, void*,void) +IMPL_LINK_NOARG(FmXFormShell, OnInvalidateSlots, void*,void) { if ( impl_checkDisposed() ) return; @@ -2178,7 +2178,7 @@ void FmXFormShell::ShowSelectionProperties( bool bShow ) } -IMPL_LINK_TYPED(FmXFormShell, OnFoundData, FmFoundRecordInformation&, rfriWhere, void) +IMPL_LINK(FmXFormShell, OnFoundData, FmFoundRecordInformation&, rfriWhere, void) { if ( impl_checkDisposed() ) return; @@ -2260,7 +2260,7 @@ IMPL_LINK_TYPED(FmXFormShell, OnFoundData, FmFoundRecordInformation&, rfriWhere, } -IMPL_LINK_TYPED(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation&, rfriWhere, void) +IMPL_LINK(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation&, rfriWhere, void) { if ( impl_checkDisposed() ) return; @@ -2289,7 +2289,7 @@ IMPL_LINK_TYPED(FmXFormShell, OnCanceledNotFound, FmFoundRecordInformation&, rfr } -IMPL_LINK_TYPED(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextInfo, sal_uInt32) +IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextInfo, sal_uInt32) { if ( impl_checkDisposed() ) return 0; @@ -2657,7 +2657,7 @@ void FmXFormShell::selectionChanged(const lang::EventObject& rEvent) throw(css:: } -IMPL_LINK_NOARG_TYPED(FmXFormShell, OnTimeOut, Timer*, void) +IMPL_LINK_NOARG(FmXFormShell, OnTimeOut, Timer*, void) { if ( impl_checkDisposed() ) return; @@ -3588,7 +3588,7 @@ void FmXFormShell::viewDeactivated( FmFormView& _rCurrentView, bool _bDeactivate } -IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFirstTimeActivation, void*, void ) +IMPL_LINK_NOARG( FmXFormShell, OnFirstTimeActivation, void*, void ) { if ( impl_checkDisposed() ) return; @@ -3608,7 +3608,7 @@ IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFirstTimeActivation, void*, void ) } -IMPL_LINK_NOARG_TYPED( FmXFormShell, OnFormsCreated, FmFormPageImpl&, void ) +IMPL_LINK_NOARG( FmXFormShell, OnFormsCreated, FmFormPageImpl&, void ) { UpdateForms( true ); } @@ -3751,7 +3751,7 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels } -IMPL_LINK_NOARG_TYPED( FmXFormShell, OnLoadForms, void*, void ) +IMPL_LINK_NOARG( FmXFormShell, OnLoadForms, void*, void ) { FmLoadAction aAction = m_aLoadingPages.front(); m_aLoadingPages.pop(); diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index f1f1f49e1842..b2db67555831 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -976,7 +976,7 @@ void FmSearchEngine::OnSearchTerminated() } -IMPL_LINK_TYPED(FmSearchEngine, OnNewRecordCount, sal_Int32, theCounter, void) +IMPL_LINK(FmSearchEngine, OnNewRecordCount, sal_Int32, theCounter, void) { if (!m_aProgressHandler.IsSet()) return; diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 52b6b2e67d5b..c1755834469f 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -548,7 +548,7 @@ namespace svx } - IMPL_LINK_NOARG_TYPED( FmTextControlShell, OnInvalidateClipboard, Timer*, void ) + IMPL_LINK_NOARG( FmTextControlShell, OnInvalidateClipboard, Timer*, void ) { if ( m_bNeedClipboardInvalidation ) { diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 79b30f036876..3ee22cca727c 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -596,7 +596,7 @@ void FmXFormView::displayAsyncErrorMessage( const SQLErrorEvent& _rEvent ) } -IMPL_LINK_NOARG_TYPED(FmXFormView, OnDelayedErrorMessage, void*, void) +IMPL_LINK_NOARG(FmXFormView, OnDelayedErrorMessage, void*, void) { m_nErrorMessageEvent = nullptr; displayException( m_aAsyncError ); @@ -704,7 +704,7 @@ namespace } -IMPL_LINK_NOARG_TYPED(FmXFormView, OnActivate, void*, void) +IMPL_LINK_NOARG(FmXFormView, OnActivate, void*, void) { m_nActivationEvent = nullptr; @@ -940,7 +940,7 @@ Reference< XFormController > FmXFormView::getFormController( const Reference< XF } -IMPL_LINK_NOARG_TYPED(FmXFormView, OnAutoFocus, void*, void) +IMPL_LINK_NOARG(FmXFormView, OnAutoFocus, void*, void) { m_nAutoFocusEvent = nullptr; @@ -1054,7 +1054,7 @@ void FmXFormView::breakCreateFormObject() m_xLastCreatedControlModel.clear(); } -IMPL_LINK_NOARG_TYPED( FmXFormView, OnStartControlWizard, void*, void ) +IMPL_LINK_NOARG( FmXFormView, OnStartControlWizard, void*, void ) { m_nControlWizardEvent = nullptr; OSL_PRECOND( m_xLastCreatedControlModel.is(), "FmXFormView::OnStartControlWizard: illegal call!" ); diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index e16e6008a4a7..f1773ea316ca 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -493,7 +493,7 @@ void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& } -IMPL_LINK_NOARG_TYPED( FormController, OnActivateTabOrder, Idle*, void ) +IMPL_LINK_NOARG( FormController, OnActivateTabOrder, Idle*, void ) { activateTabOrder(); } @@ -509,7 +509,7 @@ struct UpdateAllListeners : public ::std::unary_function< Reference< XDispatch > } }; -IMPL_LINK_NOARG_TYPED( FormController, OnInvalidateFeatures, Timer*, void ) +IMPL_LINK_NOARG( FormController, OnInvalidateFeatures, Timer*, void ) { ::osl::MutexGuard aGuard( m_aMutex ); for ( ::std::set< sal_Int16 >::const_iterator aLoop = m_aInvalidFeatures.begin(); @@ -1432,7 +1432,7 @@ void FormController::toggleAutoFields(bool bAutoFields) } -IMPL_LINK_NOARG_TYPED(FormController, OnToggleAutoFields, void*, void) +IMPL_LINK_NOARG(FormController, OnToggleAutoFields, void*, void) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); @@ -1753,7 +1753,7 @@ void FormController::focusGained(const FocusEvent& e) throw( RuntimeException, s } -IMPL_LINK_NOARG_TYPED( FormController, OnActivated, void*, void ) +IMPL_LINK_NOARG( FormController, OnActivated, void*, void ) { EventObject aEvent; aEvent.Source = *this; @@ -1761,7 +1761,7 @@ IMPL_LINK_NOARG_TYPED( FormController, OnActivated, void*, void ) } -IMPL_LINK_NOARG_TYPED( FormController, OnDeactivated, void*, void ) +IMPL_LINK_NOARG( FormController, OnDeactivated, void*, void ) { EventObject aEvent; aEvent.Source = *this; @@ -2604,7 +2604,7 @@ void FormController::updateAllDispatchers() const } -IMPL_LINK_NOARG_TYPED(FormController, OnLoad, void*, void) +IMPL_LINK_NOARG(FormController, OnLoad, void*, void) { OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" ); m_bLocked = determineLockState(); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 35ca31efc13f..d41851871cac 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1483,7 +1483,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEdit, void*, void) + IMPL_LINK_NOARG(NavigatorTree, OnEdit, void*, void) { nEditEvent = nullptr; EditEntry( m_pEditEntry ); @@ -1491,7 +1491,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnDropActionTimer, Timer *, void) + IMPL_LINK_NOARG(NavigatorTree, OnDropActionTimer, Timer *, void) { if (--m_aTimerCounter > 0) return; @@ -1526,7 +1526,7 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void) + IMPL_LINK_NOARG(NavigatorTree, OnEntrySelDesel, SvTreeListBox*, void) { m_sdiState = SDI_DIRTY; @@ -1541,13 +1541,13 @@ namespace svxform } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnSynchronizeTimer, Timer *, void) + IMPL_LINK_NOARG(NavigatorTree, OnSynchronizeTimer, Timer *, void) { SynchronizeMarkList(); } - IMPL_LINK_NOARG_TYPED(NavigatorTree, OnClipboardAction, OLocalExchange&, void) + IMPL_LINK_NOARG(NavigatorTree, OnClipboardAction, OLocalExchange&, void) { if ( !m_aControlExchange.isClipboardOwner() ) { diff --git a/svx/source/gallery2/GalleryControl.cxx b/svx/source/gallery2/GalleryControl.cxx index f6c113694f51..99f3f06663e5 100644 --- a/svx/source/gallery2/GalleryControl.cxx +++ b/svx/source/gallery2/GalleryControl.cxx @@ -225,7 +225,7 @@ void GalleryControl::ThemeSelectionHasChanged() mpBrowser2->SelectTheme(mpBrowser1->GetSelectedTheme()); } -IMPL_LINK_NOARG_TYPED( GalleryControl, SplitHdl, Splitter*, void ) +IMPL_LINK_NOARG( GalleryControl, SplitHdl, Splitter*, void ) { if(mpSplitter->IsHorizontal()) { diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index e3012a1d07bf..dd53ecef93ca 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -322,17 +322,17 @@ void GalleryBrowser1::ImplEndGalleryThemeProperties(Dialog* pDialog, bool bCreat Application::PostUserEvent( LINK( this, GalleryBrowser1, DestroyThemePropertiesDlgHdl ), pDialog, true ); } -IMPL_LINK_TYPED( GalleryBrowser1, EndNewThemePropertiesDlgHdl, Dialog&, rDialog, void ) +IMPL_LINK( GalleryBrowser1, EndNewThemePropertiesDlgHdl, Dialog&, rDialog, void ) { ImplEndGalleryThemeProperties(&rDialog, true); } -IMPL_LINK_TYPED( GalleryBrowser1, EndThemePropertiesDlgHdl, Dialog&, rDialog, void ) +IMPL_LINK( GalleryBrowser1, EndThemePropertiesDlgHdl, Dialog&, rDialog, void ) { ImplEndGalleryThemeProperties(&rDialog, false); } -IMPL_LINK_TYPED( GalleryBrowser1, DestroyThemePropertiesDlgHdl, void*, p, void ) +IMPL_LINK( GalleryBrowser1, DestroyThemePropertiesDlgHdl, void*, p, void ) { VclAbstractDialog2* pDialog = static_cast<VclAbstractDialog2*>(p); delete pDialog; @@ -574,7 +574,7 @@ bool GalleryBrowser1::KeyInput( const KeyEvent& rKEvt, vcl::Window* pWindow ) return bRet; } -IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ShowContextMenuHdl, void*, void) +IMPL_LINK_NOARG(GalleryBrowser1, ShowContextMenuHdl, void*, void) { ::std::vector< sal_uInt16 > aExecVector; ImplGetExecuteVector(aExecVector); @@ -601,19 +601,19 @@ IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ShowContextMenuHdl, void*, void) } } -IMPL_LINK_TYPED( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu, bool ) +IMPL_LINK( GalleryBrowser1, PopupMenuHdl, Menu*, pMenu, bool ) { ImplExecute( pMenu->GetCurItemId() ); return false; } -IMPL_LINK_NOARG_TYPED(GalleryBrowser1, SelectThemeHdl, ListBox&, void) +IMPL_LINK_NOARG(GalleryBrowser1, SelectThemeHdl, ListBox&, void) { if (maThemeSlectionHandler) maThemeSlectionHandler(); } -IMPL_LINK_NOARG_TYPED(GalleryBrowser1, ClickNewThemeHdl, Button*, void) +IMPL_LINK_NOARG(GalleryBrowser1, ClickNewThemeHdl, Button*, void) { OUString aNewTheme( GAL_RESSTR(RID_SVXSTR_GALLERY_NEWTHEME) ); OUString aName( aNewTheme ); diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index de7cc8cce042..999d8a6cea76 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -105,13 +105,13 @@ private: // SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; - DECL_LINK_TYPED( ClickNewThemeHdl, Button*, void ); - DECL_LINK_TYPED( SelectThemeHdl, ListBox&, void ); - DECL_LINK_TYPED( ShowContextMenuHdl, void*, void ); - DECL_LINK_TYPED( PopupMenuHdl, Menu*, bool ); - DECL_LINK_TYPED( EndNewThemePropertiesDlgHdl, Dialog&, void ); - DECL_LINK_TYPED( EndThemePropertiesDlgHdl, Dialog&, void ); - DECL_LINK_TYPED( DestroyThemePropertiesDlgHdl, void*, void ); + DECL_LINK( ClickNewThemeHdl, Button*, void ); + DECL_LINK( SelectThemeHdl, ListBox&, void ); + DECL_LINK( ShowContextMenuHdl, void*, void ); + DECL_LINK( PopupMenuHdl, Menu*, bool ); + DECL_LINK( EndNewThemePropertiesDlgHdl, Dialog&, void ); + DECL_LINK( EndThemePropertiesDlgHdl, Dialog&, void ); + DECL_LINK( DestroyThemePropertiesDlgHdl, void*, void ); public: diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index f2b38b84291c..aff553ac7d09 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -74,7 +74,7 @@ struct DispatchInfo css::uno::Reference< css::frame::XDispatch > Dispatch; }; -IMPL_STATIC_LINK_TYPED( GalleryBrowser2, AsyncDispatch_Impl, void*, p, void ) +IMPL_STATIC_LINK( GalleryBrowser2, AsyncDispatch_Impl, void*, p, void ) { DispatchInfo* pDispatchInfo = static_cast<DispatchInfo*>(p); if ( pDispatchInfo && pDispatchInfo->Dispatch.is() ) @@ -122,8 +122,8 @@ private: static void Execute( const CommandInfo &rCmdInfo, const css::uno::Sequence< css::beans::PropertyValue > &rArguments ); - DECL_LINK_TYPED( MenuSelectHdl, Menu*, bool ); - DECL_LINK_TYPED( BackgroundMenuSelectHdl, Menu*, bool ); + DECL_LINK( MenuSelectHdl, Menu*, bool ); + DECL_LINK( BackgroundMenuSelectHdl, Menu*, bool ); public: GalleryThemePopup( const GalleryTheme* pTheme, sal_uIntPtr nObjectPos, @@ -318,7 +318,7 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos mpPopupMenu->Execute( pWindow, aPos ); } -IMPL_LINK_TYPED( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool ) +IMPL_LINK( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool ) { if( !pMenu ) return false; @@ -343,7 +343,7 @@ IMPL_LINK_TYPED( GalleryThemePopup, MenuSelectHdl, Menu*, pMenu, bool ) return false; } -IMPL_LINK_TYPED( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu, bool ) +IMPL_LINK( GalleryThemePopup, BackgroundMenuSelectHdl, Menu*, pMenu, bool ) { if( !pMenu ) return false; @@ -1287,17 +1287,17 @@ OUString GalleryBrowser2::GetFilterName() const } -IMPL_LINK_NOARG_TYPED(GalleryBrowser2, SelectObjectValueSetHdl, ValueSet*, void) +IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectValueSetHdl, ValueSet*, void) { ImplUpdateInfoBar(); } -IMPL_LINK_NOARG_TYPED(GalleryBrowser2, SelectObjectHdl, GalleryListView*, void) +IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectHdl, GalleryListView*, void) { ImplUpdateInfoBar(); } -IMPL_LINK_TYPED( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox, void ) +IMPL_LINK( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox, void ) { if( pBox->GetCurItemId() == TBX_ID_ICON ) SetMode( GALLERYBROWSERMODE_ICON ); @@ -1305,7 +1305,7 @@ IMPL_LINK_TYPED( GalleryBrowser2, SelectTbxHdl, ToolBox*, pBox, void ) SetMode( GALLERYBROWSERMODE_LIST ); } -IMPL_LINK_NOARG_TYPED(GalleryBrowser2, MiscHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(GalleryBrowser2, MiscHdl, LinkParamNone*, void) { maViewBox->SetOutStyle( maMiscOptions.GetToolboxStyle() ); diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 2578ac37a06c..70c9ad68d002 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -76,7 +76,7 @@ BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ) return aBmpEx; } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( SgaUserDataFactory, MakeUserData, SdrObjUserDataCreatorParams, aParams, SdrObjUserData* ) { if ( aParams.nInventor == IV_IMAPINFO && aParams.nObjIdentifier == ID_IMAPINFO ) diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx index fb1771fcd501..de2a2c4f5797 100644 --- a/svx/source/inc/AccessibleFrameSelector.hxx +++ b/svx/source/inc/AccessibleFrameSelector.hxx @@ -101,7 +101,7 @@ public: void NotifyAccessibleEvent( const sal_Int16 _nEventId, const css::uno::Any& _rOldValue, const css::uno::Any& _rNewValue ); protected: - DECL_LINK_TYPED( WindowEventListener, VclWindowEvent&, void ); + DECL_LINK( WindowEventListener, VclWindowEvent&, void ); void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index da4aba3f3b6d..e0d65a2ef168 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -260,8 +260,8 @@ namespace svxform OUString m_sInstanceURL; bool m_bLinkOnce; - DECL_LINK_TYPED(TbxSelectHdl, ToolBox *, void); - DECL_LINK_TYPED(ItemSelectHdl, SvTreeListBox*, void); + DECL_LINK(TbxSelectHdl, ToolBox *, void); + DECL_LINK(ItemSelectHdl, SvTreeListBox*, void); void AddChildren( SvTreeListEntry* _pParent, const ImageList& _rImgLst, @@ -334,11 +334,11 @@ namespace svxform XFrame_ref m_xFrame; XFrameModel_ref m_xFrameModel; - DECL_LINK_TYPED( ModelSelectListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( MenuSelectHdl, MenuButton *, void ); - DECL_LINK_TYPED( MenuActivateHdl, MenuButton *, void ); - DECL_LINK_TYPED( ActivatePageHdl, TabControl*, void); - DECL_LINK_TYPED( UpdateHdl, Timer *, void); + DECL_LINK( ModelSelectListBoxHdl, ListBox&, void ); + DECL_LINK( MenuSelectHdl, MenuButton *, void ); + DECL_LINK( MenuActivateHdl, MenuButton *, void ); + DECL_LINK( ActivatePageHdl, TabControl*, void); + DECL_LINK( UpdateHdl, Timer *, void); void ModelSelectHdl(ListBox*); XFormsPage* GetCurrentPage( sal_uInt16& rCurId ); void LoadModels(); @@ -445,9 +445,9 @@ namespace svxform OUString m_sFL_Binding; OUString m_sFT_BindingExp; - DECL_LINK_TYPED( CheckHdl, Button*, void ); - DECL_LINK_TYPED( ConditionHdl, Button*, void ); - DECL_LINK_TYPED( OKHdl, Button*, void); + DECL_LINK( CheckHdl, Button*, void ); + DECL_LINK( ConditionHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void); void InitDialog(); void InitFromNode(); @@ -477,10 +477,10 @@ namespace svxform XFormsUIHelper1_ref m_xUIHelper; XPropertySet_ref m_xBinding; - DECL_LINK_TYPED(ModifyHdl, Edit&, void); - DECL_LINK_TYPED(ResultHdl, Idle *, void); - DECL_LINK_TYPED(EditHdl, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(ModifyHdl, Edit&, void); + DECL_LINK(ResultHdl, Idle *, void); + DECL_LINK(EditHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: AddConditionDialog(vcl::Window* pParent, @@ -514,9 +514,9 @@ namespace svxform XNameContainer_ref& m_rNamespaces; - DECL_LINK_TYPED( SelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( ClickHdl, Button*, void ); - DECL_LINK_TYPED( OKHdl, Button*, void); + DECL_LINK( SelectHdl, SvTreeListBox*, void ); + DECL_LINK( ClickHdl, Button*, void ); + DECL_LINK( OKHdl, Button*, void); void LoadNamespaces(); @@ -536,7 +536,7 @@ namespace svxform VclPtr<AddConditionDialog> m_pConditionDlg; - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); public: ManageNamespaceDialog(vcl::Window* pParent, AddConditionDialog* _pCondDlg, bool bIsEdit); @@ -577,8 +577,8 @@ namespace svxform XPropertySet_ref m_xTempBinding; XPropertySet_ref m_xCreatedBinding; - DECL_LINK_TYPED(RefHdl, Button*, void); - DECL_LINK_TYPED(OKHdl, Button*, void); + DECL_LINK(RefHdl, Button*, void); + DECL_LINK(OKHdl, Button*, void); void FillAllBoxes(); @@ -622,7 +622,7 @@ namespace svxform OUString m_sAllFilterName; - DECL_LINK_TYPED(FilePickerHdl, Button*, void); + DECL_LINK(FilePickerHdl, Button*, void); public: AddInstanceDialog( vcl::Window* pParent, bool _bEdit ); diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx index 7fb6dcbd6bcc..4f7925c94b1d 100644 --- a/svx/source/inc/delayedevent.hxx +++ b/svx/source/inc/delayedevent.hxx @@ -65,7 +65,7 @@ namespace svxform ImplSVEvent * m_nEventId; private: - DECL_LINK_TYPED( OnCall, void*, void ); + DECL_LINK( OnCall, void*, void ); private: DelayedEvent( const DelayedEvent& ) = delete; diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx index bba889059f54..244c56983439 100644 --- a/svx/source/inc/docrecovery.hxx +++ b/svx/source/inc/docrecovery.hxx @@ -394,7 +394,7 @@ class SaveDialog : public Dialog virtual ~SaveDialog() override; virtual void dispose() override; - DECL_LINK_TYPED(OKButtonHdl, Button*, void); + DECL_LINK(OKButtonHdl, Button*, void); }; class SaveProgressDialog : public ModalDialog @@ -538,8 +538,8 @@ class RecoveryDialog : public Dialog // helper private: /** @short TODO */ - DECL_LINK_TYPED(NextButtonHdl, Button*, void); - DECL_LINK_TYPED(CancelButtonHdl, Button*, void); + DECL_LINK(NextButtonHdl, Button*, void); + DECL_LINK(CancelButtonHdl, Button*, void); /** @short TODO */ @@ -593,15 +593,15 @@ class BrokenRecoveryDialog : public ModalDialog /** @short TODO */ - DECL_LINK_TYPED(SaveButtonHdl, Button*, void); + DECL_LINK(SaveButtonHdl, Button*, void); /** @short TODO */ - DECL_LINK_TYPED(OkButtonHdl, Button*, void); + DECL_LINK(OkButtonHdl, Button*, void); /** @short TODO */ - DECL_LINK_TYPED(CancelButtonHdl, Button*, void); + DECL_LINK(CancelButtonHdl, Button*, void); /** @short TODO */ diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 35ebbe57595e..6487e0afff36 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -272,8 +272,8 @@ protected: void Insert(FmFilterData* pItem, sal_uLong nPos); void Remove(FmFilterData* pItem); - DECL_LINK_TYPED(OnRemove, void*, void); - DECL_LINK_TYPED(OnDropActionTimer, Timer*, void); + DECL_LINK(OnRemove, void*, void); + DECL_LINK(OnDropActionTimer, Timer*, void); private: /** returns the first form item and the selected FilterItems in the vector diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx index 44448b58723f..04c3a28ab467 100644 --- a/svx/source/inc/fmPropBrw.hxx +++ b/svx/source/inc/fmPropBrw.hxx @@ -67,7 +67,7 @@ protected: virtual void FillInfo( SfxChildWinInfo& rInfo ) const override; virtual bool Close() override; - DECL_LINK_TYPED( OnAsyncGetFocus, void*, void ); + DECL_LINK( OnAsyncGetFocus, void*, void ); void implSetNewSelection( const InterfaceBag& _rSelection ); void implDetachController(); diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 8028ae837af7..122ba071246d 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -468,13 +468,13 @@ namespace svxform static bool IsHiddenControl(FmEntryData* pEntryData); - DECL_LINK_TYPED( OnEdit, void*, void ); - DECL_LINK_TYPED( OnDropActionTimer, Timer*, void ); + DECL_LINK( OnEdit, void*, void ); + DECL_LINK( OnDropActionTimer, Timer*, void ); - DECL_LINK_TYPED( OnEntrySelDesel, SvTreeListBox*, void ); - DECL_LINK_TYPED( OnSynchronizeTimer, Timer*, void ); + DECL_LINK( OnEntrySelDesel, SvTreeListBox*, void ); + DECL_LINK( OnSynchronizeTimer, Timer*, void ); - DECL_LINK_TYPED( OnClipboardAction, OLocalExchange&, void ); + DECL_LINK( OnClipboardAction, OLocalExchange&, void ); protected: virtual void Command( const CommandEvent& rEvt ) override; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 21de05b2b7d1..300650ec6ed4 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -465,12 +465,12 @@ public: SAL_DLLPRIVATE bool HasControlFocus() const; private: - DECL_DLLPRIVATE_LINK_TYPED(OnFoundData, FmFoundRecordInformation&, void); - DECL_DLLPRIVATE_LINK_TYPED(OnCanceledNotFound, FmFoundRecordInformation&, void); - DECL_DLLPRIVATE_LINK_TYPED(OnSearchContextRequest, FmSearchContext&, sal_uInt32); - DECL_DLLPRIVATE_LINK_TYPED(OnTimeOut, Timer*, void); - DECL_DLLPRIVATE_LINK_TYPED(OnFirstTimeActivation, void*, void); - DECL_DLLPRIVATE_LINK_TYPED(OnFormsCreated, FmFormPageImpl&, void); + DECL_DLLPRIVATE_LINK(OnFoundData, FmFoundRecordInformation&, void); + DECL_DLLPRIVATE_LINK(OnCanceledNotFound, FmFoundRecordInformation&, void); + DECL_DLLPRIVATE_LINK(OnSearchContextRequest, FmSearchContext&, sal_uInt32); + DECL_DLLPRIVATE_LINK(OnTimeOut, Timer*, void); + DECL_DLLPRIVATE_LINK(OnFirstTimeActivation, void*, void); + DECL_DLLPRIVATE_LINK(OnFormsCreated, FmFormPageImpl&, void); SAL_DLLPRIVATE void LoopGrids(LoopGridsSync nSync, LoopGridsFlags nWhat = LoopGridsFlags::NONE); @@ -481,7 +481,7 @@ private: // (asynchron) invalidiert SAL_DLLPRIVATE void LockSlotInvalidation(bool bLock); - DECL_DLLPRIVATE_LINK_TYPED(OnInvalidateSlots, void*, void); + DECL_DLLPRIVATE_LINK(OnInvalidateSlots, void*, void); SAL_DLLPRIVATE void CloseExternalFormViewer(); // closes the task-local beamer displaying a grid view for a form @@ -531,7 +531,7 @@ public: SAL_DLLPRIVATE bool IsFormSlotEnabled( sal_Int32 _nSlot, css::form::runtime::FeatureState* _pCompleteState ); protected: - DECL_DLLPRIVATE_LINK_TYPED( OnLoadForms, void*, void ); + DECL_DLLPRIVATE_LINK( OnLoadForms, void*, void ); }; diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 36825fa24286..9b8801e65ab4 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -199,7 +199,7 @@ namespace svx */ void impl_parseURL_nothrow( css::util::URL& _rURL ); - DECL_LINK_TYPED( OnInvalidateClipboard, Timer*, void ); + DECL_LINK( OnInvalidateClipboard, Timer*, void ); }; diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx index f01ad9d557d9..f2f0a6875fd7 100644 --- a/svx/source/inc/fmvwimp.hxx +++ b/svx/source/inc/fmvwimp.hxx @@ -293,10 +293,10 @@ private: /// the auto focus to the first (in terms of the tab order) control void AutoFocus(); - DECL_LINK_TYPED( OnActivate, void*, void ); - DECL_LINK_TYPED( OnAutoFocus, void*, void ); - DECL_LINK_TYPED( OnDelayedErrorMessage, void*, void ); - DECL_LINK_TYPED( OnStartControlWizard, void*, void ); + DECL_LINK( OnActivate, void*, void ); + DECL_LINK( OnAutoFocus, void*, void ); + DECL_LINK( OnDelayedErrorMessage, void*, void ); + DECL_LINK( OnStartControlWizard, void*, void ); private: ::svxform::DocumentType impl_getDocumentType() const; diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx index a28e50f0ce23..77966e3ea946 100644 --- a/svx/source/inc/formcontroller.hxx +++ b/svx/source/inc/formcontroller.hxx @@ -563,12 +563,12 @@ namespace svxform bool isListeningForChanges() const {return m_bDBConnection && !m_bFiltering && !isLocked();} css::uno::Reference< css::awt::XControl> isInList(const css::uno::Reference< css::awt::XWindowPeer>& xPeer) const; - DECL_LINK_TYPED( OnActivateTabOrder, Idle*, void ); - DECL_LINK_TYPED( OnInvalidateFeatures, Timer*, void ); - DECL_LINK_TYPED( OnLoad, void*, void ); - DECL_LINK_TYPED( OnToggleAutoFields, void*, void ); - DECL_LINK_TYPED( OnActivated, void*, void ); - DECL_LINK_TYPED( OnDeactivated, void*, void ); + DECL_LINK( OnActivateTabOrder, Idle*, void ); + DECL_LINK( OnInvalidateFeatures, Timer*, void ); + DECL_LINK( OnLoad, void*, void ); + DECL_LINK( OnToggleAutoFields, void*, void ); + DECL_LINK( OnActivated, void*, void ); + DECL_LINK( OnDeactivated, void*, void ); }; } diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index 5a2ce9512b32..38b8478425b4 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -696,7 +696,7 @@ protected: protected: void SetList(const css::uno::Any& rItems, bool bComboBox); void CreateControl(vcl::Window* pParent, const css::uno::Reference< css::beans::XPropertySet >& xModel); - DECL_LINK_TYPED( OnClick, VclPtr<CheckBox>, void ); + DECL_LINK( OnClick, VclPtr<CheckBox>, void ); }; @@ -801,7 +801,7 @@ protected: virtual void onFocusLost( const css::awt::FocusEvent& _rEvent ); private: - DECL_LINK_TYPED( OnWindowEvent, VclWindowEvent&, void ); + DECL_LINK( OnWindowEvent, VclWindowEvent&, void ); }; @@ -1014,7 +1014,7 @@ public: protected: virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; - DECL_LINK_TYPED( OnDoubleClick, ListBox&, void ); + DECL_LINK( OnDoubleClick, ListBox&, void ); }; @@ -1107,7 +1107,7 @@ public: virtual sal_Int16 SAL_CALL getMaxTextLen() throw(css::uno::RuntimeException, std::exception) override; protected: - DECL_LINK_TYPED( OnCommit, DbFilterField&, void ); + DECL_LINK( OnCommit, DbFilterField&, void ); }; #endif // INCLUDED_SVX_SOURCE_INC_GRIDCELL_HXX diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx index aaa99f0d8630..d1d279bd5a58 100644 --- a/svx/source/mnuctrls/smarttagmenu.cxx +++ b/svx/source/mnuctrls/smarttagmenu.cxx @@ -39,7 +39,7 @@ public: private: void FillMenu(); - DECL_LINK_TYPED( MenuSelect, Menu*, bool ); + DECL_LINK( MenuSelect, Menu*, bool ); struct InvokeAction { css::uno::Reference< css::smarttags::XSmartTagAction > m_xAction; @@ -196,7 +196,7 @@ void SmartTagMenuController::FillMenu() } } -IMPL_LINK_TYPED( SmartTagMenuController, MenuSelect, Menu*, pMenu, bool ) +IMPL_LINK( SmartTagMenuController, MenuSelect, Menu*, pMenu, bool ) { if ( !m_pSmartTagItem ) return false; diff --git a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx index d5bb135a4c7a..864274093103 100644 --- a/svx/source/sdr/overlay/overlaymanagerbuffered.cxx +++ b/svx/source/sdr/overlay/overlaymanagerbuffered.cxx @@ -205,7 +205,7 @@ namespace sdr mpBufferDevice->EnableMapMode(bMapModeWasEnabledSource); } - IMPL_LINK_NOARG_TYPED(OverlayManagerBuffered, ImpBufferTimerHandler, Idle*, void) + IMPL_LINK_NOARG(OverlayManagerBuffered, ImpBufferTimerHandler, Idle*, void) { //Resolves: fdo#46728 ensure this exists until end of scope rtl::Reference<OverlayManager> xRef(this); diff --git a/svx/source/sidebar/PanelLayout.cxx b/svx/source/sidebar/PanelLayout.cxx index 9e04f33b31ba..9ef444c67344 100644 --- a/svx/source/sidebar/PanelLayout.cxx +++ b/svx/source/sidebar/PanelLayout.cxx @@ -74,7 +74,7 @@ void PanelLayout::queue_resize(StateChangedType /*eReason*/) m_aPanelLayoutIdle.Start(); } -IMPL_LINK_NOARG_TYPED( PanelLayout, ImplHandlePanelLayoutTimerHdl, Idle*, void ) +IMPL_LINK_NOARG( PanelLayout, ImplHandlePanelLayoutTimerHdl, Idle*, void ) { vcl::Window *pChild = GetWindow(GetWindowType::FirstChild); assert(pChild); diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx index a48fbf60c172..d65d2bdfa692 100644 --- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx +++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx @@ -202,7 +202,7 @@ void AreaPropertyPanelBase::SetTransparency(sal_uInt16 nVal) mpMTRTransparent->SetValue(nVal); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void) { SvxOpenGraphicDialog aDlg( "Import" ); aDlg.EnableLink(false); @@ -244,7 +244,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ClickImportBitmapHdl, Button*, void } } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) { sal_Int32 nPos = (eFillStyle)mpLbFillType->GetSelectEntryPos(); mpLbFillAttr->Clear(); @@ -484,12 +484,12 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillTypeHdl, ListBox&, void) mpSidebarController->NotifyResize(); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, SelectFillAttrHdl, ListBox&, void) { SelectFillAttrHdl_Impl(); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeGradientAngle, Edit&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ChangeGradientAngle, Edit&, void) { SelectFillAttrHdl_Impl(); } @@ -1311,7 +1311,7 @@ void AreaPropertyPanelBase::Update() mpSidebarController->NotifyResize(); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ModifyTransSliderHdl, Slider*, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ModifyTransSliderHdl, Slider*, void) { const sal_uInt16 nVal = mpSldTransparent->GetThumbPos(); SetTransparency(nVal); @@ -1319,7 +1319,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ModifyTransSliderHdl, Slider*, void setFillTransparence(aLinearItem); } -IMPL_LINK_TYPED( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void ) +IMPL_LINK( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, void ) { if (!mxTrGrPopup) mxTrGrPopup = VclPtr<AreaTransparencyGradientPopup>::Create(pToolBox, *this); @@ -1329,7 +1329,7 @@ IMPL_LINK_TYPED( AreaPropertyPanelBase, ClickTrGrHdl_Impl, ToolBox*, pToolBox, v FloatWinPopupFlags::NoAppFocusClose); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, void) { sal_Int32 nSelectType = mpLBTransType->GetSelectEntryPos(); bool bGradient = false; @@ -1427,7 +1427,7 @@ IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ChangeTrgrTypeHdl_Impl, ListBox&, v setFillFloatTransparence(aGradientItem); } -IMPL_LINK_NOARG_TYPED(AreaPropertyPanelBase, ModifyTransparentHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(AreaPropertyPanelBase, ModifyTransparentHdl_Impl, Edit&, void) { const sal_uInt16 nTrans = (sal_uInt16)mpMTRTransparent->GetValue(); mnLastTransSolid = nTrans; diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx index 7b895945cdc0..dc50fb1f8b00 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.cxx @@ -291,14 +291,14 @@ void AreaTransparencyGradientControl::ExecuteValueModify( sal_uInt8 nStartCol, s mrAreaPropertyPanel.setFillFloatTransparence(aGradientItem); } -IMPL_LINK_NOARG_TYPED(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl, Edit&, void) +IMPL_LINK_NOARG(AreaTransparencyGradientControl, ModifiedTrgrHdl_Impl, Edit&, void) { sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue->GetValue() * 255) / 100); sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue->GetValue() * 255) / 100); ExecuteValueModify( nStartCol, nEndCol ); } -IMPL_LINK_NOARG_TYPED(AreaTransparencyGradientControl, Left_Click45_Impl, ToolBox *, void) +IMPL_LINK_NOARG(AreaTransparencyGradientControl, Left_Click45_Impl, ToolBox *, void) { sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue->GetValue() * 255) / 100); sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue->GetValue() * 255) / 100); @@ -310,7 +310,7 @@ IMPL_LINK_NOARG_TYPED(AreaTransparencyGradientControl, Left_Click45_Impl, ToolBo ExecuteValueModify( nStartCol, nEndCol ); } -IMPL_LINK_NOARG_TYPED(AreaTransparencyGradientControl, Right_Click45_Impl, ToolBox *, void) +IMPL_LINK_NOARG(AreaTransparencyGradientControl, Right_Click45_Impl, ToolBox *, void) { sal_uInt8 nStartCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrStartValue->GetValue() * 255) / 100); sal_uInt8 nEndCol = (sal_uInt8)(((sal_uInt16)maMtrTrgrEndValue->GetValue() * 255) / 100); diff --git a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx index 304e030ed171..452da99030a5 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientControl.hxx @@ -66,9 +66,9 @@ private: Image maRotRight; AreaPropertyPanelBase& mrAreaPropertyPanel; - DECL_LINK_TYPED( ModifiedTrgrHdl_Impl, Edit&, void ); - DECL_LINK_TYPED( Left_Click45_Impl, ToolBox*, void ); - DECL_LINK_TYPED( Right_Click45_Impl, ToolBox*, void ); + DECL_LINK( ModifiedTrgrHdl_Impl, Edit&, void ); + DECL_LINK( Left_Click45_Impl, ToolBox*, void ); + DECL_LINK( Right_Click45_Impl, ToolBox*, void ); }; diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx index ff7acc5a07ba..8b39ad235d79 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx @@ -128,7 +128,7 @@ void GraphicPropertyPanel::Initialize() } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) { const sal_Int16 nBright = mpMtrBrightness->GetValue(); const SfxInt16Item aBrightItem( SID_ATTR_GRAF_LUMINANCE, nBright ); @@ -137,7 +137,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyBrightnessHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) { const sal_Int16 nContrast = mpMtrContrast->GetValue(); const SfxInt16Item aContrastItem( SID_ATTR_GRAF_CONTRAST, nContrast ); @@ -146,7 +146,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyContrastHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) { const sal_Int16 nTrans = mpMtrTrans->GetValue(); const SfxInt16Item aTransItem( SID_ATTR_GRAF_TRANSPARENCE, nTrans ); @@ -155,7 +155,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ModifyTransHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) { const sal_Int16 nTrans = mpLBColorMode->GetSelectEntryPos(); const SfxInt16Item aTransItem( SID_ATTR_GRAF_MODE, nTrans ); @@ -164,7 +164,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, ClickColorModeHdl, ListBox&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, RedHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, RedHdl, Edit&, void ) { const sal_Int16 nRed = mpMtrRed->GetValue(); const SfxInt16Item aRedItem( SID_ATTR_GRAF_RED, nRed ); @@ -173,7 +173,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, RedHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, GreenHdl, Edit&, void ) +IMPL_LINK_NOARG( GraphicPropertyPanel, GreenHdl, Edit&, void ) { const sal_Int16 nGreen = mpMtrGreen->GetValue(); const SfxInt16Item aGreenItem( SID_ATTR_GRAF_GREEN, nGreen ); @@ -182,7 +182,7 @@ IMPL_LINK_NOARG_TYPED( GraphicPropertyPanel, GreenHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, BlueHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicPropertyPanel, BlueHdl, Edit&, void) { const sal_Int16 nBlue = mpMtrBlue->GetValue(); const SfxInt16Item aBlueItem( SID_ATTR_GRAF_BLUE, nBlue ); @@ -191,7 +191,7 @@ IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, BlueHdl, Edit&, void) } -IMPL_LINK_NOARG_TYPED(GraphicPropertyPanel, GammaHdl, Edit&, void) +IMPL_LINK_NOARG(GraphicPropertyPanel, GammaHdl, Edit&, void) { const sal_Int32 nGamma = mpMtrGamma->GetValue(); const SfxInt32Item nGammaItem( SID_ATTR_GRAF_GAMMA, nGamma ); diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index dfdc375804da..4f8903dfd2e6 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -85,14 +85,14 @@ private: SfxBindings* mpBindings; - DECL_LINK_TYPED( ModifyBrightnessHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyContrastHdl, Edit&, void ); - DECL_LINK_TYPED( ModifyTransHdl, Edit&, void ); - DECL_LINK_TYPED( ClickColorModeHdl, ListBox&, void ); - DECL_LINK_TYPED( RedHdl, Edit&, void ); - DECL_LINK_TYPED( GreenHdl, Edit&, void ); - DECL_LINK_TYPED( BlueHdl, Edit&, void ); - DECL_LINK_TYPED( GammaHdl, Edit&, void ); + DECL_LINK( ModifyBrightnessHdl, Edit&, void ); + DECL_LINK( ModifyContrastHdl, Edit&, void ); + DECL_LINK( ModifyTransHdl, Edit&, void ); + DECL_LINK( ClickColorModeHdl, ListBox&, void ); + DECL_LINK( RedHdl, Edit&, void ); + DECL_LINK( GreenHdl, Edit&, void ); + DECL_LINK( BlueHdl, Edit&, void ); + DECL_LINK( GammaHdl, Edit&, void ); void Initialize(); }; diff --git a/svx/source/sidebar/line/LinePropertyPanelBase.cxx b/svx/source/sidebar/line/LinePropertyPanelBase.cxx index 41688c851b29..4d1ff4a309f1 100644 --- a/svx/source/sidebar/line/LinePropertyPanelBase.cxx +++ b/svx/source/sidebar/line/LinePropertyPanelBase.cxx @@ -537,7 +537,7 @@ void LinePropertyPanelBase::updateLineCap(bool bDisabled, bool bSetOrDefault, mpLBCapStyle->SetNoSelection(); } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeLineStyleHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeLineStyleHdl, ListBox&, void) { const sal_Int32 nPos(mpLBStyle->GetSelectEntryPos()); @@ -575,7 +575,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeLineStyleHdl, ListBox&, void) ActivateControls(); } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) { sal_Int32 nPos = mpLBStart->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBStart->IsValueChangedFromSaved() ) @@ -589,7 +589,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeStartHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) { sal_Int32 nPos = mpLBEnd->GetSelectEntryPos(); if( nPos != LISTBOX_ENTRY_NOTFOUND && mpLBEnd->IsValueChangedFromSaved() ) @@ -603,7 +603,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeEndHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeEdgeStyleHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeEdgeStyleHdl, ListBox&, void) { const sal_Int32 nPos(mpLBEdgeStyle->GetSelectEntryPos()); @@ -639,7 +639,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeEdgeStyleHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeCapStyleHdl, ListBox&, void) +IMPL_LINK_NOARG(LinePropertyPanelBase, ChangeCapStyleHdl, ListBox&, void) { const sal_Int32 nPos(mpLBCapStyle->GetSelectEntryPos()); @@ -670,7 +670,7 @@ IMPL_LINK_NOARG_TYPED(LinePropertyPanelBase, ChangeCapStyleHdl, ListBox&, void) } } -IMPL_LINK_TYPED(LinePropertyPanelBase, ToolboxWidthSelectHdl,ToolBox*, pToolBox, void) +IMPL_LINK(LinePropertyPanelBase, ToolboxWidthSelectHdl,ToolBox*, pToolBox, void) { if (pToolBox->GetItemCommand(pToolBox->GetCurItemId()) == UNO_SELECTWIDTH) { @@ -679,7 +679,7 @@ IMPL_LINK_TYPED(LinePropertyPanelBase, ToolboxWidthSelectHdl,ToolBox*, pToolBox, } } -IMPL_LINK_NOARG_TYPED( LinePropertyPanelBase, ChangeTransparentHdl, Edit&, void ) +IMPL_LINK_NOARG( LinePropertyPanelBase, ChangeTransparentHdl, Edit&, void ) { sal_uInt16 nVal = (sal_uInt16)mpMFTransparent->GetValue(); XLineTransparenceItem aItem( nVal ); diff --git a/svx/source/sidebar/line/LineWidthPopup.cxx b/svx/source/sidebar/line/LineWidthPopup.cxx index 1bc93919e2a4..b455758f8216 100644 --- a/svx/source/sidebar/line/LineWidthPopup.cxx +++ b/svx/source/sidebar/line/LineWidthPopup.cxx @@ -111,7 +111,7 @@ LineWidthPopup::~LineWidthPopup() disposeOnce(); } -IMPL_LINK_TYPED(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void) +IMPL_LINK(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void) { sal_uInt16 iPos = m_xVSWidth->GetSelectItemId(); if (iPos >= 1 && iPos <= 8) @@ -154,7 +154,7 @@ IMPL_LINK_TYPED(LineWidthPopup, VSSelectHdl, ValueSet*, /*pControl*/, void) } } -IMPL_LINK_TYPED(LineWidthPopup, MFModifyHdl, Edit&, /*rControl*/, void) +IMPL_LINK(LineWidthPopup, MFModifyHdl, Edit&, /*rControl*/, void) { if (m_xVSWidth->GetSelItem()) { diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.cxx b/svx/source/sidebar/media/MediaPlaybackPanel.cxx index f35304c40d75..46f7645c7a3e 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.cxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.cxx @@ -124,14 +124,14 @@ void MediaPlaybackPanel::Update() UpdateTimeField( *mpMediaItem, mpMediaItem->getTime() ); } -IMPL_LINK_NOARG_TYPED( MediaPlaybackPanel, VolumeSlideHdl, Slider*, void) +IMPL_LINK_NOARG( MediaPlaybackPanel, VolumeSlideHdl, Slider*, void) { MediaItem aItem(SID_AVMEDIA_TOOLBOX); aItem.setVolumeDB( static_cast< sal_Int16 > (mpVolumeSlider->GetThumbPos())); mpBindings->GetDispatcher()->ExecuteList(SID_AVMEDIA_TOOLBOX, SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED( MediaPlaybackPanel, SeekHdl, Slider*, void) +IMPL_LINK_NOARG( MediaPlaybackPanel, SeekHdl, Slider*, void) { MediaItem aItem(SID_AVMEDIA_TOOLBOX); aItem.setState( MediaState::Pause ); @@ -140,12 +140,12 @@ IMPL_LINK_NOARG_TYPED( MediaPlaybackPanel, SeekHdl, Slider*, void) mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX); } -IMPL_LINK_NOARG_TYPED( MediaPlaybackPanel, TimeoutHdl, Idle*, void) +IMPL_LINK_NOARG( MediaPlaybackPanel, TimeoutHdl, Idle*, void) { mpBindings->Invalidate(SID_AVMEDIA_TOOLBOX); } -IMPL_LINK_TYPED( MediaPlaybackPanel, PlayToolBoxSelectHdl, ToolBox*, pControl, void) +IMPL_LINK( MediaPlaybackPanel, PlayToolBoxSelectHdl, ToolBox*, pControl, void) { MediaItem aItem(SID_AVMEDIA_TOOLBOX); switch(pControl->GetCurItemId()) diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.hxx b/svx/source/sidebar/media/MediaPlaybackPanel.hxx index 4ba851b2333c..d7c88456a605 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx @@ -70,10 +70,10 @@ private: const SfxItemState eState, const SfxPoolItem* pState, const bool bIsEnabled) override; - DECL_LINK_TYPED(PlayToolBoxSelectHdl, ToolBox*, void); - DECL_LINK_TYPED(VolumeSlideHdl, Slider*, void); - DECL_LINK_TYPED(SeekHdl, Slider*, void); - DECL_LINK_TYPED(TimeoutHdl, Idle*, void); + DECL_LINK(PlayToolBoxSelectHdl, ToolBox*, void); + DECL_LINK(VolumeSlideHdl, Slider*, void); + DECL_LINK(SeekHdl, Slider*, void); + DECL_LINK(TimeoutHdl, Idle*, void); }; diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 6887e95d3e86..f58cb6bc11ad 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -324,13 +324,13 @@ void ParaLineSpacingControl::SelectEntryPos(sal_Int32 nPos) UpdateMetricFields(); } -IMPL_LINK_NOARG_TYPED(ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox&, void) +IMPL_LINK_NOARG(ParaLineSpacingControl, LineSPDistHdl_Impl, ListBox&, void) { UpdateMetricFields(); ExecuteLineSpace(); } -IMPL_LINK_NOARG_TYPED( ParaLineSpacingControl, LineSPDistAtHdl_Impl, Edit&, void ) +IMPL_LINK_NOARG( ParaLineSpacingControl, LineSPDistAtHdl_Impl, Edit&, void ) { ExecuteLineSpace(); } @@ -416,7 +416,7 @@ void ParaLineSpacingControl::SetLineSpace(SvxLineSpacingItem& rLineSpace, sal_In } } -IMPL_LINK_TYPED(ParaLineSpacingControl, PredefinedValuesHandler, Button*, pControl, void) +IMPL_LINK(ParaLineSpacingControl, PredefinedValuesHandler, Button*, pControl, void) { if (pControl == mpSpacing1Button) { diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index e0df457776be..e467392bf6a9 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -69,9 +69,9 @@ private: /// Set the entry and update the metric fields. void SelectEntryPos(sal_Int32 nPos); - DECL_LINK_TYPED(LineSPDistHdl_Impl, ListBox&, void); - DECL_LINK_TYPED(LineSPDistAtHdl_Impl, Edit&, void); - DECL_LINK_TYPED(PredefinedValuesHandler, Button*, void); + DECL_LINK(LineSPDistHdl_Impl, ListBox&, void); + DECL_LINK(LineSPDistAtHdl_Impl, Edit&, void); + DECL_LINK(PredefinedValuesHandler, Button*, void); }; } diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index b6b8c6f6ef6f..b3e7e078145d 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -192,7 +192,7 @@ void ParaPropertyPanel::initial() } // for Paragraph Indent -IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void) +IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void) { SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE ); aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) ); @@ -203,7 +203,7 @@ IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ModifyIndentHdl_Impl, Edit&, void) SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, { &aMargin }); } -IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, void) +IMPL_LINK(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pControl, void) { const OUString aCommand(pControl->GetItemCommand(pControl->GetCurItemId())); @@ -283,7 +283,7 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont } // for Paragraph Spacing -IMPL_LINK_NOARG_TYPED( ParaPropertyPanel, ULSpaceHdl_Impl, Edit&, void) +IMPL_LINK_NOARG( ParaPropertyPanel, ULSpaceHdl_Impl, Edit&, void) { SvxULSpaceItem aMargin( SID_ATTR_PARA_ULSPACE ); aMargin.SetUpper( (sal_uInt16)GetCoreValue( *mpTopDist, m_eULSpaceUnit ) ); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index fabb1cb62865..04ba3d0ec395 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -111,9 +111,9 @@ private: SfxBindings* mpBindings; css::uno::Reference<css::ui::XSidebar> mxSidebar; - DECL_LINK_TYPED(ModifyIndentHdl_Impl, Edit&, void); - DECL_LINK_TYPED(ClickIndent_IncDec_Hdl_Impl, ToolBox*, void); - DECL_LINK_TYPED(ULSpaceHdl_Impl, Edit&, void); + DECL_LINK(ModifyIndentHdl_Impl, Edit&, void); + DECL_LINK(ClickIndent_IncDec_Hdl_Impl, ToolBox*, void); + DECL_LINK(ULSpaceHdl_Impl, Edit&, void); void StateChangedIndentImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); void StateChangedULImpl( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index c534d4c13640..576da6087e28 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -89,7 +89,7 @@ void ParaULSpacingWindow::SetValue(const SvxULSpaceItem* pItem) m_pBelowSpacing->SetValue(nVal, FUNIT_100TH_MM); } -IMPL_LINK_NOARG_TYPED(ParaULSpacingWindow, ModifySpacingHdl, Edit&, void) +IMPL_LINK_NOARG(ParaULSpacingWindow, ModifySpacingHdl, Edit&, void) { SfxDispatcher* pDisp = SfxViewFrame::Current()->GetBindings().GetDispatcher(); if(pDisp) @@ -250,7 +250,7 @@ void ParaLRSpacingWindow::SetUnit(FieldUnit eUnit) m_eUnit = rPool.GetMetric(nWhich); } -IMPL_LINK_NOARG_TYPED(ParaLRSpacingWindow, ModifySpacingHdl, Edit&, void) +IMPL_LINK_NOARG(ParaLRSpacingWindow, ModifySpacingHdl, Edit&, void) { SfxDispatcher* pDisp = SfxViewFrame::Current()->GetBindings().GetDispatcher(); if(pDisp) diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index b396cd50b74f..b0fbcea4d4ec 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -51,7 +51,7 @@ private: MapUnit m_eUnit; - DECL_LINK_TYPED(ModifySpacingHdl, Edit&, void); + DECL_LINK(ModifySpacingHdl, Edit&, void); }; class ParaLRSpacingWindow : public VclVBox, @@ -75,7 +75,7 @@ private: vcl::EnumContext m_aContext; - DECL_LINK_TYPED(ModifySpacingHdl, Edit&, void); + DECL_LINK(ModifySpacingHdl, Edit&, void); }; } diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index b9939b482d4a..6dc0f9025179 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -323,7 +323,7 @@ void PosSizePropertyPanel::HandleContextChange( } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) { if( mpCbxScale->IsChecked() && mpCbxScale->IsEnabled() ) @@ -345,7 +345,7 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeWidthHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) { if( mpCbxScale->IsChecked() && mpCbxScale->IsEnabled() ) @@ -367,19 +367,19 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangeHeightHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangePosXHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosXHdl, Edit&, void ) { executePosX(); } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ChangePosYHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosYHdl, Edit&, void ) { executePosY(); } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) { if ( mpCbxScale->IsChecked() ) { @@ -393,7 +393,7 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, ClickAutoHdl, Button*, void ) } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) { OUString sTmp = mpMtrAngle->GetText(); if (sTmp.isEmpty()) @@ -438,7 +438,7 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, AngleModifiedHdl, Edit&, void ) } -IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void ) +IMPL_LINK_NOARG( PosSizePropertyPanel, RotationHdl, DialControl*, void ) { sal_Int32 nTmp = mpDial->GetRotation(); @@ -453,7 +453,7 @@ IMPL_LINK_NOARG_TYPED( PosSizePropertyPanel, RotationHdl, DialControl*, void ) } -IMPL_LINK_TYPED( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void ) +IMPL_LINK( PosSizePropertyPanel, FlipHdl, ToolBox*, pBox, void ) { const OUString aCommand(pBox->GetItemCommand(pBox->GetCurItemId())); diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 9501c11987f0..7bb65f5cd671 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -147,14 +147,14 @@ private: css::uno::Reference<css::ui::XSidebar> mxSidebar; - DECL_LINK_TYPED( ChangePosXHdl, Edit&, void ); - DECL_LINK_TYPED( ChangePosYHdl, Edit&, void ); - DECL_LINK_TYPED( ChangeWidthHdl, Edit&, void ); - DECL_LINK_TYPED( ChangeHeightHdl, Edit&, void ); - DECL_LINK_TYPED( ClickAutoHdl, Button*, void ); - DECL_LINK_TYPED( AngleModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( RotationHdl, svx::DialControl*, void ); - DECL_LINK_TYPED( FlipHdl, ToolBox *, void ); + DECL_LINK( ChangePosXHdl, Edit&, void ); + DECL_LINK( ChangePosYHdl, Edit&, void ); + DECL_LINK( ChangeWidthHdl, Edit&, void ); + DECL_LINK( ChangeHeightHdl, Edit&, void ); + DECL_LINK( ClickAutoHdl, Button*, void ); + DECL_LINK( AngleModifiedHdl, Edit&, void ); + DECL_LINK( RotationHdl, svx::DialControl*, void ); + DECL_LINK( FlipHdl, ToolBox *, void ); void Initialize(); void executePosX(); diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx index 2dd26e6c2935..693f17149ec8 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx @@ -142,7 +142,7 @@ void ShadowPropertyPanel::Initialize() } } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ClickShadowHdl, Button*, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ClickShadowHdl, Button*, void) { if( mpShowShadow->GetState() == TRISTATE_FALSE ) { @@ -158,14 +158,14 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ClickShadowHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowColorHdl, ListBox&, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowColorHdl, ListBox&, void) { XColorItem aItem(makeSdrShadowColorItem(mpLBShadowColor->GetSelectEntryColor())); GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_SHADOW_COLOR, SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransMetricHdl, Edit&, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowTransMetricHdl, Edit&, void) { sal_uInt16 nVal = mpShadowTransMetric->GetValue(); SetTransparencyValue(nVal); @@ -174,7 +174,7 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransMetricHdl, Edit&, vo SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*, void) { sal_uInt16 nVal = mpShadowTransSlider->GetThumbPos(); SetTransparencyValue(nVal); @@ -183,7 +183,7 @@ IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowTransSliderHdl, Slider*, SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG_TYPED(ShadowPropertyPanel, ModifyShadowDistanceHdl, Edit&, void) +IMPL_LINK_NOARG(ShadowPropertyPanel, ModifyShadowDistanceHdl, Edit&, void) { OUString sAngle = mpShadowAngle->GetText(); nXY = mpShadowDistance->GetValue(FUNIT_100TH_MM); diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index b4b5f4fcedd5..88343630e8e9 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -84,11 +84,11 @@ private: void InsertAngleValues(); void SetTransparencyValue(long); void UpdateControls(); - DECL_LINK_TYPED(ClickShadowHdl, Button*, void); - DECL_LINK_TYPED(ModifyShadowColorHdl, ListBox&, void); - DECL_LINK_TYPED(ModifyShadowTransMetricHdl, Edit&, void); - DECL_LINK_TYPED(ModifyShadowDistanceHdl, Edit&, void); - DECL_LINK_TYPED(ModifyShadowTransSliderHdl, Slider*, void); + DECL_LINK(ClickShadowHdl, Button*, void); + DECL_LINK(ModifyShadowColorHdl, ListBox&, void); + DECL_LINK(ModifyShadowTransMetricHdl, Edit&, void); + DECL_LINK(ModifyShadowDistanceHdl, Edit&, void); + DECL_LINK(ModifyShadowTransSliderHdl, Slider*, void); }; } } diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index 32254b14acc5..dfc621874664 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -106,7 +106,7 @@ void DefaultShapesPanel::dispose() PanelLayout::dispose(); } -IMPL_LINK_TYPED(DefaultShapesPanel, ShapeSelectHdl, ValueSet*, rValueSet, void) +IMPL_LINK(DefaultShapesPanel, ShapeSelectHdl, ValueSet*, rValueSet, void) { for(auto& aSetMap : mpShapesSetMap) { diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx b/svx/source/sidebar/shapes/DefaultShapesPanel.hxx index 6a57eb3af0db..073e2a1ee151 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.hxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.hxx @@ -66,7 +66,7 @@ private: void populateShapes(); void Initialize(); - DECL_LINK_TYPED( ShapeSelectHdl, ValueSet*, void ); + DECL_LINK( ShapeSelectHdl, ValueSet*, void ); }; diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 30d83e647bf6..5005f59c873a 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -163,7 +163,7 @@ void TextCharacterSpacingControl::ExecuteCharacterSpacing(long nValue, bool bClo EndPopupMode(); } -IMPL_LINK_TYPED(TextCharacterSpacingControl, PredefinedValuesHdl, Button*, pControl, void) +IMPL_LINK(TextCharacterSpacingControl, PredefinedValuesHdl, Button*, pControl, void) { mnLastCus = SPACING_CLOSE_BY_CLICK_ICON; @@ -193,7 +193,7 @@ IMPL_LINK_TYPED(TextCharacterSpacingControl, PredefinedValuesHdl, Button*, pCont } } -IMPL_LINK_NOARG_TYPED(TextCharacterSpacingControl, KerningModifyHdl, Edit&, void) +IMPL_LINK_NOARG(TextCharacterSpacingControl, KerningModifyHdl, Edit&, void) { mnLastCus = SPACING_CLOSE_BY_CUS_EDIT; mnCustomKern = static_cast<long>(maEditKerning->GetValue()); diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index 0046ea35bce9..7d30ab9704d0 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -58,9 +58,9 @@ private: void Initialize(); void ExecuteCharacterSpacing(long nValue, bool bClose = true); - DECL_LINK_TYPED(PredefinedValuesHdl, Button*, void); - DECL_LINK_TYPED(KerningSelectHdl, ListBox&, void); - DECL_LINK_TYPED(KerningModifyHdl, Edit&, void); + DECL_LINK(PredefinedValuesHdl, Button*, void); + DECL_LINK(KerningSelectHdl, ListBox&, void); + DECL_LINK(KerningModifyHdl, Edit&, void); MapUnit GetCoreMetric() const; }; diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index 1f2416c6e9e6..22f242f9d5bc 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -127,7 +127,7 @@ Color GetUnderlineColor() } -IMPL_LINK_TYPED(TextUnderlineControl, PBClickHdl, Button*, pButton, void) +IMPL_LINK(TextUnderlineControl, PBClickHdl, Button*, pButton, void) { if(pButton == maMoreOptions) { diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 0fd0dfff1aa6..fe7cbf3da300 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -51,7 +51,7 @@ private: FontLineStyle getLineStyle(Button* pButton); - DECL_LINK_TYPED(PBClickHdl, Button*, void); + DECL_LINK(PBClickHdl, Button*, void); }; } diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index a838f8882e41..a76263b46d78 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -106,7 +106,7 @@ void SvxModifyControl::StateChanged( sal_uInt16, SfxItemState eState, } -IMPL_LINK_TYPED( SvxModifyControl, OnTimer, Idle *, pTimer, void ) +IMPL_LINK( SvxModifyControl, OnTimer, Idle *, pTimer, void ) { if (pTimer == nullptr) return; diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 1f95e25f1423..0467ab6495dd 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -36,13 +36,13 @@ class CandidateMgr { std::vector<VclPtr<vcl::Window> > m_aCandidates; std::set<VclPtr<vcl::Window> > m_aDeletedCandidates; - DECL_LINK_TYPED(WindowEventListener, VclWindowEvent&, void); + DECL_LINK(WindowEventListener, VclWindowEvent&, void); public: void PaintTransparentChildren(vcl::Window & rWindow, Rectangle const& rPixelRect); ~CandidateMgr(); }; -IMPL_LINK_TYPED(CandidateMgr, WindowEventListener, VclWindowEvent&, rEvent, void) +IMPL_LINK(CandidateMgr, WindowEventListener, VclWindowEvent&, rEvent, void) { vcl::Window* pWindow = rEvent.GetWindow(); if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index c06c22ee41ee..3876de9157f7 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -552,7 +552,7 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP return pOutlView; } -IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerStatusEventHdl, EditStatus&, rEditStat, void) +IMPL_LINK(SdrObjEditView,ImpOutlinerStatusEventHdl, EditStatus&, rEditStat, void) { if(pTextEditOutliner ) { @@ -626,7 +626,7 @@ void SdrObjEditView::ImpChainingEventHdl() } -IMPL_LINK_NOARG_TYPED(SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl, LinkParamNone*, void) { SdrTextObj* pTextObj = dynamic_cast< SdrTextObj * >( GetTextEditObject()); if (!pTextObj) @@ -659,7 +659,7 @@ void SdrObjEditView::ImpMoveCursorAfterChainingEvent(TextChainCursorManager *pCu } -IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,void) +IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,void) { bool bOk=false; OUString& rStr=pFI->GetRepresentation(); @@ -693,7 +693,7 @@ IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,v } } -IMPL_LINK_NOARG_TYPED(SdrObjEditView, EndTextEditHdl, SdrUndoManager*, void) +IMPL_LINK_NOARG(SdrObjEditView, EndTextEditHdl, SdrUndoManager*, void) { SdrEndTextEdit(); } @@ -2092,12 +2092,12 @@ void SdrObjEditView::MarkListHasChanged() } } -IMPL_LINK_TYPED( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfo, void ) +IMPL_LINK( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfo, void ) { OnEndPasteOrDrop( pInfo ); } -IMPL_LINK_TYPED( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfo, void ) +IMPL_LINK( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfo, void ) { OnBeginPasteOrDrop( pInfo ); } diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 3ee78e9714b5..f10b09f81ed5 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -248,7 +248,7 @@ bool OLEObjCache::UnloadObj(SdrOle2Obj* pObj) return bUnloaded; } -IMPL_LINK_NOARG_TYPED(OLEObjCache, UnloadCheckHdl, Timer*, void) +IMPL_LINK_NOARG(OLEObjCache, UnloadCheckHdl, Timer*, void) { UnloadOnDemand(); } diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 0ba525c6c065..3e7b9478da1a 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -1228,7 +1228,7 @@ void SdrHdlGradient::CreateB2dIAObject() } } -IMPL_LINK_NOARG_TYPED(SdrHdlGradient, ColorChangeHdl, SdrHdlColor*, void) +IMPL_LINK_NOARG(SdrHdlGradient, ColorChangeHdl, SdrHdlColor*, void) { if(GetObj()) FromIAOToItem(GetObj(), true, true); diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index ec2a8a80cecd..c006538f6ab4 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -1127,12 +1127,12 @@ void SdrItemBrowser::Undirty() } } -IMPL_LINK_NOARG_TYPED(SdrItemBrowser, IdleHdl, Idle *, void) +IMPL_LINK_NOARG(SdrItemBrowser, IdleHdl, Idle *, void) { Undirty(); } -IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, SdrItemBrowserControl&, rBrowse, void) +IMPL_LINK(SdrItemBrowser, ChangedHdl, SdrItemBrowserControl&, rBrowse, void) { const ImpItemListRow* pEntry = rBrowse.GetAktChangeEntry(); if (pEntry!=nullptr) @@ -1246,7 +1246,7 @@ IMPL_LINK_TYPED(SdrItemBrowser, ChangedHdl, SdrItemBrowserControl&, rBrowse, voi } } -IMPL_LINK_NOARG_TYPED(SdrItemBrowser, SetDirtyHdl, SdrItemBrowserControl&, void) +IMPL_LINK_NOARG(SdrItemBrowser, SetDirtyHdl, SdrItemBrowserControl&, void) { SetDirty(); } diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index fd4c9ff7f183..602ec30b3d65 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -1289,7 +1289,7 @@ void SdrGrafObj::AdjustToMaxRect( const Rectangle& rMaxRect, bool bShrinkOnly ) } } -IMPL_LINK_TYPED( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* ) +IMPL_LINK( SdrGrafObj, ImpSwapHdl, const GraphicObject*, pO, SvStream* ) { SvStream* pRet = GRFMGR_AUTOSWAPSTREAM_NONE; diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index ff941a738fda..a7211172784f 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -94,13 +94,13 @@ namespace // BlockText (see there) basegfx::B2DRange maClipRange; - DECL_LINK_TYPED(decomposeContourTextPrimitive, DrawPortionInfo*, void); - DECL_LINK_TYPED(decomposeBlockTextPrimitive, DrawPortionInfo*, void); - DECL_LINK_TYPED(decomposeStretchTextPrimitive, DrawPortionInfo*, void); + DECL_LINK(decomposeContourTextPrimitive, DrawPortionInfo*, void); + DECL_LINK(decomposeBlockTextPrimitive, DrawPortionInfo*, void); + DECL_LINK(decomposeStretchTextPrimitive, DrawPortionInfo*, void); - DECL_LINK_TYPED(decomposeContourBulletPrimitive, DrawBulletInfo*, void); - DECL_LINK_TYPED(decomposeBlockBulletPrimitive, DrawBulletInfo*, void); - DECL_LINK_TYPED(decomposeStretchBulletPrimitive, DrawBulletInfo*, void); + DECL_LINK(decomposeContourBulletPrimitive, DrawBulletInfo*, void); + DECL_LINK(decomposeBlockBulletPrimitive, DrawBulletInfo*, void); + DECL_LINK(decomposeStretchBulletPrimitive, DrawBulletInfo*, void); static bool impIsUnderlineAbove(const vcl::Font& rFont); void impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo); @@ -563,7 +563,7 @@ namespace maTextPortionPrimitives.push_back(pNewPrimitive); } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeContourTextPrimitive, DrawPortionInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeContourTextPrimitive, DrawPortionInfo*, pInfo, void) { // for contour text, ignore (clip away) all portions which are below // the visible area given by maScale @@ -573,7 +573,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeBlockTextPrimitive, DrawPortionInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeBlockTextPrimitive, DrawPortionInfo*, pInfo, void) { if(pInfo) { @@ -618,7 +618,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeStretchTextPrimitive, DrawPortionInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeStretchTextPrimitive, DrawPortionInfo*, pInfo, void) { if(pInfo) { @@ -626,7 +626,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeContourBulletPrimitive, DrawBulletInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeContourBulletPrimitive, DrawBulletInfo*, pInfo, void) { if(pInfo) { @@ -634,7 +634,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeBlockBulletPrimitive, DrawBulletInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeBlockBulletPrimitive, DrawBulletInfo*, pInfo, void) { if(pInfo) { @@ -642,7 +642,7 @@ namespace } } - IMPL_LINK_TYPED(impTextBreakupHandler, decomposeStretchBulletPrimitive, DrawBulletInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decomposeStretchBulletPrimitive, DrawBulletInfo*, pInfo, void) { if(pInfo) { diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index dca4e230da67..3e6e5f3df65e 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -169,7 +169,7 @@ namespace SdrOutliner& mrOutliner; ::std::vector< impPathTextPortion > maPathTextPortions; - DECL_LINK_TYPED(decompositionPathTextPrimitive, DrawPortionInfo*, void ); + DECL_LINK(decompositionPathTextPrimitive, DrawPortionInfo*, void ); public: explicit impTextBreakupHandler(SdrOutliner& rOutliner) @@ -193,7 +193,7 @@ namespace } }; - IMPL_LINK_TYPED(impTextBreakupHandler, decompositionPathTextPrimitive, DrawPortionInfo*, pInfo, void) + IMPL_LINK(impTextBreakupHandler, decompositionPathTextPrimitive, DrawPortionInfo*, pInfo, void) { maPathTextPortions.push_back(impPathTextPortion(*pInfo)); } diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 2e26091d99c8..b100976e4b81 100644 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -275,7 +275,7 @@ void SdrPaintView::ConfigurationChanged( ::utl::ConfigurationBroadcaster* , sal_ InvalidateAllWin(); } -IMPL_LINK_NOARG_TYPED(SdrPaintView, ImpComeBackHdl, Idle *, void) +IMPL_LINK_NOARG(SdrPaintView, ImpComeBackHdl, Idle *, void) { if (mbSomeObjChgdFlag) { mbSomeObjChgdFlag=false; diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 9385ca843c6a..83a4d99067a4 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -2730,7 +2730,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo } -IMPL_LINK_NOARG_TYPED(SvxTableController, UpdateHdl, void*, void) +IMPL_LINK_NOARG(SvxTableController, UpdateHdl, void*, void) { mnUpdateEvent = nullptr; diff --git a/svx/source/table/tablertfimporter.cxx b/svx/source/table/tablertfimporter.cxx index cb67ec81dbff..22186a1a2aee 100644 --- a/svx/source/table/tablertfimporter.cxx +++ b/svx/source/table/tablertfimporter.cxx @@ -90,7 +90,7 @@ public: void FillTable(); - DECL_LINK_TYPED( RTFImportHdl, ImportInfo&, void ); + DECL_LINK( RTFImportHdl, ImportInfo&, void ); private: SdrTableObj& mrTableObj; @@ -160,7 +160,7 @@ void SdrTableRTFParser::Read( SvStream& rStream ) FillTable(); } -IMPL_LINK_TYPED( SdrTableRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) +IMPL_LINK( SdrTableRTFParser, RTFImportHdl, ImportInfo&, rInfo, void ) { switch ( rInfo.eState ) { diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx index 7ad3b628b429..c0b3ed12898b 100644 --- a/svx/source/tbxctrls/SvxPresetListBox.cxx +++ b/svx/source/tbxctrls/SvxPresetListBox.cxx @@ -123,7 +123,7 @@ void SvxPresetListBox::FillPresetListBox(XPatternList& pList, sal_uInt32 nStartI FillPresetListBoxImpl< XPatternList, XBitmapEntry >( pList, nStartIndex ); } -IMPL_LINK_TYPED(SvxPresetListBox, OnMenuItemSelected, Menu*, pMenu, bool) +IMPL_LINK(SvxPresetListBox, OnMenuItemSelected, Menu*, pMenu, bool) { if( pMenu == nullptr ) { diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index 4a4df8f7a84d..847d4022276d 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -28,8 +28,8 @@ class NumberingPopup : public svtools::ToolbarMenu NumberingPageType mePageType; NumberingToolBoxControl& mrController; VclPtr<SvxNumValueSet> mpValueSet; - DECL_LINK_TYPED( VSSelectToolbarMenuHdl, ToolbarMenu*, void ); - DECL_LINK_TYPED( VSSelectValueSetHdl, ValueSet*, void ); + DECL_LINK( VSSelectToolbarMenuHdl, ToolbarMenu*, void ); + DECL_LINK( VSSelectValueSetHdl, ValueSet*, void ); void VSSelectHdl(void *); public: NumberingPopup( NumberingToolBoxControl& rController, @@ -156,11 +156,11 @@ void NumberingPopup::statusChanged( const css::frame::FeatureStateEvent& rEvent mpValueSet->SelectItem( nSelItem ); } -IMPL_LINK_TYPED( NumberingPopup, VSSelectValueSetHdl, ValueSet*, pControl, void ) +IMPL_LINK( NumberingPopup, VSSelectValueSetHdl, ValueSet*, pControl, void ) { VSSelectHdl(pControl); } -IMPL_LINK_TYPED( NumberingPopup, VSSelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) +IMPL_LINK( NumberingPopup, VSSelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) { VSSelectHdl(pControl); } diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx index cb472bba7d20..22b6d8af9d5e 100644 --- a/svx/source/tbxctrls/colorwindow.hxx +++ b/svx/source/tbxctrls/colorwindow.hxx @@ -54,10 +54,10 @@ private: std::function<void(const OUString&, const Color&)> maColorSelectFunction; - DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); - DECL_LINK_TYPED( SelectPaletteHdl, ListBox&, void); - DECL_LINK_TYPED( AutoColorClickHdl, Button*, void ); - DECL_LINK_TYPED( OpenPickerClickHdl, Button*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); + DECL_LINK( SelectPaletteHdl, ListBox&, void); + DECL_LINK( AutoColorClickHdl, Button*, void ); + DECL_LINK( OpenPickerClickHdl, Button*, void ); protected: virtual void Resize() override; diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 6db593cd3d39..61ecfa9f7ece 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -166,7 +166,7 @@ void SvxColorValueSet_docking::DoDrag() } } -IMPL_LINK_NOARG_TYPED(SvxColorValueSet_docking, ExecDragHdl, void*, void) +IMPL_LINK_NOARG(SvxColorValueSet_docking, ExecDragHdl, void*, void) { // Als Link, damit asynchron ohne ImpMouseMoveMsg auf dem Stack auch die // Farbleiste geloescht werden darf @@ -339,7 +339,7 @@ bool SvxColorDockingWindow::Close() return true; } -IMPL_LINK_NOARG_TYPED(SvxColorDockingWindow, SelectHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxColorDockingWindow, SelectHdl, ValueSet*, void) { SfxDispatcher* pDispatcher = GetBindings().GetDispatcher(); sal_uInt16 nPos = aColorSet->GetSelectItemId(); diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 0832955ff033..b09e4355a6f6 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -193,11 +193,11 @@ void ExtrusionDirectionWindow::statusChanged( } -IMPL_LINK_TYPED( ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, pControl, void ) +IMPL_LINK( ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); } -IMPL_LINK_TYPED( ExtrusionDirectionWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) +IMPL_LINK( ExtrusionDirectionWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) { SelectHdl(pControl); } @@ -415,7 +415,7 @@ void ExtrusionDepthWindow::statusChanged( } } -IMPL_LINK_NOARG_TYPED(ExtrusionDepthWindow, SelectHdl, ToolbarMenu*, void) +IMPL_LINK_NOARG(ExtrusionDepthWindow, SelectHdl, ToolbarMenu*, void) { int nSelected = getSelectedEntryId(); if( nSelected != -1 ) @@ -681,11 +681,11 @@ void ExtrusionLightingWindow::DataChanged( const DataChangedEvent& rDCEvt ) } -IMPL_LINK_TYPED( ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, pControl, void ) +IMPL_LINK( ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, pControl, void ) { SelectHdl(pControl); } -IMPL_LINK_TYPED( ExtrusionLightingWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) +IMPL_LINK( ExtrusionLightingWindow, SelectToolbarMenuHdl, ToolbarMenu*, pControl, void ) { SelectHdl(pControl); } @@ -848,7 +848,7 @@ void ExtrusionSurfaceWindow::statusChanged( } -IMPL_LINK_NOARG_TYPED(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void) +IMPL_LINK_NOARG(ExtrusionSurfaceWindow, SelectHdl, ToolbarMenu*, void) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index c055403ca056..f1426cfb4cf8 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -54,8 +54,8 @@ private: Image maImgPerspective; Image maImgParallel; - DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void ); - DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void ); + DECL_LINK( SelectValueSetHdl, ValueSet*, void ); void SelectHdl(void*); void implSetDirection( sal_Int32 nSkew, bool bEnabled ); @@ -100,7 +100,7 @@ private: const OUString msExtrusionDepth; const OUString msMetricUnit; - DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void ); + DECL_LINK( SelectHdl, ToolbarMenu*, void ); void implFillStrings( FieldUnit eUnit ); void implSetDepth( double fDepth ); @@ -152,8 +152,8 @@ private: void implSetIntensity( int nLevel, bool bEnabled ); void implSetDirection( int nDirection, bool bEnabled ); - DECL_LINK_TYPED( SelectToolbarMenuHdl, ToolbarMenu*, void ); - DECL_LINK_TYPED( SelectValueSetHdl, ValueSet*, void ); + DECL_LINK( SelectToolbarMenuHdl, ToolbarMenu*, void ); + DECL_LINK( SelectValueSetHdl, ValueSet*, void ); void SelectHdl(void*); public: ExtrusionLightingWindow( svt::ToolboxController& rController, const css::uno::Reference< css::frame::XFrame >& rFrame, vcl::Window* pParentWindow ); @@ -194,7 +194,7 @@ private: Image maImgSurface3; Image maImgSurface4; - DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void ); + DECL_LINK( SelectHdl, ToolbarMenu*, void ); void implSetSurface( int nSurface, bool bEnabled ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 9251ff39eb89..f29663067f81 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -568,7 +568,7 @@ void FillControl::dispose() vcl::Window::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) { const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectEntryPos(); @@ -743,7 +743,7 @@ IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillTypeHdl, ListBox&, void) } } -IMPL_LINK_NOARG_TYPED(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxFillToolBoxControl, SelectFillAttrHdl, ListBox&, void) { const drawing::FillStyle eXFS = (drawing::FillStyle)mpLbFillType->GetSelectEntryPos(); const XFillStyleItem aXFillStyleItem(eXFS); diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 28cd5274fec0..5400cea008c6 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -229,14 +229,14 @@ void FontWorkGalleryDialog::insertSelectedFontwork() } -IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, ClickOKHdl, Button*, void) +IMPL_LINK_NOARG(FontWorkGalleryDialog, ClickOKHdl, Button*, void) { insertSelectedFontwork(); EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, void) +IMPL_LINK_NOARG(FontWorkGalleryDialog, DoubleClickFavoriteHdl, ValueSet*, void) { insertSelectedFontwork(); EndDialog( RET_OK ); @@ -261,7 +261,7 @@ private: const OUString msFontworkAlignment; - DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void ); + DECL_LINK( SelectHdl, ToolbarMenu*, void ); void implSetAlignment( int nAlignmentMode, bool bEnabled ); }; @@ -317,7 +317,7 @@ void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent } } -IMPL_LINK_NOARG_TYPED(FontworkAlignmentWindow, SelectHdl, ToolbarMenu*, void) +IMPL_LINK_NOARG(FontworkAlignmentWindow, SelectHdl, ToolbarMenu*, void) { if ( IsInPopupMode() ) EndPopupMode(); @@ -422,7 +422,7 @@ private: const OUString msFontworkCharacterSpacing; const OUString msFontworkKernCharacterPairs; - DECL_LINK_TYPED( SelectHdl, ToolbarMenu*, void ); + DECL_LINK( SelectHdl, ToolbarMenu*, void ); void implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled ); void implSetKernCharacterPairs( bool bKernOnOff, bool bEnabled ); @@ -516,7 +516,7 @@ void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureSta } -IMPL_LINK_NOARG_TYPED(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void) +IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, SelectHdl,ToolbarMenu*, void) { if ( IsInPopupMode() ) EndPopupMode(); diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 250273190957..7f64405eb058 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -79,7 +79,7 @@ void FormatPaintBrushToolBoxControl::Click() } -IMPL_LINK_NOARG_TYPED(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, Timer *, void) +IMPL_LINK_NOARG(FormatPaintBrushToolBoxControl, WaitDoubleClickHdl, Timer *, void) { //there was no second click during waiting this->impl_executePaintBrush(); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 7c066c8d0bfc..ed7e047b5c2c 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -74,7 +74,7 @@ private: OUString maCommand; Reference< XFrame > mxFrame; - DECL_LINK_TYPED(ImplModifyHdl, Idle *, void); + DECL_LINK(ImplModifyHdl, Idle *, void); protected: @@ -130,7 +130,7 @@ void ImplGrafMetricField::Modify() maIdle.Start(); } -IMPL_LINK_NOARG_TYPED(ImplGrafMetricField, ImplModifyHdl, Idle *, void) +IMPL_LINK_NOARG(ImplGrafMetricField, ImplModifyHdl, Idle *, void) { const sal_Int64 nVal = GetValue(); diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 858c0ed533fc..1b7da6d23514 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -69,7 +69,7 @@ SvxLineBox::SvxLineBox( vcl::Window* pParent, const Reference< XFrame >& rFrame } -IMPL_LINK_NOARG_TYPED(SvxLineBox, DelayHdl_Impl, Timer *, void) +IMPL_LINK_NOARG(SvxLineBox, DelayHdl_Impl, Timer *, void) { if ( GetEntryCount() == 0 ) { diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 8a4becca15a5..c439d848b24d 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -68,7 +68,7 @@ private: long mnTableWidth; long mnTableHeight; - DECL_LINK_TYPED( SelectHdl, Button*, void ); + DECL_LINK( SelectHdl, Button*, void ); public: TableWindow( sal_uInt16 nSlotId, @@ -94,7 +94,7 @@ const long TableWindow::TABLE_CELLS_HORIZ = 10; const long TableWindow::TABLE_CELLS_VERT = 15; -IMPL_LINK_NOARG_TYPED(TableWindow, SelectHdl, Button*, void) +IMPL_LINK_NOARG(TableWindow, SelectHdl, Button*, void) { CloseAndShowTableDialog(); } diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 96e44e014a12..9305a369a9da 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -153,7 +153,7 @@ void SvxListBoxControl::StateChanged( } -IMPL_LINK_NOARG_TYPED(SvxListBoxControl, PopupModeEndHdl, FloatingWindow*, void) +IMPL_LINK_NOARG(SvxListBoxControl, PopupModeEndHdl, FloatingWindow*, void) { if( pPopupWin && FloatWinPopupFlags::NONE == pPopupWin->GetPopupModeFlags() && pPopupWin->IsUserSelected() ) @@ -189,7 +189,7 @@ void SvxListBoxControl::Impl_SetInfo( sal_Int32 nCount ) } -IMPL_LINK_NOARG_TYPED(SvxListBoxControl, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxListBoxControl, SelectHdl, ListBox&, void) { if (pPopupWin) { diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index f601d5843433..8d78bd1a3870 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -301,7 +301,7 @@ void SvxLineEndWindow::dispose() SfxPopupWindow::dispose(); } -IMPL_LINK_NOARG_TYPED(SvxLineEndWindow, SelectHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxLineEndWindow, SelectHdl, ValueSet*, void) { std::unique_ptr<XLineEndItem> pLineEndItem; std::unique_ptr<XLineStartItem> pLineStartItem; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index c12dcf6c6030..1998590f69f3 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -145,7 +145,7 @@ public: protected: /// Calculate the optimal width of the dropdown. Very expensive operation, triggers lots of font measurement. - DECL_LINK_TYPED(CalcOptimalExtraUserWidth, VclWindowEvent&, void); + DECL_LINK(CalcOptimalExtraUserWidth, VclWindowEvent&, void); virtual void Select() override; @@ -172,7 +172,7 @@ private: void SetupEntry(vcl::RenderContext& rRenderContext, vcl::Window* pParent, sal_Int32 nItem, const Rectangle& rRect, const OUString& rStyleName, bool bIsNotSelected); static bool AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight); void SetOptimalSize(); - DECL_LINK_TYPED( MenuSelectHdl, Menu *, bool ); + DECL_LINK( MenuSelectHdl, Menu *, bool ); }; class SvxFontNameBox_Impl : public FontNameBox @@ -200,7 +200,7 @@ private: ".uno:CharEndPreviewFontName", aArgs ); } - DECL_LINK_TYPED( CheckAndMarkUnknownFont, VclWindowEvent&, void ); + DECL_LINK( CheckAndMarkUnknownFont, VclWindowEvent&, void ); void SetOptimalSize(); @@ -256,7 +256,7 @@ private: ImageList aImgList; bool bParagraphMode; - DECL_LINK_TYPED( SelectHdl, ValueSet*, void ); + DECL_LINK( SelectHdl, ValueSet*, void ); protected: virtual void Resize() override; @@ -280,7 +280,7 @@ private: VclPtr<LineListBox> m_aLineStyleLb; bool m_bIsWriter; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); protected: virtual void Resize() override; @@ -302,7 +302,7 @@ private: std::vector<OUString> m_aFormatEntries; LanguageType m_eFormatLanguage; - DECL_LINK_TYPED( SelectHdl, ListBox&, void ); + DECL_LINK( SelectHdl, ListBox&, void ); public: SvxCurrencyList_Impl( sal_uInt16 nId, const Reference< XFrame >& rxFrame, @@ -396,7 +396,7 @@ void SvxStyleBox_Impl::ReleaseFocus() m_xFrame->getContainerWindow()->setFocus(); } -IMPL_LINK_TYPED( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool) +IMPL_LINK( SvxStyleBox_Impl, MenuSelectHdl, Menu*, pMenu, bool) { OUString sEntry = GetSelectEntry(); sal_uInt16 nMenuId = pMenu->GetCurItemId(); @@ -820,7 +820,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) DrawEntry( rUDEvt, false, false ); } -IMPL_LINK_TYPED(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, event, void) +IMPL_LINK(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, event, void) { // perform the calculation only when we are opening the dropdown if (event.GetId() != VCLEVENT_DROPDOWN_PRE_OPEN) @@ -994,7 +994,7 @@ void SvxFontNameBox_Impl::FillList() SetSelection( aOldSel ); } -IMPL_LINK_TYPED( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, event, void ) +IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, event, void ) { if( event.GetId() != VCLEVENT_EDIT_MODIFY ) return; @@ -1384,7 +1384,7 @@ void SvxColorWindow_Impl::KeyInput( const KeyEvent& rKEvt ) mpColorSet->KeyInput(rKEvt); } -IMPL_LINK_TYPED(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void) +IMPL_LINK(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void) { VclPtr<SvxColorWindow_Impl> xThis(this); @@ -1409,7 +1409,7 @@ IMPL_LINK_TYPED(SvxColorWindow_Impl, SelectHdl, ValueSet*, pColorSet, void) maColorSelectFunction(maCommand, aColor); } -IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, SelectPaletteHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl, ListBox&, void) { sal_Int32 nPos = mpPaletteListBox->GetSelectEntryPos(); mrPaletteManager.SetPalette( nPos ); @@ -1417,7 +1417,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, SelectPaletteHdl, ListBox&, void) mpColorSet->layoutToGivenHeight(mpColorSet->GetSizePixel().Height(), mrPaletteManager.GetColorCount()); } -IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void) +IMPL_LINK_NOARG(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void) { VclPtr<SvxColorWindow_Impl> xThis(this); @@ -1450,7 +1450,7 @@ IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, AutoColorClickHdl, Button*, void) maColorSelectFunction(maCommand, aColor); } -IMPL_LINK_NOARG_TYPED(SvxColorWindow_Impl, OpenPickerClickHdl, Button*, void) +IMPL_LINK_NOARG(SvxColorWindow_Impl, OpenPickerClickHdl, Button*, void) { VclPtr<SvxColorWindow_Impl> xThis(this); @@ -1694,7 +1694,7 @@ void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) // By default unset lines remain unchanged. // Via Shift unset lines are reset -IMPL_LINK_NOARG_TYPED(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) +IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl, ValueSet*, void) { VclPtr<SvxFrameWindow_Impl> xThis(this); @@ -1987,7 +1987,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame m_aLineStyleLb->Show(); } -IMPL_LINK_NOARG_TYPED(SvxCurrencyList_Impl, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxCurrencyList_Impl, SelectHdl, ListBox&, void) { VclPtr<SvxCurrencyList_Impl> xThis(this); @@ -2003,7 +2003,7 @@ IMPL_LINK_NOARG_TYPED(SvxCurrencyList_Impl, SelectHdl, ListBox&, void) m_xControl->Select( m_pCurrencyLb->GetSelectEntryPos() + 1 ); } -IMPL_LINK_NOARG_TYPED(SvxLineWindow_Impl, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl, ListBox&, void) { VclPtr<SvxLineWindow_Impl> xThis(this); @@ -2484,7 +2484,7 @@ void SvxStyleToolBoxControl::SetFamilyState( sal_uInt16 nIdx, Update(); } -IMPL_LINK_NOARG_TYPED(SvxStyleToolBoxControl, VisibilityNotification, SvxStyleBox_Impl&, void) +IMPL_LINK_NOARG(SvxStyleToolBoxControl, VisibilityNotification, SvxStyleBox_Impl&, void) { // Call ReBind() && UnBind() according to visibility SvxStyleBox_Impl* pBox = static_cast<SvxStyleBox_Impl*>( GetToolBox().GetItemWindow( GetId() )); @@ -2755,7 +2755,7 @@ VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow() return pColorWin; } -IMPL_LINK_TYPED(SvxColorToolBoxControl, SelectedHdl, const Color&, rColor, void) +IMPL_LINK(SvxColorToolBoxControl, SelectedHdl, const Color&, rColor, void) { m_xBtnUpdater->Update( rColor ); mPaletteManager.SetLastColor( rColor ); diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 8eb93515e564..8916c5ffbe66 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -495,7 +495,7 @@ void SAL_CALL FindTextToolbarController::statusChanged( const css::frame::Featur textfieldChanged(); } -IMPL_LINK_NOARG_TYPED(FindTextToolbarController, EditModifyHdl, Edit&, void) +IMPL_LINK_NOARG(FindTextToolbarController, EditModifyHdl, Edit&, void) { textfieldChanged(); } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 778659cc7b43..f68aed90f6c1 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -289,7 +289,7 @@ void DictionaryList::sortByColumn( sal_uInt16 nSortColumnIndex, bool bSortAtoZ ) } -IMPL_LINK_TYPED( DictionaryList, CompareHdl, const SvSortData&, rData, sal_Int32 ) +IMPL_LINK( DictionaryList, CompareHdl, const SvSortData&, rData, sal_Int32 ) { SvTreeListEntry* pLeft = const_cast<SvTreeListEntry*>(rData.pLeft); SvTreeListEntry* pRight = const_cast<SvTreeListEntry*>(rData.pRight); @@ -585,7 +585,7 @@ void ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirect updateAfterDirectionChange(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, DirectionHdl, Button*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl, Button*, void) { updateAfterDirectionChange(); } @@ -610,15 +610,15 @@ void ChineseDictionaryDialog::updateAfterDirectionChange() updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, EditFieldsListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsListBoxHdl, ListBox&, void) { updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, EditFieldsHdl, Edit&, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, EditFieldsHdl, Edit&, void) { updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, MappingSelectHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, MappingSelectHdl, SvTreeListBox*, void) { DictionaryEntry* pE = getActiveDictionary().getFirstSelectedEntry(); if(pE) @@ -704,7 +704,7 @@ void ChineseDictionaryDialog::updateButtons() m_pPB_Modify->Enable( bModify ); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, AddHdl, Button*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, AddHdl, Button*, void) { if( !isEditFieldsHaveContent() ) return; @@ -722,7 +722,7 @@ IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, AddHdl, Button*, void) updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, ModifyHdl, Button*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, ModifyHdl, Button*, void) { OUString aTerm( m_pED_Term->GetText() ); OUString aMapping( m_pED_Mapping->GetText() ); @@ -754,7 +754,7 @@ IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, ModifyHdl, Button*, void) updateButtons(); } -IMPL_LINK_NOARG_TYPED(ChineseDictionaryDialog, DeleteHdl, Button*, void) +IMPL_LINK_NOARG(ChineseDictionaryDialog, DeleteHdl, Button*, void) { DictionaryList& rActive = getActiveDictionary(); DictionaryList& rReverse = getReverseDictionary(); @@ -811,7 +811,7 @@ short ChineseDictionaryDialog::Execute() return nRet; } -IMPL_LINK_TYPED(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar, void) +IMPL_LINK(ChineseDictionaryDialog, HeaderBarClick, HeaderBar*, pHeaderBar, void) { sal_uInt16 nId = pHeaderBar->GetCurItemId(); HeaderBarItemBits nBits = pHeaderBar->GetItemBits(nId); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index eac4a01881f9..4b37723a5456 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -83,7 +83,7 @@ private: OUString getPropertyTypeName( sal_Int16 nConversionPropertyType /*linguistic2::ConversionPropertyType*/ ) const; OUString makeTabString( const DictionaryEntry& rEntry ) const; - DECL_LINK_TYPED( CompareHdl, const SvSortData&, sal_Int32 ); + DECL_LINK( CompareHdl, const SvSortData&, sal_Int32 ); sal_Int32 ColumnCompare( SvTreeListEntry* pLeft, SvTreeListEntry* pRight ); SvLBoxItem* getItemAtColumn( SvTreeListEntry* pEntry, sal_uInt16 nColumn ) const; @@ -117,14 +117,14 @@ public: virtual short Execute() override; private: - DECL_LINK_TYPED( DirectionHdl, Button*, void ); - DECL_LINK_TYPED( EditFieldsHdl, Edit&, void ); - DECL_LINK_TYPED( EditFieldsListBoxHdl, ListBox&, void ); - DECL_LINK_TYPED( MappingSelectHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( AddHdl, Button*, void ); - DECL_LINK_TYPED( ModifyHdl, Button*, void ); - DECL_LINK_TYPED( DeleteHdl, Button*, void ); - DECL_LINK_TYPED( HeaderBarClick, HeaderBar*, void ); + DECL_LINK( DirectionHdl, Button*, void ); + DECL_LINK( EditFieldsHdl, Edit&, void ); + DECL_LINK( EditFieldsListBoxHdl, ListBox&, void ); + DECL_LINK( MappingSelectHdl, SvTreeListBox*, void ); + DECL_LINK( AddHdl, Button*, void ); + DECL_LINK( ModifyHdl, Button*, void ); + DECL_LINK( DeleteHdl, Button*, void ); + DECL_LINK( HeaderBarClick, HeaderBar*, void ); void initDictionaryControl(DictionaryList *pList, const css::uno::Reference< css::linguistic2::XConversionDictionary>& xDictionary); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 62ada096b75b..4e4d62fe57ae 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -89,7 +89,7 @@ void ChineseTranslationDialog::getSettings( bool& rbDirectionToSimplified rbTranslateCommonTerms = m_pCB_Translate_Commonterms->IsChecked(); } -IMPL_LINK_NOARG_TYPED(ChineseTranslationDialog, OkHdl, Button*, void) +IMPL_LINK_NOARG(ChineseTranslationDialog, OkHdl, Button*, void) { //save settings to configuration SvtLinguConfig aLngCfg; @@ -102,7 +102,7 @@ IMPL_LINK_NOARG_TYPED(ChineseTranslationDialog, OkHdl, Button*, void) EndDialog( RET_OK ); } -IMPL_LINK_NOARG_TYPED(ChineseTranslationDialog, DictionaryHdl, Button*, void) +IMPL_LINK_NOARG(ChineseTranslationDialog, DictionaryHdl, Button*, void) { if( !m_pDictionaryDialog ) { diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx index 74262152d6c8..45c0d53414e6 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx @@ -44,8 +44,8 @@ public: , bool& rbTranslateCommonTerms ) const; private: - DECL_LINK_TYPED( DictionaryHdl, Button*, void ); - DECL_LINK_TYPED( OkHdl, Button*, void ); + DECL_LINK( DictionaryHdl, Button*, void ); + DECL_LINK( OkHdl, Button*, void ); private: VclPtr<RadioButton> m_pRB_To_Simplified; diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 0a25d0aa9ad9..be81e31c7ca1 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -160,7 +160,7 @@ namespace { VclPtr<VirtualDevice> CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const; - DECL_LINK_TYPED( CalcFieldValueHdl, EditFieldInfo*, void ); + DECL_LINK( CalcFieldValueHdl, EditFieldInfo*, void ); void ParseSettings( const Sequence< PropertyValue >& aDescriptor, ExportSettings& rSettings ); bool GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, bool bVectorType ); @@ -337,7 +337,7 @@ GraphicExporter::~GraphicExporter() { } -IMPL_LINK_TYPED(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) +IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void) { if( pInfo ) { diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 6f8ff3920025..6b7f0d86591e 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -146,7 +146,7 @@ public: Point LogicToPixel( const Point&, const MapMode& rMapMode ); Point PixelToLogic( const Point&, const MapMode& rMapMode ); - DECL_LINK_TYPED( NotifyHdl, EENotify&, void ); + DECL_LINK( NotifyHdl, EENotify&, void ); virtual void ObjectInDestruction(const SdrObject& rObject) override; @@ -980,7 +980,7 @@ Point SvxTextEditSourceImpl::PixelToLogic( const Point& rPoint, const MapMode& r return Point(); } -IMPL_LINK_TYPED(SvxTextEditSourceImpl, NotifyHdl, EENotify&, rNotify, void) +IMPL_LINK(SvxTextEditSourceImpl, NotifyHdl, EENotify&, rNotify, void) { if( !mbNotificationsDisabled ) { |