diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-01 18:00:32 +0100 |
commit | bd205223ec029a875c662474bb6d423d3cdd1994 (patch) | |
tree | 6531a292edb0d2a13103a4c55cbd10e7137b8a58 /chart2 | |
parent | given that we can build with java7 now, allow it for windows too (diff) | |
download | core-bd205223ec029a875c662474bb6d423d3cdd1994.tar.gz core-bd205223ec029a875c662474bb6d423d3cdd1994.zip |
New IMPL_LINK_NOARG to work around SAL_UNUSED_PARAMETER problem
...see ebe26f72e90337da2d14f3029de148904e3e30b6 "WaE: 'unused' attribute ignored when parsing type"
for the problem.
Diffstat (limited to 'chart2')
20 files changed, 58 insertions, 58 deletions
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index af6794b11cd5..98247b916614 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -1218,7 +1218,7 @@ void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Ref } } -IMPL_LINK( CombiColumnLineChartDialogController, ChangeLineCountHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(CombiColumnLineChartDialogController, ChangeLineCountHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 182a36f22ecc..c518e642eae2 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -356,13 +356,13 @@ void SeriesHeader::SetEditChangedHdl( const Link & rLink ) m_aChangeLink = rLink; } -IMPL_LINK( SeriesHeader, SeriesNameChanged, void * , EMPTYARG ) +IMPL_LINK_NOARG(SeriesHeader, SeriesNameChanged) { notifyChanges(); return 0; } -IMPL_LINK( SeriesHeader, SeriesNameEdited, void * , EMPTYARG ) +IMPL_LINK_NOARG(SeriesHeader, SeriesNameEdited) { m_bSeriesNameChangePending = true; return 0; diff --git a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx index ae490b653697..7b33086aea88 100644 --- a/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx +++ b/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx @@ -58,7 +58,7 @@ void TimerTriggeredControllerLock::startTimer() m_apControllerLockGuard = std::auto_ptr< ControllerLockGuard >( new ControllerLockGuard(m_xModel) ); m_aTimer.Start(); } -IMPL_LINK( TimerTriggeredControllerLock, TimerTimeout, void*, EMPTYARG ) +IMPL_LINK_NOARG(TimerTriggeredControllerLock, TimerTimeout) { m_apControllerLockGuard.reset(); return 0; diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx index dea3e88f60e1..05a578d5423d 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx +++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx @@ -128,7 +128,7 @@ DataEditor::~DataEditor() } // react on click (or keypress) on toolbar icon -IMPL_LINK( DataEditor, ToolboxHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataEditor, ToolboxHdl) { switch( m_aTbxData.GetCurItemId() ) { @@ -159,7 +159,7 @@ IMPL_LINK( DataEditor, ToolboxHdl, void *, EMPTYARG ) } // refresh toolbar icons according to currently selected cell in brwose box -IMPL_LINK( DataEditor, BrowserCursorMovedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataEditor, BrowserCursorMovedHdl) { if( m_bReadOnly ) return 0; @@ -196,7 +196,7 @@ void DataEditor::SetReadOnly( bool bReadOnly ) m_apBrwData->SetReadOnly( m_bReadOnly ); } -IMPL_LINK( DataEditor, MiscHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(DataEditor, MiscHdl) { SvtMiscOptions aMiscOptions; sal_Int16 nStyle( aMiscOptions.GetToolboxStyle() ); @@ -206,7 +206,7 @@ IMPL_LINK( DataEditor, MiscHdl, void*, EMPTYARG ) return 0L; } -IMPL_LINK( DataEditor, CellModified, void*, EMPTYARG ) +IMPL_LINK_NOARG(DataEditor, CellModified) { return 0; } diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index e3a6d22dcb7b..0b586c6ad11c 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -640,7 +640,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage) } } -IMPL_LINK( SchAttribTabDlg, OKPressed, void * , EMPTYARG ) +IMPL_LINK_NOARG(SchAttribTabDlg, OKPressed) { m_bOKPressed = true; return m_aOriginalOKClickHdl.Call( this ); diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index e05c5195966e..49359d456f21 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -418,14 +418,14 @@ IMPL_LINK( ErrorBarResources, CategoryChosen, void *, ) return 0; } -IMPL_LINK( ErrorBarResources, SynchronizePosAndNeg, void *, EMPTYARG ) +IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg) { UpdateControlStates(); PosValueChanged( 0 ); return 0; } -IMPL_LINK( ErrorBarResources, PosValueChanged, void *, EMPTYARG ) +IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged) { if( m_aCbSyncPosNeg.IsChecked()) { @@ -441,7 +441,7 @@ IMPL_LINK( ErrorBarResources, PosValueChanged, void *, EMPTYARG ) return 0; } -IMPL_LINK( ErrorBarResources, IndicatorChanged, void *, EMPTYARG ) +IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged) { m_bIndicatorUnique = true; if( m_aRbBoth.IsChecked()) diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 4755e0477603..30e207cb8642 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -182,7 +182,7 @@ void LegendPositionResources::writeToModel( const ::com::sun::star::uno::Referen } } -IMPL_LINK( LegendPositionResources, PositionEnableHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl) { sal_Bool bEnable = m_aCbxShow.IsChecked(); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx index db3c0c4c38e0..d46083141eaf 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx @@ -298,7 +298,7 @@ void ThreeD_SceneAppearance_TabPage::updateScheme() } } -IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl) { if( !m_bUpdateOtherControls ) return 0; @@ -324,7 +324,7 @@ IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( ThreeD_SceneAppearance_TabPage, SelectShading, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading) { if( !m_bUpdateOtherControls ) return 0; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx index 53802dd33725..18f4481020ca 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx @@ -200,7 +200,7 @@ void ThreeD_SceneGeometry_TabPage::applyAnglesToModel() m_bAngleChangePending = false; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, AngleEdited, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleEdited) { m_nXRotation = m_aMFXRotation.GetValue(); m_nYRotation = m_aMFYRotation.GetValue(); @@ -209,7 +209,7 @@ IMPL_LINK( ThreeD_SceneGeometry_TabPage, AngleEdited, void*, EMPTYARG ) return 0; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, AngleChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, AngleChanged) { applyAnglesToModel(); return 0; @@ -236,26 +236,26 @@ void ThreeD_SceneGeometry_TabPage::applyPerspectiveToModel() m_bPerspectiveChangePending = false; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveEdited, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveEdited) { m_bPerspectiveChangePending = true; return 0; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveChanged, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveChanged) { applyPerspectiveToModel(); return 0; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, PerspectiveToggled, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled) { m_aMFPerspective.Enable( m_aCbxPerspective.IsChecked() ); applyPerspectiveToModel(); return 0; } -IMPL_LINK( ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled) { ControllerLockHelperGuard aGuard( m_rControllerLockHelper ); diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx index 3d58744a315e..b094fb90d950 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx @@ -372,7 +372,7 @@ void ThreeD_SceneIllumination_TabPage::commitPendingChanges() { } -IMPL_LINK( ThreeD_SceneIllumination_TabPage, fillControlsFromModel, void *, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, fillControlsFromModel) { if( m_bInCommitToModel )//don't read own changes return 0; @@ -408,7 +408,7 @@ void ThreeD_SceneIllumination_TabPage::applyLightSourcesToModel() m_aTimerTriggeredControllerLock.startTimer(); } -IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewChangeHdl) { m_aTimerTriggeredControllerLock.startTimer(); @@ -460,7 +460,7 @@ IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewChangeHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( ThreeD_SceneIllumination_TabPage, PreviewSelectHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ThreeD_SceneIllumination_TabPage, PreviewSelectHdl) { sal_uInt32 nLightNumber = m_aCtl_Preview.GetSvx3DLightControl().GetSelectedLight(); if(nLightNumber<8) diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index ab071603e503..e0892c3837bf 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -303,7 +303,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories ) // event handling routines // ----------------------- -IMPL_LINK ( SchAxisLabelTabPage, ToggleShowLabel, void *, EMPTYARG ) +IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel) { sal_Bool bEnable = ( aCbShowDescription.GetState() != STATE_NOCHECK ); diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx index b51b30319868..d60b44c38ac4 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx @@ -459,7 +459,7 @@ void AxisPositionsTabPage::SupportAxisPositioning( bool bSupportAxisPositioning m_bSupportAxisPositioning = bSupportAxisPositioning; } -IMPL_LINK ( AxisPositionsTabPage, CrossesAtSelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AxisPositionsTabPage, CrossesAtSelectHdl) { sal_uInt16 nPos = m_aLB_CrossesAt.GetSelectEntryPos(); m_aED_CrossesAt.Show( (2==nPos) && !m_bCrossingAxisIsCategoryAxis ); @@ -474,7 +474,7 @@ IMPL_LINK ( AxisPositionsTabPage, CrossesAtSelectHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK ( AxisPositionsTabPage, PlaceLabelsSelectHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(AxisPositionsTabPage, PlaceLabelsSelectHdl) { sal_uInt16 nLabelPos = m_aLB_PlaceLabels.GetSelectEntryPos(); diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index dbe13b7e3248..3c95ec19e353 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -95,7 +95,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK( AxisTypeCheckHdl, CheckBox* ); + DECL_LINK( AxisTypeCheckHdl, void* ); private: CheckBox m_aCB_XAxis_Categories; }; @@ -132,7 +132,7 @@ void AxisTypeResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { rParameter.bXAxisWithValues = !m_aCB_XAxis_Categories.IsChecked(); } -IMPL_LINK( AxisTypeResourceGroup, AxisTypeCheckHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(AxisTypeResourceGroup, AxisTypeCheckHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -157,7 +157,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK( Dim3DLookCheckHdl, CheckBox* ); + DECL_LINK( Dim3DLookCheckHdl, void* ); DECL_LINK( SelectSchemeHdl, void* ); private: @@ -225,13 +225,13 @@ void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter ) else rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown; } -IMPL_LINK( Dim3DLookResourceGroup, Dim3DLookCheckHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); return 0; } -IMPL_LINK( Dim3DLookResourceGroup, SelectSchemeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -254,7 +254,7 @@ public: void fillParameter( ChartTypeParameter& rParameter ); private: - DECL_LINK( SortByXValuesCheckHdl, CheckBox* ); + DECL_LINK( SortByXValuesCheckHdl, void* ); private: CheckBox m_aCB_XValueSorting; @@ -288,7 +288,7 @@ void SortByXValuesResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { rParameter.bSortByXValues = m_aCB_XValueSorting.IsChecked(); } -IMPL_LINK( SortByXValuesResourceGroup, SortByXValuesCheckHdl, CheckBox*, EMPTYARG ) +IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); @@ -428,7 +428,7 @@ IMPL_LINK( StackingResourceGroup, StackingChangeHdl, RadioButton*, pRadio ) m_pChangeListener->stateChanged(this); return 0; } -IMPL_LINK( StackingResourceGroup, StackingEnableHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -447,7 +447,7 @@ public: virtual void StateChanged( StateChangedType nType ); private: - DECL_LINK( SplineModeRadioHdl, RadioButton* ); + DECL_LINK( SplineModeRadioHdl, void* ); void adjustControlPositions(); void adjustSize(); @@ -583,7 +583,7 @@ void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter, bool rParameter.nCurveResolution = static_cast< sal_Int32 >( m_aMF_SplineResolution.GetValue()); rParameter.nSplineOrder = static_cast< sal_Int32 >( m_aMF_SplineOrder.GetValue()); } -IMPL_LINK( SplinePropertiesDialog, SplineModeRadioHdl, RadioButton*, EMPTYARG ) +IMPL_LINK_NOARG(SplinePropertiesDialog, SplineModeRadioHdl) { m_aFT_SplineOrder.Enable(m_aRB_Splines_B.IsChecked()); m_aMF_SplineOrder.Enable(m_aRB_Splines_B.IsChecked()); @@ -686,14 +686,14 @@ void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { getSplinePropertiesDialog().fillParameter( rParameter, m_aCB_Splines.IsChecked() ); } -IMPL_LINK( SplineResourceGroup, SplineChangeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SplineResourceGroup, SplineChangeHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); return 0; } -IMPL_LINK( SplineResourceGroup, SplineDetailsDialogHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl) { ChartTypeParameter aOldParameter; @@ -770,7 +770,7 @@ void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter ) if( m_aGeometryResources.GetSelectEntryCount() ) rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos(); } -IMPL_LINK( GeometryResourceGroup, GeometryChangeHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl) { if( m_pChangeListener ) m_pChangeListener->stateChanged(this); @@ -964,7 +964,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType() pTypeController = m_aChartTypeDialogControllerList[nM]; return pTypeController; } -IMPL_LINK( ChartTypeTabPage, SelectSubTypeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ChartTypeTabPage, SelectSubTypeHdl) { if( m_pCurrentMainType ) { @@ -977,7 +977,7 @@ IMPL_LINK( ChartTypeTabPage, SelectSubTypeHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( ChartTypeTabPage, SelectMainTypeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl) { ChartTypeParameter aParameter( this->getCurrentParamter() ); diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 3d99e97aac80..0c66967661d1 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -594,7 +594,7 @@ void DataSourceTabPage::updateControlState() isValid(); } -IMPL_LINK( DataSourceTabPage, SeriesSelectionChangedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, SeriesSelectionChangedHdl) { m_rDialogModel.startControllerLockTimer(); if( m_apLB_SERIES->FirstSelected()) @@ -607,7 +607,7 @@ IMPL_LINK( DataSourceTabPage, SeriesSelectionChangedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, RoleSelectionChangedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, RoleSelectionChangedHdl) { m_rDialogModel.startControllerLockTimer(); SvLBoxEntry * pEntry = m_aLB_ROLE.FirstSelected(); @@ -634,7 +634,7 @@ IMPL_LINK( DataSourceTabPage, RoleSelectionChangedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, MainRangeButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl) { OSL_ASSERT( m_pCurrentRangeChoosingField == 0 ); m_pCurrentRangeChoosingField = & m_aEDT_RANGE; @@ -678,7 +678,7 @@ IMPL_LINK( DataSourceTabPage, MainRangeButtonClickedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, CategoriesRangeButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl) { OSL_ASSERT( m_pCurrentRangeChoosingField == 0 ); m_pCurrentRangeChoosingField = & m_aEDT_CATEGORIES; @@ -693,7 +693,7 @@ IMPL_LINK( DataSourceTabPage, CategoriesRangeButtonClickedHdl, void *, EMPTYARG return 0; } -IMPL_LINK( DataSourceTabPage, AddButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); @@ -733,7 +733,7 @@ IMPL_LINK( DataSourceTabPage, AddButtonClickedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, RemoveButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, RemoveButtonClickedHdl) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); @@ -778,7 +778,7 @@ IMPL_LINK( DataSourceTabPage, RemoveButtonClickedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, UpButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, UpButtonClickedHdl) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); @@ -795,7 +795,7 @@ IMPL_LINK( DataSourceTabPage, UpButtonClickedHdl, void *, EMPTYARG ) return 0; } -IMPL_LINK( DataSourceTabPage, DownButtonClickedHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(DataSourceTabPage, DownButtonClickedHdl) { m_rDialogModel.startControllerLockTimer(); SeriesEntry * pEntry = dynamic_cast< SeriesEntry * >( m_apLB_SERIES->FirstSelected()); diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx index 67889c3408a9..fb064f9fb0d3 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx +++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx @@ -344,14 +344,14 @@ bool RangeChooserTabPage::isValid() return bIsValid; } -IMPL_LINK( RangeChooserTabPage, ControlEditedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl) { setDirty(); isValid(); return 0; } -IMPL_LINK( RangeChooserTabPage, ControlChangedHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedHdl) { setDirty(); if( isValid()) @@ -359,7 +359,7 @@ IMPL_LINK( RangeChooserTabPage, ControlChangedHdl, void*, EMPTYARG ) return 0; } -IMPL_LINK( RangeChooserTabPage, ChooseRangeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl) { rtl::OUString aRange = m_aED_Range.GetText(); // using assignment for broken gcc 3.3 diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx index fd456ff2c490..7bcdb925f2ed 100644 --- a/chart2/source/controller/dialogs/tp_Scale.cxx +++ b/chart2/source/controller/dialogs/tp_Scale.cxx @@ -392,7 +392,7 @@ enum AxisTypeListBoxEntry TYPE_DATE=2 }; -IMPL_LINK( ScaleTabPage, SelectAxisTypeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl) { sal_uInt16 nPos = m_aLB_AxisType.GetSelectEntryPos(); if( nPos==TYPE_DATE ) diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx index 5b3b32099371..daa9baf5fd16 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx @@ -80,7 +80,7 @@ SchOptionTabPage::~SchOptionTabPage() { } -IMPL_LINK( SchOptionTabPage, EnableHdl, RadioButton *, EMPTYARG ) +IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl) { if( m_nAllSeriesAxisIndex == 0 ) aCBAxisSideBySide.Enable( aRbtAxis2.IsChecked()); diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx index f09b24814511..034b7b7b462b 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx @@ -78,7 +78,7 @@ private: //member CheckBox m_aCBIncludeHiddenCells; - DECL_LINK(EnableHdl, RadioButton * ); + DECL_LINK(EnableHdl, 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 e40d59b6794c..eb70c70ea838 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -165,7 +165,7 @@ void TitlesAndObjectsTabPage::commitToModel() } } -IMPL_LINK( TitlesAndObjectsTabPage, ChangeHdl, void *, EMPTYARG ) +IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeHdl) { if( m_bCommitToModel ) commitToModel(); diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 54345303f9f5..6a2a18bd0aaa 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -580,7 +580,7 @@ void ChartController::stopDoubleClickWaiting() m_bWaitingForDoubleClick = false; } -IMPL_LINK( ChartController, DoubleClickWaitingHdl, void*, EMPTYARG ) +IMPL_LINK_NOARG(ChartController, DoubleClickWaitingHdl) { m_bWaitingForDoubleClick = false; |