diff options
Diffstat (limited to 'chart2/source/controller')
57 files changed, 186 insertions, 186 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 972e52db5eb7..0956589ee991 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -1205,7 +1205,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref } } -IMPL_LINK_NOARG_TYPED(CombiColumnLineChartDialogController, ChangeLineCountHdl, Edit&, void) +IMPL_LINK_NOARG(CombiColumnLineChartDialogController, ChangeLineCountHdl, Edit&, void) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 81e2115d49e0..ec36f07ddff0 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -280,7 +280,7 @@ public: virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException) override; private: - DECL_LINK_TYPED( ChangeLineCountHdl, Edit&, void ); + DECL_LINK( ChangeLineCountHdl, Edit&, void ); private: VclPtr<FixedText> m_pFT_NumberOfLines; diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index bee501889089..79b214efd9a7 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -181,8 +181,8 @@ private: Link<SeriesHeaderEdit*,void> m_aChangeLink; void notifyChanges(); - DECL_LINK_TYPED( SeriesNameChanged, Edit&, void ); - DECL_LINK_TYPED( SeriesNameEdited, Edit&, void ); + DECL_LINK( SeriesNameChanged, Edit&, void ); + DECL_LINK( SeriesNameEdited, Edit&, void ); static Image GetChartTypeImage( const Reference< chart2::XChartType > & xChartType, @@ -321,12 +321,12 @@ void SeriesHeader::SetEditChangedHdl( const Link<SeriesHeaderEdit*,void> & rLink m_aChangeLink = rLink; } -IMPL_LINK_NOARG_TYPED(SeriesHeader, SeriesNameChanged, Edit&, void) +IMPL_LINK_NOARG(SeriesHeader, SeriesNameChanged, Edit&, void) { notifyChanges(); } -IMPL_LINK_NOARG_TYPED(SeriesHeader, SeriesNameEdited, Edit&, void) +IMPL_LINK_NOARG(SeriesHeader, SeriesNameEdited, Edit&, void) { m_bSeriesNameChangePending = true; } @@ -1285,7 +1285,7 @@ void DataBrowser::ImplAdjustHeaderControls() } } -IMPL_LINK_TYPED( DataBrowser, SeriesHeaderGotFocus, Control&, rControl, void ) +IMPL_LINK( DataBrowser, SeriesHeaderGotFocus, Control&, rControl, void ) { impl::SeriesHeaderEdit* pEdit = static_cast<impl::SeriesHeaderEdit*>(&rControl); pEdit->SetShowWarningBox( !m_bDataValid ); @@ -1300,7 +1300,7 @@ IMPL_LINK_TYPED( DataBrowser, SeriesHeaderGotFocus, Control&, rControl, void ) } } -IMPL_LINK_TYPED( DataBrowser, SeriesHeaderChanged, impl::SeriesHeaderEdit*, pEdit, void ) +IMPL_LINK( DataBrowser, SeriesHeaderChanged, impl::SeriesHeaderEdit*, pEdit, void ) { if( pEdit ) { diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx index 4724ac8d7076..cc67b5b07dfd 100644 --- a/chart2/source/controller/dialogs/DataBrowser.hxx +++ b/chart2/source/controller/dialogs/DataBrowser.hxx @@ -175,8 +175,8 @@ private: OUString GetColString( sal_Int32 nColumnId ) const; static OUString GetRowString( sal_Int32 nRow ); - DECL_LINK_TYPED( SeriesHeaderGotFocus, Control&, void ); - DECL_LINK_TYPED( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void ); + DECL_LINK( SeriesHeaderGotFocus, Control&, void ); + DECL_LINK( SeriesHeaderChanged, impl::SeriesHeaderEdit*, void ); DataBrowser( const DataBrowser & ) = delete; }; diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index 565c0e74718c..66293238f55f 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -45,7 +45,7 @@ void TimerTriggeredControllerLock::startTimer() m_apControllerLockGuard.reset( new ControllerLockGuardUNO(m_xModel) ); m_aTimer.Start(); } -IMPL_LINK_NOARG_TYPED(TimerTriggeredControllerLock, TimerTimeout, Timer *, void) +IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout, Timer *, void) { m_apControllerLockGuard.reset(); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 21b9a2d6a9c9..16696b0b7c34 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -208,7 +208,7 @@ void CreationWizardUnoDlg::createDialogOnDemand() } } } -IMPL_LINK_TYPED( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void ) +IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void ) { if(rEvent.GetId() == VCLEVENT_OBJECT_DYING) m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index a12497c38ed1..36af3ffcb78d 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -111,7 +111,7 @@ void DataEditor::dispose() } // react on click (or keypress) on toolbar icon -IMPL_LINK_NOARG_TYPED(DataEditor, ToolboxHdl, ToolBox *, void) +IMPL_LINK_NOARG(DataEditor, ToolboxHdl, ToolBox *, void) { sal_uInt16 nId = m_pTbxData->GetCurItemId(); @@ -132,7 +132,7 @@ IMPL_LINK_NOARG_TYPED(DataEditor, ToolboxHdl, ToolBox *, void) } // refresh toolbar icons according to currently selected cell in browse box -IMPL_LINK_NOARG_TYPED(DataEditor, BrowserCursorMovedHdl, DataBrowser*, void) +IMPL_LINK_NOARG(DataEditor, BrowserCursorMovedHdl, DataBrowser*, void) { if( m_bReadOnly ) return; @@ -167,7 +167,7 @@ void DataEditor::SetReadOnly( bool bReadOnly ) m_xBrwData->SetReadOnly( m_bReadOnly ); } -IMPL_LINK_NOARG_TYPED(DataEditor, MiscHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(DataEditor, MiscHdl, LinkParamNone*, void) { SvtMiscOptions aMiscOptions; sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() ); diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index c3e5547e2ab0..d5ead3a404a5 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -639,7 +639,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) } } -IMPL_LINK_TYPED(SchAttribTabDlg, OKPressed, Button*, pButton, void) +IMPL_LINK(SchAttribTabDlg, OKPressed, Button*, pButton, void) { m_bOKPressed = true; m_aOriginalOKClickHdl.Call( pButton ); diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx index 8d4a31cc315b..fc3cf0449cb9 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.cxx +++ b/chart2/source/controller/dialogs/res_DataLabel.cxx @@ -182,7 +182,7 @@ void DataLabelResources::SetNumberFormatter( SvNumberFormatter* pFormatter ) m_pNumberFormatter = pFormatter; } -IMPL_LINK_TYPED( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, void ) +IMPL_LINK( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, void ) { if( !m_pPool || !m_pNumberFormatter ) { @@ -230,7 +230,7 @@ IMPL_LINK_TYPED( DataLabelResources, NumberFormatDialogHdl, Button *, pButton, v } } -IMPL_LINK_TYPED( DataLabelResources, CheckHdl, Button*, pBox, void ) +IMPL_LINK( DataLabelResources, CheckHdl, Button*, pBox, void ) { if( pBox ) static_cast<CheckBox*>(pBox)->EnableTriState( false ); diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index 2f715e5a44f5..01366656179d 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -83,8 +83,8 @@ private: VclPtr<vcl::Window> m_pWindow; SfxItemPool* m_pPool; - DECL_LINK_TYPED(NumberFormatDialogHdl, Button *, void ); - DECL_LINK_TYPED(CheckHdl, Button*, void ); + DECL_LINK(NumberFormatDialogHdl, Button *, void ); + DECL_LINK(CheckHdl, Button*, void ); void EnableControls(); }; diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 0294813bd294..4296b9502b86 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -340,12 +340,12 @@ void ErrorBarResources::UpdateControlStates() } } -IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen2, ListBox&, void ) +IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen2, ListBox&, void ) { CategoryChosen(nullptr); } -IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void ) +IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, Button*, void ) { m_bErrorKindUnique = true; SvxChartKindError eOldError = m_eErrorKind; @@ -403,13 +403,13 @@ IMPL_LINK_NOARG_TYPED( ErrorBarResources, CategoryChosen, Button*, void ) UpdateControlStates(); } -IMPL_LINK_NOARG_TYPED(ErrorBarResources, SynchronizePosAndNeg, CheckBox&, void) +IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg, CheckBox&, void) { UpdateControlStates(); PosValueChanged( *m_pMfPositive ); } -IMPL_LINK_NOARG_TYPED(ErrorBarResources, PosValueChanged, Edit&, void) +IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged, Edit&, void) { if( m_pCbSyncPosNeg->IsChecked()) { @@ -423,7 +423,7 @@ IMPL_LINK_NOARG_TYPED(ErrorBarResources, PosValueChanged, Edit&, void) } } -IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void) +IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, Button*, void) { m_bIndicatorUnique = true; if( m_pRbBoth->IsChecked()) @@ -438,7 +438,7 @@ IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void) UpdateControlStates(); } -IMPL_LINK_TYPED( ErrorBarResources, ChooseRange, Button*, pButton, void ) +IMPL_LINK( ErrorBarResources, ChooseRange, Button*, pButton, void ) { OSL_ASSERT( m_apRangeSelectionHelper.get()); if( ! m_apRangeSelectionHelper.get()) @@ -470,7 +470,7 @@ IMPL_LINK_TYPED( ErrorBarResources, ChooseRange, Button*, pButton, void ) m_pCurrentRangeChoosingField = nullptr; } -IMPL_LINK_TYPED( ErrorBarResources, RangeChanged, Edit&, rEdit, void ) +IMPL_LINK( ErrorBarResources, RangeChanged, Edit&, rEdit, void ) { if( &rEdit == m_pEdRangePositive ) { diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index b4ed6789103e..6b268f90685a 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -165,7 +165,7 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM } } -IMPL_LINK_NOARG_TYPED(LegendPositionResources, PositionEnableHdl, CheckBox&, void) +IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl, CheckBox&, void) { bool bEnable = m_pCbxShow == nullptr || m_pCbxShow->IsChecked(); @@ -225,7 +225,7 @@ void LegendPositionResources::writeToItemSet( SfxItemSet& rOutAttrs ) const rOutAttrs.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, m_pCbxShow == nullptr || m_pCbxShow->IsChecked()) ); } -IMPL_LINK_TYPED( LegendPositionResources, PositionChangeHdl, RadioButton&, rRadio, void ) +IMPL_LINK( LegendPositionResources, PositionChangeHdl, RadioButton&, rRadio, void ) { //for each radio click there are coming two change events //first uncheck of previous button -> ignore that call diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 034a63b756f5..bec6a44257eb 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -93,7 +93,7 @@ TrendlineResources::TrendlineResources( vcl::Window * pParent, const SfxItemSet& TrendlineResources::~TrendlineResources() {} -IMPL_LINK_TYPED( TrendlineResources, SelectTrendLine, Button *, pRadioButton, void ) +IMPL_LINK( TrendlineResources, SelectTrendLine, Button *, pRadioButton, void ) { if( pRadioButton == m_pRB_Linear ) m_eTrendLineType = SvxChartRegress::Linear; @@ -348,7 +348,7 @@ void TrendlineResources::UpdateControlStates() m_pEE_YName->Enable( !bMovingAverage && m_pCB_ShowEquation->IsChecked() ); } -IMPL_LINK_TYPED( TrendlineResources, ChangeValue, Edit&, rNumericField, void) +IMPL_LINK( TrendlineResources, ChangeValue, Edit&, rNumericField, void) { if( &rNumericField == m_pNF_Degree ) { @@ -388,7 +388,7 @@ void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints ) UpdateControlStates(); } -IMPL_LINK_TYPED( TrendlineResources, ShowEquation, CheckBox&, rCheckBox, void) +IMPL_LINK( TrendlineResources, ShowEquation, CheckBox&, rCheckBox, void) { if( &rCheckBox == m_pCB_ShowEquation ) { diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx index 69ca98e2e4ab..1dccbd3a4f0c 100644 --- a/chart2/source/controller/dialogs/res_Trendline.hxx +++ b/chart2/source/controller/dialogs/res_Trendline.hxx @@ -80,9 +80,9 @@ private: sal_Int32 m_nNbPoints; void UpdateControlStates(); - DECL_LINK_TYPED( SelectTrendLine, Button*, void ); - DECL_LINK_TYPED( ChangeValue, Edit&, void); - DECL_LINK_TYPED( ShowEquation, CheckBox&, void); + DECL_LINK( SelectTrendLine, Button*, void ); + DECL_LINK( ChangeValue, Edit&, void); + DECL_LINK( ShowEquation, CheckBox&, void); }; } // namespace chart diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index ed3a1f3c2ac6..602afffbaecf 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -291,7 +291,7 @@ void ThreeD_SceneAppearance_TabPage::updateScheme() } } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void) +IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, void) { if( !m_bUpdateOtherControls ) return; @@ -316,7 +316,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, ListBox&, initControlsFromModel(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, void) +IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, void) { if( !m_bUpdateOtherControls ) return; @@ -325,7 +325,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneAppearance_TabPage, SelectShading, CheckBox&, applyShadeModeToModel(); updateScheme(); } -IMPL_LINK_TYPED( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, CheckBox&, rCheckBox, void ) +IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, CheckBox&, rCheckBox, void ) { if( !m_bUpdateOtherControls ) return; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index a7b339697844..9ea3935feedb 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -44,9 +44,9 @@ public: virtual void ActivatePage() override; private: - DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectShading, CheckBox&, void ); - DECL_LINK_TYPED( SelectRoundedEdgeOrObjectLines, CheckBox&, void ); + DECL_LINK( SelectSchemeHdl, ListBox&, void ); + DECL_LINK( SelectShading, CheckBox&, void ); + DECL_LINK( SelectRoundedEdgeOrObjectLines, CheckBox&, void ); void initControlsFromModel(); void applyShadeModeToModel(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index ae6bfa5fdf2b..af8174f617db 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -195,7 +195,7 @@ void ThreeD_SceneGeometry_TabPage::applyAnglesToModel() m_bAngleChangePending = false; } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void) { m_nXRotation = m_pMFXRotation->GetValue(); m_nYRotation = m_pMFYRotation->GetValue(); @@ -203,7 +203,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleEdited, Edit&, void) m_bAngleChangePending = true; } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, AngleChanged, Edit&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleChanged, Edit&, void) { applyAnglesToModel(); } @@ -229,23 +229,23 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel() m_bPerspectiveChangePending = false; } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveEdited, Edit&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveEdited, Edit&, void) { m_bPerspectiveChangePending = true; } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveChanged, Edit&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveChanged, Edit&, void) { applyPerspectiveToModel(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, CheckBox&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, CheckBox&, void) { m_pMFPerspective->Enable( m_pCbxPerspective->IsChecked() ); applyPerspectiveToModel(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, CheckBox&, void) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, CheckBox&, void) { ControllerLockHelperGuard aGuard( m_rControllerLockHelper ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index 6da428d43f42..8d1ab9a83901 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -45,16 +45,16 @@ public: void commitPendingChanges(); // is called by timer to apply changes to model - DECL_LINK_TYPED( AngleChanged, Edit&, void ); + DECL_LINK( AngleChanged, Edit&, void ); // is called immediately when a field changes - DECL_LINK_TYPED( AngleEdited, Edit&, void ); + DECL_LINK( AngleEdited, Edit&, void ); // is called by timer to apply changes to model - DECL_LINK_TYPED( PerspectiveChanged, Edit&, void ); + DECL_LINK( PerspectiveChanged, Edit&, void ); // is called immediately when a field changes - DECL_LINK_TYPED( PerspectiveEdited, Edit&, void ); - DECL_LINK_TYPED( PerspectiveToggled, CheckBox&, void ); - DECL_LINK_TYPED( RightAngledAxesToggled, CheckBox&, void ); + DECL_LINK( PerspectiveEdited, Edit&, void ); + DECL_LINK( PerspectiveToggled, CheckBox&, void ); + DECL_LINK( RightAngledAxesToggled, CheckBox&, void ); private: void applyAnglesToModel(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 07509aedc228..bdd53ff10d21 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -308,7 +308,7 @@ void ThreeD_SceneIllumination_TabPage::dispose() TabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void*, void) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void*, void) { if( m_bInCommitToModel )//don't read own changes return; @@ -342,7 +342,7 @@ void ThreeD_SceneIllumination_TabPage::applyLightSourcesToModel() m_aTimerTriggeredControllerLock.startTimer(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLightCtl3D*, void) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLightCtl3D*, void) { m_aTimerTriggeredControllerLock.startTimer(); @@ -392,7 +392,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, SvxLig applyLightSourcesToModel(); } -IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLightCtl3D*, void) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLightCtl3D*, void) { sal_uInt32 nLightNumber = m_pCtl_Preview->GetSvx3DLightControl().GetSelectedLight(); if(nLightNumber<8) @@ -405,7 +405,7 @@ IMPL_LINK_NOARG_TYPED(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, SvxLig } } -IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton, void ) +IMPL_LINK( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pButton, void ) { bool bIsAmbientLight = (pButton==m_pBtn_AmbientLight_Color); ColorLB* pListBox = ( bIsAmbientLight ? m_pLB_AmbientLight : m_pLB_LightSource); @@ -441,7 +441,7 @@ IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ColorDialogHdl, Button*, pBut } } -IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBox, void ) +IMPL_LINK( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBox, void ) { ColorLB* pListBox = static_cast<ColorLB*>(&rBox); if(pListBox==m_pLB_AmbientLight) @@ -471,7 +471,7 @@ IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, SelectColorHdl, ListBox&, rBo this->updatePreview(); } -IMPL_LINK_TYPED( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void ) +IMPL_LINK( ThreeD_SceneIllumination_TabPage, ClickLightSourceButtonHdl, Button*, pBtn, void ) { LightButton* pButton = static_cast<LightButton*>(pBtn); if( !pButton ) diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index 735d7659ddd8..515ace16b8e4 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -58,16 +58,16 @@ public: virtual void dispose() override; private: - DECL_LINK_TYPED( ClickLightSourceButtonHdl, Button*, void ); - DECL_LINK_TYPED( SelectColorHdl, ListBox&, void ); - DECL_LINK_TYPED( ColorDialogHdl, Button*, void ); - DECL_LINK_TYPED( PreviewChangeHdl, SvxLightCtl3D*, void ); - DECL_LINK_TYPED( PreviewSelectHdl, SvxLightCtl3D*, void ); + DECL_LINK( ClickLightSourceButtonHdl, Button*, void ); + DECL_LINK( SelectColorHdl, ListBox&, void ); + DECL_LINK( ColorDialogHdl, Button*, void ); + DECL_LINK( PreviewChangeHdl, SvxLightCtl3D*, void ); + DECL_LINK( PreviewSelectHdl, SvxLightCtl3D*, void ); void updatePreview(); private: - DECL_LINK_TYPED(fillControlsFromModel, void *, void); + DECL_LINK(fillControlsFromModel, void *, void); void applyLightSourceToModel( sal_uInt32 nLightNumber ); void applyLightSourcesToModel(); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 8746615917b3..7b4c914ed99d 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -298,7 +298,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories ) // event handling routines -IMPL_LINK_NOARG_TYPED(SchAxisLabelTabPage, ToggleShowLabel, Button*, void) +IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel, Button*, void) { bool bEnable = ( m_pCbShowDescription->GetState() != TRISTATE_FALSE ); diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index b847e4d69ffe..aefe92dc6962 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -65,7 +65,7 @@ private: bool m_bHasInitialStacking; /// false = checkbox in tristate bool m_bComplexCategories; - DECL_LINK_TYPED ( ToggleShowLabel, Button*, void ); + DECL_LINK ( ToggleShowLabel, Button*, void ); public: SchAxisLabelTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index 908fd49b9d27..6cee0064cb18 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -313,7 +313,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning m_bSupportAxisPositioning = bSupportAxisPositioning; } -IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void) { sal_Int32 nPos = m_pLB_CrossesAt->GetSelectEntryPos(); m_pED_CrossesAt->Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis ); @@ -327,7 +327,7 @@ IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, CrossesAtSelectHdl, ListBox&, void) PlaceLabelsSelectHdl( *m_pLB_PlaceLabels ); } -IMPL_LINK_NOARG_TYPED(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void) +IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl, ListBox&, void) { sal_Int32 nLabelPos = m_pLB_PlaceLabels->GetSelectEntryPos(); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 25fe19017da6..e5bacafbc00e 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -50,8 +50,8 @@ public: void SupportAxisPositioning( bool bSupportAxisPositioning ); private: //methods: - DECL_LINK_TYPED( CrossesAtSelectHdl, ListBox&, void ); - DECL_LINK_TYPED( PlaceLabelsSelectHdl, ListBox&, void ); + DECL_LINK( CrossesAtSelectHdl, ListBox&, void ); + DECL_LINK( PlaceLabelsSelectHdl, ListBox&, void ); private: //member: VclPtr<VclFrame> m_pFL_AxisLine; diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index ee86f8ed9f06..777297cb45c0 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -55,8 +55,8 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( Dim3DLookCheckHdl, CheckBox&, void ); - DECL_LINK_TYPED( SelectSchemeHdl, ListBox&, void ); + DECL_LINK( Dim3DLookCheckHdl, CheckBox&, void ); + DECL_LINK( SelectSchemeHdl, ListBox&, void ); private: VclPtr<CheckBox> m_pCB_3DLook; @@ -104,13 +104,13 @@ void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter ) rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown; } -IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox&, void) +IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox&, void) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); } -IMPL_LINK_NOARG_TYPED(Dim3DLookResourceGroup, SelectSchemeHdl, ListBox&, void) +IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl, ListBox&, void) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -127,7 +127,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( SortByXValuesCheckHdl, CheckBox&, void ); + DECL_LINK( SortByXValuesCheckHdl, CheckBox&, void ); private: VclPtr<CheckBox> m_pCB_XValueSorting; @@ -155,7 +155,7 @@ void SortByXValuesResourceGroup::fillParameter( ChartTypeParameter& rParameter ) rParameter.bSortByXValues = m_pCB_XValueSorting->IsChecked(); } -IMPL_LINK_NOARG_TYPED(SortByXValuesResourceGroup, SortByXValuesCheckHdl, CheckBox&, void) +IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl, CheckBox&, void) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -172,8 +172,8 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( StackingChangeHdl, RadioButton&, void ); - DECL_LINK_TYPED( StackingEnableHdl, CheckBox&, void ); + DECL_LINK( StackingChangeHdl, RadioButton&, void ); + DECL_LINK( StackingEnableHdl, CheckBox&, void ); private: VclPtr<CheckBox> m_pCB_Stacked; @@ -250,7 +250,7 @@ void StackingResourceGroup::fillParameter( ChartTypeParameter& rParameter ) else if(m_pRB_Stack_Z->IsChecked()) rParameter.eStackMode = GlobalStackMode_STACK_Z; } -IMPL_LINK_TYPED( StackingResourceGroup, StackingChangeHdl, RadioButton&, rRadio, void ) +IMPL_LINK( StackingResourceGroup, StackingChangeHdl, RadioButton&, rRadio, void ) { //for each radio click there are coming two change events //first uncheck of previous button -> ignore that call @@ -258,7 +258,7 @@ IMPL_LINK_TYPED( StackingResourceGroup, StackingChangeHdl, RadioButton&, rRadio, if( m_pChangeListener && rRadio.IsChecked() ) m_pChangeListener->stateChanged(this); } -IMPL_LINK_NOARG_TYPED(StackingResourceGroup, StackingEnableHdl, CheckBox&, void) +IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, CheckBox&, void) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -274,7 +274,7 @@ public: void fillParameter( ChartTypeParameter& rParam ); private: - DECL_LINK_TYPED( SettingChangedHdl, CheckBox&, void ); + DECL_LINK( SettingChangedHdl, CheckBox&, void ); private: VclPtr<CheckBox> m_pCB_RoundedEdge; }; @@ -300,7 +300,7 @@ void GL3DResourceGroup::fillParameter( ChartTypeParameter& rParam ) rParam.mbRoundedEdge = m_pCB_RoundedEdge->IsChecked(); } -IMPL_LINK_NOARG_TYPED( GL3DResourceGroup, SettingChangedHdl, CheckBox&, void ) +IMPL_LINK_NOARG( GL3DResourceGroup, SettingChangedHdl, CheckBox&, void ) { if (m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -319,7 +319,7 @@ public: virtual void StateChanged( StateChangedType nType ) override; private: - DECL_LINK_TYPED( SplineTypeListBoxHdl, ListBox&, void ); + DECL_LINK( SplineTypeListBoxHdl, ListBox&, void ); private: VclPtr<ListBox> m_pLB_Spline_Type; @@ -392,7 +392,7 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool rParameter.nCurveResolution = static_cast< sal_Int32 >( m_pMF_SplineResolution->GetValue()); rParameter.nSplineOrder = static_cast< sal_Int32 >( m_pMF_SplineOrder->GetValue()); } -IMPL_LINK_NOARG_TYPED(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, ListBox&, void) { m_pFT_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos()); m_pMF_SplineOrder->Enable(B_SPLINE_POS == m_pLB_Spline_Type->GetSelectEntryPos()); @@ -491,9 +491,9 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( LineTypeChangeHdl, ListBox&, void ); - DECL_LINK_TYPED( SplineDetailsDialogHdl, Button*, void ); - DECL_LINK_TYPED( SteppedDetailsDialogHdl, Button*, void ); + DECL_LINK( LineTypeChangeHdl, ListBox&, void ); + DECL_LINK( SplineDetailsDialogHdl, Button*, void ); + DECL_LINK( SteppedDetailsDialogHdl, Button*, void ); SplinePropertiesDialog& getSplinePropertiesDialog(); SteppedPropertiesDialog& getSteppedPropertiesDialog(); @@ -584,12 +584,12 @@ void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter ) break; } } -IMPL_LINK_NOARG_TYPED(SplineResourceGroup, LineTypeChangeHdl, ListBox&, void) +IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl, ListBox&, void) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); } -IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void) +IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void) { ChartTypeParameter aOldParameter; @@ -609,7 +609,7 @@ IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SplineDetailsDialogHdl, Button*, void getSplinePropertiesDialog().fillControls( aOldParameter ); } } -IMPL_LINK_NOARG_TYPED(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void) +IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl, Button*, void) { ChartTypeParameter aOldParameter; @@ -641,7 +641,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK_TYPED( GeometryChangeHdl, ListBox&, void ); + DECL_LINK( GeometryChangeHdl, ListBox&, void ); private: BarGeometryResources m_aGeometryResources; @@ -673,7 +673,7 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter ) rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos(); } -IMPL_LINK_NOARG_TYPED(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void) +IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, ListBox&, void) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -872,7 +872,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType() pTypeController = m_aChartTypeDialogControllerList[nM]; return pTypeController; } -IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) +IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) { if( m_pCurrentMainType ) { @@ -884,7 +884,7 @@ IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectSubTypeHdl, ValueSet*, void) } } -IMPL_LINK_NOARG_TYPED(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl, ListBox&, void) { selectMainType(); } diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index ea756379cf41..e885898fbdc9 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -70,8 +70,8 @@ protected: void commitToModel( const ChartTypeParameter& rParameter ); void selectMainType(); - DECL_LINK_TYPED( SelectMainTypeHdl, ListBox&, void ); - DECL_LINK_TYPED( SelectSubTypeHdl, ValueSet*, void ); + DECL_LINK( SelectMainTypeHdl, ListBox&, void ); + DECL_LINK( SelectSubTypeHdl, ValueSet*, void ); protected: VclPtr<FixedText> m_pFT_ChooseType; diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 9c8fe5f0074b..df92cc0e680d 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -529,7 +529,7 @@ void DataSourceTabPage::updateControlState() isValid(); } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBox*, void) { m_rDialogModel.startControllerLockTimer(); if( m_pLB_SERIES->FirstSelected()) @@ -540,7 +540,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, SeriesSelectionChangedHdl, SvTreeListBo updateControlState(); } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*, void) +IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox*, void) { m_rDialogModel.startControllerLockTimer(); SvTreeListEntry * pEntry = m_pLB_ROLE->FirstSelected(); @@ -564,7 +564,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RoleSelectionChangedHdl, SvTreeListBox* } } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, void) { OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); m_pCurrentRangeChoosingField = m_pEDT_RANGE; @@ -605,7 +605,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, MainRangeButtonClickedHdl, Button*, voi m_pCurrentRangeChoosingField = nullptr; } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button*, void) { OSL_ASSERT( m_pCurrentRangeChoosingField == nullptr ); m_pCurrentRangeChoosingField = m_pEDT_CATEGORIES; @@ -619,7 +619,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, CategoriesRangeButtonClickedHdl, Button m_rDialogModel.getCategoriesRange(), aStr, *this ); } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, AddButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -657,7 +657,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, AddButtonClickedHdl, Button*, void) SeriesSelectionChangedHdl( nullptr ); } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -699,7 +699,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, RemoveButtonClickedHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, UpButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -714,7 +714,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, UpButtonClickedHdl, Button*, void) } } -IMPL_LINK_NOARG_TYPED(DataSourceTabPage, DownButtonClickedHdl, Button*, void) +IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl, Button*, void) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_pLB_SERIES->FirstSelected()); @@ -729,7 +729,7 @@ IMPL_LINK_NOARG_TYPED(DataSourceTabPage, DownButtonClickedHdl, Button*, void) } } -IMPL_LINK_TYPED( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void ) +IMPL_LINK( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void ) { // note: isValid sets the color of the edit field if( isRangeFieldContentValid( rEdit )) @@ -747,7 +747,7 @@ IMPL_LINK_TYPED( DataSourceTabPage, RangeModifiedHdl, Edit&, rEdit, void ) isValid(); } -IMPL_LINK_TYPED( DataSourceTabPage, RangeUpdateDataHdl, Edit&, rEdit, void ) +IMPL_LINK( DataSourceTabPage, RangeUpdateDataHdl, Edit&, rEdit, void ) { // note: isValid sets the color of the edit field if( isRangeFieldContentValid( rEdit )) diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx index 3b0c0b554c47..1cfd2802a64e 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.hxx +++ b/chart2/source/controller/dialogs/tp_DataSource.hxx @@ -73,16 +73,16 @@ protected: virtual void initializePage() override; - DECL_LINK_TYPED( SeriesSelectionChangedHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( RoleSelectionChangedHdl, SvTreeListBox*, void ); - DECL_LINK_TYPED( MainRangeButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( CategoriesRangeButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( AddButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( RemoveButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( RangeModifiedHdl, Edit&, void ); - DECL_LINK_TYPED( RangeUpdateDataHdl, Edit&, void ); - DECL_LINK_TYPED( UpButtonClickedHdl, Button*, void ); - DECL_LINK_TYPED( DownButtonClickedHdl, Button*, void ); + DECL_LINK( SeriesSelectionChangedHdl, SvTreeListBox*, void ); + DECL_LINK( RoleSelectionChangedHdl, SvTreeListBox*, void ); + DECL_LINK( MainRangeButtonClickedHdl, Button*, void ); + DECL_LINK( CategoriesRangeButtonClickedHdl, Button*, void ); + DECL_LINK( AddButtonClickedHdl, Button*, void ); + DECL_LINK( RemoveButtonClickedHdl, Button*, void ); + DECL_LINK( RangeModifiedHdl, Edit&, void ); + DECL_LINK( RangeUpdateDataHdl, Edit&, void ); + DECL_LINK( UpButtonClickedHdl, Button*, void ); + DECL_LINK( DownButtonClickedHdl, Button*, void ); // ____ RangeSelectionListenerParent ____ virtual void listeningFinished( const OUString & rNewRange ) override; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index f990f54ed0ca..62ce33ac5f1b 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -349,30 +349,30 @@ bool RangeChooserTabPage::isValid() return bIsValid; } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlEditedHdl, Edit&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl, Edit&, void) { setDirty(); isValid(); } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedRadioHdl, RadioButton&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedRadioHdl, RadioButton&, void) { ControlChangedHdl(*m_pED_Range); } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedCheckBoxHdl, CheckBox&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, CheckBox&, void) { ControlChangedHdl(*m_pED_Range); } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ControlChangedHdl, Edit&, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl, Edit&, void) { setDirty(); if( isValid()) changeDialogModelAccordingToControls(); } -IMPL_LINK_NOARG_TYPED(RangeChooserTabPage, ChooseRangeHdl, Button*, void) +IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl, Button*, void) { OUString aRange = m_pED_Range->GetText(); OUString aTitle = m_pFTTitle->GetText(); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx index fb62d98835b9..1e74fd7f98df 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx @@ -69,11 +69,11 @@ protected: //methods bool isValid(); void setDirty(); - DECL_LINK_TYPED( ChooseRangeHdl, Button*, void ); - DECL_LINK_TYPED( ControlChangedHdl, Edit&, void ); - DECL_LINK_TYPED( ControlChangedCheckBoxHdl, CheckBox&, void ); - DECL_LINK_TYPED( ControlChangedRadioHdl, RadioButton&, void ); - DECL_LINK_TYPED( ControlEditedHdl, Edit&, void ); + DECL_LINK( ChooseRangeHdl, Button*, void ); + DECL_LINK( ControlChangedHdl, Edit&, void ); + DECL_LINK( ControlChangedCheckBoxHdl, CheckBox&, void ); + DECL_LINK( ControlChangedRadioHdl, RadioButton&, void ); + DECL_LINK( ControlEditedHdl, Edit&, void ); protected: //member diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index cdf8c6484c77..3edb725029ac 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -157,7 +157,7 @@ void ScaleTabPage::dispose() SfxTabPage::dispose(); } -IMPL_STATIC_LINK_TYPED( +IMPL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, Edit&, rEdit, void ) { FormattedField& rFmtField = static_cast<FormattedField&>(rEdit); @@ -217,7 +217,7 @@ void ScaleTabPage::EnableControls() EnableValueHdl(m_pCbx_AutoTimeResolution); } -IMPL_LINK_TYPED( ScaleTabPage, EnableValueHdl, Button *, pButton, void ) +IMPL_LINK( ScaleTabPage, EnableValueHdl, Button *, pButton, void ) { CheckBox * pCbx = static_cast<CheckBox*>(pButton); bool bEnable = pCbx && !pCbx->IsChecked() && pCbx->IsEnabled(); @@ -257,7 +257,7 @@ enum AxisTypeListBoxEntry TYPE_DATE=2 }; -IMPL_LINK_NOARG_TYPED(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void) +IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void) { const sal_Int32 nPos = m_pLB_AxisType->GetSelectEntryPos(); if( nPos==TYPE_DATE ) diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 5fdd60994f54..2eb856017aa7 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -99,9 +99,9 @@ private: void EnableControls(); - DECL_LINK_TYPED( SelectAxisTypeHdl, ListBox&, void ); - DECL_LINK_TYPED( EnableValueHdl, Button*, void ); - DECL_STATIC_LINK_TYPED( ScaleTabPage, FmtFieldModifiedHdl, Edit&, void); + DECL_LINK( SelectAxisTypeHdl, ListBox&, void ); + DECL_LINK( EnableValueHdl, Button*, void ); + DECL_STATIC_LINK( ScaleTabPage, FmtFieldModifiedHdl, Edit&, void); /** shows a warning window due to an invalid input. diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index b8c6a7a90d6f..bc7122cdb9d0 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -87,7 +87,7 @@ void SchOptionTabPage::dispose() SfxTabPage::dispose(); } -IMPL_LINK_NOARG_TYPED(SchOptionTabPage, EnableHdl, Button*, void) +IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, Button*, void) { if( m_nAllSeriesAxisIndex == 0 ) m_pCBAxisSideBySide->Enable( m_pRbtAxis2->IsChecked()); diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index 56b587d077b5..5051d7c2f7da 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -62,7 +62,7 @@ private: //member VclPtr<CheckBox> m_pCBIncludeHiddenCells; - DECL_LINK_TYPED(EnableHdl, Button*, void ); + DECL_LINK(EnableHdl, Button*, void ); sal_Int32 m_nAllSeriesAxisIndex; diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index e28bb0571504..be85cacf6647 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -146,15 +146,15 @@ void TitlesAndObjectsTabPage::commitToModel() } -IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, CheckBox&, void) +IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, CheckBox&, void) { ChangeHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeEditHdl, Edit&, void) +IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeEditHdl, Edit&, void) { ChangeHdl(nullptr); } -IMPL_LINK_NOARG_TYPED(TitlesAndObjectsTabPage, ChangeHdl, LinkParamNone*, void) +IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeHdl, LinkParamNone*, void) { if( m_bCommitToModel ) commitToModel(); diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx index 0820ffa1250a..2b5eabbfcb03 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx @@ -51,9 +51,9 @@ public: protected: void commitToModel(); - DECL_LINK_TYPED( ChangeHdl, LinkParamNone*, void ); - DECL_LINK_TYPED( ChangeEditHdl, Edit&, void ); - DECL_LINK_TYPED( ChangeCheckBoxHdl, CheckBox&, void ); + DECL_LINK( ChangeHdl, LinkParamNone*, void ); + DECL_LINK( ChangeEditHdl, Edit&, void ); + DECL_LINK( ChangeCheckBoxHdl, CheckBox&, void ); protected: std::unique_ptr< TitleResources > m_xTitleResources; diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index 336d86ae968e..a128a03d2a05 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -376,7 +376,7 @@ public: ViewElementListProvider getViewElementListProvider(); DrawModelWrapper* GetDrawModelWrapper(); - DECL_LINK_TYPED( NotifyUndoActionHdl, SdrUndoAction*, void ); + DECL_LINK( NotifyUndoActionHdl, SdrUndoAction*, void ); css::uno::Reference<css::uno::XInterface> const & getChartView(); @@ -552,7 +552,7 @@ private: void impl_ShapeControllerDispatch( const css::util::URL& rURL, const css::uno::Sequence< css::beans::PropertyValue >& rArgs ); - DECL_LINK_TYPED( DoubleClickWaitingHdl, Timer*, void ); + DECL_LINK( DoubleClickWaitingHdl, Timer*, void ); void execute_DoubleClick( const Point* pMousePixel ); void startDoubleClickWaiting(); void stopDoubleClickWaiting(); diff --git a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx index 429365917b5b..dd2c3dc2031e 100644 --- a/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx +++ b/chart2/source/controller/inc/TimerTriggeredControllerLock.hxx @@ -41,7 +41,7 @@ private: std::unique_ptr< ControllerLockGuardUNO > m_apControllerLockGuard; AutoTimer m_aTimer; - DECL_LINK_TYPED( TimerTimeout, Timer*, void ); + DECL_LINK( TimerTimeout, Timer*, void ); }; } //namespace chart diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 7122daf207b2..3868211faf0e 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -95,7 +95,7 @@ public: virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - DECL_LINK_TYPED( DialogEventHdl, VclWindowEvent&, void ); + DECL_LINK( DialogEventHdl, VclWindowEvent&, void ); protected: // ____ OComponentHelper ____ diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index b90c0adb8fef..b2e9009d208f 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -70,11 +70,11 @@ private: m_xContext; /// handles actions of the toolbox - DECL_LINK_TYPED( ToolboxHdl, ToolBox*, void ); + DECL_LINK( ToolboxHdl, ToolBox*, void ); /// is called, if the cursor of the table has moved - DECL_LINK_TYPED( BrowserCursorMovedHdl, DataBrowser*, void); + DECL_LINK( BrowserCursorMovedHdl, DataBrowser*, void); /// this is called if MiscOptions change, esp. High-Contrast mode - DECL_LINK_TYPED( MiscHdl, LinkParamNone*, void ); + DECL_LINK( MiscHdl, LinkParamNone*, void ); void UpdateData(); /// moved and resizes the series name control etc. to fit the dimensions of the edit browsebox diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx index 40ad209598c3..4c82d01bdc0f 100644 --- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx +++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx @@ -122,7 +122,7 @@ private: virtual void PageCreated(sal_uInt16 nId, SfxTabPage& rPage) override; Link<Button*,void> m_aOriginalOKClickHdl; - DECL_LINK_TYPED( OKPressed, Button*, void ); + DECL_LINK( OKPressed, Button*, void ); public: SchAttribTabDlg(vcl::Window* pParent, const SfxItemSet* pAttr, diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx index d87b4bc655db..a22e613d63cd 100644 --- a/chart2/source/controller/inc/res_ErrorBar.hxx +++ b/chart2/source/controller/inc/res_ErrorBar.hxx @@ -121,13 +121,13 @@ private: bool m_bHasInternalDataProvider; bool m_bEnableDataTableDialog; - DECL_LINK_TYPED( CategoryChosen, Button*, void ); - DECL_LINK_TYPED( CategoryChosen2, ListBox&, void ); - DECL_LINK_TYPED( SynchronizePosAndNeg, CheckBox&, void ); - DECL_LINK_TYPED( PosValueChanged, Edit&, void ); - DECL_LINK_TYPED( IndicatorChanged, Button *, void ); - DECL_LINK_TYPED( ChooseRange, Button *, void ); - DECL_LINK_TYPED( RangeChanged, Edit&, void ); + DECL_LINK( CategoryChosen, Button*, void ); + DECL_LINK( CategoryChosen2, ListBox&, void ); + DECL_LINK( SynchronizePosAndNeg, CheckBox&, void ); + DECL_LINK( PosValueChanged, Edit&, void ); + DECL_LINK( IndicatorChanged, Button *, void ); + DECL_LINK( ChooseRange, Button *, void ); + DECL_LINK( RangeChanged, Edit&, void ); void UpdateControlStates(); void isRangeFieldContentValid( Edit & rEdit ); diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx index c282718b34c8..cf6442008160 100644 --- a/chart2/source/controller/inc/res_LegendPosition.hxx +++ b/chart2/source/controller/inc/res_LegendPosition.hxx @@ -48,8 +48,8 @@ public: void SetChangeHdl( const Link<LinkParamNone*,void>& rLink ); - DECL_LINK_TYPED( PositionEnableHdl, CheckBox&, void ); - DECL_LINK_TYPED( PositionChangeHdl, RadioButton&, void ); + DECL_LINK( PositionEnableHdl, CheckBox&, void ); + DECL_LINK( PositionChangeHdl, RadioButton&, void ); private: void impl_setRadioButtonToggleHdl(); diff --git a/chart2/source/controller/inc/uiobject.hxx b/chart2/source/controller/inc/uiobject.hxx index f5a2ede42ded..e1d54747e52d 100644 --- a/chart2/source/controller/inc/uiobject.hxx +++ b/chart2/source/controller/inc/uiobject.hxx @@ -38,7 +38,7 @@ private: VclPtr<chart::ChartWindow> mxChartWindow; std::vector<std::unique_ptr<OUString>> maCommands; - DECL_LINK_TYPED(PostCommand, void*, void); + DECL_LINK(PostCommand, void*, void); }; class ChartWindowUIObject : public WindowUIObject diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index f537b6bc28b0..0f9dd7c4ae9b 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -1454,7 +1454,7 @@ void SAL_CALL ChartController::modified( //todo? update menu states ? } -IMPL_LINK_TYPED( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction, void ) +IMPL_LINK( ChartController, NotifyUndoActionHdl, SdrUndoAction*, pUndoAction, void ) { ENSURE_OR_RETURN_VOID( pUndoAction, "invalid Undo action" ); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index b0e5ffca73df..e55196f86521 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -529,7 +529,7 @@ void ChartController::stopDoubleClickWaiting() m_bWaitingForDoubleClick = false; } -IMPL_LINK_NOARG_TYPED(ChartController, DoubleClickWaitingHdl, Timer *, void) +IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl, Timer *, void) { m_bWaitingForDoubleClick = false; diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 5c65270da837..de1d92bddbe7 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -224,7 +224,7 @@ void ShapeController::describeSupportedFeatures() implDescribeSupportedFeature( ".uno:ParagraphDialog", COMMAND_ID_PARAGRAPH_DIALOG, CommandGroup::EDIT ); } -IMPL_LINK_TYPED( ShapeController, CheckNameHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) +IMPL_LINK( ShapeController, CheckNameHdl, AbstractSvxObjectNameDialog&, rDialog, bool ) { OUString aName; rDialog.GetName( aName ); diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index c5ff2983afa1..34885a725283 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -58,7 +58,7 @@ protected: virtual void describeSupportedFeatures() override; private: - DECL_LINK_TYPED( CheckNameHdl, AbstractSvxObjectNameDialog&, bool); + DECL_LINK( CheckNameHdl, AbstractSvxObjectNameDialog&, bool); void executeDispatch_FormatLine(); void executeDispatch_FormatArea(); diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx index ac0d6f4ae731..27cb58b82d71 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx @@ -358,7 +358,7 @@ void ChartAxisPanel::SelectionInvalid() { } -IMPL_LINK_TYPED(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void) +IMPL_LINK(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void) { CheckBox* pCheckbox = static_cast<CheckBox*>(pButton); OUString aCID = getCID(mxModel); @@ -373,7 +373,7 @@ IMPL_LINK_TYPED(ChartAxisPanel, CheckBoxHdl, Button*, pButton, void) setReverse(mxModel, aCID, bChecked); } -IMPL_LINK_NOARG_TYPED(ChartAxisPanel, ListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartAxisPanel, ListBoxHdl, ListBox&, void) { OUString aCID = getCID(mxModel); sal_Int32 nPos = mpLBLabelPos->GetSelectEntryPos(); @@ -381,7 +381,7 @@ IMPL_LINK_NOARG_TYPED(ChartAxisPanel, ListBoxHdl, ListBox&, void) setLabelPosition(mxModel, aCID, nPos); } -IMPL_LINK_TYPED(ChartAxisPanel, TextRotationHdl, Edit&, rMetricField, void) +IMPL_LINK(ChartAxisPanel, TextRotationHdl, Edit&, rMetricField, void) { OUString aCID = getCID(mxModel); double nVal = static_cast<NumericField&>(rMetricField).GetValue(); diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx index 2f2fc98d898f..51da3511563c 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx @@ -92,9 +92,9 @@ private: void Initialize(); - DECL_LINK_TYPED(CheckBoxHdl, Button*, void); - DECL_LINK_TYPED(ListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(TextRotationHdl, Edit&, void); + DECL_LINK(CheckBoxHdl, Button*, void); + DECL_LINK(ListBoxHdl, ListBox&, void); + DECL_LINK(TextRotationHdl, Edit&, void); }; } } // end of namespace ::chart::sidebar diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index b18171313702..9829a63ea07c 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -534,7 +534,7 @@ void ChartElementsPanel::updateModel( xBroadcasterNew->addModifyListener(mxListener); } -IMPL_LINK_TYPED(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void) +IMPL_LINK(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void) { CheckBox* pCheckBox = static_cast<CheckBox*>(pButton); bool bChecked = pCheckBox->IsChecked(); @@ -577,7 +577,7 @@ IMPL_LINK_TYPED(ChartElementsPanel, CheckBoxHdl, Button*, pButton, void) setGridVisible(mxModel, GridType::HOR_MINOR, bChecked); } -IMPL_LINK_NOARG_TYPED(ChartElementsPanel, LegendPosHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartElementsPanel, LegendPosHdl, ListBox&, void) { sal_Int32 nPos = mpLBLegendPosition->GetSelectEntryPos(); setLegendPos(mxModel, nPos); diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index 5e04943b145a..e1fbe5767ff2 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -112,8 +112,8 @@ private: void setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible); - DECL_LINK_TYPED(CheckBoxHdl, Button*, void); - DECL_LINK_TYPED(LegendPosHdl, ListBox&, void); + DECL_LINK(CheckBoxHdl, Button*, void); + DECL_LINK(LegendPosHdl, ListBox&, void); }; } } // end of namespace ::chart::sidebar diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx index 248b9e74876f..13e3d611eb7d 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx @@ -408,7 +408,7 @@ void ChartErrorBarPanel::updateModel( xBroadcasterNew->addModifyListener(mxListener); } -IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void) +IMPL_LINK_NOARG(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void) { OUString aCID = getCID(mxModel); bool bPos = mpRBPosAndNeg->IsChecked() || mpRBPos->IsChecked(); @@ -418,7 +418,7 @@ IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, RadioBtnHdl, RadioButton&, void) setShowNegativeError(mxModel, aCID, bNeg); } -IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, ListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartErrorBarPanel, ListBoxHdl, ListBox&, void) { OUString aCID = getCID(mxModel); sal_Int32 nPos = mpLBType->GetSelectEntryPos(); @@ -426,7 +426,7 @@ IMPL_LINK_NOARG_TYPED(ChartErrorBarPanel, ListBoxHdl, ListBox&, void) setTypePos(mxModel, aCID, nPos); } -IMPL_LINK_TYPED(ChartErrorBarPanel, NumericFieldHdl, Edit&, rMetricField, void) +IMPL_LINK(ChartErrorBarPanel, NumericFieldHdl, Edit&, rMetricField, void) { OUString aCID = getCID(mxModel); double nVal = static_cast<NumericField&>(rMetricField).GetValue(); diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx index ea7e14b79548..b68d33cd9e85 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx @@ -87,9 +87,9 @@ private: void Initialize(); - DECL_LINK_TYPED(RadioBtnHdl, RadioButton&, void); - DECL_LINK_TYPED(ListBoxHdl, ListBox&, void); - DECL_LINK_TYPED(NumericFieldHdl, Edit&, void); + DECL_LINK(RadioBtnHdl, RadioButton&, void); + DECL_LINK(ListBoxHdl, ListBox&, void); + DECL_LINK(NumericFieldHdl, Edit&, void); }; } } // end of namespace ::chart::sidebar diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx index 43b36ddbe01e..b23733eaf97f 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx @@ -456,7 +456,7 @@ void ChartSeriesPanel::SelectionInvalid() { } -IMPL_LINK_TYPED(ChartSeriesPanel, CheckBoxHdl, Button*, pButton, void) +IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, Button*, pButton, void) { CheckBox* pCheckBox = static_cast<CheckBox*>(pButton); bool bChecked = pCheckBox->IsChecked(); @@ -471,7 +471,7 @@ IMPL_LINK_TYPED(ChartSeriesPanel, CheckBoxHdl, Button*, pButton, void) setErrorBarVisible(mxModel, aCID, true, bChecked); } -IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, RadioBtnHdl, RadioButton&, void) +IMPL_LINK_NOARG(ChartSeriesPanel, RadioBtnHdl, RadioButton&, void) { OUString aCID = getCID(mxModel); bool bChecked = mpRBPrimaryAxis->IsChecked(); @@ -479,7 +479,7 @@ IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, RadioBtnHdl, RadioButton&, void) setAttachedAxisType(mxModel, aCID, bChecked); } -IMPL_LINK_NOARG_TYPED(ChartSeriesPanel, ListBoxHdl, ListBox&, void) +IMPL_LINK_NOARG(ChartSeriesPanel, ListBoxHdl, ListBox&, void) { OUString aCID = getCID(mxModel); diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx index 5710810f86d7..d38eb797dbfc 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx @@ -106,9 +106,9 @@ private: void Initialize(); - DECL_LINK_TYPED(CheckBoxHdl, Button*, void); - DECL_LINK_TYPED(RadioBtnHdl, RadioButton&, void); - DECL_LINK_TYPED(ListBoxHdl, ListBox&, void); + DECL_LINK(CheckBoxHdl, Button*, void); + DECL_LINK(RadioBtnHdl, RadioButton&, void); + DECL_LINK(ListBoxHdl, ListBox&, void); }; } } // end of namespace ::chart::sidebar diff --git a/chart2/source/controller/uitest/uiobject.cxx b/chart2/source/controller/uitest/uiobject.cxx index d100466e659f..70d5e142f53e 100644 --- a/chart2/source/controller/uitest/uiobject.cxx +++ b/chart2/source/controller/uitest/uiobject.cxx @@ -65,7 +65,7 @@ void ChartUIObject::execute(const OUString& rAction, } } -IMPL_LINK_TYPED(ChartUIObject, PostCommand, void*, pCommand, void) +IMPL_LINK(ChartUIObject, PostCommand, void*, pCommand, void) { css::util::URL aURL; aURL.Path = *static_cast<OUString*>(pCommand); |