summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-26 12:28:58 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-26 12:54:43 +0000
commite57ca02849c3d87142ff5ff9099a212e72b8139c (patch)
treebcce66b27261553c308779f3e8663a269ed3a671 /chart2
parent8802ebd5172ec4bc412a59d136c82b77ab452281 (diff)
Remove dynamic exception specifications
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/inc/ChartModel.hxx288
-rw-r--r--chart2/inc/ChartView.hxx72
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx29
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.cxx17
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.hxx43
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartShape.cxx18
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartShape.hxx46
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartView.cxx10
-rw-r--r--chart2/source/controller/accessibility/AccessibleTextHelper.cxx14
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.cxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.hxx34
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.cxx20
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.hxx46
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx37
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx75
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx96
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx45
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx34
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx167
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx144
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.hxx18
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx20
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.hxx34
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx25
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx56
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.cxx33
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.hxx51
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx25
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx56
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx18
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx24
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx36
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx19
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx18
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx9
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx9
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx16
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx16
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx3
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.cxx4
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.hxx4
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionListener.cxx3
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx8
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx31
-rw-r--r--chart2/source/controller/inc/AccessibleBase.hxx87
-rw-r--r--chart2/source/controller/inc/AccessibleChartView.hxx27
-rw-r--r--chart2/source/controller/inc/AccessibleTextHelper.hxx36
-rw-r--r--chart2/source/controller/inc/AxisItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/CharacterPropertyItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/ChartController.hxx150
-rw-r--r--chart2/source/controller/inc/ChartDocumentWrapper.hxx102
-rw-r--r--chart2/source/controller/inc/ChartToolbarController.hxx36
-rw-r--r--chart2/source/controller/inc/DataPointItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/ErrorBarItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/GraphicPropertyItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/ItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/LegendItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/RangeSelectionListener.hxx9
-rw-r--r--chart2/source/controller/inc/RegressionCurveItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/RegressionEquationItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/SeriesOptionsItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/StatisticsItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/TextLabelItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/TitleItemConverter.hxx6
-rw-r--r--chart2/source/controller/inc/dlg_ChartType_UNO.hxx8
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx43
-rw-r--r--chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx2
-rw-r--r--chart2/source/controller/main/ChartController.cxx30
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx21
-rw-r--r--chart2/source/controller/main/ChartFrameloader.cxx5
-rw-r--r--chart2/source/controller/main/ChartFrameloader.hxx14
-rw-r--r--chart2/source/controller/main/CommandDispatch.cxx5
-rw-r--r--chart2/source/controller/main/CommandDispatch.hxx15
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.cxx4
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.hxx12
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx1
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.hxx3
-rw-r--r--chart2/source/controller/main/ElementSelector.cxx8
-rw-r--r--chart2/source/controller/main/ElementSelector.hxx15
-rw-r--r--chart2/source/controller/main/FeatureCommandDispatchBase.cxx1
-rw-r--r--chart2/source/controller/main/FeatureCommandDispatchBase.hxx3
-rw-r--r--chart2/source/controller/main/ShapeController.cxx1
-rw-r--r--chart2/source/controller/main/ShapeController.hxx3
-rw-r--r--chart2/source/controller/main/StatusBarCommandDispatch.cxx4
-rw-r--r--chart2/source/controller/main/StatusBarCommandDispatch.hxx12
-rw-r--r--chart2/source/controller/main/ToolbarController.cxx12
-rw-r--r--chart2/source/controller/main/UndoActions.cxx12
-rw-r--r--chart2/source/controller/main/UndoActions.hxx12
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.cxx2
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.hxx6
-rw-r--r--chart2/source/controller/sidebar/Chart2PanelFactory.cxx7
-rw-r--r--chart2/source/controller/sidebar/Chart2PanelFactory.hxx15
-rw-r--r--chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx2
-rw-r--r--chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx6
-rw-r--r--chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx2
-rw-r--r--chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx6
-rw-r--r--chart2/source/inc/CachedDataSequence.hxx41
-rw-r--r--chart2/source/inc/ConfigColorScheme.hxx12
-rw-r--r--chart2/source/inc/DataSource.hxx15
-rw-r--r--chart2/source/inc/ErrorBar.hxx62
-rw-r--r--chart2/source/inc/ExponentialRegressionCurveCalculator.hxx11
-rw-r--r--chart2/source/inc/InternalDataProvider.hxx136
-rw-r--r--chart2/source/inc/LabeledDataSequence.hxx30
-rw-r--r--chart2/source/inc/LifeTime.hxx11
-rw-r--r--chart2/source/inc/LinearRegressionCurveCalculator.hxx7
-rw-r--r--chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx11
-rw-r--r--chart2/source/inc/MeanValueRegressionCurveCalculator.hxx11
-rw-r--r--chart2/source/inc/ModifyListenerHelper.hxx12
-rw-r--r--chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx11
-rw-r--r--chart2/source/inc/NameContainer.hxx24
-rw-r--r--chart2/source/inc/OPropertySet.hxx61
-rw-r--r--chart2/source/inc/PolynomialRegressionCurveCalculator.hxx7
-rw-r--r--chart2/source/inc/PotentialRegressionCurveCalculator.hxx11
-rw-r--r--chart2/source/inc/RangeHighlighter.hxx15
-rw-r--r--chart2/source/inc/RegressionCurveCalculator.hxx26
-rw-r--r--chart2/source/inc/Scaling.hxx68
-rw-r--r--chart2/source/inc/UncachedDataSequence.hxx71
-rw-r--r--chart2/source/inc/WeakListenerAdapter.hxx9
-rw-r--r--chart2/source/inc/WrappedDefaultProperty.hxx13
-rw-r--r--chart2/source/inc/WrappedDirectStateProperty.hxx4
-rw-r--r--chart2/source/inc/WrappedIgnoreProperty.hxx15
-rw-r--r--chart2/source/inc/WrappedProperty.hxx15
-rw-r--r--chart2/source/inc/WrappedPropertySet.hxx38
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx9
-rw-r--r--chart2/source/model/inc/BaseCoordinateSystem.hxx48
-rw-r--r--chart2/source/model/inc/CartesianCoordinateSystem.hxx36
-rw-r--r--chart2/source/model/inc/ChartTypeManager.hxx14
-rw-r--r--chart2/source/model/inc/DataSeries.hxx64
-rw-r--r--chart2/source/model/inc/Diagram.hxx81
-rw-r--r--chart2/source/model/inc/PolarCoordinateSystem.hxx36
-rw-r--r--chart2/source/model/inc/StockBar.hxx21
-rw-r--r--chart2/source/model/inc/XMLFilter.hxx34
-rw-r--r--chart2/source/model/main/Axis.cxx17
-rw-r--r--chart2/source/model/main/Axis.hxx52
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx20
-rw-r--r--chart2/source/model/main/CartesianCoordinateSystem.cxx12
-rw-r--r--chart2/source/model/main/ChartModel.cxx91
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx46
-rw-r--r--chart2/source/model/main/DataPoint.cxx14
-rw-r--r--chart2/source/model/main/DataPoint.hxx40
-rw-r--r--chart2/source/model/main/DataSeries.cxx24
-rw-r--r--chart2/source/model/main/Diagram.cxx33
-rw-r--r--chart2/source/model/main/FormattedString.cxx12
-rw-r--r--chart2/source/model/main/FormattedString.hxx49
-rw-r--r--chart2/source/model/main/GridProperties.cxx10
-rw-r--r--chart2/source/model/main/GridProperties.hxx30
-rw-r--r--chart2/source/model/main/Legend.cxx10
-rw-r--r--chart2/source/model/main/Legend.hxx30
-rw-r--r--chart2/source/model/main/PageBackground.cxx10
-rw-r--r--chart2/source/model/main/PageBackground.hxx30
-rw-r--r--chart2/source/model/main/PolarCoordinateSystem.cxx12
-rw-r--r--chart2/source/model/main/StockBar.cxx7
-rw-r--r--chart2/source/model/main/Title.cxx12
-rw-r--r--chart2/source/model/main/Title.hxx36
-rw-r--r--chart2/source/model/main/UndoManager.cxx48
-rw-r--r--chart2/source/model/main/UndoManager.hxx48
-rw-r--r--chart2/source/model/main/Wall.cxx7
-rw-r--r--chart2/source/model/main/Wall.hxx21
-rw-r--r--chart2/source/model/template/AreaChartType.cxx5
-rw-r--r--chart2/source/model/template/AreaChartType.hxx15
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx5
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.hxx15
-rw-r--r--chart2/source/model/template/BarChartType.cxx6
-rw-r--r--chart2/source/model/template/BarChartType.hxx18
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx6
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.hxx18
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx12
-rw-r--r--chart2/source/model/template/BubbleChartType.hxx34
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.cxx6
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.hxx18
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.cxx3
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.hxx9
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx11
-rw-r--r--chart2/source/model/template/CandleStickChartType.hxx33
-rw-r--r--chart2/source/model/template/ChartType.cxx19
-rw-r--r--chart2/source/model/template/ChartType.hxx52
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx8
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx10
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.hxx30
-rw-r--r--chart2/source/model/template/ColumnChartType.cxx8
-rw-r--r--chart2/source/model/template/ColumnChartType.hxx24
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx6
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.hxx18
-rw-r--r--chart2/source/model/template/ColumnLineDataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/ColumnLineDataInterpreter.hxx3
-rw-r--r--chart2/source/model/template/DataInterpreter.cxx7
-rw-r--r--chart2/source/model/template/DataInterpreter.hxx21
-rw-r--r--chart2/source/model/template/FilledNetChartType.cxx5
-rw-r--r--chart2/source/model/template/FilledNetChartType.hxx15
-rw-r--r--chart2/source/model/template/GL3DBarChartType.cxx8
-rw-r--r--chart2/source/model/template/GL3DBarChartType.hxx24
-rw-r--r--chart2/source/model/template/GL3DBarChartTypeTemplate.cxx5
-rw-r--r--chart2/source/model/template/GL3DBarChartTypeTemplate.hxx15
-rw-r--r--chart2/source/model/template/LineChartType.cxx7
-rw-r--r--chart2/source/model/template/LineChartType.hxx21
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.cxx5
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.hxx15
-rw-r--r--chart2/source/model/template/NetChartType.cxx9
-rw-r--r--chart2/source/model/template/NetChartType.hxx25
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.cxx3
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.hxx9
-rw-r--r--chart2/source/model/template/PieChartType.cxx10
-rw-r--r--chart2/source/model/template/PieChartType.hxx28
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx6
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.hxx18
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx10
-rw-r--r--chart2/source/model/template/ScatterChartType.hxx28
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.hxx21
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.hxx21
-rw-r--r--chart2/source/model/template/StockDataInterpreter.cxx3
-rw-r--r--chart2/source/model/template/StockDataInterpreter.hxx9
-rw-r--r--chart2/source/model/template/XYDataInterpreter.cxx3
-rw-r--r--chart2/source/model/template/XYDataInterpreter.hxx9
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx16
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx4
-rw-r--r--chart2/source/tools/DataSource.cxx5
-rw-r--r--chart2/source/tools/ErrorBar.cxx22
-rw-r--r--chart2/source/tools/ExponentialRegressionCurveCalculator.cxx5
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx61
-rw-r--r--chart2/source/tools/LabeledDataSequence.cxx10
-rw-r--r--chart2/source/tools/LifeTime.cxx4
-rw-r--r--chart2/source/tools/LinearRegressionCurveCalculator.cxx3
-rw-r--r--chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx5
-rw-r--r--chart2/source/tools/MeanValueRegressionCurveCalculator.cxx5
-rw-r--r--chart2/source/tools/ModifyListenerHelper.cxx4
-rw-r--r--chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx5
-rw-r--r--chart2/source/tools/NameContainer.cxx12
-rw-r--r--chart2/source/tools/OPropertySet.cxx31
-rw-r--r--chart2/source/tools/PolynomialRegressionCurveCalculator.cxx3
-rw-r--r--chart2/source/tools/PotentialRegressionCurveCalculator.cxx5
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx5
-rw-r--r--chart2/source/tools/RegressionCurveCalculator.cxx6
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx38
-rw-r--r--chart2/source/tools/RegressionCurveModel.hxx114
-rw-r--r--chart2/source/tools/RegressionEquation.cxx12
-rw-r--r--chart2/source/tools/RegressionEquation.hxx31
-rw-r--r--chart2/source/tools/Scaling.cxx24
-rw-r--r--chart2/source/tools/UncachedDataSequence.cxx29
-rw-r--r--chart2/source/tools/WeakListenerAdapter.cxx2
-rw-r--r--chart2/source/tools/WrappedDefaultProperty.cxx7
-rw-r--r--chart2/source/tools/WrappedDirectStateProperty.cxx2
-rw-r--r--chart2/source/tools/WrappedIgnoreProperty.cxx5
-rw-r--r--chart2/source/tools/WrappedProperty.cxx5
-rw-r--r--chart2/source/tools/WrappedPropertySet.cxx19
-rw-r--r--chart2/source/view/axes/DateScaling.cxx12
-rw-r--r--chart2/source/view/axes/DateScaling.hxx34
-rw-r--r--chart2/source/view/axes/VAxisBase.cxx1
-rw-r--r--chart2/source/view/axes/VAxisBase.hxx3
-rw-r--r--chart2/source/view/axes/VAxisOrGridBase.cxx1
-rw-r--r--chart2/source/view/axes/VAxisOrGridBase.hxx3
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx3
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx1
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.cxx2
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx5
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx1
-rw-r--r--chart2/source/view/inc/Linear3DTransformation.hxx10
-rw-r--r--chart2/source/view/inc/PlotterBase.hxx2
-rw-r--r--chart2/source/view/inc/VCoordinateSystem.hxx3
-rw-r--r--chart2/source/view/inc/VPolarTransformation.hxx10
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx3
-rw-r--r--chart2/source/view/main/ChartView.cxx34
-rw-r--r--chart2/source/view/main/DummyXShape.cxx60
-rw-r--r--chart2/source/view/main/DummyXShape.hxx84
-rw-r--r--chart2/source/view/main/Linear3DTransformation.cxx4
-rw-r--r--chart2/source/view/main/PlotterBase.cxx1
-rw-r--r--chart2/source/view/main/VPolarTransformation.cxx4
295 files changed, 1599 insertions, 4482 deletions
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 0a0889138a40..05999229a296 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -180,21 +180,17 @@ private:
/// @throws css::uno::RuntimeException
css::uno::Reference< css::frame::XController >
- impl_getCurrentController()
- throw( css::uno::RuntimeException);
+ impl_getCurrentController();
/// @throws css::uno::RuntimeException
void SAL_CALL
- impl_notifyModifiedListeners()
- throw( css::uno::RuntimeException);
+ impl_notifyModifiedListeners();
/// @throws css::uno::RuntimeException
void SAL_CALL
- impl_notifyCloseListeners()
- throw( css::uno::RuntimeException);
+ impl_notifyCloseListeners();
/// @throws css::uno::RuntimeException
void SAL_CALL
- impl_notifyStorageChangeListeners()
- throw(css::uno::RuntimeException);
+ impl_notifyStorageChangeListeners();
void impl_store(
const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor,
@@ -223,349 +219,241 @@ public:
// css::lang::XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// css::lang::XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// css::frame::XModel (required interface)
virtual sal_Bool SAL_CALL
attachResource( const OUString& rURL,
- const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
virtual OUString SAL_CALL
- getURL() throw (css::uno::RuntimeException, std::exception) override;
+ getURL() override;
virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
- getArgs() throw (css::uno::RuntimeException, std::exception) override;
+ getArgs() override;
virtual void SAL_CALL
- connectController( const css::uno::Reference< css::frame::XController >& xController )
- throw (css::uno::RuntimeException, std::exception) override;
+ connectController( const css::uno::Reference< css::frame::XController >& xController ) override;
virtual void SAL_CALL
- disconnectController( const css::uno::Reference< css::frame::XController >& xController )
- throw (css::uno::RuntimeException, std::exception) override;
+ disconnectController( const css::uno::Reference< css::frame::XController >& xController ) override;
virtual void SAL_CALL
- lockControllers() throw (css::uno::RuntimeException, std::exception) override;
+ lockControllers() override;
virtual void SAL_CALL
- unlockControllers() throw (css::uno::RuntimeException, std::exception) override;
+ unlockControllers() override;
virtual sal_Bool SAL_CALL
- hasControllersLocked()
- throw (css::uno::RuntimeException, std::exception) override;
+ hasControllersLocked() override;
virtual css::uno::Reference< css::frame::XController > SAL_CALL
- getCurrentController()
- throw (css::uno::RuntimeException, std::exception) override;
+ getCurrentController() override;
virtual void SAL_CALL
- setCurrentController( const css::uno::Reference< css::frame::XController >& xController )
- throw (css::container::NoSuchElementException
- , css::uno::RuntimeException, std::exception) override;
+ setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- getCurrentSelection()
- throw (css::uno::RuntimeException, std::exception) override;
+ getCurrentSelection() override;
// css::lang::XComponent (base of XModel)
virtual void SAL_CALL
- dispose() throw (css::uno::RuntimeException, std::exception) override;
+ dispose() override;
virtual void SAL_CALL
- addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
virtual void SAL_CALL
- removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
// css::util::XCloseable
virtual void SAL_CALL
- close( sal_Bool bDeliverOwnership )
- throw(css::util::CloseVetoException,
- css::uno::RuntimeException, std::exception) override;
+ close( sal_Bool bDeliverOwnership ) override;
// css::util::XCloseBroadcaster (base of XCloseable)
virtual void SAL_CALL
- addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) override;
virtual void SAL_CALL
- removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) override;
// css::frame::XStorable2 (extension of XStorable)
virtual void SAL_CALL storeSelf(
- const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
- throw (css::lang::IllegalArgumentException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
// css::frame::XStorable (required interface)
virtual sal_Bool SAL_CALL
- hasLocation() throw (css::uno::RuntimeException, std::exception) override;
+ hasLocation() override;
virtual OUString SAL_CALL
- getLocation() throw (css::uno::RuntimeException, std::exception) override;
+ getLocation() override;
virtual sal_Bool SAL_CALL
- isReadonly() throw (css::uno::RuntimeException, std::exception) override;
+ isReadonly() override;
virtual void SAL_CALL
- store() throw (css::io::IOException
- , css::uno::RuntimeException, std::exception) override;
+ store() override;
virtual void SAL_CALL
storeAsURL( const OUString& rURL,
- const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
- throw (css::io::IOException
- , css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
virtual void SAL_CALL
storeToURL( const OUString& rURL,
- const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
- throw (css::io::IOException
- , css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
// css::util::XModifiable (required interface)
virtual sal_Bool SAL_CALL
- isModified() throw (css::uno::RuntimeException, std::exception) override;
+ isModified() override;
virtual void SAL_CALL
- setModified( sal_Bool bModified )
- throw (css::beans::PropertyVetoException
- , css::uno::RuntimeException, std::exception) override;
+ setModified( sal_Bool bModified ) override;
// css::util::XModifyBroadcaster (base of XModifiable)
virtual void SAL_CALL
- addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override;
virtual void SAL_CALL
- removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override;
// ____ XModifyListener ____
virtual void SAL_CALL modified(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
// ____ datatransferable::XTransferable ____
virtual css::uno::Any SAL_CALL getTransferData(
- const css::datatransfer::DataFlavor& aFlavor )
- throw (css::datatransfer::UnsupportedFlavorException,
- css::io::IOException,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::datatransfer::DataFlavor& aFlavor ) override;
+ virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() override;
virtual sal_Bool SAL_CALL isDataFlavorSupported(
- const css::datatransfer::DataFlavor& aFlavor )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::datatransfer::DataFlavor& aFlavor ) override;
// lang::XTypeProvider (override method of WeakImplHelper)
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes() throw (css::uno::RuntimeException, std::exception) override;
+ getTypes() override;
// ____ document::XDocumentPropertiesSupplier ____
virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL
- getDocumentProperties( ) throw (css::uno::RuntimeException, std::exception) override;
+ getDocumentProperties( ) override;
// ____ document::XUndoManagerSupplier ____
virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL
- getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override;
+ getUndoManager( ) override;
// css::chart2::XChartDocument
virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL
- getFirstDiagram() throw (css::uno::RuntimeException, std::exception) override;
+ getFirstDiagram() override;
virtual void SAL_CALL setFirstDiagram(
- const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
virtual void SAL_CALL
- createInternalDataProvider( sal_Bool bCloneExistingData )
- throw (css::util::CloseVetoException,
- css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasInternalDataProvider()
- throw (css::uno::RuntimeException, std::exception) override;
+ createInternalDataProvider( sal_Bool bCloneExistingData ) override;
+ virtual sal_Bool SAL_CALL hasInternalDataProvider() override;
virtual css::uno::Reference< css::chart2::data::XDataProvider > SAL_CALL
- getDataProvider()
- throw (css::uno::RuntimeException, std::exception) override;
+ getDataProvider() override;
virtual void SAL_CALL
- setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager )
- throw (css::uno::RuntimeException, std::exception) override;
+ setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager ) override;
virtual css::uno::Reference< css::chart2::XChartTypeManager > SAL_CALL
- getChartTypeManager()
- throw (css::uno::RuntimeException, std::exception) override;
+ getChartTypeManager() override;
virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
- getPageBackground()
- throw (css::uno::RuntimeException, std::exception) override;
+ getPageBackground() override;
- virtual void SAL_CALL createDefaultChart() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL createDefaultChart() override;
- virtual sal_Bool SAL_CALL isOpenGLChart() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isOpenGLChart() override;
// ____ XDataReceiver (public API) ____
virtual void SAL_CALL
- attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider )
- throw (css::uno::RuntimeException, std::exception) override;
+ attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider ) override;
virtual void SAL_CALL setArguments(
- const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() override;
+ virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData() override;
virtual void SAL_CALL attachNumberFormatsSupplier( const css::uno::Reference<
- css::util::XNumberFormatsSupplier >& xSupplier )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::util::XNumberFormatsSupplier >& xSupplier ) override;
+ virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() override;
// ____ XTitled ____
- virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() override;
+ virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title ) override;
// ____ XInterface (for old API wrapper) ____
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
// ____ XLoadable ____
- virtual void SAL_CALL initNew()
- throw (css::frame::DoubleInitializationException,
- css::io::IOException,
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
- throw (css::frame::DoubleInitializationException,
- css::io::IOException,
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initNew() override;
+ virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
// ____ XCloneable ____
- virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
// ____ XVisualObject ____
virtual void SAL_CALL setVisualAreaSize(
::sal_Int64 nAspect,
- const css::awt::Size& aSize )
- throw (css::lang::IllegalArgumentException,
- css::embed::WrongStateException,
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::awt::Size& aSize ) override;
virtual css::awt::Size SAL_CALL getVisualAreaSize(
- ::sal_Int64 nAspect )
- throw (css::lang::IllegalArgumentException,
- css::embed::WrongStateException,
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ ::sal_Int64 nAspect ) override;
virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation(
- ::sal_Int64 nAspect )
- throw (css::lang::IllegalArgumentException,
- css::embed::WrongStateException,
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ ::sal_Int64 nAspect ) override;
virtual ::sal_Int32 SAL_CALL getMapUnit(
- ::sal_Int64 nAspect )
- throw (css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ ::sal_Int64 nAspect ) override;
// ____ XMultiServiceFactory ____
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- createInstance( const OUString& aServiceSpecifier )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ createInstance( const OUString& aServiceSpecifier ) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments( const OUString& ServiceSpecifier
- , const css::uno::Sequence< css::uno::Any >& Arguments )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ , const css::uno::Sequence< css::uno::Any >& Arguments ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ getAvailableServiceNames() override;
// ____ XStorageBasedDocument ____
virtual void SAL_CALL loadFromStorage(
const css::uno::Reference< css::embed::XStorage >& xStorage,
- const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
- throw (css::lang::IllegalArgumentException,
- css::frame::DoubleInitializationException,
- css::io::IOException,
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
virtual void SAL_CALL storeToStorage(
const css::uno::Reference< css::embed::XStorage >& xStorage,
- const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
- throw (css::lang::IllegalArgumentException,
- css::io::IOException,
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override;
virtual void SAL_CALL switchToStorage(
- const css::uno::Reference< css::embed::XStorage >& xStorage )
- throw (css::lang::IllegalArgumentException,
- css::io::IOException,
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage()
- throw (css::io::IOException,
- css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
+ virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() override;
virtual void SAL_CALL addStorageChangeListener(
- const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
virtual void SAL_CALL removeStorageChangeListener(
- const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override;
// for SvNumberFormatsSupplierObj
// ____ XUnoTunnel ___
- virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override;
// ____ XNumberFormatsSupplier ____
- virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() override;
+ virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats() override;
// ____ XChild ____
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override;
virtual void SAL_CALL setParent(
- const css::uno::Reference< css::uno::XInterface >& Parent )
- throw (css::lang::NoSupportException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::uno::XInterface >& Parent ) override;
// ____ XDataSource ____ allows access to the currently used data and data ranges
- virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override;
// X3DChartWindowProvider
- virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) override;
// XUpdatable
- virtual void SAL_CALL update()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL update() override;
// XDumper
- virtual OUString SAL_CALL dump()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL dump() override;
// normal methods
css::uno::Reference< css::util::XNumberFormatsSupplier > const &
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index aa1e30949da1..a7b545f49af0 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -113,16 +113,12 @@ public:
virtual ~ChartView() override;
// ___lang::XServiceInfo___
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ___lang::XInitialization___
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// ___ExplicitValueProvider___
virtual bool getExplicitValuesForAxis(
@@ -139,68 +135,56 @@ public:
std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() override;
// ___XTransferable___
- virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
- throw (css::datatransfer::UnsupportedFlavorException
- , css::io::IOException
- , css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override;
+ virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override;
+ virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override;
// css::util::XEventListener (base of XCloseListener and XModifyListener)
virtual void SAL_CALL
- disposing( const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ disposing( const css::lang::EventObject& Source ) override;
// css::util::XModifyListener
virtual void SAL_CALL modified(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
//SfxListener
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
// css::util::XModeChangeBroadcaster
- virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override;
+ virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override;
+ virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override;
+ virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override;
// css::util::XUpdatable
- virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL update() override;
// util::XUpdatable2
- virtual void SAL_CALL updateSoft() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL updateHard() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL updateSoft() override;
+ virtual void SAL_CALL updateHard() override;
// css::beans::XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- 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;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
// css::lang::XMultiServiceFactory
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(
- const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
// for ExplicitValueProvider
// ____ XUnoTunnel ___
- virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override;
// XDumper
- virtual OUString SAL_CALL dump()
- throw(css::uno::RuntimeException,
- std::exception) override;
+ virtual OUString SAL_CALL dump() override;
void setViewDirty();
void updateOpenGLWindow();
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 64fef563a974..4759754b95a3 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -100,7 +100,6 @@ AccessibleBase::~AccessibleBase()
}
bool AccessibleBase::CheckDisposeState( bool bThrowException /* default: true */ ) const
- throw (lang::DisposedException)
{
if( bThrowException &&
m_bIsDisposed )
@@ -188,7 +187,6 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId
}
void AccessibleBase::AddState( sal_Int16 aState )
- throw (RuntimeException)
{
CheckDisposeState();
OSL_ASSERT( m_xStateSetHelper.is() );
@@ -196,7 +194,6 @@ void AccessibleBase::AddState( sal_Int16 aState )
}
void AccessibleBase::RemoveState( sal_Int16 aState )
- throw (RuntimeException)
{
CheckDisposeState();
OSL_ASSERT( m_xStateSetHelper.is() );
@@ -473,14 +470,12 @@ void SAL_CALL AccessibleBase::disposing()
// ________ XAccessible ________
Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext()
- throw (RuntimeException, std::exception)
{
return this;
}
// ________ AccessibleBase::XAccessibleContext ________
sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
- throw (RuntimeException, std::exception)
{
ClearableMutexGuard aGuard( GetMutex() );
if( ! m_bMayHaveChildren ||
@@ -500,13 +495,11 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount()
}
sal_Int32 AccessibleBase::ImplGetAccessibleChildCount() const
- throw (RuntimeException)
{
return m_aChildList.size();
}
Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 i )
- throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
{
CheckDisposeState();
Reference< XAccessible > xResult;
@@ -526,7 +519,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32
}
Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i ) const
- throw (lang::IndexOutOfBoundsException, RuntimeException)
{
Reference< XAccessible > xResult;
@@ -550,7 +542,6 @@ Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i
}
Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent()
- throw (RuntimeException, std::exception)
{
CheckDisposeState();
Reference< XAccessible > aResult;
@@ -561,7 +552,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent()
}
sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent()
- throw (RuntimeException, std::exception)
{
CheckDisposeState();
@@ -571,20 +561,17 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent()
}
sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole()
- throw (RuntimeException, std::exception)
{
return AccessibleRole::SHAPE;
}
Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet()
- throw (RuntimeException, std::exception)
{
Reference< XAccessibleRelationSet > aResult;
return aResult;
}
Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet()
- throw (RuntimeException, std::exception)
{
if( ! m_bStateSetInitialized )
{
@@ -605,7 +592,6 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet(
}
lang::Locale SAL_CALL AccessibleBase::getLocale()
- throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception)
{
CheckDisposeState();
@@ -614,7 +600,6 @@ lang::Locale SAL_CALL AccessibleBase::getLocale()
// ________ AccessibleBase::XAccessibleComponent ________
sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint )
- throw (RuntimeException, std::exception)
{
awt::Rectangle aRect( getBounds() );
@@ -629,7 +614,6 @@ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint )
}
Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const awt::Point& aPoint )
- throw (RuntimeException, std::exception)
{
CheckDisposeState();
Reference< XAccessible > aResult;
@@ -669,7 +653,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const aw
}
awt::Rectangle SAL_CALL AccessibleBase::getBounds()
- throw (RuntimeException, std::exception)
{
ExplicitValueProvider *pExplicitValueProvider(
ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView ));
@@ -705,7 +688,6 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds()
}
awt::Point SAL_CALL AccessibleBase::getLocation()
- throw (RuntimeException, std::exception)
{
CheckDisposeState();
awt::Rectangle aBBox( getBounds() );
@@ -713,7 +695,6 @@ awt::Point SAL_CALL AccessibleBase::getLocation()
}
awt::Point SAL_CALL AccessibleBase::getLocationOnScreen()
- throw (RuntimeException, std::exception)
{
CheckDisposeState();
@@ -734,7 +715,6 @@ awt::Point SAL_CALL AccessibleBase::getLocationOnScreen()
}
awt::Size SAL_CALL AccessibleBase::getSize()
- throw (RuntimeException, std::exception)
{
CheckDisposeState();
awt::Rectangle aBBox( getBounds() );
@@ -742,7 +722,6 @@ awt::Size SAL_CALL AccessibleBase::getSize()
}
void SAL_CALL AccessibleBase::grabFocus()
- throw (RuntimeException, std::exception)
{
CheckDisposeState();
@@ -754,13 +733,11 @@ void SAL_CALL AccessibleBase::grabFocus()
}
sal_Int32 SAL_CALL AccessibleBase::getForeground()
- throw (RuntimeException, std::exception)
{
return getColor( ACC_BASE_FOREGROUND );
}
sal_Int32 SAL_CALL AccessibleBase::getBackground()
- throw (RuntimeException, std::exception)
{
return getColor( ACC_BASE_BACKGROUND );
}
@@ -859,19 +836,16 @@ sal_Int32 AccessibleBase::getColor( eColorType eColType )
// ________ AccessibleBase::XServiceInfo ________
OUString SAL_CALL AccessibleBase::getImplementationName()
- throw (RuntimeException, std::exception)
{
return OUString( "AccessibleBase" );
}
sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName )
- throw (RuntimeException, std::exception)
{
return cppu::supportsService( this, ServiceName );
}
uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames()
- throw (RuntimeException, std::exception)
{
return {
"com.sun.star.accessibility.Accessible",
@@ -881,13 +855,11 @@ uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames()
// ________ AccessibleBase::XEventListener ________
void SAL_CALL AccessibleBase::disposing( const lang::EventObject& /*Source*/ )
- throw (RuntimeException, std::exception)
{
}
// ________ XAccessibleEventBroadcasters ________
void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
@@ -901,7 +873,6 @@ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAcce
}
void SAL_CALL AccessibleBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener )
- throw (RuntimeException, std::exception)
{
MutexGuard aGuard( GetMutex() );
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index d94233a76c2e..b231b030c56a 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -115,7 +115,6 @@ void AccessibleChartElement::InitTextEdit()
// ________ AccessibleBase::XAccessibleContext ________
Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal_Int32 i ) const
- throw (lang::IndexOutOfBoundsException, RuntimeException)
{
Reference< XAccessible > xResult;
@@ -128,7 +127,6 @@ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal
}
sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const
- throw (RuntimeException)
{
if( m_bHasText )
{
@@ -142,14 +140,12 @@ sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const
// ________ XServiceInfo ________
OUString SAL_CALL AccessibleChartElement::getImplementationName()
- throw (RuntimeException, std::exception)
{
return OUString( "AccessibleChartElement" );
}
// ________ AccessibleChartElement::XAccessibleContext (override) ________
OUString SAL_CALL AccessibleChartElement::getAccessibleName()
- throw (css::uno::RuntimeException, std::exception)
{
return ObjectNameProvider::getNameForCID(
GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument );
@@ -157,14 +153,12 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName()
// ________ AccessibleChartElement::XAccessibleContext (override) ________
OUString SAL_CALL AccessibleChartElement::getAccessibleDescription()
- throw (css::uno::RuntimeException, std::exception)
{
return getToolTipText();
}
// ________ AccessibleChartElement::XAccessibleExtendedComponent ________
Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont()
- throw (uno::RuntimeException, std::exception)
{
CheckDisposeState();
@@ -185,13 +179,11 @@ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont()
}
OUString SAL_CALL AccessibleChartElement::getTitledBorderText()
- throw (uno::RuntimeException, std::exception)
{
return OUString();
}
OUString SAL_CALL AccessibleChartElement::getToolTipText()
- throw (css::uno::RuntimeException, std::exception)
{
CheckDisposeState();
@@ -201,55 +193,46 @@ OUString SAL_CALL AccessibleChartElement::getToolTipText()
// ________ XAccessibleComponent ________
sal_Bool SAL_CALL AccessibleChartElement::containsPoint( const awt::Point& aPoint )
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::containsPoint( aPoint );
}
Reference< XAccessible > SAL_CALL AccessibleChartElement::getAccessibleAtPoint( const awt::Point& aPoint )
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::getAccessibleAtPoint( aPoint );
}
awt::Rectangle SAL_CALL AccessibleChartElement::getBounds()
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::getBounds();
}
awt::Point SAL_CALL AccessibleChartElement::getLocation()
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::getLocation();
}
awt::Point SAL_CALL AccessibleChartElement::getLocationOnScreen()
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::getLocationOnScreen();
}
awt::Size SAL_CALL AccessibleChartElement::getSize()
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::getSize();
}
void SAL_CALL AccessibleChartElement::grabFocus()
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::grabFocus();
}
sal_Int32 SAL_CALL AccessibleChartElement::getForeground()
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::getForeground();
}
sal_Int32 SAL_CALL AccessibleChartElement::getBackground()
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::getBackground();
}
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 58db7bd12501..a2e48d64ad87 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -75,44 +75,35 @@ public:
// ________ AccessibleBase ________
virtual bool ImplUpdateChildren() override;
virtual css::uno::Reference< css::accessibility::XAccessible >
- ImplGetAccessibleChildById( sal_Int32 i ) const
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException) override;
- virtual sal_Int32 ImplGetAccessibleChildCount() const
- throw (css::uno::RuntimeException) override;
+ ImplGetAccessibleChildById( sal_Int32 i ) const override;
+ virtual sal_Int32 ImplGetAccessibleChildCount() const override;
// ________ XAccessibleContext ________
- virtual OUString SAL_CALL getAccessibleName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleName() override;
+ virtual OUString SAL_CALL getAccessibleDescription() override;
// ________ XAccessibleExtendedComponent ________
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getTitledBorderText()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getToolTipText()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
+ virtual OUString SAL_CALL getTitledBorderText() override;
+ virtual OUString SAL_CALL getToolTipText() override;
// the following interface is implemented in AccessibleBase, however it is
// also a (non-virtual) base class of XAccessibleExtendedComponent Thus
// these methods have to be overridden and forward to AccessibleBase
// ________ XAccessibleComponent ________
- virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds() override;
+ virtual css::awt::Point SAL_CALL getLocation() override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+ virtual css::awt::Size SAL_CALL getSize() override;
+ virtual void SAL_CALL grabFocus() override;
+ virtual sal_Int32 SAL_CALL getForeground() override;
+ virtual sal_Int32 SAL_CALL getBackground() override;
// ________ XServiceInfo ________
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
private:
bool m_bHasText;
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index 3139f9dd66d2..2757cef19cb2 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -75,14 +75,12 @@ AccessibleChartShape::~AccessibleChartShape()
// ________ XServiceInfo ________
OUString AccessibleChartShape::getImplementationName()
- throw (RuntimeException, std::exception)
{
return OUString( "AccessibleChartShape" );
}
// ________ XAccessibleContext ________
sal_Int32 AccessibleChartShape::getAccessibleChildCount()
- throw (RuntimeException, std::exception)
{
sal_Int32 nCount(0);
if ( m_pAccShape.is() )
@@ -93,7 +91,6 @@ sal_Int32 AccessibleChartShape::getAccessibleChildCount()
}
Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i )
- throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception)
{
Reference< XAccessible > xChild;
if ( m_pAccShape.is() )
@@ -104,7 +101,6 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i )
}
sal_Int16 AccessibleChartShape::getAccessibleRole()
- throw (RuntimeException, std::exception)
{
sal_Int16 nRole(0);
if ( m_pAccShape.is() )
@@ -115,7 +111,6 @@ sal_Int16 AccessibleChartShape::getAccessibleRole()
}
OUString AccessibleChartShape::getAccessibleDescription()
- throw (css::uno::RuntimeException, std::exception)
{
OUString aDescription;
if ( m_pAccShape.is() )
@@ -126,7 +121,6 @@ OUString AccessibleChartShape::getAccessibleDescription()
}
OUString AccessibleChartShape::getAccessibleName()
- throw (css::uno::RuntimeException, std::exception)
{
OUString aName;
if ( m_pAccShape.is() )
@@ -138,7 +132,6 @@ OUString AccessibleChartShape::getAccessibleName()
// ________ XAccessibleComponent ________
sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint )
- throw (uno::RuntimeException, std::exception)
{
bool bReturn = false;
if ( m_pAccShape.is() )
@@ -149,7 +142,6 @@ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint )
}
Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt::Point& aPoint )
- throw (uno::RuntimeException, std::exception)
{
Reference< XAccessible > xResult;
if ( m_pAccShape.is() )
@@ -160,7 +152,6 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt::
}
awt::Rectangle AccessibleChartShape::getBounds()
- throw (uno::RuntimeException, std::exception)
{
awt::Rectangle aBounds;
if ( m_pAccShape.is() )
@@ -171,7 +162,6 @@ awt::Rectangle AccessibleChartShape::getBounds()
}
awt::Point AccessibleChartShape::getLocation()
- throw (uno::RuntimeException, std::exception)
{
awt::Point aLocation;
if ( m_pAccShape.is() )
@@ -182,7 +172,6 @@ awt::Point AccessibleChartShape::getLocation()
}
awt::Point AccessibleChartShape::getLocationOnScreen()
- throw (uno::RuntimeException, std::exception)
{
awt::Point aLocation;
if ( m_pAccShape.is() )
@@ -193,7 +182,6 @@ awt::Point AccessibleChartShape::getLocationOnScreen()
}
awt::Size AccessibleChartShape::getSize()
- throw (uno::RuntimeException, std::exception)
{
awt::Size aSize;
if ( m_pAccShape.is() )
@@ -204,13 +192,11 @@ awt::Size AccessibleChartShape::getSize()
}
void AccessibleChartShape::grabFocus()
- throw (uno::RuntimeException, std::exception)
{
return AccessibleBase::grabFocus();
}
sal_Int32 AccessibleChartShape::getForeground()
- throw (uno::RuntimeException, std::exception)
{
sal_Int32 nColor(0);
if ( m_pAccShape.is() )
@@ -221,7 +207,6 @@ sal_Int32 AccessibleChartShape::getForeground()
}
sal_Int32 AccessibleChartShape::getBackground()
- throw (uno::RuntimeException, std::exception)
{
sal_Int32 nColor(0);
if ( m_pAccShape.is() )
@@ -233,7 +218,6 @@ sal_Int32 AccessibleChartShape::getBackground()
// ________ XAccessibleExtendedComponent ________
Reference< awt::XFont > AccessibleChartShape::getFont()
- throw (uno::RuntimeException, std::exception)
{
Reference< awt::XFont > xFont;
if ( m_pAccShape.is() )
@@ -244,7 +228,6 @@ Reference< awt::XFont > AccessibleChartShape::getFont()
}
OUString AccessibleChartShape::getTitledBorderText()
- throw (uno::RuntimeException, std::exception)
{
OUString aText;
if ( m_pAccShape.is() )
@@ -255,7 +238,6 @@ OUString AccessibleChartShape::getTitledBorderText()
}
OUString AccessibleChartShape::getToolTipText()
- throw (css::uno::RuntimeException, std::exception)
{
OUString aText;
if ( m_pAccShape.is() )
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index 3108b18fd95d..6feaf9e295b9 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -48,41 +48,31 @@ public:
virtual ~AccessibleChartShape() override;
// ________ XServiceInfo ________
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
// ________ XAccessibleContext ________
- virtual sal_Int32 SAL_CALL getAccessibleChildCount()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
- getAccessibleChild( sal_Int32 i )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName()
- throw (css::uno::RuntimeException, std::exception) override;
+ getAccessibleChild( sal_Int32 i ) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole() override;
+ virtual OUString SAL_CALL getAccessibleDescription() override;
+ virtual OUString SAL_CALL getAccessibleName() override;
// ________ XAccessibleComponent ________
- virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds() override;
+ virtual css::awt::Point SAL_CALL getLocation() override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+ virtual css::awt::Size SAL_CALL getSize() override;
+ virtual void SAL_CALL grabFocus() override;
+ virtual sal_Int32 SAL_CALL getForeground() override;
+ virtual sal_Int32 SAL_CALL getBackground() override;
// ________ XAccessibleExtendedComponent ________
- virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getTitledBorderText()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getToolTipText()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override;
+ virtual OUString SAL_CALL getTitledBorderText() override;
+ virtual OUString SAL_CALL getToolTipText() override;
private:
rtl::Reference<accessibility::AccessibleShape> m_pAccShape;
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index fac65a65c301..77c4457651a9 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -98,39 +98,33 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const
// ________ XAccessibleContext ________
OUString SAL_CALL AccessibleChartView::getAccessibleName()
- throw (uno::RuntimeException, std::exception)
{
return SCH_RESSTR(STR_OBJECT_DIAGRAM);
}
OUString SAL_CALL AccessibleChartView::getAccessibleDescription()
- throw (uno::RuntimeException, std::exception)
{
return getAccessibleName();
}
Reference< XAccessible > SAL_CALL AccessibleChartView::getAccessibleParent()
- throw (uno::RuntimeException, std::exception)
{
return Reference< XAccessible >( m_xParent );
}
sal_Int32 SAL_CALL AccessibleChartView::getAccessibleIndexInParent()
- throw (uno::RuntimeException, std::exception)
{
// the document is always the only child of the window
return 0;
}
sal_Int16 SAL_CALL AccessibleChartView::getAccessibleRole()
- throw (uno::RuntimeException, std::exception)
{
return AccessibleRole::DOCUMENT;
}
// ________ XAccessibleComponent ________
awt::Rectangle SAL_CALL AccessibleChartView::getBounds()
- throw (uno::RuntimeException, std::exception)
{
awt::Rectangle aResult( GetWindowPosSize());
Reference< XAccessible > xParent( m_xParent );
@@ -148,7 +142,6 @@ awt::Rectangle SAL_CALL AccessibleChartView::getBounds()
}
awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen()
- throw (uno::RuntimeException, std::exception)
{
awt::Rectangle aBounds( getBounds());
awt::Point aResult;
@@ -167,7 +160,6 @@ awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen()
// lang::XInitialization
void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments )
- throw (uno::Exception, uno::RuntimeException, std::exception)
{
//0: view::XSelectionSupplier offers notifications for selection changes and access to the selection itself
//1: frame::XModel representing the chart model - offers access to object data
@@ -334,7 +326,6 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments
// view::XSelectionChangeListener
void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*rEvent*/ )
- throw (uno::RuntimeException, std::exception)
{
Reference< view::XSelectionSupplier > xSelectionSupplier;
{
@@ -359,7 +350,6 @@ void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*
// XEventListener
void SAL_CALL AccessibleChartView::disposing( const lang::EventObject& /*Source*/ )
- throw (uno::RuntimeException, std::exception)
{
}
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 367c098c73b9..6276daf18d2e 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -57,8 +57,6 @@ AccessibleTextHelper::~AccessibleTextHelper()
// ____ XInitialization ____
void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArguments )
- throw (uno::Exception,
- uno::RuntimeException, std::exception)
{
OUString aCID;
Reference< XAccessible > xEventSource;
@@ -100,7 +98,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
// ____ XAccessibleContext ____
::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleChildCount()
- throw (uno::RuntimeException, std::exception)
{
if( m_pTextHelper )
{
@@ -111,8 +108,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg
}
Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sal_Int32 i )
- throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException, std::exception)
{
if( m_pTextHelper )
{
@@ -123,57 +118,48 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa
}
Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent()
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "Not implemented in this helper" );
return Reference< XAccessible >();
}
::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent()
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "Not implemented in this helper" );
return -1;
}
::sal_Int16 SAL_CALL AccessibleTextHelper::getAccessibleRole()
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "Not implemented in this helper" );
return AccessibleRole::UNKNOWN;
}
OUString SAL_CALL AccessibleTextHelper::getAccessibleDescription()
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "Not implemented in this helper" );
return OUString();
}
OUString SAL_CALL AccessibleTextHelper::getAccessibleName()
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "Not implemented in this helper" );
return OUString();
}
Reference< XAccessibleRelationSet > SAL_CALL AccessibleTextHelper::getAccessibleRelationSet()
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "Not implemented in this helper" );
return Reference< XAccessibleRelationSet >();
}
Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleStateSet()
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "Not implemented in this helper" );
return Reference< XAccessibleStateSet >();
}
lang::Locale SAL_CALL AccessibleTextHelper::getLocale()
- throw (IllegalAccessibleComponentStateException,
- uno::RuntimeException, std::exception)
{
OSL_FAIL( "Not implemented in this helper" );
return lang::Locale();
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 69c9183bae25..d18d405eadf0 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -84,40 +84,33 @@ AreaWrapper::~AreaWrapper()
// ____ XShape ____
awt::Point SAL_CALL AreaWrapper::getPosition()
- throw (uno::RuntimeException, std::exception)
{
return awt::Point(0,0);
}
void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ )
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "trying to set position of chart area" );
}
awt::Size SAL_CALL AreaWrapper::getSize()
- throw (uno::RuntimeException, std::exception)
{
return m_spChart2ModelContact->GetPageSize();
}
void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ )
- throw (beans::PropertyVetoException,
- uno::RuntimeException, std::exception)
{
OSL_FAIL( "trying to set size of chart area" );
}
// ____ XShapeDescriptor (base of XShape) ____
OUString SAL_CALL AreaWrapper::getShapeType()
- throw (uno::RuntimeException, std::exception)
{
return OUString( "com.sun.star.chart.ChartArea" );
}
// ____ XComponent ____
void SAL_CALL AreaWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -128,14 +121,12 @@ void SAL_CALL AreaWrapper::dispose()
void SAL_CALL AreaWrapper::addEventListener(
const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL AreaWrapper::removeEventListener(
const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
@@ -165,19 +156,16 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
}
OUString SAL_CALL AreaWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.Area");
}
sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.xml.UserDefinedAttributesSupplier",
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index de77aafe0472..bd5fad7298a1 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -51,37 +51,25 @@ public:
virtual ~AreaWrapper() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XShape ____
- virtual css::awt::Point SAL_CALL getPosition()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setSize( const css::awt::Size& aSize )
- throw (css::beans::PropertyVetoException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getPosition() override;
+ virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+ virtual css::awt::Size SAL_CALL getSize() override;
+ virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
// ____ XShapeDescriptor (base of XShape) ____
- virtual OUString SAL_CALL getShapeType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getShapeType() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener( const css::uno::Reference<
- css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& xListener ) override;
virtual void SAL_CALL removeEventListener( const css::uno::Reference<
- css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& aListener ) override;
protected:
// ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index cfab846edcd3..a7b088083ff8 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -412,7 +412,7 @@ AxisWrapper::~AxisWrapper()
}
// ____ chart::XAxis ____
-Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException, std::exception)
+Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle()
{
if( !m_xAxisTitle.is() )
{
@@ -441,7 +441,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno
}
return m_xAxisTitle;
}
-Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException, std::exception)
+Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid()
{
if( !m_xMajorGrid.is() )
{
@@ -464,7 +464,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno
}
return m_xMajorGrid;
}
-Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException, std::exception)
+Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid()
{
if( !m_xMinorGrid.is() )
{
@@ -490,42 +490,35 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno
// ____ XShape ____
awt::Point SAL_CALL AxisWrapper::getPosition()
- throw (uno::RuntimeException, std::exception)
{
awt::Point aResult( m_spChart2ModelContact->GetAxisPosition( this->getAxis() ) );
return aResult;
}
void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ )
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL( "trying to set position of Axis" );
}
awt::Size SAL_CALL AxisWrapper::getSize()
- throw (uno::RuntimeException, std::exception)
{
awt::Size aSize( m_spChart2ModelContact->GetAxisSize( this->getAxis() ) );
return aSize;
}
void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ )
- throw (beans::PropertyVetoException,
- uno::RuntimeException, std::exception)
{
OSL_FAIL( "trying to set size of Axis" );
}
// ____ XShapeDescriptor (base of XShape) ____
OUString SAL_CALL AxisWrapper::getShapeType()
- throw (uno::RuntimeException, std::exception)
{
return OUString("com.sun.star.chart.ChartAxis");
}
// ____ XNumberFormatsSupplier ____
uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSettings()
- throw (uno::RuntimeException, std::exception)
{
Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY );
if( xNumSuppl.is() )
@@ -535,7 +528,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSetti
}
uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats()
- throw (uno::RuntimeException, std::exception)
{
Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY );
if( xNumSuppl.is() )
@@ -563,7 +555,6 @@ void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDim
// ____ XComponent ____
void SAL_CALL AxisWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -577,14 +568,12 @@ void SAL_CALL AxisWrapper::dispose()
void SAL_CALL AxisWrapper::addEventListener(
const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL AxisWrapper::removeEventListener(
const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
@@ -691,19 +680,16 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
}
OUString SAL_CALL AxisWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.Axis");
}
sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.ChartAxis",
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 352778b8f0b3..4adc3b77ff36 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -67,12 +67,9 @@ public:
static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis );
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() override;
@@ -80,42 +77,31 @@ public:
virtual css::awt::Size getCurrentSizeForReference() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener( const css::uno::Reference<
- css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& xListener ) override;
virtual void SAL_CALL removeEventListener( const css::uno::Reference<
- css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& aListener ) override;
// ____ chart::XAxis ____
- virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle( ) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid( ) override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid( ) override;
// ____ XShape ____
- virtual css::awt::Point SAL_CALL getPosition()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setSize( const css::awt::Size& aSize )
- throw (css::beans::PropertyVetoException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getPosition() override;
+ virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+ virtual css::awt::Size SAL_CALL getSize() override;
+ virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
// ____ XShapeDescriptor (base of XShape) ____
- virtual OUString SAL_CALL getShapeType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getShapeType() override;
// ____ XNumberFormatsSupplier ____
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getNumberFormatSettings()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() override;
virtual css::uno::Reference<
- css::util::XNumberFormats > SAL_CALL getNumberFormats()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::util::XNumberFormats > SAL_CALL getNumberFormats() override;
protected:
// ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 2378a1d579bf..705f9fc2eb1e 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -413,7 +413,6 @@ ChartDataWrapper::~ChartDataWrapper()
// ____ XChartDataArray (read)____
Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData()
- throw (uno::RuntimeException, std::exception)
{
initDataAccess();
if( m_xDataAccess.is() )
@@ -421,7 +420,6 @@ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData()
return Sequence< Sequence< double > >();
}
Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions()
- throw (uno::RuntimeException, std::exception)
{
initDataAccess();
if( m_xDataAccess.is() )
@@ -429,7 +427,6 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions()
return Sequence< OUString >();
}
Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions()
- throw (uno::RuntimeException, std::exception)
{
initDataAccess();
if( m_xDataAccess.is() )
@@ -438,14 +435,14 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions()
}
// ____ XComplexDescriptionAccess (read) ____
-Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions()
{
initDataAccess();
if( m_xDataAccess.is() )
return m_xDataAccess->getComplexRowDescriptions();
return Sequence< Sequence< OUString > >();
}
-Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions()
{
initDataAccess();
if( m_xDataAccess.is() )
@@ -454,14 +451,14 @@ Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDesc
}
// ____ XAnyDescriptionAccess (read) ____
-Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions()
{
initDataAccess();
if( m_xDataAccess.is() )
return m_xDataAccess->getAnyRowDescriptions();
return Sequence< Sequence< uno::Any > >();
}
-Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception)
+Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions()
{
initDataAccess();
if( m_xDataAccess.is() )
@@ -470,7 +467,7 @@ Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescript
}
// ____ XDateCategories (read) ____
-Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException, std::exception)
+Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories()
{
initDataAccess();
Reference< XDateCategories > xDateCategories( m_xDataAccess, uno::UNO_QUERY );
@@ -481,50 +478,47 @@ Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::Ru
// ____ XChartDataArray (write)____
void SAL_CALL ChartDataWrapper::setData( const Sequence< Sequence< double > >& rData )
- throw (uno::RuntimeException, std::exception)
{
lcl_DataOperator aOperator( rData );
applyData( aOperator );
}
void SAL_CALL ChartDataWrapper::setRowDescriptions( const Sequence< OUString >& rRowDescriptions )
- throw (uno::RuntimeException, std::exception)
{
lcl_RowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() );
applyData( aOperator );
}
void SAL_CALL ChartDataWrapper::setColumnDescriptions( const Sequence< OUString >& rColumnDescriptions )
- throw (uno::RuntimeException, std::exception)
{
lcl_ColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() );
applyData( aOperator );
}
// ____ XComplexDescriptionAccess (write) ____
-void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions )
{
lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() );
applyData( aOperator );
}
-void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions )
{
lcl_ComplexColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() );
applyData( aOperator );
}
// ____ XAnyDescriptionAccess (write) ____
-void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions )
{
lcl_AnyRowDescriptionsOperator aOperator( rRowDescriptions );
applyData( aOperator );
}
-void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions )
{
lcl_AnyColumnDescriptionsOperator aOperator( rColumnDescriptions );
applyData( aOperator );
}
// ____ XDateCategories (write) ____
-void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates )
{
Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY ));
@@ -536,26 +530,22 @@ void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDa
// ____ XChartData (base of XChartDataArray) ____
void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener(
const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( aListener );
}
void SAL_CALL ChartDataWrapper::removeChartDataChangeEventListener(
const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
double SAL_CALL ChartDataWrapper::getNotANumber()
- throw (uno::RuntimeException, std::exception)
{
return DBL_MIN;
}
sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber )
- throw (uno::RuntimeException, std::exception)
{
return DBL_MIN == nNumber
|| ::rtl::math::isNan( nNumber )
@@ -564,7 +554,6 @@ sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber )
// ____ XComponent ____
void SAL_CALL ChartDataWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this )));
m_xDataAccess=nullptr;
@@ -572,21 +561,18 @@ void SAL_CALL ChartDataWrapper::dispose()
void SAL_CALL ChartDataWrapper::addEventListener(
const uno::Reference< lang::XEventListener > & xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL ChartDataWrapper::removeEventListener(
const uno::Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
// ____ XEventListener ____
void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */ )
- throw (uno::RuntimeException, std::exception)
{
}
@@ -702,19 +688,16 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator )
}
OUString SAL_CALL ChartDataWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.ChartData");
}
sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.ChartDataArray",
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index 34a35ee7643b..a15a2d06ab70 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -54,77 +54,56 @@ public:
virtual ~ChartDataWrapper() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
protected:
// ____ XDateCategories ____
- virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override;
+ virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override;
// ____ XAnyDescriptionAccess ____
virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
- getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+ getAnyRowDescriptions() override;
virtual void SAL_CALL setAnyRowDescriptions(
- const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) override;
virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
- getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+ getAnyColumnDescriptions() override;
virtual void SAL_CALL setAnyColumnDescriptions(
- const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) override;
// ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
- getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+ getComplexRowDescriptions() override;
virtual void SAL_CALL setComplexRowDescriptions(
- const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override;
virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
- getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+ getComplexColumnDescriptions() override;
virtual void SAL_CALL setComplexColumnDescriptions(
- const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override;
// ____ XChartDataArray (base of XComplexDescriptionAccess) ____
- virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override;
+ virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override;
+ virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override;
+ virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) override;
// ____ XChartData (base of XChartDataArray) ____
- virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getNotANumber()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isNotANumber( double nNumber )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+ virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+ virtual double SAL_CALL getNotANumber() override;
+ virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// ____ XEventListener ____
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
void fireChartDataChangeEvent( css::chart::ChartDataChangeEvent& aEvent );
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 4f46ea84cb16..f98a743814c4 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -273,14 +273,11 @@ class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty
public:
explicit WrappedDataSourceLabelsInFirstRowProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -296,7 +293,6 @@ WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProp
}
void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bLabelsInFirstRow = true;
if( ! (rOuterValue >>= bLabelsInFirstRow) )
@@ -329,7 +325,6 @@ void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOu
}
Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OUString aRangeString;
bool bUseColumns = true;
@@ -353,7 +348,6 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference
}
Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= true;
@@ -366,14 +360,11 @@ class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty
public:
explicit WrappedDataSourceLabelsInFirstColumnProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -389,7 +380,6 @@ WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColu
}
void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bLabelsInFirstRow = true;
if( ! (rOuterValue >>= bLabelsInFirstRow) )
@@ -422,7 +412,6 @@ void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any&
}
Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OUString aRangeString;
bool bUseColumns = true;
@@ -446,7 +435,6 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Refere
}
Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= true;
@@ -459,14 +447,11 @@ class WrappedHasLegendProperty : public WrappedProperty
public:
explicit WrappedHasLegendProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -479,7 +464,6 @@ WrappedHasLegendProperty::WrappedHasLegendProperty(const std::shared_ptr<Chart2M
}
void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNewValue = true;
if( ! (rOuterValue >>= bNewValue) )
@@ -505,7 +489,6 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R
}
Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
try
@@ -525,7 +508,6 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert
}
Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
@@ -538,14 +520,11 @@ class WrappedHasMainTitleProperty : public WrappedProperty
public:
explicit WrappedHasMainTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -558,7 +537,6 @@ WrappedHasMainTitleProperty::WrappedHasMainTitleProperty(const std::shared_ptr<C
}
void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNewValue = true;
if( ! (rOuterValue >>= bNewValue) )
@@ -578,7 +556,6 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons
}
Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
try
@@ -593,7 +570,6 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp
}
Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
@@ -606,14 +582,11 @@ class WrappedHasSubTitleProperty : public WrappedProperty
public:
explicit WrappedHasSubTitleProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -626,7 +599,6 @@ WrappedHasSubTitleProperty::WrappedHasSubTitleProperty(const std::shared_ptr<Cha
}
void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNewValue = true;
if( ! (rOuterValue >>= bNewValue) )
@@ -646,7 +618,6 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const
}
Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
try
@@ -661,7 +632,6 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope
}
Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
@@ -683,7 +653,6 @@ ChartDocumentWrapper::~ChartDocumentWrapper()
// ____ XInterface (for new interfaces) ____
uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType )
- throw (uno::RuntimeException, std::exception)
{
if( m_xDelegator.is())
// calls queryAggregation if the delegator doesn't know aType
@@ -694,7 +663,6 @@ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType )
// ____ chart::XChartDocument (old API wrapper) ____
Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle()
- throw (uno::RuntimeException, std::exception)
{
if( !m_xTitle.is() )
{
@@ -705,7 +673,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle()
}
Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle()
- throw (uno::RuntimeException, std::exception)
{
if( !m_xSubTitle.is() )
{
@@ -716,7 +683,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle()
}
Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend()
- throw (uno::RuntimeException, std::exception)
{
if( ! m_xLegend.is())
{
@@ -728,7 +694,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend()
}
Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea()
- throw (uno::RuntimeException, std::exception)
{
if( ! m_xArea.is())
{
@@ -740,7 +705,6 @@ Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea()
}
Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram()
- throw (uno::RuntimeException, std::exception)
{
if( !m_xDiagram.is() )
{
@@ -758,7 +722,6 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram()
}
void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDiagram )
- throw (uno::RuntimeException, std::exception)
{
uno::Reference< util::XRefreshable > xAddIn( xDiagram, uno::UNO_QUERY );
if( xAddIn.is() )
@@ -791,7 +754,6 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi
}
Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData()
- throw (uno::RuntimeException, std::exception)
{
if( !m_xChartData.is() )
{
@@ -803,7 +765,6 @@ Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData()
}
void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& xNewData )
- throw (uno::RuntimeException, std::exception)
{
if( !xNewData.is() )
return;
@@ -816,7 +777,6 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& x
sal_Bool SAL_CALL ChartDocumentWrapper::attachResource(
const OUString& URL,
const Sequence< beans::PropertyValue >& Arguments )
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -825,7 +785,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource(
}
OUString SAL_CALL ChartDocumentWrapper::getURL()
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -834,7 +793,6 @@ OUString SAL_CALL ChartDocumentWrapper::getURL()
}
Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs()
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -843,7 +801,6 @@ Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs()
}
void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::XController >& Controller )
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -852,7 +809,6 @@ void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::X
void SAL_CALL ChartDocumentWrapper::disconnectController(
const Reference< frame::XController >& Controller )
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -860,7 +816,6 @@ void SAL_CALL ChartDocumentWrapper::disconnectController(
}
void SAL_CALL ChartDocumentWrapper::lockControllers()
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -868,7 +823,6 @@ void SAL_CALL ChartDocumentWrapper::lockControllers()
}
void SAL_CALL ChartDocumentWrapper::unlockControllers()
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -876,7 +830,6 @@ void SAL_CALL ChartDocumentWrapper::unlockControllers()
}
sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked()
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -885,7 +838,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked()
}
Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentController()
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -895,8 +847,6 @@ Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentControl
void SAL_CALL ChartDocumentWrapper::setCurrentController(
const Reference< frame::XController >& Controller )
- throw (container::NoSuchElementException,
- uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -904,7 +854,6 @@ void SAL_CALL ChartDocumentWrapper::setCurrentController(
}
Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection()
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -914,7 +863,6 @@ Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection(
// ____ XComponent ____
void SAL_CALL ChartDocumentWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
if( m_bIsDisposed )
throw lang::DisposedException("ChartDocumentWrapper is disposed",
@@ -1074,7 +1022,6 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const
}
void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -1082,7 +1029,6 @@ void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEv
}
void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() );
if( xModel.is() )
@@ -1091,13 +1037,11 @@ void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::
// ____ XDrawPageSupplier ____
uno::Reference< drawing::XDrawPage > SAL_CALL ChartDocumentWrapper::getDrawPage()
- throw (uno::RuntimeException, std::exception)
{
return this->impl_getDrawPage();
}
uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() const
- throw (uno::RuntimeException)
{
return m_spChart2ModelContact->getDrawPage();
}
@@ -1123,8 +1067,6 @@ uno::Reference< lang::XMultiServiceFactory > getShapeFactory(const uno::Referenc
// ____ XMultiServiceFactory ____
uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
const OUString& aServiceSpecifier )
- throw (uno::Exception,
- uno::RuntimeException, std::exception)
{
uno::Reference< uno::XInterface > xResult;
@@ -1411,8 +1353,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance(
uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceWithArguments(
const OUString& ServiceSpecifier,
const uno::Sequence< uno::Any >& Arguments )
- throw (uno::Exception,
- uno::RuntimeException, std::exception)
{
OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" );
(void)(Arguments);
@@ -1421,7 +1361,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW
}
uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames()
- throw (uno::RuntimeException, std::exception)
{
return comphelper::mapKeysToSequence( lcl_getStaticServiceNameMap() );
}
@@ -1429,7 +1368,6 @@ uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceName
// ____ XAggregation ____
void SAL_CALL ChartDocumentWrapper::setDelegator(
const uno::Reference< uno::XInterface >& rDelegator )
- throw (uno::RuntimeException, std::exception)
{
if( m_bIsDisposed )
{
@@ -1460,7 +1398,6 @@ void SAL_CALL ChartDocumentWrapper::setDelegator(
}
uno::Any SAL_CALL ChartDocumentWrapper::queryAggregation( const uno::Type& rType )
- throw (uno::RuntimeException, std::exception)
{
return ChartDocumentWrapper_Base::queryInterface( rType );
}
@@ -1516,19 +1453,16 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert
}
OUString SAL_CALL ChartDocumentWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString(CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.ChartDocument",
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index a480d30057df..f83bc35c5cc8 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -259,14 +259,11 @@ class WrappedAttachedAxisProperty : public ::chart::WrappedProperty
public:
explicit WrappedAttachedAxisProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
protected:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -280,7 +277,6 @@ WrappedAttachedAxisProperty::WrappedAttachedAxisProperty(
}
Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= css::chart::ChartAxisAssign::PRIMARY_Y;
@@ -288,7 +284,6 @@ Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPr
}
Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
@@ -302,7 +297,6 @@ Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XProp
}
void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
uno::Reference< chart2::XDataSeries > xDataSeries( xInnerPropertySet, uno::UNO_QUERY );
@@ -364,14 +358,11 @@ class WrappedLineColorProperty : public WrappedSeriesAreaOrLineProperty
public:
explicit WrappedLineColorProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper );
- virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+ virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
protected:
DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
@@ -389,7 +380,6 @@ WrappedLineColorProperty::WrappedLineColorProperty(
}
void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
m_aOuterValue = rOuterValue;
@@ -398,7 +388,6 @@ void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const R
}
void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
m_aOuterValue = m_aDefaultValue;
@@ -407,7 +396,6 @@ void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPr
}
Any WrappedLineColorProperty::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
if( m_pDataSeriesPointWrapper && !m_pDataSeriesPointWrapper->isSupportingAreaProperties() )
return m_aDefaultValue;
@@ -420,11 +408,9 @@ class WrappedLineStyleProperty : public WrappedSeriesAreaOrLineProperty
public:
explicit WrappedLineStyleProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper );
- virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+ virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
protected:
DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
@@ -442,7 +428,6 @@ WrappedLineStyleProperty::WrappedLineStyleProperty(
}
void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aNewValue(rOuterValue);
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
@@ -454,7 +439,6 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R
}
void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException)
{
if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() )
m_aOuterValue = m_aDefaultValue;
@@ -482,7 +466,6 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr<Chart2Model
}
void SAL_CALL DataSeriesPointWrapper::initialize( const uno::Sequence< uno::Any >& aArguments )
- throw ( uno::Exception, uno::RuntimeException, std::exception)
{
OSL_PRECOND(aArguments.getLength() >= 1,"need at least 1 argument to initialize the DataSeriesPointWrapper: series reference + optional datapoint index");
@@ -527,7 +510,6 @@ DataSeriesPointWrapper::~DataSeriesPointWrapper()
// ____ XComponent ____
void SAL_CALL DataSeriesPointWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
uno::Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -538,21 +520,18 @@ void SAL_CALL DataSeriesPointWrapper::dispose()
void SAL_CALL DataSeriesPointWrapper::addEventListener(
const uno::Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL DataSeriesPointWrapper::removeEventListener(
const uno::Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
// ____ XEventListener ____
void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Source*/ )
- throw (uno::RuntimeException, std::exception)
{
}
@@ -623,7 +602,6 @@ awt::Size DataSeriesPointWrapper::getCurrentSizeForReference()
//XPropertyState
beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE );
try
@@ -688,7 +666,6 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU
}
void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
if( m_eType == DATA_SERIES )
WrappedPropertySet::setPropertyToDefault( rPropertyName );
@@ -699,7 +676,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPro
}
}
Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Any aRet;
try
@@ -800,7 +776,6 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope
}
void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
if(rPropertyName == "Lines")
{
@@ -861,7 +836,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert
}
Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rPropertyName )
- throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
if( m_eType == DATA_POINT )
{
@@ -890,19 +864,16 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty
}
OUString SAL_CALL DataSeriesPointWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.DataSeries");
}
sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.ChartDataRowProperties",
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index c2bcf4ea3cdc..6f3120b40502 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -73,16 +73,12 @@ public:
bool isLinesForbidden() { return !m_bLinesAllowed;}
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ___lang::XInitialization___
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
- throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() override;
@@ -91,28 +87,24 @@ public:
protected:
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// ____ XEventListener ____
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
protected:
// ____ WrappedPropertySet ____
virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override;
virtual const std::vector< WrappedProperty* > createWrappedProperties() override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override;
- virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
//own methods
css::uno::Reference< css::chart2::XDataSeries > getDataSeries();
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 2d33bf349f8e..ffb4fd92f2ff 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -635,7 +635,6 @@ DiagramWrapper::~DiagramWrapper()
// ____ XDiagram ____
OUString SAL_CALL DiagramWrapper::getDiagramType()
- throw (uno::RuntimeException, std::exception)
{
OUString aRet;
@@ -682,8 +681,6 @@ OUString SAL_CALL DiagramWrapper::getDiagramType()
Reference<
beans::XPropertySet > SAL_CALL DiagramWrapper::getDataRowProperties( sal_Int32 nRow )
- throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException, std::exception)
{
if( nRow < 0 )
throw lang::IndexOutOfBoundsException("DataSeries index invalid",
@@ -703,8 +700,6 @@ Reference<
Reference<
beans::XPropertySet > SAL_CALL DiagramWrapper::getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow )
- throw (lang::IndexOutOfBoundsException,
- uno::RuntimeException, std::exception)
{
if( nCol < 0 || nRow < 0 )
throw lang::IndexOutOfBoundsException("DataSeries index invalid",
@@ -727,14 +722,12 @@ Reference<
// ____ XShape (base of XDiagram) ____
awt::Point SAL_CALL DiagramWrapper::getPosition()
- throw (uno::RuntimeException, std::exception)
{
awt::Point aPosition = ToPoint( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() );
return aPosition;
}
void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
- throw (uno::RuntimeException, std::exception)
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
@@ -759,15 +752,12 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition )
}
awt::Size SAL_CALL DiagramWrapper::getSize()
- throw (uno::RuntimeException, std::exception)
{
awt::Size aSize = ToSize( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() );
return aSize;
}
void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize )
- throw (beans::PropertyVetoException,
- uno::RuntimeException, std::exception)
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
@@ -794,14 +784,13 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize )
// ____ XShapeDescriptor (base of XShape) ____
OUString SAL_CALL DiagramWrapper::getShapeType()
- throw (uno::RuntimeException, std::exception)
{
return OUString( "com.sun.star.chart.Diagram" );
}
// ____ XDiagramPositioning ____
-void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::RuntimeException, std::exception)
+void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning()
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
@@ -811,7 +800,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::Runti
xDiaProps->setPropertyValue( "RelativePosition", Any() );
}
}
-sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( )
{
uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
if( xDiaProps.is() )
@@ -823,7 +812,7 @@ sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno::
}
return true;
}
-void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect )
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
@@ -831,7 +820,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan
if( xDiaProps.is() )
xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(true) );
}
-sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::RuntimeException, std::exception)
+sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning()
{
uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY );
if( xDiaProps.is() )
@@ -847,11 +836,11 @@ sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::Ru
}
return false;
}
-awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) throw (uno::RuntimeException, std::exception)
+awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( )
{
return m_spChart2ModelContact->GetDiagramRectangleExcludingAxes();
}
-void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect )
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect );
@@ -859,24 +848,23 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan
if( xDiaProps.is() )
xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(false) );
}
-awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) throw (uno::RuntimeException, std::exception)
+awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( )
{
return m_spChart2ModelContact->GetDiagramRectangleIncludingAxes();
}
-void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect )
{
ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() );
awt::Rectangle aRect( m_spChart2ModelContact->SubstractAxisTitleSizes(rPositionRect) );
DiagramWrapper::setDiagramPositionIncludingAxes( aRect );
}
-css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception)
+css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( )
{
return m_spChart2ModelContact->GetDiagramRectangleIncludingTitle();
}
// ____ XAxisSupplier ____
Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex )
- throw (uno::RuntimeException, std::exception)
{
Reference< XAxis > xAxis;
if(!nDimensionIndex)
@@ -901,7 +889,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex )
}
Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensionIndex )
- throw (uno::RuntimeException, std::exception)
{
Reference< XAxis > xAxis;
if(!nDimensionIndex)
@@ -921,7 +908,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensi
// ____ XAxisZSupplier ____
Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle()
- throw (uno::RuntimeException, std::exception)
{
Reference< drawing::XShape > xRet;
Reference< XAxis > xAxis( getAxis(2) );
@@ -931,7 +917,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle()
}
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid()
- throw (uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xRet;
Reference< XAxis > xAxis( getAxis(2) );
@@ -941,7 +926,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid()
}
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid()
- throw (uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xRet;
Reference< XAxis > xAxis( getAxis(2) );
@@ -951,7 +935,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid()
}
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis()
- throw (uno::RuntimeException, std::exception)
{
if( ! m_xZAxis.is())
m_xZAxis = new AxisWrapper( AxisWrapper::Z_AXIS, m_spChart2ModelContact );
@@ -960,7 +943,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis()
// ____ XTwoAxisXSupplier ____
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis()
- throw (uno::RuntimeException, std::exception)
{
if( ! m_xSecondXAxis.is())
m_xSecondXAxis = new AxisWrapper( AxisWrapper::SECOND_X_AXIS, m_spChart2ModelContact );
@@ -969,7 +951,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis()
// ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____
Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle()
- throw (uno::RuntimeException, std::exception)
{
Reference< drawing::XShape > xRet;
Reference< XAxis > xAxis( getAxis(0) );
@@ -979,7 +960,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle()
}
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis()
- throw (uno::RuntimeException, std::exception)
{
if( ! m_xXAxis.is())
m_xXAxis = new AxisWrapper( AxisWrapper::X_AXIS, m_spChart2ModelContact );
@@ -987,7 +967,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis()
}
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid()
- throw (uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xRet;
Reference< XAxis > xAxis( getAxis(0) );
@@ -997,7 +976,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid()
}
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid()
- throw (uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xRet;
Reference< XAxis > xAxis( getAxis(0) );
@@ -1008,7 +986,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid()
// ____ XTwoAxisYSupplier ____
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis()
- throw (uno::RuntimeException, std::exception)
{
if( ! m_xSecondYAxis.is())
m_xSecondYAxis = new AxisWrapper( AxisWrapper::SECOND_Y_AXIS, m_spChart2ModelContact );
@@ -1017,7 +994,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis()
// ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____
Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle()
- throw (uno::RuntimeException, std::exception)
{
Reference< drawing::XShape > xRet;
Reference< XAxis > xAxis( getAxis(1) );
@@ -1027,7 +1003,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle()
}
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis()
- throw (uno::RuntimeException, std::exception)
{
if( ! m_xYAxis.is())
m_xYAxis = new AxisWrapper( AxisWrapper::Y_AXIS, m_spChart2ModelContact );
@@ -1035,7 +1010,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis()
}
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid()
- throw (uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xRet;
Reference< XAxis > xAxis( getAxis(1) );
@@ -1045,7 +1019,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid()
}
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid()
- throw (uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xRet;
Reference< XAxis > xAxis( getAxis(1) );
@@ -1056,7 +1029,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid()
// ____ XSecondAxisTitleSupplier ____
Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle()
- throw (uno::RuntimeException, std::exception)
{
Reference< drawing::XShape > xRet;
Reference< XAxis > xAxis( getSecondaryAxis(0) );
@@ -1066,7 +1038,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle()
}
Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle()
- throw (uno::RuntimeException, std::exception)
{
Reference< drawing::XShape > xRet;
Reference< XAxis > xAxis( getSecondaryAxis(1) );
@@ -1078,7 +1049,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle()
// ____ XStatisticDisplay ____
Reference<
beans::XPropertySet > SAL_CALL DiagramWrapper::getUpBar()
- throw (uno::RuntimeException, std::exception)
{
if( !m_xUpBarWrapper.is() )
{
@@ -1089,7 +1059,6 @@ Reference<
Reference<
beans::XPropertySet > SAL_CALL DiagramWrapper::getDownBar()
- throw (uno::RuntimeException, std::exception)
{
if( !m_xDownBarWrapper.is() )
{
@@ -1100,7 +1069,6 @@ Reference<
Reference<
beans::XPropertySet > SAL_CALL DiagramWrapper::getMinMaxLine()
- throw (uno::RuntimeException, std::exception)
{
if( !m_xMinMaxLineWrapper.is() )
{
@@ -1111,7 +1079,6 @@ Reference<
// ____ X3DDisplay ____
Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall()
- throw (uno::RuntimeException, std::exception)
{
if( !m_xWall.is() )
{
@@ -1122,7 +1089,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall()
Reference<
beans::XPropertySet > SAL_CALL DiagramWrapper::getFloor()
- throw (uno::RuntimeException, std::exception)
{
if( !m_xFloor.is() )
{
@@ -1133,7 +1099,6 @@ Reference<
// ____ X3DDefaultSetter ____
void SAL_CALL DiagramWrapper::set3DSettingsToDefault()
- throw (uno::RuntimeException, std::exception)
{
Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY );
if( x3DDefaultSetter.is() )
@@ -1141,7 +1106,6 @@ void SAL_CALL DiagramWrapper::set3DSettingsToDefault()
}
void SAL_CALL DiagramWrapper::setDefaultRotation()
- throw (uno::RuntimeException, std::exception)
{
Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY );
if( x3DDefaultSetter.is() )
@@ -1149,7 +1113,6 @@ void SAL_CALL DiagramWrapper::setDefaultRotation()
}
void SAL_CALL DiagramWrapper::setDefaultIllumination()
- throw (uno::RuntimeException, std::exception)
{
Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY );
if( x3DDefaultSetter.is() )
@@ -1158,7 +1121,6 @@ void SAL_CALL DiagramWrapper::setDefaultIllumination()
// ____ XComponent ____
void SAL_CALL DiagramWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this )));
@@ -1180,14 +1142,12 @@ void SAL_CALL DiagramWrapper::dispose()
void SAL_CALL DiagramWrapper::addEventListener(
const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL DiagramWrapper::removeEventListener(
const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
@@ -1198,14 +1158,11 @@ class WrappedDataRowSourceProperty : public WrappedProperty
public:
explicit WrappedDataRowSourceProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -1221,7 +1178,6 @@ WrappedDataRowSourceProperty::WrappedDataRowSourceProperty(const std::shared_ptr
}
void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS;
if( ! (rOuterValue >>= eChartDataRowSource) )
@@ -1257,7 +1213,6 @@ void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, con
}
Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OUString aRangeString;
bool bUseColumns = true;
@@ -1280,7 +1235,6 @@ Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPro
}
Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= css::chart::ChartDataRowSource_COLUMNS;
@@ -1295,14 +1249,11 @@ class WrappedStackingProperty : public WrappedProperty
public:
WrappedStackingProperty(StackMode eStackMode, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
protected: //methods
bool detectInnerValue( StackMode& eInnerStackMode ) const;
@@ -1346,7 +1297,6 @@ bool WrappedStackingProperty::detectInnerValue( StackMode& eStackMode ) const
}
void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
@@ -1375,7 +1325,6 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re
}
Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
StackMode eInnerStackMode;
if( detectInnerValue( eInnerStackMode ) )
@@ -1387,7 +1336,6 @@ Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XProperty
}
Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
@@ -1400,14 +1348,11 @@ class WrappedDim3DProperty : public WrappedProperty
public:
explicit WrappedDim3DProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -1423,7 +1368,6 @@ WrappedDim3DProperty::WrappedDim3DProperty(const std::shared_ptr<Chart2ModelCont
}
void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNew3D = false;
if( ! (rOuterValue >>= bNew3D) )
@@ -1441,7 +1385,6 @@ void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Refer
}
Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
if( xDiagram.is() )
@@ -1453,7 +1396,6 @@ Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet
}
Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
@@ -1466,14 +1408,11 @@ class WrappedVerticalProperty : public WrappedProperty
public:
explicit WrappedVerticalProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -1489,7 +1428,6 @@ WrappedVerticalProperty::WrappedVerticalProperty(const std::shared_ptr<Chart2Mod
}
void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNewVertical = false;
if( ! (rOuterValue >>= bNewVertical) )
@@ -1509,7 +1447,6 @@ void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Re
}
Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
if( xDiagram.is() )
@@ -1524,7 +1461,6 @@ Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XProperty
}
Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
@@ -1537,14 +1473,11 @@ class WrappedNumberOfLinesProperty : public WrappedProperty
public:
explicit WrappedNumberOfLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
protected: //methods
bool detectInnerValue( uno::Any& rInnerValue ) const;
@@ -1597,7 +1530,6 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con
}
void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
sal_Int32 nNewValue;
if( ! (rOuterValue >>= nNewValue) )
@@ -1664,7 +1596,6 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con
}
Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
if( !detectInnerValue( aRet ) )
@@ -1673,7 +1604,6 @@ Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPro
}
Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= sal_Int32( 0 );
@@ -1686,14 +1616,11 @@ class WrappedAttributedDataPointsProperty : public WrappedProperty
public:
explicit WrappedAttributedDataPointsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -1709,7 +1636,6 @@ WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty(const s
}
void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
uno::Sequence< uno::Sequence< sal_Int32 > > aNewValue;
if( ! (rOuterValue >>= aNewValue) )
@@ -1748,7 +1674,6 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal
}
Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY );
@@ -1781,7 +1706,6 @@ Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< bean
}
Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
uno::Sequence< uno::Sequence< sal_Int32 > > aSeq;
@@ -1795,14 +1719,11 @@ class WrappedSolidTypeProperty : public WrappedProperty
public:
explicit WrappedSolidTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -1818,7 +1739,6 @@ WrappedSolidTypeProperty::WrappedSolidTypeProperty(const std::shared_ptr<Chart2M
}
void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
sal_Int32 nNewSolidType = css::chart::ChartSolidType::RECTANGULAR_SOLID;
if( ! (rOuterValue >>= nNewSolidType) )
@@ -1838,7 +1758,6 @@ void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const R
}
Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
if( xDiagram.is() )
@@ -1853,7 +1772,6 @@ Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropert
}
Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return uno::makeAny( css::chart::ChartSolidType::RECTANGULAR_SOLID );
}
@@ -1863,14 +1781,11 @@ class WrappedAutomaticSizeProperty : public WrappedProperty
public:
WrappedAutomaticSizeProperty();
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
};
WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty()
@@ -1879,7 +1794,6 @@ WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty()
}
void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
if( xInnerPropertySet.is() )
{
@@ -1904,7 +1818,6 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con
}
Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
if( xInnerPropertySet.is() )
@@ -1917,7 +1830,6 @@ Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPro
}
Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
@@ -1930,10 +1842,8 @@ class WrappedIncludeHiddenCellsProperty : public WrappedProperty
public:
explicit WrappedIncludeHiddenCellsProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
- virtual Any getPropertyValue(const Reference<beans::XPropertySet>& xInnerPropertySet) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
+ virtual Any getPropertyValue(const Reference<beans::XPropertySet>& xInnerPropertySet) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -1946,7 +1856,6 @@ WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty(const std::
}
void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
@@ -1956,7 +1865,6 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue
}
Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bValue = ChartModelHelper::isIncludeHiddenCells( m_spChart2ModelContact->getChartModel() );
return uno::Any(bValue);
@@ -1964,14 +1872,12 @@ Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans:
// ____ XDiagramProvider ____
Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram()
- throw (uno::RuntimeException, std::exception)
{
return m_spChart2ModelContact->getChart2Diagram();
}
void SAL_CALL DiagramWrapper::setDiagram(
const Reference< chart2::XDiagram >& /*xDiagram*/ )
- throw (uno::RuntimeException, std::exception)
{
//@todo: remove this method from interface
OSL_FAIL("DiagramWrapper::setDiagram is not implemented, should be removed and not be called" );
@@ -2022,19 +1928,16 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
}
OUString SAL_CALL DiagramWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.Diagram");
}
sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.Diagram",
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index 24649f66bc0b..148e4705eb08 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -75,158 +75,116 @@ public:
virtual ~DiagramWrapper() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener( const css::uno::Reference<
- css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& xListener ) override;
virtual void SAL_CALL removeEventListener( const css::uno::Reference<
- css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& aListener ) override;
// ____ XDiagram ____
- virtual OUString SAL_CALL getDiagramType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getDiagramType() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) override;
// ____ XShape (base of XDiagram) ____
- virtual css::awt::Point SAL_CALL getPosition()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setSize( const css::awt::Size& aSize )
- throw (css::beans::PropertyVetoException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getPosition() override;
+ virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+ virtual css::awt::Size SAL_CALL getSize() override;
+ virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
// ____ XShapeDescriptor (base of XShape) ____
- virtual OUString SAL_CALL getShapeType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getShapeType() override;
// ____ XAxisSupplier ____
virtual css::uno::Reference<
- css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) override;
virtual css::uno::Reference<
- css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) override;
// ____ XAxisZSupplier ____
virtual css::uno::Reference<
- css::drawing::XShape > SAL_CALL getZAxisTitle()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::drawing::XShape > SAL_CALL getZAxisTitle() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getZMainGrid()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getZMainGrid() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getZHelpGrid()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getZHelpGrid() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getZAxis()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getZAxis() override;
// ____ XTwoAxisXSupplier ____
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getSecondaryXAxis()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getSecondaryXAxis() override;
// ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____
virtual css::uno::Reference<
- css::drawing::XShape > SAL_CALL getXAxisTitle()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::drawing::XShape > SAL_CALL getXAxisTitle() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getXAxis()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getXAxis() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getXMainGrid()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getXMainGrid() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getXHelpGrid()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getXHelpGrid() override;
// ____ XTwoAxisYSupplier ____
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getSecondaryYAxis()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getSecondaryYAxis() override;
// ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____
virtual css::uno::Reference<
- css::drawing::XShape > SAL_CALL getYAxisTitle()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::drawing::XShape > SAL_CALL getYAxisTitle() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getYAxis()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getYAxis() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getYHelpGrid()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getYHelpGrid() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getYMainGrid()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getYMainGrid() override;
// ____ XSecondAxisTitleSupplier ____
virtual css::uno::Reference<
- css::drawing::XShape > SAL_CALL getSecondXAxisTitle()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::drawing::XShape > SAL_CALL getSecondXAxisTitle() override;
virtual css::uno::Reference<
- css::drawing::XShape > SAL_CALL getSecondYAxisTitle()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::drawing::XShape > SAL_CALL getSecondYAxisTitle() override;
// ____ XStatisticDisplay ____
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getUpBar()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getUpBar() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getDownBar()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getDownBar() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getMinMaxLine()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getMinMaxLine() override;
// ____ X3DDisplay ____
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getWall()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getWall() override;
virtual css::uno::Reference<
- css::beans::XPropertySet > SAL_CALL getFloor()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::XPropertySet > SAL_CALL getFloor() override;
// ____ X3DDefaultSetter ____
- virtual void SAL_CALL set3DSettingsToDefault() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDefaultRotation() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDefaultIllumination() throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL set3DSettingsToDefault() override;
+ virtual void SAL_CALL setDefaultRotation() override;
+ virtual void SAL_CALL setDefaultIllumination() override;
// ____ XDiagramPositioning ____
- virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setAutomaticDiagramPositioning( ) override;
+ virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) override;
+ virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) override;
+ virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) override;
+ virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) override;
+ virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) override;
+ virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) override;
+ virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) override;
+ virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) override;
// ____ XDiagramProvider ____
- virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram() override;
+ virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override;
protected:
// ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index a1ee70db97f0..fb2fb8d7e8e2 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -109,7 +109,6 @@ void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDime
// ____ XComponent ____
void SAL_CALL GridWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -119,14 +118,12 @@ void SAL_CALL GridWrapper::dispose()
void SAL_CALL GridWrapper::addEventListener(
const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL GridWrapper::removeEventListener(
const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
@@ -170,19 +167,16 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties()
}
OUString SAL_CALL GridWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.Grid");
}
sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.ChartGrid",
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
index 818b5fea65b6..2e7097e8e207 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx
@@ -61,20 +61,14 @@ public:
static void getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid );
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
protected:
// ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 9d4f7ce0ba50..caa5bf8e1eaa 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -57,10 +57,8 @@ class WrappedLegendAlignmentProperty : public WrappedProperty
public:
WrappedLegendAlignmentProperty();
- virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override;
- virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+ virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+ virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
protected:
virtual Any convertInnerToOuterValue( const Any& rInnerValue ) const override;
@@ -73,7 +71,6 @@ WrappedLegendAlignmentProperty::WrappedLegendAlignmentProperty()
}
Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
if( xInnerPropertySet.is() )
@@ -94,7 +91,6 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP
}
void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
if(xInnerPropertySet.is())
{
@@ -280,13 +276,11 @@ LegendWrapper::~LegendWrapper()
// ____ XShape ____
awt::Point SAL_CALL LegendWrapper::getPosition()
- throw (uno::RuntimeException, std::exception)
{
return m_spChart2ModelContact->GetLegendPosition();
}
void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition )
- throw (uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
if( xProp.is() )
@@ -302,14 +296,11 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition )
}
awt::Size SAL_CALL LegendWrapper::getSize()
- throw (uno::RuntimeException, std::exception)
{
return m_spChart2ModelContact->GetLegendSize();
}
void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize )
- throw (beans::PropertyVetoException,
- uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() );
if( xProp.is() )
@@ -327,14 +318,12 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize )
// ____ XShapeDescriptor (base of XShape) ____
OUString SAL_CALL LegendWrapper::getShapeType()
- throw (uno::RuntimeException, std::exception)
{
return OUString( "com.sun.star.chart.ChartLegend" );
}
// ____ XComponent ____
void SAL_CALL LegendWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -345,14 +334,12 @@ void SAL_CALL LegendWrapper::dispose()
void SAL_CALL LegendWrapper::addEventListener(
const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL LegendWrapper::removeEventListener(
const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
@@ -415,19 +402,16 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties()
}
OUString SAL_CALL LegendWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.Legend");
}
sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.ChartLegend",
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 3c539c6aa779..c59bb25caddc 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -54,12 +54,9 @@ public:
virtual ~LegendWrapper() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() override;
@@ -67,29 +64,20 @@ public:
virtual css::awt::Size getCurrentSizeForReference() override;
// ____ XShape ____
- virtual css::awt::Point SAL_CALL getPosition()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setSize( const css::awt::Size& aSize )
- throw (css::beans::PropertyVetoException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getPosition() override;
+ virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+ virtual css::awt::Size SAL_CALL getSize() override;
+ virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
// ____ XShapeDescriptor (base of XShape) ____
- virtual OUString SAL_CALL getShapeType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getShapeType() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener( const css::uno::Reference<
- css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& xListener ) override;
virtual void SAL_CALL removeEventListener( const css::uno::Reference<
- css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& aListener ) override;
protected:
// ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 4b3f28773c2d..282fcdf5469a 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -130,7 +130,6 @@ MinMaxLineWrapper::~MinMaxLineWrapper()
// ____ XComponent ____
void SAL_CALL MinMaxLineWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -138,27 +137,23 @@ void SAL_CALL MinMaxLineWrapper::dispose()
void SAL_CALL MinMaxLineWrapper::addEventListener(
const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL MinMaxLineWrapper::removeEventListener(
const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
//XPropertySet
uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo()
- throw (uno::RuntimeException, std::exception)
{
return *StaticMinMaxLineWrapperInfo::get();
}
void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue )
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xPropSet(nullptr);
@@ -195,7 +190,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName
}
}
uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Any aRet;
@@ -237,22 +231,18 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rProperty
}
void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
@@ -260,7 +250,6 @@ void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& /
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
- throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<nMinCount; nN++)
@@ -278,7 +267,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUStrin
//todo: store unknown properties elsewhere
}
uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq )
- throw (uno::RuntimeException, std::exception)
{
Sequence< Any > aRetSeq;
if( rNameSeq.getLength() )
@@ -295,27 +283,23 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const u
void SAL_CALL MinMaxLineWrapper::addPropertiesChangeListener(
const uno::Sequence< OUString >& /* aPropertyNames */,
const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener(
const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent(
const uno::Sequence< OUString >& /* aPropertyNames */,
const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
//XPropertyState
beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) )
return beans::PropertyState_DEFAULT_VALUE;
@@ -329,7 +313,6 @@ beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUStrin
return beans::PropertyState_DIRECT_VALUE;
}
uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
Sequence< beans::PropertyState > aRetSeq;
if( rNameSeq.getLength() )
@@ -344,13 +327,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertySta
return aRetSeq;
}
void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
}
uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get();
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticMinMaxLineWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) );
@@ -362,7 +343,6 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rProper
//XMultiPropertyStates
//getPropertyStates() already declared in XPropertyState
void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( )
- throw (uno::RuntimeException, std::exception)
{
const Sequence< beans::Property >& rPropSeq = *StaticMinMaxLineWrapperPropertyArray::get();
for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
@@ -372,7 +352,6 @@ void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( )
}
}
void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
@@ -381,7 +360,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertiesToDefault( const uno::Sequence< OU
}
}
uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Sequence< Any > aRetSeq;
if( rNameSeq.getLength() )
@@ -397,19 +375,16 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const
}
OUString SAL_CALL MinMaxLineWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.ChartLine");
}
sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.ChartLine",
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index 860e70e1923c..07687651e728 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -59,51 +59,45 @@ public:
virtual ~MinMaxLineWrapper() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
//XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- 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;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
- virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+ virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
//XPropertyState
- virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+ virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
//XMultiPropertyStates
//getPropertyStates() already declared in XPropertyState
- virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setAllPropertiesToDefault( ) override;
+ virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index d70606fd28dd..3cbef7fb707d 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -51,12 +51,9 @@ class WrappedTitleStringProperty : public WrappedProperty
public:
explicit WrappedTitleStringProperty( const Reference< uno::XComponentContext >& xContext );
- virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override;
- virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
- virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+ virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+ virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+ virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
protected:
Reference< uno::XComponentContext > m_xContext;
@@ -69,7 +66,6 @@ WrappedTitleStringProperty::WrappedTitleStringProperty( const Reference< uno::XC
}
void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY);
if(xTitle.is())
@@ -80,7 +76,6 @@ void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const
}
}
Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY);
@@ -98,7 +93,6 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope
return aRet;
}
Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return uno::makeAny( OUString() );//default title is a empty String
}
@@ -205,13 +199,11 @@ TitleWrapper::~TitleWrapper()
// ____ XShape ____
awt::Point SAL_CALL TitleWrapper::getPosition()
- throw (uno::RuntimeException, std::exception)
{
return m_spChart2ModelContact->GetTitlePosition( this->getTitleObject() );
}
void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition )
- throw (uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xPropertySet( this->getInnerPropertySet() );
if(xPropertySet.is())
@@ -227,28 +219,23 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition )
}
awt::Size SAL_CALL TitleWrapper::getSize()
- throw (uno::RuntimeException, std::exception)
{
return m_spChart2ModelContact->GetTitleSize( this->getTitleObject() );
}
void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ )
- throw (beans::PropertyVetoException,
- uno::RuntimeException, std::exception)
{
OSL_FAIL( "trying to set size of title" );
}
// ____ XShapeDescriptor (base of XShape) ____
OUString SAL_CALL TitleWrapper::getShapeType()
- throw (uno::RuntimeException, std::exception)
{
return OUString( "com.sun.star.chart.ChartTitle" );
}
// ____ XComponent ____
void SAL_CALL TitleWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -259,14 +246,12 @@ void SAL_CALL TitleWrapper::dispose()
void SAL_CALL TitleWrapper::addEventListener(
const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL TitleWrapper::removeEventListener(
const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
@@ -309,7 +294,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue
}
void TitleWrapper::setFastCharacterPropertyValue(
- sal_Int32 nHandle, const Any& rValue ) throw (uno::Exception)
+ sal_Int32 nHandle, const Any& rValue )
{
OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle &&
nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP );
@@ -336,7 +321,6 @@ void TitleWrapper::setFastCharacterPropertyValue(
// WrappedPropertySet
void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue )
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) )
@@ -348,7 +332,6 @@ void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, con
}
Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Any aRet;
sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
@@ -360,7 +343,6 @@ Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName )
}
beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE );
@@ -383,7 +365,6 @@ beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rP
return aState;
}
void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) )
@@ -395,7 +376,6 @@ void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName
WrappedPropertySet::setPropertyToDefault( rPropertyName );
}
Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Any aRet;
@@ -419,7 +399,6 @@ Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName )
}
void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) )
@@ -432,7 +411,6 @@ void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rProperty
WrappedPropertySet::addPropertyChangeListener( rPropertyName, xListener );
}
void SAL_CALL TitleWrapper::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName );
if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) )
@@ -502,19 +480,16 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties()
}
OUString SAL_CALL TitleWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.Title");
}
sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.ChartTitle",
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index 4017385040b9..b986eb9a2c8c 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -53,12 +53,9 @@ public:
virtual ~TitleWrapper() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
//ReferenceSizePropertyProvider
virtual void updateReferenceSize() override;
@@ -67,45 +64,35 @@ public:
protected:
// ____ XShape ____
- virtual css::awt::Point SAL_CALL getPosition()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setSize( const css::awt::Size& aSize )
- throw (css::beans::PropertyVetoException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Point SAL_CALL getPosition() override;
+ virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override;
+ virtual css::awt::Size SAL_CALL getSize() override;
+ virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override;
// ____ XShapeDescriptor (base of XShape) ____
- virtual OUString SAL_CALL getShapeType()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getShapeType() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// character properties have to be handled differently (via the XFormattedString elements)
void getFastCharacterPropertyValue( sal_Int32 nHandle, css::uno::Any& rValue );
/// @throws css::uno::Exception
- void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue )
- throw (css::uno::Exception);
+ void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue );
// ____ WrappedPropertySet ____
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
- virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
- virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override;
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index ef048b1d945d..19bd0ba2ac1b 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -138,7 +138,6 @@ UpDownBarWrapper::~UpDownBarWrapper()
// ____ XComponent ____
void SAL_CALL UpDownBarWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -146,26 +145,22 @@ void SAL_CALL UpDownBarWrapper::dispose()
void SAL_CALL UpDownBarWrapper::addEventListener(
const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL UpDownBarWrapper::removeEventListener(
const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
//XPropertySet
uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo()
- throw (uno::RuntimeException, std::exception)
{
return *StaticUpDownBarWrapperInfo::get();
}
void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue )
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Reference< beans::XPropertySet > xPropSet(nullptr);
@@ -187,7 +182,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName,
xPropSet->setPropertyValue( rPropertyName, rValue );
}
uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Any aRet;
@@ -213,22 +207,18 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyN
}
void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
@@ -236,7 +226,6 @@ void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /*
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq )
- throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<nMinCount; nN++)
@@ -254,7 +243,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString
//todo: store unknown properties elsewhere
}
uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq )
- throw (uno::RuntimeException, std::exception)
{
Sequence< Any > aRetSeq;
if( rNameSeq.getLength() )
@@ -269,24 +257,20 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un
return aRetSeq;
}
void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ )
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
//XPropertyState
beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
uno::Any aDefault( this->getPropertyDefault( rPropertyName ) );
uno::Any aValue( this->getPropertyValue( rPropertyName ) );
@@ -297,7 +281,6 @@ beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString
return beans::PropertyState_DIRECT_VALUE;
}
uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
Sequence< beans::PropertyState > aRetSeq;
if( rNameSeq.getLength() )
@@ -312,13 +295,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat
return aRetSeq;
}
void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) );
}
uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get();
tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticUpDownBarWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) );
@@ -330,7 +311,6 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropert
//XMultiPropertyStates
//getPropertyStates() already declared in XPropertyState
void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( )
- throw (uno::RuntimeException, std::exception)
{
const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::get();
for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
@@ -340,7 +320,6 @@ void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( )
}
}
void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUString >& rNameSeq )
- throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception)
{
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
@@ -349,7 +328,6 @@ void SAL_CALL UpDownBarWrapper::setPropertiesToDefault( const uno::Sequence< OUS
}
}
uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
Sequence< Any > aRetSeq;
if( rNameSeq.getLength() )
@@ -365,19 +343,16 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const
}
OUString SAL_CALL UpDownBarWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.ChartArea");
}
sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.chart.ChartArea",
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index dca66c5333fc..6e902d487062 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -58,53 +58,47 @@ public:
virtual ~UpDownBarWrapper() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
virtual void SAL_CALL addEventListener( const css::uno::Reference<
- css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& xListener ) override;
virtual void SAL_CALL removeEventListener( const css::uno::Reference<
- css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::lang::XEventListener >& aListener ) override;
//XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- 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;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
- virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+ virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
//XPropertyState
- virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+ virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
//XMultiPropertyStates
//getPropertyStates() already declared in XPropertyState
- virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setAllPropertiesToDefault( ) override;
+ virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 9610bb600392..f179264767fe 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -93,7 +93,6 @@ WallFloorWrapper::~WallFloorWrapper()
// ____ XComponent ____
void SAL_CALL WallFloorWrapper::dispose()
- throw (uno::RuntimeException, std::exception)
{
Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) );
@@ -104,14 +103,12 @@ void SAL_CALL WallFloorWrapper::dispose()
void SAL_CALL WallFloorWrapper::addEventListener(
const Reference< lang::XEventListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.addInterface( xListener );
}
void SAL_CALL WallFloorWrapper::removeEventListener(
const Reference< lang::XEventListener >& aListener )
- throw (uno::RuntimeException, std::exception)
{
m_aEventListenerContainer.removeInterface( aListener );
}
@@ -153,19 +150,16 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties(
}
OUString SAL_CALL WallFloorWrapper::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart.WallOrFloor");
}
sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.xml.UserDefinedAttributesSupplier",
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
index 60cd15aff708..c49e6c9ccdbd 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx
@@ -48,20 +48,14 @@ public:
virtual ~WallFloorWrapper() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
protected:
// ____ WrappedPropertySet ____
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index 241f716c09ca..ffd6baa83711 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -39,7 +39,6 @@ WrappedAddInProperty::~WrappedAddInProperty()
}
void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
Reference< util::XRefreshable > xAddIn;
if( ! (rOuterValue >>= xAddIn) )
@@ -49,7 +48,6 @@ void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Refer
}
Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return uno::makeAny( m_rChartDocumentWrapper.getAddIn() );
}
@@ -64,7 +62,6 @@ WrappedBaseDiagramProperty::~WrappedBaseDiagramProperty()
}
void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
OUString aBaseDiagram;
if( ! (rOuterValue >>= aBaseDiagram) )
@@ -74,7 +71,6 @@ void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const
}
Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return uno::makeAny( m_rChartDocumentWrapper.getBaseDiagram() );
}
@@ -89,13 +85,11 @@ WrappedAdditionalShapesProperty::~WrappedAdditionalShapesProperty()
}
void WrappedAdditionalShapesProperty::setPropertyValue( const Any& /*rOuterValue*/, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
throw lang::IllegalArgumentException( "AdditionalShapes is a read only property", nullptr, 0 );
}
Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return uno::makeAny( m_rChartDocumentWrapper.getAdditionalShapes() );
}
@@ -110,7 +104,6 @@ WrappedRefreshAddInAllowedProperty::~WrappedRefreshAddInAllowedProperty()
}
void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bUpdateAddIn = true;
if( ! (rOuterValue >>= bUpdateAddIn) )
@@ -120,7 +113,6 @@ void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValu
}
Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return uno::makeAny( m_rChartDocumentWrapper.getUpdateAddIn() );
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
index fc7ea946935b..a95bf97bc4f9 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx
@@ -33,11 +33,9 @@ public:
explicit WrappedAddInProperty( ChartDocumentWrapper& rChartDocumentWrapper );
virtual ~WrappedAddInProperty() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
private:
ChartDocumentWrapper& m_rChartDocumentWrapper;
@@ -49,11 +47,9 @@ public:
explicit WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper );
virtual ~WrappedBaseDiagramProperty() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
private:
ChartDocumentWrapper& m_rChartDocumentWrapper;
@@ -65,11 +61,9 @@ public:
explicit WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper );
virtual ~WrappedAdditionalShapesProperty() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
private:
ChartDocumentWrapper& m_rChartDocumentWrapper;
@@ -81,11 +75,9 @@ public:
explicit WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper );
virtual ~WrappedRefreshAddInAllowedProperty() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
private:
ChartDocumentWrapper& m_rChartDocumentWrapper;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 605fd723cb86..39bcb5140f41 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -38,12 +38,9 @@ class WrappedAutomaticPositionProperty : public WrappedProperty
public:
WrappedAutomaticPositionProperty();
- virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override;
- virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
- virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+ virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+ virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+ virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
};
WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
@@ -52,7 +49,6 @@ WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
}
void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
if( xInnerPropertySet.is() )
{
@@ -77,7 +73,6 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue,
}
Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
if( xInnerPropertySet.is() )
@@ -90,7 +85,6 @@ Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans::
}
Any WrappedAutomaticPositionProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 8aebd9fb02cb..bd80bbd16009 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -38,14 +38,11 @@ public:
WrappedAxisAndGridExistenceProperty( bool bAxis, bool bMain, sal_Int32 nDimensionIndex
, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -139,7 +136,6 @@ WrappedAxisAndGridExistenceProperty::WrappedAxisAndGridExistenceProperty( bool b
}
void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
@@ -169,7 +165,6 @@ void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterVal
}
Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
@@ -187,7 +182,6 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< bean
}
Any WrappedAxisAndGridExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
@@ -200,14 +194,11 @@ public:
WrappedAxisTitleExistenceProperty( sal_Int32 nTitleIndex
, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -256,7 +247,6 @@ WrappedAxisTitleExistenceProperty::WrappedAxisTitleExistenceProperty(sal_Int32 n
}
void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
@@ -281,7 +271,6 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue
}
Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bHasTitle = false;
@@ -296,7 +285,6 @@ Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans:
}
Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
@@ -309,14 +297,11 @@ public:
WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex
, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -357,7 +342,6 @@ WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain,
}
void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
@@ -383,7 +367,6 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue
}
Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
@@ -396,7 +379,6 @@ Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans:
}
Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= true;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 78a0076f82f8..0a63ae3cb19a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -51,7 +51,6 @@ void WrappedCharacterHeightProperty::addWrappedProperties( std::vector< WrappedP
}
void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
if(xInnerPropertySet.is())
{
@@ -62,7 +61,6 @@ void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterVal
}
Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
if( xInnerPropertySet.is() )
@@ -87,7 +85,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< bean
}
Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
if( xInnerPropertyState.is() )
@@ -98,7 +95,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< be
}
beans::PropertyState WrappedCharacterHeightProperty_Base::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException)
{
return beans::PropertyState_DIRECT_VALUE;
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
index cd065de41d33..6902ebb91b86 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
@@ -36,17 +36,13 @@ public:
WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider );
virtual ~WrappedCharacterHeightProperty_Base() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
- virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+ virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
protected:
virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
index 9e135594fe82..93bbda452c22 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx
@@ -55,9 +55,7 @@ public:
WrappedGL3DProperty( const OUString& rInName, const OUString& rOutName, const uno::Any& rDefault, const std::shared_ptr<Chart2ModelContact>& pContact ) :
WrappedProperty(rInName, rOutName), maDefault(rDefault), mpModelContact(pContact) {}
- virtual uno::Any getPropertyValue( const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException,
- uno::RuntimeException) override
+ virtual uno::Any getPropertyValue( const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override
{
uno::Reference<chart2::XChartType> xCT = getChartType();
if (!xCT.is())
@@ -74,10 +72,7 @@ public:
};
virtual void setPropertyValue(
- const uno::Any& rOutValue, const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException,
- lang::IllegalArgumentException, lang::WrappedTargetException,
- uno::RuntimeException) override
+ const uno::Any& rOutValue, const uno::Reference<beans::XPropertySet>& /*xInnerPS*/ ) const override
{
uno::Reference<chart2::XChartType> xCT = getChartType();
if (!xCT.is())
@@ -91,8 +86,7 @@ public:
catch ( const uno::Exception& ) {}
}
- virtual void setPropertyToDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPropState*/ ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException) override
+ virtual void setPropertyToDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPropState*/ ) const override
{
uno::Reference<chart2::XChartType> xCT = getChartType();
if (!xCT.is())
@@ -106,15 +100,12 @@ public:
catch ( const uno::Exception& ) {}
}
- virtual uno::Any getPropertyDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException,
- uno::RuntimeException) override
+ virtual uno::Any getPropertyDefault( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override
{
return maDefault;
}
- virtual beans::PropertyState getPropertyState( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException) override
+ virtual beans::PropertyState getPropertyState( const uno::Reference<beans::XPropertyState>& /*xInnerPS*/ ) const override
{
return beans::PropertyState_DIRECT_VALUE;
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 68d9681345e9..57fa2a3aa3c2 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -59,7 +59,6 @@ WrappedBarPositionProperty_Base::~WrappedBarPositionProperty_Base()
}
void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
sal_Int32 nNewValue = 0;
if( ! (rOuterValue >>= nNewValue) )
@@ -109,7 +108,6 @@ void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue,
}
Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
if( xDiagram.is() )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
index 27b51f40a9a4..8838ed066d1a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
@@ -39,11 +39,9 @@ public:
, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
virtual ~WrappedBarPositionProperty_Base() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
void setDimensionAndAxisIndex( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index 966dead7aad7..0b41f8900c9a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -42,7 +42,6 @@ WrappedNumberFormatProperty::~WrappedNumberFormatProperty()
}
void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
sal_Int32 nFormat = 0;
if( ! (rOuterValue >>= nFormat) )
@@ -53,7 +52,6 @@ void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, cons
}
Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
if( !xInnerPropertySet.is() )
{
@@ -78,7 +76,6 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp
}
Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return uno::makeAny( sal_Int32( 0 ) );
}
@@ -93,7 +90,6 @@ WrappedLinkNumberFormatProperty::~WrappedLinkNumberFormatProperty()
}
void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
if( !xInnerPropertySet.is() )
{
@@ -105,7 +101,6 @@ void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue,
}
Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
if( !xInnerPropertySet.is() )
{
@@ -117,7 +112,6 @@ Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::X
}
Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
bool bLink = true;
return uno::makeAny( bLink );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
index 567e9320c597..296e1fcc7262 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx
@@ -37,14 +37,11 @@ public:
explicit WrappedNumberFormatProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
virtual ~WrappedNumberFormatProperty() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
friend class WrappedLinkNumberFormatProperty;
private:
@@ -57,14 +54,11 @@ public:
explicit WrappedLinkNumberFormatProperty();
virtual ~WrappedLinkNumberFormatProperty() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
};
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 2be350b47a0f..bd042609183e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -125,19 +125,16 @@ void WrappedScaleProperty::addWrappedProperties( std::vector< WrappedProperty* >
}
void WrappedScaleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
setPropertyValue( m_eScaleProperty, rOuterValue, xInnerPropertySet );
}
Any WrappedScaleProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
return getPropertyValue( m_eScaleProperty, xInnerPropertySet );
}
void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
m_aOuterValue = rOuterValue;
@@ -345,7 +342,6 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons
}
Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet( m_aOuterValue );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
index 164731da68ca..35bd6b30bcf7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx
@@ -59,11 +59,9 @@ public:
static void addWrappedProperties( std::vector< WrappedProperty* >& rList, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
protected: //methods
/// @throws css::beans::UnknownPropertyException
@@ -71,13 +69,11 @@ protected: //methods
/// @throws css::lang::IllegalArgumentException
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
- void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const;
/// @throws css::beans::UnknownPropertyException
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
- css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const;
private: //member
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 6d19e2ef31c5..5bdd1404089c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -38,12 +38,9 @@ class WrappedScaleTextProperty : public WrappedProperty
public:
explicit WrappedScaleTextProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override;
- virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
- virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
+ virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+ virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+ virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
@@ -56,7 +53,6 @@ WrappedScaleTextProperty::WrappedScaleTextProperty(const std::shared_ptr<Chart2M
}
void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
static const char aRefSizeName[] = "ReferencePageSize";
@@ -87,7 +83,6 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R
}
Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) );
if( xInnerPropertySet.is() )
@@ -102,7 +97,6 @@ Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropert
}
Any WrappedScaleTextProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
aRet <<= false;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index fb1fa0360d4d..0de7f6d77378 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -50,7 +50,6 @@ WrappedD3DTransformMatrixProperty::~WrappedD3DTransformMatrixProperty()
}
void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException)
{
if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) )
{
@@ -76,7 +75,6 @@ void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue
}
Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
index 36564addd3c2..e587f417296c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx
@@ -44,11 +44,9 @@ public:
const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
virtual ~WrappedD3DTransformMatrixProperty() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
private:
std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index 14bbb7d4fd5e..e5ba28c44b45 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -109,8 +109,7 @@ public:
}
}
}
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override
{
PROPERTYTYPE aNewValue = PROPERTYTYPE();
if( ! (rOuterValue >>= aNewValue) )
@@ -134,8 +133,7 @@ public:
}
}
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override
{
if( m_ePropertyType == DIAGRAM )
{
@@ -158,8 +156,7 @@ public:
}
}
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const override
{
return m_aDefaultValue;
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index e7af4fffaf94..9b1d869ee5e7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -93,8 +93,7 @@ public:
}
return bHasDetectableInnerValue;
}
- void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+ void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override
{
PROPERTYTYPE aNewValue;
if( ! (rOuterValue >>= aNewValue) )
@@ -131,8 +130,7 @@ public:
}
}
- css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+ css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override
{
bool bHasAmbiguousValue = false;
PROPERTYTYPE aValue;
@@ -143,8 +141,7 @@ public:
return m_aOuterValue;
}
- css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override
+ css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const override
{
return m_aDefaultValue;
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 1b95c37d9252..c7f16fe0d61b 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -42,11 +42,9 @@ public:
, const css::uno::Any& rDefaulValue
, const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact );
- void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0;
@@ -67,7 +65,6 @@ WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName
}
void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{
bool bNewValue = false;
if( ! (rOuterValue >>= bNewValue) )
@@ -104,7 +101,6 @@ void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, c
}
css::uno::Any WrappedStockProperty::getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{
return m_aDefaultValue;
}
@@ -114,8 +110,7 @@ class WrappedVolumeProperty : public WrappedStockProperty
public:
explicit WrappedVolumeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override;
};
@@ -126,7 +121,6 @@ WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr<Chart2ModelCo
}
css::uno::Any WrappedVolumeProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{
Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
@@ -181,8 +175,7 @@ class WrappedUpDownProperty : public WrappedStockProperty
public:
explicit WrappedUpDownProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact);
- css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override;
};
@@ -193,7 +186,6 @@ WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr<Chart2ModelCo
}
css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException)
{
Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 1f8a99eff6c5..ba107ea2e72b 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -55,10 +55,8 @@ public:
virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const override;
- virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override;
- virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException) override;
+ virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override;
+ virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
explicit WrappedSymbolTypeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType);
@@ -79,8 +77,7 @@ class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty< awt::Si
public:
virtual awt::Size getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const awt::Size& aNewSize ) const override;
- virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException) override;
+ virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
explicit WrappedSymbolSizeProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType);
@@ -91,8 +88,7 @@ class WrappedSymbolAndLinesProperty : public WrappedSeriesOrDiagramProperty< boo
public:
virtual bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& bDrawLines ) const override;
- virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException) override;
+ virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override;
explicit WrappedSymbolAndLinesProperty(const std::shared_ptr<Chart2ModelContact>& spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType);
@@ -242,7 +238,6 @@ void WrappedSymbolTypeProperty::setValueToSeries( const Reference< beans::XPrope
}
Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
- throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
//the old chart (< OOo 2.3) needs symbol-type="automatic" at the plot-area if any of the series should be able to have symbols
if( m_ePropertyType == DIAGRAM )
@@ -274,7 +269,6 @@ Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XProper
}
beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException)
{
//the special situation for this property here is that the diagram default can be
//different from the normal default and different from all singles series values
@@ -451,7 +445,6 @@ void WrappedSymbolSizeProperty::setValueToSeries(
}
beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException)
{
//only export symbol size if necessary
if( m_ePropertyType == DIAGRAM )
@@ -511,7 +504,6 @@ void WrappedSymbolAndLinesProperty::setValueToSeries(
}
beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException)
{
//do not export this property anymore, instead use a linestyle none for no lines
return beans::PropertyState_DEFAULT_VALUE;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index 9d496a3d9886..bd371b35b80e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -37,7 +37,6 @@ WrappedTextRotationProperty::~WrappedTextRotationProperty()
}
beans::PropertyState WrappedTextRotationProperty::getPropertyState( const uno::Reference< beans::XPropertyState >& xInnerPropertyState ) const
- throw (beans::UnknownPropertyException, uno::RuntimeException)
{
if( m_bDirectState )
return beans::PropertyState_DIRECT_VALUE;
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
index 8525d61be525..faf102bb0b6e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx
@@ -30,8 +30,7 @@ public:
explicit WrappedTextRotationProperty( bool bDirectState=false );
virtual ~WrappedTextRotationProperty() override;
- virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+ virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
protected:
virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override;
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index b9b82fc0705d..1d434d4f86e6 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -403,7 +403,7 @@ void ChartTypeDialogController::fillExtraControls( const ChartTypeParameter& /*r
, const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const
{
}
-void ChartTypeDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const throw (uno::RuntimeException)
+void ChartTypeDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const
{
}
@@ -1224,7 +1224,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar
m_pMF_NumberOfLines->SetLast( nMaxLines );
m_pMF_NumberOfLines->SetMax( nMaxLines );
}
-void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& xTemplateProps ) const throw (uno::RuntimeException)
+void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& xTemplateProps ) const
{
if( xTemplateProps.is() )
{
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 39647f97a580..0c40bd95087b 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -112,7 +112,7 @@ public:
, const css::uno::Reference< css::chart2::XChartDocument >& xChartModel
, const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const;
/// @throws css::uno::RuntimeException
- virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException);
+ virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const;
bool isSubType( const OUString& rServiceName );
ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const css::uno::Reference<
@@ -278,7 +278,7 @@ public:
, const css::uno::Reference< css::chart2::XChartDocument >& xChartModel
, const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const override;
- virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException) override;
+ virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const override;
private:
DECL_LINK( ChangeLineCountHdl, Edit&, void );
diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
index a6860d374494..f3ffec17c85b 100644
--- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
@@ -40,21 +40,18 @@ RangeSelectionListener::~RangeSelectionListener()
// ____ XRangeSelectionListener ____
void SAL_CALL RangeSelectionListener::done( const sheet::RangeSelectionEvent& aEvent )
- throw (uno::RuntimeException, std::exception)
{
m_aRange = aEvent.RangeDescriptor;
m_rParent.listeningFinished( m_aRange );
}
void SAL_CALL RangeSelectionListener::aborted( const sheet::RangeSelectionEvent& /*aEvent*/ )
- throw (uno::RuntimeException, std::exception)
{
m_rParent.listeningFinished( m_aRange );
}
// ____ XEventListener ____
void SAL_CALL RangeSelectionListener::disposing( const lang::EventObject& /*Source*/ )
- throw (uno::RuntimeException, std::exception)
{
m_rParent.disposingRangeSelection();
}
diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index fc1384d52e3f..71f5c00bd82a 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -41,16 +41,16 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg()
}
}
// lang::XServiceInfo
-OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException, std::exception)
+OUString SAL_CALL ChartTypeUnoDlg::getImplementationName()
{
return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME);
}
-css::uno::Sequence<OUString> SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception)
+css::uno::Sequence<OUString> SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames()
{
return { CHART_TYPE_DIALOG_SERVICE_NAME };
}
-uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception )
+uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
@@ -71,7 +71,7 @@ VclPtr<Dialog> ChartTypeUnoDlg::createDialog(vcl::Window* _pParent)
{
return VclPtr<ChartTypeDialog>::Create( _pParent, m_xChartModel );
}
-uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException, std::exception)
+uno::Reference<beans::XPropertySetInfo> SAL_CALL ChartTypeUnoDlg::getPropertySetInfo()
{
return createPropertySetInfo( getInfoHelper() );
}
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 065a511ea68d..096fecf0c1e5 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -58,25 +58,22 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg()
}
// lang::XServiceInfo
OUString SAL_CALL CreationWizardUnoDlg::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString(CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL CreationWizardUnoDlg::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return { CHART_WIZARD_DIALOG_SERVICE_NAME };
}
// XInterface
-uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType )
{
return OComponentHelper::queryInterface( aType );
}
@@ -88,7 +85,7 @@ void SAL_CALL CreationWizardUnoDlg::release() throw ()
{
OComponentHelper::release();
}
-uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) throw (uno::RuntimeException, std::exception)
+uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType )
{
if (rType == cppu::UnoType<ui::dialogs::XExecutableDialog>::get())
{
@@ -118,7 +115,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rTyp
return OComponentHelper::queryAggregation( rType );
}
-uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException, std::exception)
+uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes()
{
static uno::Sequence< uno::Type > aTypeList;
@@ -141,28 +138,28 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx
return aTypeList;
}
-uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception )
+uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
// XTerminateListener
-void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ )
{
}
-void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ )
{
// we are going down, so dispose us!
dispose();
}
-void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ )
{
//Listener should deregister himself and release all references to the closing object.
}
-void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ )
{
}
void CreationWizardUnoDlg::createDialogOnDemand()
@@ -203,7 +200,7 @@ IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void )
m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog
}
-sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException, std::exception)
+sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( )
{
sal_Int16 nRet = RET_CANCEL;
{
@@ -219,7 +216,7 @@ sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException
return nRet;
}
-void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException, std::exception)
+void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments )
{
const uno::Any* pArguments = aArguments.getConstArray();
for(sal_Int32 i=0; i<aArguments.getLength(); ++i, ++pArguments)
@@ -263,7 +260,6 @@ void SAL_CALL CreationWizardUnoDlg::disposing()
//XPropertySet
uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getPropertySetInfo()
- throw (uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
return nullptr;
@@ -271,8 +267,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getProp
void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyName
, const uno::Any& rValue )
- throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException
- , lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
if( rPropertyName == "Position" )
{
@@ -307,7 +301,6 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyN
}
uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
uno::Any aRet;
if( rPropertyName == "Position" )
@@ -347,25 +340,21 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope
void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener(
const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener(
const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ )
- throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception)
{
OSL_FAIL("not implemented");
}
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index 07416aef68b4..f20c14d3f71e 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -116,7 +116,7 @@ protected:
false otherwise
@throws css::lang::DisposedException
*/
- bool CheckDisposeState( bool bThrowException = true ) const throw (css::lang::DisposedException);
+ bool CheckDisposeState( bool bThrowException = true ) const;
/** Events coming from the core have to be processed in this methods. The
default implementation returns false, which indicates that the object is
@@ -137,14 +137,14 @@ protected:
@throws css::uno::RuntimeException
*/
- void AddState( sal_Int16 aState ) throw (css::uno::RuntimeException);
+ void AddState( sal_Int16 aState );
/** Removes a state from the set if the set contains the state, otherwise
nothing is done.
@throws css::uno::RuntimeException
*/
- void RemoveState( sal_Int16 aState ) throw (css::uno::RuntimeException);
+ void RemoveState( sal_Int16 aState );
/** has to be overridden by derived classes that support child elements.
With this method a rescan is initiated that should result in a correct
@@ -211,17 +211,14 @@ protected:
@throws css::uno::RuntimeException
*/
virtual css::uno::Reference< css::accessibility::XAccessible >
- ImplGetAccessibleChildById( sal_Int32 i ) const
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException);
+ ImplGetAccessibleChildById( sal_Int32 i ) const;
/** Is called from getAccessibleChildCount(). Before this method is called,
an update of children is done if necessary.
@throws css::uno::RuntimeException
*/
- virtual sal_Int32 ImplGetAccessibleChildCount() const
- throw (css::uno::RuntimeException);
+ virtual sal_Int32 ImplGetAccessibleChildCount() const;
const AccessibleElementInfo& GetInfo() const { return m_aAccInfo;}
void SetInfo( const AccessibleElementInfo & rNewInfo );
@@ -231,84 +228,58 @@ protected:
virtual void SAL_CALL disposing() override;
// ________ XAccessible ________
- virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override;
// ________ XAccessibleContext ________
- virtual sal_Int32 SAL_CALL getAccessibleChildCount()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int32 SAL_CALL getAccessibleChildCount() override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
- getAccessibleChild( sal_Int32 i )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
+ getAccessibleChild( sal_Int32 i ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
- getAccessibleParent()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
- throw (css::uno::RuntimeException, std::exception) override;
+ getAccessibleParent() override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
/// @return AccessibleRole.SHAPE
- virtual sal_Int16 SAL_CALL getAccessibleRole()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole() override;
// has to be implemented by derived classes
// virtual OUString SAL_CALL getAccessibleName()
// throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL
- getAccessibleRelationSet()
- throw (css::uno::RuntimeException, std::exception) override;
+ getAccessibleRelationSet() override;
virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL
- getAccessibleStateSet()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::lang::Locale SAL_CALL getLocale()
- throw (css::accessibility::IllegalAccessibleComponentStateException,
- css::uno::RuntimeException, std::exception) override;
+ getAccessibleStateSet() override;
+ virtual css::lang::Locale SAL_CALL getLocale() override;
// has to be implemented by derived classes
// virtual OUString SAL_CALL getAccessibleDescription()
// throw (css::uno::RuntimeException);
// ________ XAccessibleComponent ________
virtual sal_Bool SAL_CALL containsPoint(
- const css::awt::Point& aPoint )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::awt::Point& aPoint ) override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
- getAccessibleAtPoint( const css::awt::Point& aPoint )
- throw (css::uno::RuntimeException, std::exception) override;
+ getAccessibleAtPoint( const css::awt::Point& aPoint ) override;
// has to be defined in derived classes
- virtual css::awt::Rectangle SAL_CALL getBounds()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocation()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocationOnScreen()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Size SAL_CALL getSize()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL grabFocus()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getForeground()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getBackground()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds() override;
+ virtual css::awt::Point SAL_CALL getLocation() override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
+ virtual css::awt::Size SAL_CALL getSize() override;
+ virtual void SAL_CALL grabFocus() override;
+ virtual sal_Int32 SAL_CALL getForeground() override;
+ virtual sal_Int32 SAL_CALL getBackground() override;
// ________ XServiceInfo ________
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService(
- const OUString& ServiceName )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ________ XEventListener ________
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
// ________ XAccessibleEventBroadcaster ________
virtual void SAL_CALL addAccessibleEventListener(
- const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
virtual void SAL_CALL removeAccessibleEventListener(
- const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override;
private:
enum eColorType
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index a82fc8bd64f0..5fce27f6be09 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -73,31 +73,24 @@ public:
// 4: awt::XWindow representing the view's window (is a vcl Window)
// all arguments are only valid until next initialization - don't keep them longer
virtual void SAL_CALL initialize(
- const css::uno::Sequence< css::uno::Any >& aArguments )
- throw (css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// ____ view::XSelectionChangeListener ____
- virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override;
// ________ XEventListener ________
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// ________ XAccessibleContext ________
- virtual OUString SAL_CALL getAccessibleDescription()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL getAccessibleRole()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getAccessibleDescription() override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override;
+ virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+ virtual OUString SAL_CALL getAccessibleName() override;
+ virtual sal_Int16 SAL_CALL getAccessibleRole() override;
// ________ XAccessibleComponent ________
- virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override;
- virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::awt::Rectangle SAL_CALL getBounds() override;
+ virtual css::awt::Point SAL_CALL getLocationOnScreen() override;
protected:
// ________ AccessibleChartElement ________
diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx
index 27744de6d085..bd12ac349475 100644
--- a/chart2/source/controller/inc/AccessibleTextHelper.hxx
+++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx
@@ -65,34 +65,20 @@ public:
text currently.
*/
virtual void SAL_CALL initialize(
- const css::uno::Sequence< css::uno::Any >& aArguments )
- throw (css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// ____ XAccessibleContext ____
- virtual ::sal_Int32 SAL_CALL getAccessibleChildCount()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override;
virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild(
- ::sal_Int32 i )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int16 SAL_CALL getAccessibleRole()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleDescription()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getAccessibleName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::lang::Locale SAL_CALL getLocale()
- throw (css::accessibility::IllegalAccessibleComponentStateException,
- css::uno::RuntimeException, std::exception) override;
+ ::sal_Int32 i ) override;
+ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override;
+ virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() override;
+ virtual ::sal_Int16 SAL_CALL getAccessibleRole() override;
+ virtual OUString SAL_CALL getAccessibleDescription() override;
+ virtual OUString SAL_CALL getAccessibleName() override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override;
+ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override;
+ virtual css::lang::Locale SAL_CALL getLocale() override;
private:
std::unique_ptr<::accessibility::AccessibleTextHelper> m_pTextHelper;
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx
index ab787002a155..24a7e412ab87 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -52,10 +52,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( css::uno::Exception ) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( css::uno::Exception ) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
::std::vector< ItemConverter * > m_aConverters;
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 82615553a34d..5c21d43c9365 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -46,10 +46,8 @@ public:
protected:
virtual const sal_uInt16* GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw (css::uno::Exception) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw (css::uno::Exception) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
const css::uno::Reference<css::beans::XPropertySet>& GetRefSizePropertySet() const;
diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx
index eb2ba8857696..40b31bc6ec00 100644
--- a/chart2/source/controller/inc/ChartController.hxx
+++ b/chart2/source/controller/inc/ChartController.hxx
@@ -112,225 +112,175 @@ public:
OUString GetContextName();
// css::lang::XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// css::frame::XController (required interface)
virtual void SAL_CALL
- attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame )
- throw (css::uno::RuntimeException, std::exception) override;
+ attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) override;
virtual sal_Bool SAL_CALL
- attachModel( const css::uno::Reference< css::frame::XModel > & xModel )
- throw (css::uno::RuntimeException, std::exception) override;
+ attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) override;
virtual css::uno::Reference< css::frame::XFrame > SAL_CALL
- getFrame() throw (css::uno::RuntimeException, std::exception) override;
+ getFrame() override;
virtual css::uno::Reference< css::frame::XModel > SAL_CALL
- getModel() throw (css::uno::RuntimeException, std::exception) override;
+ getModel() override;
virtual css::uno::Any SAL_CALL
- getViewData() throw (css::uno::RuntimeException, std::exception) override;
+ getViewData() override;
virtual void SAL_CALL
- restoreViewData( const css::uno::Any& rValue )
- throw (css::uno::RuntimeException, std::exception) override;
+ restoreViewData( const css::uno::Any& rValue ) override;
virtual sal_Bool SAL_CALL
- suspend( sal_Bool bSuspend )
- throw (css::uno::RuntimeException, std::exception) override;
+ suspend( sal_Bool bSuspend ) override;
// css::lang::XComponent (base of XController)
virtual void SAL_CALL
- dispose() throw (css::uno::RuntimeException, std::exception) override;
+ dispose() override;
virtual void SAL_CALL
- addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
virtual void SAL_CALL
- removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override;
// css::frame::XDispatchProvider (required interface)
virtual css::uno::Reference< css::frame::XDispatch> SAL_CALL
queryDispatch( const css::util::URL& rURL
, const OUString& rTargetFrameName
- , sal_Int32 nSearchFlags)
- throw (css::uno::RuntimeException, std::exception) override;
+ , sal_Int32 nSearchFlags) override;
virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL
- queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor > & xDescripts)
- throw (css::uno::RuntimeException, std::exception) override;
+ queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor > & xDescripts) override;
// css::view::XSelectionSupplier (optional interface)
virtual sal_Bool SAL_CALL
- select( const css::uno::Any& rSelection )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ select( const css::uno::Any& rSelection ) override;
virtual css::uno::Any SAL_CALL
- getSelection() throw (css::uno::RuntimeException, std::exception) override;
+ getSelection() override;
virtual void SAL_CALL
- addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) override;
virtual void SAL_CALL
- removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) override;
// css::ui::XContextMenuInterception (optional interface)
virtual void SAL_CALL
- registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor)
- throw (css::uno::RuntimeException, std::exception) override;
+ registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) override;
virtual void SAL_CALL
- releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor)
- throw (css::uno::RuntimeException, std::exception) override;
+ releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) override;
//additional interfaces
// css::util::XCloseListener
virtual void SAL_CALL
queryClosing( const css::lang::EventObject& Source
- , sal_Bool GetsOwnership )
- throw (css::util::CloseVetoException
- , css::uno::RuntimeException, std::exception) override;
+ , sal_Bool GetsOwnership ) override;
virtual void SAL_CALL
- notifyClosing( const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ notifyClosing( const css::lang::EventObject& Source ) override;
// css::util::XEventListener (base of XCloseListener and XModifyListener)
virtual void SAL_CALL
- disposing( const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ disposing( const css::lang::EventObject& Source ) override;
// css::frame::XDispatch
virtual void SAL_CALL
dispatch( const css::util::URL& aURL
- , const css::uno::Sequence< css::beans::PropertyValue >& aArgs )
- throw (css::uno::RuntimeException,
- std::exception) override;
+ , const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override;
virtual void SAL_CALL
addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl
- , const css::util::URL& aURL )
- throw (css::uno::RuntimeException, std::exception) override;
+ , const css::util::URL& aURL ) override;
virtual void SAL_CALL
removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl
- , const css::util::URL& aURL )
- throw (css::uno::RuntimeException, std::exception) override;
+ , const css::util::URL& aURL ) override;
// css::awt::XWindow
virtual void SAL_CALL
setPosSize( sal_Int32 X, sal_Int32 Y
- , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
- throw (css::uno::RuntimeException, std::exception) override;
+ , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override;
virtual css::awt::Rectangle SAL_CALL
- getPosSize()
- throw (css::uno::RuntimeException, std::exception) override;
+ getPosSize() override;
virtual void SAL_CALL
- setVisible( sal_Bool Visible )
- throw (css::uno::RuntimeException, std::exception) override;
+ setVisible( sal_Bool Visible ) override;
virtual void SAL_CALL
- setEnable( sal_Bool Enable )
- throw (css::uno::RuntimeException, std::exception) override;
+ setEnable( sal_Bool Enable ) override;
virtual void SAL_CALL
- setFocus() throw (css::uno::RuntimeException, std::exception) override;
+ setFocus() override;
virtual void SAL_CALL
- addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
virtual void SAL_CALL
- removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override;
virtual void SAL_CALL
- addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
virtual void SAL_CALL
- removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override;
virtual void SAL_CALL
- addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
virtual void SAL_CALL
- removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override;
virtual void SAL_CALL
- addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
virtual void SAL_CALL
- removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override;
virtual void SAL_CALL
- addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
virtual void SAL_CALL
- removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override;
virtual void SAL_CALL
- addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
virtual void SAL_CALL
- removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override;
// css::lang XMultiServiceFactory
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
- createInstance( const OUString& aServiceSpecifier )
- throw (css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ createInstance( const OUString& aServiceSpecifier ) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
createInstanceWithArguments( const OUString& ServiceSpecifier,
const css::uno::Sequence<
- css::uno::Any >& Arguments )
- throw (css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ css::uno::Any >& Arguments ) override;
virtual css::uno::Sequence< OUString > SAL_CALL
- getAvailableServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ getAvailableServiceNames() override;
// css::util::XModifyListener
virtual void SAL_CALL modified(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
// css::util::XModeChangeListener
virtual void SAL_CALL modeChanged(
- const css::util::ModeChangeEvent& _rSource )
- throw (css::uno::RuntimeException,
- std::exception) override;
+ const css::util::ModeChangeEvent& _rSource ) override;
// css::frame::XLayoutManagerListener
virtual void SAL_CALL layoutEvent(
const css::lang::EventObject& aSource,
::sal_Int16 eLayoutEvent,
- const css::uno::Any& aInfo )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Any& aInfo ) override;
// WindowController stuff
void PrePaint(vcl::RenderContext& rRenderContext);
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 3cf3aa7a8f99..eacf8d011936 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -62,12 +62,9 @@ public:
virtual ~ChartDocumentWrapper() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
void setAddIn( const css::uno::Reference< css::util::XRefreshable >& xAddIn );
const css::uno::Reference< css::util::XRefreshable >& getAddIn() const { return m_xAddIn;}
@@ -81,98 +78,65 @@ public:
css::uno::Reference< css::drawing::XShapes > getAdditionalShapes() const;
/// @throws css::uno::RuntimeException
- css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const
- throw (css::uno::RuntimeException);
+ css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const;
protected:
// ____ chart::XChartDocument ____
- virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getSubTitle()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getLegend()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getArea()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::chart::XDiagram > SAL_CALL getDiagram()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle() override;
+ virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getSubTitle() override;
+ virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getLegend() override;
+ virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getArea() override;
+ virtual css::uno::Reference< css::chart::XDiagram > SAL_CALL getDiagram() override;
virtual void SAL_CALL setDiagram( const css::uno::Reference<
- css::chart::XDiagram >& xDiagram )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::chart::XChartData > SAL_CALL getData()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::chart::XDiagram >& xDiagram ) override;
+ virtual css::uno::Reference< css::chart::XChartData > SAL_CALL getData() override;
virtual void SAL_CALL attachData( const css::uno::Reference<
- css::chart::XChartData >& xData )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::chart::XChartData >& xData ) override;
// ____ XModel ____
virtual sal_Bool SAL_CALL attachResource( const OUString& URL,
- const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getURL()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
+ virtual OUString SAL_CALL getURL() override;
virtual css::uno::Sequence<
- css::beans::PropertyValue > SAL_CALL getArgs()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::beans::PropertyValue > SAL_CALL getArgs() override;
virtual void SAL_CALL connectController( const css::uno::Reference<
- css::frame::XController >& Controller )
- throw (css::uno::RuntimeException, std::exception) override;
+ css::frame::XController >& Controller ) override;
virtual void SAL_CALL disconnectController( const css::uno::Reference<
- css::frame::XController >& Controller )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL lockControllers()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL unlockControllers()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasControllersLocked()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::frame::XController >& Controller ) override;
+ virtual void SAL_CALL lockControllers() override;
+ virtual void SAL_CALL unlockControllers() override;
+ virtual sal_Bool SAL_CALL hasControllersLocked() override;
virtual css::uno::Reference<
- css::frame::XController > SAL_CALL getCurrentController()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller )
- throw (css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference<css::uno::XInterface > SAL_CALL getCurrentSelection()
- throw (css::uno::RuntimeException, std::exception) override;
+ css::frame::XController > SAL_CALL getCurrentController() override;
+ virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) override;
+ virtual css::uno::Reference<css::uno::XInterface > SAL_CALL getCurrentSelection() override;
// ____ XComponent ____
- virtual void SAL_CALL dispose()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL dispose() override;
+ virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override;
+ virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override;
// ____ XInterface (for new interfaces) ____
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
// ____ ::utl::OEventListenerAdapter ____
virtual void _disposing( const css::lang::EventObject& rSource ) override;
// ____ XDrawPageSupplier ____
- virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() override;
// ____ XMultiServiceFactory ____
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
- throw (css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(
const OUString& ServiceSpecifier,
- const css::uno::Sequence< css::uno::Any >& Arguments )
- throw (css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
// ____ XAggregation ____
virtual void SAL_CALL setDelegator(
- const css::uno::Reference< css::uno::XInterface >& rDelegator )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::uno::XInterface >& rDelegator ) override;
+ virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override;
// ____ WrappedPropertySet ____
virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override;
diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx b/chart2/source/controller/inc/ChartToolbarController.hxx
index 7a11bc5880fa..ad7d45ef5ba7 100644
--- a/chart2/source/controller/inc/ChartToolbarController.hxx
+++ b/chart2/source/controller/inc/ChartToolbarController.hxx
@@ -39,47 +39,35 @@ public:
const ChartToolbarController& operator=(const ChartToolbarController&) = delete;
// XToolbarContoller
- virtual void SAL_CALL execute(sal_Int16 nKeyModifier)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL execute(sal_Int16 nKeyModifier) override;
- virtual void SAL_CALL click()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL click() override;
- virtual void SAL_CALL doubleClick()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL doubleClick() override;
- virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createPopupWindow()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference<css::awt::XWindow> SAL_CALL createPopupWindow() override;
virtual css::uno::Reference<css::awt::XWindow> SAL_CALL
- createItemWindow(const css::uno::Reference<css::awt::XWindow>& rParent)
- throw (css::uno::RuntimeException, std::exception) override;
+ createItemWindow(const css::uno::Reference<css::awt::XWindow>& rParent) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
// XStatusListener
- virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override;
// XEventListener
- virtual void SAL_CALL disposing(const css::lang::EventObject& rSource)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& rSource) override;
// XInitialization
- virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rAny)
- throw (css::uno::Exception, std::exception) override;
+ virtual void SAL_CALL initialize(const css::uno::Sequence<css::uno::Any>& rAny) override;
// XUpdatable
- virtual void SAL_CALL update()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL update() override;
using cppu::WeakComponentImplHelperBase::disposing;
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index e510748590f7..030a42f65dde 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -63,10 +63,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw (css::uno::Exception) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw (css::uno::Exception) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
::std::vector< ItemConverter * > m_aConverters;
diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
index 49491161b937..9c6990c8cfbb 100644
--- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx
+++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx
@@ -55,10 +55,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( css::uno::Exception ) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( css::uno::Exception ) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
std::shared_ptr< ItemConverter > m_spGraphicConverter;
diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
index 01f8012ef74b..0fafd00d6706 100644
--- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx
@@ -54,10 +54,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw (css::uno::Exception, std::exception) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( css::uno::Exception ) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
eGraphicObjectType m_eGraphicObjectType;
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 5763318669eb..2ddbab146bc2 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -148,8 +148,7 @@ protected:
@throws css::uno::Exception
*/
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw (css::uno::Exception, std::exception);
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const;
/** for items that can not be mapped directly to a property.
@@ -162,8 +161,7 @@ protected:
@throws css::uno::Exception
*/
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( css::uno::Exception );
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet );
/// Returns the pool
SfxItemPool & GetItemPool() const { return m_rItemPool;}
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index aa86a2889627..794fd1733cd8 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -51,10 +51,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( css::uno::Exception ) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( css::uno::Exception ) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
::std::vector< ItemConverter * > m_aConverters;
diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx
index c0b96e63ee10..dcd1d7f6a5a5 100644
--- a/chart2/source/controller/inc/RangeSelectionListener.hxx
+++ b/chart2/source/controller/inc/RangeSelectionListener.hxx
@@ -50,14 +50,11 @@ public:
protected:
// ____ XRangeSelectionListener ____
- virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent ) override;
+ virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent ) override;
// ____ XEventListener ____
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
private:
RangeSelectionListenerParent & m_rParent;
diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
index 66b09a51e97b..c61489a45ee5 100644
--- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx
@@ -52,10 +52,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( css::uno::Exception ) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( css::uno::Exception ) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
std::shared_ptr< ItemConverter > m_spGraphicConverter;
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index 78a30541a579..03eaadd967b9 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -51,10 +51,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( css::uno::Exception ) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( css::uno::Exception ) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
::std::vector< ItemConverter * > m_aConverters;
diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
index 93550a6f4182..dd313a08de55 100644
--- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
+++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx
@@ -44,10 +44,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( css::uno::Exception ) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( css::uno::Exception ) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
css::uno::Reference< css::frame::XModel > m_xChartModel;
diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx
index 86fb64566888..25897e34d0e0 100644
--- a/chart2/source/controller/inc/StatisticsItemConverter.hxx
+++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx
@@ -45,10 +45,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( css::uno::Exception ) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( css::uno::Exception ) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
css::uno::Reference< css::frame::XModel > m_xModel;
diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx b/chart2/source/controller/inc/TextLabelItemConverter.hxx
index e89269fda315..3d13cc354f65 100644
--- a/chart2/source/controller/inc/TextLabelItemConverter.hxx
+++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx
@@ -51,10 +51,8 @@ protected:
virtual const sal_uInt16* GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw (css::uno::Exception) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw (css::uno::Exception) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
std::vector<ItemConverter*> maConverters;
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx
index 6671c57ee4e5..fde086ec12c9 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -47,10 +47,8 @@ protected:
virtual const sal_uInt16 * GetWhichPairs() const override;
virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override;
- virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw (css::uno::Exception) override;
- virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw (css::uno::Exception) override;
+ virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override;
+ virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
::std::vector< ItemConverter * > m_aConverters;
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index 826948c09697..76f7a15d790c 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -44,13 +44,13 @@ private:
virtual VclPtr<Dialog> createDialog(vcl::Window* _pParent) override;
// XTypeProvider
- virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
// XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override;
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
// OPropertyArrayUsageHelper
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 2c2684127065..7d08d0e6e502 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -53,44 +53,41 @@ public:
virtual ~CreationWizardUnoDlg() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
+ virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
// XTypeProvider
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override;
+ virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XExecutableDialog
- virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setTitle( const OUString& aTitle ) override;
+ virtual sal_Int16 SAL_CALL execute( ) override;
// XInitialization
- virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override;
// XTerminateListener
- virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override;
+ virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override;
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
//XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- 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;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
DECL_LINK( DialogEventHdl, VclWindowEvent&, void );
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 2ad5d630d917..fbb79d052b49 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -160,7 +160,6 @@ bool lcl_hasTimeIntervalValue( const uno::Any& rAny )
}
void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
{
if( !m_xAxis.is() )
return;
@@ -462,7 +461,6 @@ bool lcl_isAutoMinor( const SfxItemSet & rItemSet )
}
bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
if( !m_xAxis.is() )
return false;
diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index ed16e0a501fa..503a588061dc 100644
--- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -107,7 +107,6 @@ bool CharacterPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tPr
void CharacterPropertyItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
{
switch( nWhichId )
{
@@ -307,7 +306,6 @@ void CharacterPropertyItemConverter::FillSpecialItem(
bool CharacterPropertyItemConverter::ApplySpecialItem(
sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
bool bChanged = false;
uno::Any aValue;
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 9f4ce523e8ec..6fc7aef87ba3 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -288,7 +288,6 @@ bool DataPointItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa
bool DataPointItemConverter::ApplySpecialItem(
sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
bool bChanged = false;
@@ -548,7 +547,6 @@ bool DataPointItemConverter::ApplySpecialItem(
void DataPointItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
{
switch( nWhichId )
{
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index d5cc3ada524b..d92889b596ad 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -138,7 +138,6 @@ bool ErrorBarItemConverter::GetItemProperty(
bool ErrorBarItemConverter::ApplySpecialItem(
sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
bool bChanged = false;
@@ -331,7 +330,6 @@ bool ErrorBarItemConverter::ApplySpecialItem(
void ErrorBarItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
{
switch( nWhichId )
{
diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 463269467c9c..dffa2cde9337 100644
--- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -222,7 +222,6 @@ bool GraphicPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tProp
void GraphicPropertyItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw (uno::Exception, std::exception)
{
switch( nWhichId )
{
@@ -432,7 +431,6 @@ void GraphicPropertyItemConverter::FillSpecialItem(
bool GraphicPropertyItemConverter::ApplySpecialItem(
sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
bool bChanged = false;
uno::Any aValue;
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 20746e7b3c1a..c889873d751f 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -152,14 +152,12 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
void ItemConverter::FillSpecialItem(
sal_uInt16 /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const
- throw (uno::Exception, std::exception)
{
OSL_FAIL( "ItemConverter: Unhandled special item found!" );
}
bool ItemConverter::ApplySpecialItem(
sal_uInt16 /*nWhichId*/, const SfxItemSet & /*rItemSet*/ )
- throw( uno::Exception )
{
OSL_FAIL( "ItemConverter: Unhandled special item found!" );
return false;
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 396d5425a6a6..6a7969639c40 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -95,7 +95,6 @@ bool LegendItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropertyN
}
bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet& rInItemSet )
- throw( uno::Exception )
{
bool bChanged = false;
@@ -166,7 +165,6 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe
void LegendItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
{
switch( nWhichId )
{
diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 773d24e443b2..f946b3b179c9 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -138,7 +138,6 @@ bool RegressionCurveItemConverter::GetItemProperty(
bool RegressionCurveItemConverter::ApplySpecialItem(
sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
uno::Reference< chart2::XRegressionCurve > xCurve( GetPropertySet(), uno::UNO_QUERY );
bool bChanged = false;
@@ -254,7 +253,6 @@ bool RegressionCurveItemConverter::ApplySpecialItem(
}
void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const
- throw( uno::Exception )
{
uno::Reference<chart2::XRegressionCurve> xCurve(GetPropertySet(), uno::UNO_QUERY);
OSL_ASSERT(xCurve.is());
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 1047923c80dd..1ba39b2ea907 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -110,7 +110,6 @@ bool RegressionEquationItemConverter::GetItemProperty( tWhichIdType nWhichId, tP
bool RegressionEquationItemConverter::ApplySpecialItem(
sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
bool bChanged = false;
@@ -135,7 +134,6 @@ bool RegressionEquationItemConverter::ApplySpecialItem(
void RegressionEquationItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
{
switch( nWhichId )
{
diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 48ecfda6250e..61efffaeeb1b 100644
--- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -180,7 +180,6 @@ bool SeriesOptionsItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPr
}
bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
bool bChanged = false;
switch( nWhichId )
@@ -359,7 +358,6 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf
void SeriesOptionsItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
{
switch( nWhichId )
{
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index 433b736fba40..15a8aa7c39fc 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -251,7 +251,6 @@ bool StatisticsItemConverter::GetItemProperty(
bool StatisticsItemConverter::ApplySpecialItem(
sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
bool bChanged = false;
@@ -615,7 +614,6 @@ bool StatisticsItemConverter::ApplySpecialItem(
void StatisticsItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
{
switch( nWhichId )
{
diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
index 69251ca802ee..1e7abf646beb 100644
--- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx
@@ -251,7 +251,6 @@ bool TextLabelItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa
}
bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet& rItemSet )
- throw (uno::Exception)
{
bool bChanged = false;
@@ -500,7 +499,6 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte
}
void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const
- throw (uno::Exception)
{
switch (nWhichId)
{
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index 91d8e36edf01..79dcffcf1f2e 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -161,7 +161,6 @@ bool TitleItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWi
bool TitleItemConverter::ApplySpecialItem(
sal_uInt16 nWhichId, const SfxItemSet & rItemSet )
- throw( uno::Exception )
{
bool bChanged = false;
@@ -191,7 +190,6 @@ bool TitleItemConverter::ApplySpecialItem(
void TitleItemConverter::FillSpecialItem(
sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const
- throw( uno::Exception )
{
switch( nWhichId )
{
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 2067180cb258..f9a5d76b7bde 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -341,19 +341,16 @@ bool ChartController::impl_isDisposedOrSuspended() const
// lang::XServiceInfo
OUString SAL_CALL ChartController::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString(CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL ChartController::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
CHART_CONTROLLER_SERVICE_NAME,
@@ -393,7 +390,6 @@ uno::Reference<ui::XSidebar> getSidebarFromModel(const uno::Reference<frame::XMo
void SAL_CALL ChartController::attachFrame(
const uno::Reference<frame::XFrame>& xFrame )
- throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -508,7 +504,6 @@ void SAL_CALL ChartController::attachFrame(
//XModeChangeListener
void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent )
- throw (uno::RuntimeException, std::exception)
{
//adjust controller to view status changes
@@ -572,7 +567,6 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent
}
sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XModel > & xModel )
- throw(uno::RuntimeException, std::exception)
{
impl_invalidateAccessible();
@@ -661,7 +655,6 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo
}
uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame()
- throw(uno::RuntimeException, std::exception)
{
//provides access to owner frame of this controller
//return the frame containing this controller
@@ -670,7 +663,6 @@ uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame()
}
uno::Reference< frame::XModel > SAL_CALL ChartController::getModel()
- throw(uno::RuntimeException, std::exception)
{
//provides access to currently attached model
//returns the currently attached model
@@ -684,7 +676,6 @@ uno::Reference< frame::XModel > SAL_CALL ChartController::getModel()
}
uno::Any SAL_CALL ChartController::getViewData()
- throw(uno::RuntimeException, std::exception)
{
//provides access to current view status
//set of data that can be used to restore the current view status at later time
@@ -703,7 +694,6 @@ uno::Any SAL_CALL ChartController::getViewData()
void SAL_CALL ChartController::restoreViewData(
const uno::Any& /* Value */ )
- throw(uno::RuntimeException, std::exception)
{
//restores the view status using the data gotten from a previous call to XController::getViewData()
@@ -715,7 +705,6 @@ void SAL_CALL ChartController::restoreViewData(
}
sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend )
- throw(uno::RuntimeException, std::exception)
{
//is called to prepare the controller for closing the view
//bSuspend==true: force the controller to suspend his work
@@ -774,7 +763,6 @@ void ChartController::impl_deleteDrawViewController()
// XComponent (base of XController)
void SAL_CALL ChartController::dispose()
- throw(uno::RuntimeException, std::exception)
{
m_bDisposed = true;
@@ -892,7 +880,6 @@ void SAL_CALL ChartController::dispose()
void SAL_CALL ChartController::addEventListener(
const uno::Reference<lang::XEventListener>& xListener )
- throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode?
@@ -904,7 +891,6 @@ void SAL_CALL ChartController::addEventListener(
void SAL_CALL ChartController::removeEventListener(
const uno::Reference<lang::XEventListener>& xListener )
- throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if( m_aLifeTimeManager.impl_isDisposed(false) )
@@ -918,7 +904,6 @@ void SAL_CALL ChartController::removeEventListener(
void SAL_CALL ChartController::queryClosing(
const lang::EventObject& rSource,
sal_Bool /*bGetsOwnership*/ )
- throw(util::CloseVetoException, uno::RuntimeException, std::exception)
{
//do not use the m_aControllerMutex here because this call is not allowed to block
@@ -938,7 +923,6 @@ void SAL_CALL ChartController::queryClosing(
void SAL_CALL ChartController::notifyClosing(
const lang::EventObject& rSource )
- throw(uno::RuntimeException, std::exception)
{
//Listener should deregister himself and release all references to the closing object.
@@ -990,7 +974,6 @@ bool ChartController::impl_releaseThisModel(
// util::XEventListener (base of XCloseListener)
void SAL_CALL ChartController::disposing(
const lang::EventObject& rSource )
- throw(uno::RuntimeException, std::exception)
{
if( !impl_releaseThisModel( rSource.Source ))
{
@@ -1003,7 +986,6 @@ void SAL_CALL ChartController::layoutEvent(
const lang::EventObject& aSource,
sal_Int16 eLayoutEvent,
const uno::Any& /* aInfo */ )
- throw (uno::RuntimeException, std::exception)
{
if( eLayoutEvent == frame::LayoutManagerEvents::MERGEDMENUBAR )
{
@@ -1084,7 +1066,6 @@ uno::Reference<frame::XDispatch> SAL_CALL
const util::URL& rURL,
const OUString& rTargetFrameName,
sal_Int32 /* nSearchFlags */)
- throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
@@ -1099,7 +1080,6 @@ uno::Reference<frame::XDispatch> SAL_CALL
uno::Sequence<uno::Reference<frame::XDispatch > >
ChartController::queryDispatches(
const uno::Sequence<frame::DispatchDescriptor>& xDescripts )
- throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard g;
@@ -1115,7 +1095,6 @@ uno::Sequence<uno::Reference<frame::XDispatch > >
void SAL_CALL ChartController::dispatch(
const util::URL& rURL,
const uno::Sequence< beans::PropertyValue >& rArgs )
- throw (uno::RuntimeException, std::exception)
{
OUString aCommand = rURL.Path;
@@ -1298,7 +1277,6 @@ void SAL_CALL ChartController::dispatch(
void SAL_CALL ChartController::addStatusListener(
const uno::Reference<frame::XStatusListener >& /* xControl */,
const util::URL& /* aURL */ )
- throw (uno::RuntimeException, std::exception)
{
//@todo
}
@@ -1306,7 +1284,6 @@ void SAL_CALL ChartController::addStatusListener(
void SAL_CALL ChartController::removeStatusListener(
const uno::Reference<frame::XStatusListener >& /* xControl */,
const util::URL& /* aURL */ )
- throw (uno::RuntimeException, std::exception)
{
//@todo
}
@@ -1314,14 +1291,12 @@ void SAL_CALL ChartController::removeStatusListener(
// XContextMenuInterception (optional interface)
void SAL_CALL ChartController::registerContextMenuInterceptor(
const uno::Reference< ui::XContextMenuInterceptor >& /* xInterceptor */)
- throw(uno::RuntimeException, std::exception)
{
//@todo
}
void SAL_CALL ChartController::releaseContextMenuInterceptor(
const uno::Reference< ui::XContextMenuInterceptor > & /* xInterceptor */)
- throw(uno::RuntimeException, std::exception)
{
//@todo
}
@@ -1392,8 +1367,6 @@ void ChartController::executeDispatch_MoveSeries( bool bForward )
// ____ XMultiServiceFactory ____
uno::Reference< uno::XInterface > SAL_CALL
ChartController::createInstance( const OUString& aServiceSpecifier )
- throw (uno::Exception,
- uno::RuntimeException, std::exception)
{
uno::Reference< uno::XInterface > xResult;
@@ -1406,7 +1379,6 @@ uno::Reference< uno::XInterface > SAL_CALL
ChartController::createInstanceWithArguments(
const OUString& ServiceSpecifier,
const uno::Sequence< uno::Any >& /* Arguments */ )
- throw (uno::Exception, uno::RuntimeException, std::exception)
{
// ignore Arguments
return createInstance( ServiceSpecifier );
@@ -1414,7 +1386,6 @@ uno::Reference< uno::XInterface > SAL_CALL
uno::Sequence< OUString > SAL_CALL
ChartController::getAvailableServiceNames()
- throw (uno::RuntimeException, std::exception)
{
uno::Sequence< OUString > aServiceNames { CHART_ACCESSIBLE_TEXT_SERVICE_NAME };
return aServiceNames;
@@ -1423,7 +1394,6 @@ uno::Sequence< OUString > SAL_CALL
// ____ XModifyListener ____
void SAL_CALL ChartController::modified(
const lang::EventObject& /* aEvent */ )
- throw (uno::RuntimeException, std::exception)
{
// the source can also be a subobject of the ChartModel
// @todo: change the source in ChartModel to always be the model itself ?
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index 4e7a7912165d..5f37b989d208 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -222,7 +222,6 @@ void SAL_CALL ChartController::setPosSize(
sal_Int32 Width,
sal_Int32 Height,
sal_Int16 Flags )
- throw (uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -270,7 +269,6 @@ void SAL_CALL ChartController::setPosSize(
}
awt::Rectangle SAL_CALL ChartController::getPosSize()
- throw (uno::RuntimeException, std::exception)
{
//@todo
awt::Rectangle aRet(0, 0, 0, 0);
@@ -283,7 +281,6 @@ awt::Rectangle SAL_CALL ChartController::getPosSize()
}
void SAL_CALL ChartController::setVisible( sal_Bool Visible )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -293,7 +290,6 @@ void SAL_CALL ChartController::setVisible( sal_Bool Visible )
}
void SAL_CALL ChartController::setEnable( sal_Bool Enable )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -303,7 +299,6 @@ void SAL_CALL ChartController::setEnable( sal_Bool Enable )
}
void SAL_CALL ChartController::setFocus()
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -314,7 +309,6 @@ void SAL_CALL ChartController::setFocus()
void SAL_CALL ChartController::addWindowListener(
const uno::Reference< awt::XWindowListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -325,7 +319,6 @@ void SAL_CALL ChartController::addWindowListener(
void SAL_CALL ChartController::removeWindowListener(
const uno::Reference< awt::XWindowListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -336,7 +329,6 @@ void SAL_CALL ChartController::removeWindowListener(
void SAL_CALL ChartController::addFocusListener(
const uno::Reference< awt::XFocusListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -347,7 +339,6 @@ void SAL_CALL ChartController::addFocusListener(
void SAL_CALL ChartController::removeFocusListener(
const uno::Reference< awt::XFocusListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -358,7 +349,6 @@ void SAL_CALL ChartController::removeFocusListener(
void SAL_CALL ChartController::addKeyListener(
const uno::Reference< awt::XKeyListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -369,7 +359,6 @@ void SAL_CALL ChartController::addKeyListener(
void SAL_CALL ChartController::removeKeyListener(
const uno::Reference< awt::XKeyListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -380,7 +369,6 @@ void SAL_CALL ChartController::removeKeyListener(
void SAL_CALL ChartController::addMouseListener(
const uno::Reference< awt::XMouseListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -391,7 +379,6 @@ void SAL_CALL ChartController::addMouseListener(
void SAL_CALL ChartController::removeMouseListener(
const uno::Reference< awt::XMouseListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -402,7 +389,6 @@ void SAL_CALL ChartController::removeMouseListener(
void SAL_CALL ChartController::addMouseMotionListener(
const uno::Reference< awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -413,7 +399,6 @@ void SAL_CALL ChartController::addMouseMotionListener(
void SAL_CALL ChartController::removeMouseMotionListener(
const uno::Reference< awt::XMouseMotionListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -424,7 +409,6 @@ void SAL_CALL ChartController::removeMouseMotionListener(
void SAL_CALL ChartController::addPaintListener(
const uno::Reference< awt::XPaintListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -435,7 +419,6 @@ void SAL_CALL ChartController::addPaintListener(
void SAL_CALL ChartController::removePaintListener(
const uno::Reference< awt::XPaintListener >& xListener )
- throw (uno::RuntimeException, std::exception)
{
//@todo
uno::Reference<awt::XWindow> xWindow = m_xViewWindow;
@@ -1560,7 +1543,6 @@ bool ChartController::requestQuickHelp(
// XSelectionSupplier (optional interface)
sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
- throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception)
{
bool bSuccess = false;
@@ -1612,7 +1594,6 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection )
}
uno::Any SAL_CALL ChartController::getSelection()
- throw(uno::RuntimeException, std::exception)
{
uno::Any aReturn;
if ( m_aSelection.hasSelection() )
@@ -1632,7 +1613,6 @@ uno::Any SAL_CALL ChartController::getSelection()
}
void SAL_CALL ChartController::addSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener> & xListener )
- throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode?
@@ -1643,7 +1623,6 @@ void SAL_CALL ChartController::addSelectionChangeListener( const uno::Reference<
}
void SAL_CALL ChartController::removeSelectionChangeListener( const uno::Reference<view::XSelectionChangeListener> & xListener )
- throw(uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
if( impl_isDisposedOrSuspended() ) //@todo? allow removing of listeners in suspend mode?
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index a8d506834150..8d153a1e07fe 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -57,19 +57,16 @@ bool ChartFrameLoader::impl_checkCancel()
// lang::XServiceInfo
OUString SAL_CALL ChartFrameLoader::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString(CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME);
}
sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return { CHART_FRAMELOADER_SERVICE_NAME };
}
@@ -77,7 +74,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNam
// frame::XFrameLoader
sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor, const uno::Reference<frame::XFrame >& xFrame )
- throw (uno::RuntimeException, std::exception)
{
//@todo ? need to add as terminate listener to desktop?
@@ -188,7 +184,6 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa
}
void SAL_CALL ChartFrameLoader::cancel()
- throw (uno::RuntimeException, std::exception)
{
m_oCancelFinished.reset();
m_bCancelRequired = true;
diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx
index 159375b21d36..a6911dd7710d 100644
--- a/chart2/source/controller/main/ChartFrameloader.hxx
+++ b/chart2/source/controller/main/ChartFrameloader.hxx
@@ -48,22 +48,18 @@ public:
virtual ~ChartFrameLoader() override;
// css::lang::XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// css::frame::XFrameLoader
virtual sal_Bool SAL_CALL
load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor
- ,const css::uno::Reference< css::frame::XFrame >& xFrame )
- throw (css::uno::RuntimeException, std::exception) override;
+ ,const css::uno::Reference< css::frame::XFrame >& xFrame ) override;
virtual void SAL_CALL
- cancel() throw (css::uno::RuntimeException, std::exception) override;
+ cancel() override;
};
} //namespace chart
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 851caa41c6ca..42beadb65f8d 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -75,11 +75,9 @@ void SAL_CALL CommandDispatch::disposing()
// ____ XDispatch ____
void SAL_CALL CommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ )
- throw (uno::RuntimeException, std::exception)
{}
void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL )
- throw (uno::RuntimeException, std::exception)
{
tListenerMap::iterator aIt( m_aListeners.find( URL.Complete ));
if( aIt == m_aListeners.end())
@@ -95,7 +93,6 @@ void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatu
}
void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL )
- throw (uno::RuntimeException, std::exception)
{
tListenerMap::iterator aIt( m_aListeners.find( URL.Complete ));
if( aIt != m_aListeners.end())
@@ -104,14 +101,12 @@ void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XSt
// ____ XModifyListener ____
void SAL_CALL CommandDispatch::modified( const lang::EventObject& /* aEvent */ )
- throw (uno::RuntimeException, std::exception)
{
fireAllStatusEvents( nullptr );
}
// ____ XEventListener (base of XModifyListener) ____
void SAL_CALL CommandDispatch::disposing( const lang::EventObject& /* Source */ )
- throw (uno::RuntimeException, std::exception)
{}
void CommandDispatch::fireAllStatusEvents(
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index e4775564ca95..18235c3f8862 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -98,16 +98,13 @@ protected:
// ____ XDispatch ____
virtual void SAL_CALL dispatch(
const css::util::URL& URL,
- const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
virtual void SAL_CALL addStatusListener(
const css::uno::Reference< css::frame::XStatusListener >& Control,
- const css::util::URL& URL )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& URL ) override;
virtual void SAL_CALL removeStatusListener(
const css::uno::Reference< css::frame::XStatusListener >& Control,
- const css::util::URL& URL )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::util::URL& URL ) override;
// ____ WeakComponentImplHelperBase ____
/// is called when this is disposed
@@ -115,13 +112,11 @@ protected:
// ____ XModifyListener ____
virtual void SAL_CALL modified(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
protected:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 4175eb8404b7..ebe2b989e7bb 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -745,7 +745,6 @@ void ControllerCommandDispatch::fireStatusEvent(
void SAL_CALL ControllerCommandDispatch::dispatch(
const util::URL& URL,
const Sequence< beans::PropertyValue >& Arguments )
- throw (uno::RuntimeException, std::exception)
{
if( commandAvailable( URL.Complete ))
m_xDispatch->dispatch( URL, Arguments );
@@ -762,7 +761,6 @@ void SAL_CALL ControllerCommandDispatch::disposing()
// ____ XEventListener (base of XModifyListener) ____
void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* Source */ )
- throw (uno::RuntimeException, std::exception)
{
m_xChartController.clear();
m_xDispatch.clear();
@@ -771,7 +769,6 @@ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /*
// ____ XModifyListener ____
void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEvent )
- throw (uno::RuntimeException, std::exception)
{
bool bUpdateCommandAvailability = false;
@@ -797,7 +794,6 @@ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEve
// ____ XSelectionChangeListener ____
void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObject& aEvent )
- throw (uno::RuntimeException, std::exception)
{
// Update the "ControllerState" Struct.
if( m_apControllerState.get() && m_xChartController.is())
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx
index 8afbc619e68f..38d6a8c1e0ed 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.hxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx
@@ -69,8 +69,7 @@ protected:
// ____ XDispatch ____
virtual void SAL_CALL dispatch(
const css::util::URL& URL,
- const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
// ____ WeakComponentImplHelperBase ____
/// is called when this is disposed
@@ -78,8 +77,7 @@ protected:
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
virtual void fireStatusEvent(
const OUString & rURL,
@@ -87,13 +85,11 @@ protected:
// ____ XModifyListener ____
virtual void SAL_CALL modified(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
// ____ XSelectionChangeListener ____
virtual void SAL_CALL selectionChanged(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
private:
void fireStatusEventForURLImpl(
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index fc6e3bb2e123..6fe052ea3db0 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -228,7 +228,6 @@ void DrawCommandDispatch::disposing()
// XEventListener
void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ )
- throw (uno::RuntimeException, std::exception)
{
}
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx
index 435e4011edba..7df47171a79e 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.hxx
@@ -47,8 +47,7 @@ protected:
virtual void SAL_CALL disposing() override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// state of a feature
virtual FeatureState getState( const OUString& rCommand ) override;
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index 920658d9e6a1..d2499c243c31 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -244,19 +244,16 @@ Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible()
}
OUString SAL_CALL ElementSelectorToolbarController::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString(lcl_aServiceName);
}
sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return { "com.sun.star.frame.ToolbarController" };
}
@@ -267,7 +264,7 @@ ElementSelectorToolbarController::~ElementSelectorToolbarController()
{
}
// XInterface
-Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception)
+Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType )
{
Any aReturn = ToolboxController::queryInterface(_rType);
if (!aReturn.hasValue())
@@ -282,7 +279,7 @@ void SAL_CALL ElementSelectorToolbarController::release() throw ()
{
ToolboxController::release();
}
-void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException, std::exception )
+void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent )
{
if( m_apSelectorListBox.get() )
{
@@ -297,7 +294,6 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat
}
}
uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent )
- throw (uno::RuntimeException, std::exception)
{
uno::Reference< awt::XWindow > xItemWindow;
if( !m_apSelectorListBox.get() )
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index b7dd5708d28f..928b360bc84a 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -73,22 +73,19 @@ public:
virtual ~ElementSelectorToolbarController() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XInterface
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
virtual void SAL_CALL acquire() throw () override;
virtual void SAL_CALL release() throw () override;
// XStatusListener
- virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override;
+ virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override;
// XToolbarController
- virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override;
private:
VclPtr< SelectorListBox > m_apSelectorListBox;
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
index 8d02473ed58e..7e4b17fdd45f 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
@@ -75,7 +75,6 @@ void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL,
// XDispatch
void FeatureCommandDispatchBase::dispatch( const util::URL& URL,
const Sequence< beans::PropertyValue >& Arguments )
- throw (uno::RuntimeException, std::exception)
{
OUString aCommand( URL.Complete );
if ( getState( aCommand ).bEnabled )
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
index 0d6ed195b710..8dca9c202dca 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
@@ -60,8 +60,7 @@ public:
protected:
// XDispatch
virtual void SAL_CALL dispatch( const css::util::URL& URL,
- const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
virtual void fireStatusEvent( const OUString& rURL,
const css::uno::Reference< css::frame::XStatusListener >& xSingleListener ) override;
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 58b70e6bfecc..478b0a18aa05 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -71,7 +71,6 @@ void ShapeController::disposing()
// XEventListener
void ShapeController::disposing( const lang::EventObject& /* Source */ )
- throw (uno::RuntimeException, std::exception)
{
}
diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx
index 34885a725283..70fcdecf9297 100644
--- a/chart2/source/controller/main/ShapeController.hxx
+++ b/chart2/source/controller/main/ShapeController.hxx
@@ -45,8 +45,7 @@ protected:
virtual void SAL_CALL disposing() override;
// XEventListener
- virtual void SAL_CALL disposing( const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override;
// state of a feature
virtual FeatureState getState( const OUString& rCommand ) override;
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 3fc479921fba..7b04bb4e4af4 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -89,7 +89,6 @@ void StatusBarCommandDispatch::fireStatusEvent(
void SAL_CALL StatusBarCommandDispatch::dispatch(
const util::URL& /* URL */,
const Sequence< beans::PropertyValue >& /* Arguments */ )
- throw (uno::RuntimeException, std::exception)
{
// nothing to do here
}
@@ -104,7 +103,6 @@ void SAL_CALL StatusBarCommandDispatch::disposing()
// ____ XEventListener (base of XModifyListener) ____
void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* Source */ )
- throw (uno::RuntimeException, std::exception)
{
m_xModifiable.clear();
m_xSelectionSupplier.clear();
@@ -112,7 +110,6 @@ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* S
// ____ XModifyListener ____
void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEvent )
- throw (uno::RuntimeException, std::exception)
{
if( m_xModifiable.is())
m_bIsModified = m_xModifiable->isModified();
@@ -122,7 +119,6 @@ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEven
// ____ XSelectionChangeListener ____
void SAL_CALL StatusBarCommandDispatch::selectionChanged( const lang::EventObject& /* aEvent */ )
- throw (uno::RuntimeException, std::exception)
{
if( m_xSelectionSupplier.is())
m_aSelectedOID = ObjectIdentifier( m_xSelectionSupplier->getSelection() );
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
index 87537d902e98..137b8c27142b 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
@@ -58,8 +58,7 @@ protected:
// ____ XDispatch ____
virtual void SAL_CALL dispatch(
const css::util::URL& URL,
- const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
// ____ WeakComponentImplHelperBase ____
/// is called when this is disposed
@@ -67,13 +66,11 @@ protected:
// ____ XModifyListener (override from CommandDispatch) ____
virtual void SAL_CALL modified(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
virtual void fireStatusEvent(
const OUString & rURL,
@@ -81,8 +78,7 @@ protected:
// ____ XSelectionChangeListener ____
virtual void SAL_CALL selectionChanged(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
private:
css::uno::Reference< css::util::XModifiable > m_xModifiable;
diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx
index 072804b7eea2..54b1e9019903 100644
--- a/chart2/source/controller/main/ToolbarController.cxx
+++ b/chart2/source/controller/main/ToolbarController.cxx
@@ -44,12 +44,10 @@ ChartToolbarController::~ChartToolbarController()
}
void ChartToolbarController::execute(sal_Int16 /*nKeyModifier*/)
- throw (css::uno::RuntimeException, std::exception)
{
}
void ChartToolbarController::click()
- throw (css::uno::RuntimeException, std::exception)
{
css::uno::Reference<css::frame::XFrame> xActiveFrame = mxFramesSupplier->getActiveFrame();
if (!xActiveFrame.is())
@@ -69,61 +67,51 @@ void ChartToolbarController::click()
}
void ChartToolbarController::doubleClick()
- throw (css::uno::RuntimeException, std::exception)
{
SAL_INFO("chart2", "double clicked");
}
css::uno::Reference<css::awt::XWindow> ChartToolbarController::createPopupWindow()
- throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Reference<css::awt::XWindow>();
}
css::uno::Reference<css::awt::XWindow> ChartToolbarController::createItemWindow(
const css::uno::Reference<css::awt::XWindow>& /*rParent*/)
- throw (css::uno::RuntimeException, std::exception)
{
return css::uno::Reference<css::awt::XWindow>();
}
void ChartToolbarController::statusChanged(const css::frame::FeatureStateEvent& /*rEvent*/)
- throw (css::uno::RuntimeException, std::exception)
{
}
void ChartToolbarController::disposing(const css::lang::EventObject& /*rSource*/)
- throw (css::uno::RuntimeException, std::exception)
{
}
void ChartToolbarController::initialize(const css::uno::Sequence<css::uno::Any>& /*rAny*/)
- throw (css::uno::Exception, std::exception)
{
}
void ChartToolbarController::update()
- throw (css::uno::RuntimeException, std::exception)
{
}
OUString ChartToolbarController::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return OUString("org.libreoffice.chart2.Chart2ToolboxController");
}
sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence<OUString> ChartToolbarController::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return { "com.sun.star.frame.ToolbarController" };
}
diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx
index dd02fb4232b8..1c7f9cc8bc70 100644
--- a/chart2/source/controller/main/UndoActions.cxx
+++ b/chart2/source/controller/main/UndoActions.cxx
@@ -64,7 +64,7 @@ void SAL_CALL UndoElement::disposing()
m_xDocumentModel.clear();
}
-OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException, std::exception)
+OUString SAL_CALL UndoElement::getTitle()
{
return m_sActionString;
}
@@ -79,12 +79,12 @@ void UndoElement::impl_toggleModelState()
m_pModelClone = pNewClone;
}
-void SAL_CALL UndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception)
+void SAL_CALL UndoElement::undo( )
{
impl_toggleModelState();
}
-void SAL_CALL UndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception)
+void SAL_CALL UndoElement::redo( )
{
impl_toggleModelState();
}
@@ -102,21 +102,21 @@ ShapeUndoElement::~ShapeUndoElement()
{
}
-OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException, std::exception)
+OUString SAL_CALL ShapeUndoElement::getTitle()
{
if ( !m_pAction )
throw DisposedException( OUString(), *this );
return m_pAction->GetComment();
}
-void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception)
+void SAL_CALL ShapeUndoElement::undo( )
{
if ( !m_pAction )
throw DisposedException( OUString(), *this );
m_pAction->Undo();
}
-void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception)
+void SAL_CALL ShapeUndoElement::redo( )
{
if ( !m_pAction )
throw DisposedException( OUString(), *this );
diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx
index ce63b94ea7da..f1ecf3ee131a 100644
--- a/chart2/source/controller/main/UndoActions.hxx
+++ b/chart2/source/controller/main/UndoActions.hxx
@@ -66,9 +66,9 @@ public:
const UndoElement& operator=(const UndoElement&) = delete;
// XUndoAction
- virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL redo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTitle() override;
+ virtual void SAL_CALL undo( ) override;
+ virtual void SAL_CALL redo( ) override;
// OComponentHelper
virtual void SAL_CALL disposing() override;
@@ -94,9 +94,9 @@ public:
explicit ShapeUndoElement( SdrUndoAction& i_sdrUndoAction );
// XUndoAction
- virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL redo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getTitle() override;
+ virtual void SAL_CALL undo( ) override;
+ virtual void SAL_CALL redo( ) override;
// OComponentHelper
virtual void SAL_CALL disposing() override;
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index f170d04778ea..b7466c95c96a 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -83,7 +83,6 @@ void UndoCommandDispatch::fireStatusEvent(
void SAL_CALL UndoCommandDispatch::dispatch(
const util::URL& URL,
const Sequence< beans::PropertyValue >& /* Arguments */ )
- throw (uno::RuntimeException, std::exception)
{
if( m_xUndoManager.is() )
{
@@ -125,7 +124,6 @@ void SAL_CALL UndoCommandDispatch::disposing()
// ____ XEventListener (base of XModifyListener) ____
void SAL_CALL UndoCommandDispatch::disposing( const lang::EventObject& /* Source */ )
- throw (uno::RuntimeException, std::exception)
{
m_xUndoManager.clear();
m_xModel.clear();
diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx
index 603e493720fe..db6e299c0efd 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.hxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.hxx
@@ -44,8 +44,7 @@ protected:
// ____ XDispatch ____
virtual void SAL_CALL dispatch(
const css::util::URL& URL,
- const css::uno::Sequence< css::beans::PropertyValue >& Arguments )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override;
// ____ WeakComponentImplHelperBase ____
/// is called when this is disposed
@@ -53,8 +52,7 @@ protected:
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
virtual void fireStatusEvent(
const OUString & rURL,
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
index 1da8c639343e..18f327557fec 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx
@@ -54,10 +54,6 @@ ChartPanelFactory::~ChartPanelFactory()
Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement (
const ::rtl::OUString& rsResourceURL,
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
- throw(
- css::container::NoSuchElementException,
- css::lang::IllegalArgumentException,
- RuntimeException, std::exception)
{
Reference<css::ui::XUIElement> xElement;
@@ -125,19 +121,16 @@ Reference<css::ui::XUIElement> SAL_CALL ChartPanelFactory::createUIElement (
}
OUString ChartPanelFactory::getImplementationName()
- throw (css::uno::RuntimeException, std::exception)
{
return OUString("org.libreoffice.comp.chart2.sidebar.ChartPanelFactory");
}
sal_Bool ChartPanelFactory::supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception)
{
return cppu::supportsService(this, ServiceName);
}
css::uno::Sequence<OUString> ChartPanelFactory::getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception)
{
return { "com.sun.star.ui.UIElementFactory" };
}
diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
index 6fe6b4afc209..14570c143a88 100644
--- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
+++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx
@@ -46,20 +46,13 @@ public:
// XUIElementFactory
virtual css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
const ::rtl::OUString& rsResourceURL,
- const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
- throw(
- css::container::NoSuchElementException,
- css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception ) override;
+ const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
- virtual OUString SAL_CALL getImplementationName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName() override;
- virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName)
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override;
- virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
};
} } // end of namespace sc::sidebar
diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx
index fdf2dc14a460..b000e55c5aa6 100644
--- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx
+++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx
@@ -26,13 +26,11 @@ ChartSidebarModifyListener::~ChartSidebarModifyListener()
}
void ChartSidebarModifyListener::modified(const css::lang::EventObject& /*rEvent*/)
- throw (::css::uno::RuntimeException, ::std::exception)
{
mpParent->updateData();
}
void ChartSidebarModifyListener::disposing(const css::lang::EventObject& /*rEvent*/)
- throw (::css::uno::RuntimeException, ::std::exception)
{
mpParent->modelInvalid();
}
diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
index 69b71d6157de..9efe382e2761 100644
--- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
+++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx
@@ -33,11 +33,9 @@ public:
explicit ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent);
virtual ~ChartSidebarModifyListener() override;
- virtual void SAL_CALL modified(const css::lang::EventObject& rEvent)
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) override;
- virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override;
private:
ChartSidebarModifyListenerParent* mpParent;
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
index 30a2e63bfccc..c94490f1dc1b 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx
@@ -40,7 +40,6 @@ ChartSidebarSelectionListener::~ChartSidebarSelectionListener()
}
void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObject& rEvent)
- throw (::css::uno::RuntimeException, ::std::exception)
{
bool bCorrectObjectSelected = false;
@@ -66,7 +65,6 @@ void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObjec
}
void ChartSidebarSelectionListener::disposing(const css::lang::EventObject& /*rEvent*/)
- throw (::css::uno::RuntimeException, ::std::exception)
{
mpParent->SelectionInvalid();
}
diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
index 85df72231369..bf3bdbd2558a 100644
--- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
+++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx
@@ -40,11 +40,9 @@ public:
ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent, ObjectType eType);
virtual ~ChartSidebarSelectionListener() override;
- virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent)
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) override;
- virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent)
- throw (::css::uno::RuntimeException, ::std::exception) override;
+ virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override;
void setAcceptedTypes(const std::vector<ObjectType>& aTypes);
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 2cbe9c6bd048..2e4c6359550e 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -82,12 +82,9 @@ public:
virtual ~CachedDataSequence() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
/// merge XInterface implementations
DECLARE_XINTERFACE()
@@ -97,48 +94,38 @@ public:
protected:
// ____ XPropertySet ____
/// @see css::beans::XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
/// @see ::comphelper::OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
/// @see ::comphelper::OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
// ____ XDataSequence ____
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getSourceRangeRepresentation()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override;
+ virtual OUString SAL_CALL getSourceRangeRepresentation() override;
virtual css::uno::Sequence< OUString > SAL_CALL generateLabel(
- css::chart2::data::LabelOrigin nLabelOrigin )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
+ css::chart2::data::LabelOrigin nLabelOrigin ) override;
+ virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override;
// ____ XNumericalDataSequence ____
/// @see css::chart::data::XNumericalDataSequence
- virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override;
// ____ XTextualDataSequence ____
/// @see css::chart::data::XTextualDataSequence
- virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override;
// ____ XCloneable ____
- virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
// ____ XModifyBroadcaster ____
virtual void SAL_CALL addModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
virtual void SAL_CALL removeModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
// css::lang::XInitialization:
- virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments)
- throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+ virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
// <properties>
sal_Int32 m_nNumberFormatKey;
diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx
index a8feeb12b8a9..7fd695242bd4 100644
--- a/chart2/source/inc/ConfigColorScheme.hxx
+++ b/chart2/source/inc/ConfigColorScheme.hxx
@@ -49,20 +49,16 @@ public:
virtual ~ConfigColorScheme() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ ConfigItemListener ____
void notify( const OUString & rPropertyName );
protected:
// ____ XColorScheme ____
- virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) override;
private:
void retrieveConfigColors();
diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx
index f0d6eb851157..87fcd5693606 100644
--- a/chart2/source/inc/DataSource.hxx
+++ b/chart2/source/inc/DataSource.hxx
@@ -43,22 +43,17 @@ public:
virtual ~DataSource() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
protected:
// ____ XDataSource ____
virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL
- getDataSequences()
- throw (css::uno::RuntimeException, std::exception) override;
+ getDataSequences() override;
// ____ XDataSink ____
- virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override;
private:
css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 565e93d94af2..1436d436dd5f 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -83,72 +83,52 @@ public:
virtual ~ErrorBar() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// XPropertySet
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue )
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName )
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener )
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener )
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- 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;
+ getPropertySetInfo() override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
// XPropertyState
- virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName )
- throw (css::beans::UnknownPropertyException, std::exception) override;
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) override;
virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates(
- const css::uno::Sequence< OUString >& rPropNames )
- throw (css::beans::UnknownPropertyException, std::exception) override;
- virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName )
- throw (css::beans::UnknownPropertyException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName )
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override;
+ const css::uno::Sequence< OUString >& rPropNames ) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) override;
protected:
ErrorBar( const ErrorBar & rOther );
// ____ XCloneable ____
- virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
// ____ XModifyBroadcaster ____
virtual void SAL_CALL addModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
virtual void SAL_CALL removeModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
// ____ XModifyListener ____
virtual void SAL_CALL modified(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
// ____ XDataSink ____
- virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override;
// ____ XDataSource ____
- virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override;
private:
typedef ::std::vector< css::uno::Reference<
diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
index f6400b090329..ba08bb13dfd1 100644
--- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
@@ -39,12 +39,9 @@ private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
const css::uno::Sequence<double>& aXValues,
- const css::uno::Sequence<double>& aYValues )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence<double>& aYValues ) override;
- virtual double SAL_CALL getCurveValue( double x )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL getCurveValue( double x ) override;
virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
double min,
@@ -52,9 +49,7 @@ private:
sal_Int32 nPointCount,
const css::uno::Reference<css::chart2::XScaling>& xScalingX,
const css::uno::Reference<css::chart2::XScaling>& xScalingY,
- sal_Bool bMaySkipPointsInCalculation )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Bool bMaySkipPointsInCalculation ) override;
// formula is: f(x) = m_fSign * exp(m_fLogIntercept) * exp( m_fLogSlope * x )
// mathematical model f(x) = Intercept * Slope^x
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index 5142ef7ac6ce..183228250df4 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -80,143 +80,99 @@ public:
virtual ~InternalDataProvider() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XInternalDataProvider ____
- virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) override;
virtual css::uno::Sequence< css::uno::Any > SAL_CALL
- getDataByRangeRepresentation( const OUString& aRange )
- throw (css::uno::RuntimeException, std::exception) override;
+ getDataByRangeRepresentation( const OUString& aRange ) override;
virtual void SAL_CALL setDataByRangeRepresentation(
const OUString& aRange,
- const css::uno::Sequence< css::uno::Any >& aNewData )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL appendSequence()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& aNewData ) override;
+ virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) override;
+ virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) override;
+ virtual void SAL_CALL appendSequence() override;
+ virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) override;
+ virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) override;
+ virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) override;
+ virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) override;
+ virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) override;
virtual void SAL_CALL registerDataSequenceForChanges(
- const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq ) override;
// ____ XDataProvider (base of XInternalDataProvider) ____
virtual sal_Bool SAL_CALL createDataSourcePossible(
- const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource(
- const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override;
virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments(
- const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) override;
virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(
- const OUString& aRangeRepresentation )
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& aRangeRepresentation ) override;
virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(
- const OUString& aRangeRepresentation )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const OUString& aRangeRepresentation ) override;
virtual css::uno::Reference<css::chart2::data::XDataSequence> SAL_CALL
- createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation )
- throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
+ createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) override;
- virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() override;
// ____ XRangeXMLConversion ____
virtual OUString SAL_CALL convertRangeToXML(
- const OUString& aRangeRepresentation )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const OUString& aRangeRepresentation ) override;
virtual OUString SAL_CALL convertRangeFromXML(
- const OUString& aXMLRange )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const OUString& aXMLRange ) override;
// ____ XDateCategories ____
- virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override;
+ virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override;
// ____ XAnyDescriptionAccess ____
virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
- getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+ getAnyRowDescriptions() override;
virtual void SAL_CALL setAnyRowDescriptions(
- const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) override;
virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL
- getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+ getAnyColumnDescriptions() override;
virtual void SAL_CALL setAnyColumnDescriptions(
- const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) override;
// ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
- getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+ getComplexRowDescriptions() override;
virtual void SAL_CALL setComplexRowDescriptions(
- const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override;
virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL
- getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override;
+ getComplexColumnDescriptions() override;
virtual void SAL_CALL setComplexColumnDescriptions(
- const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override;
// ____ XChartDataArray (base of XComplexDescriptionAccess) ____
- virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override;
virtual void SAL_CALL setData(
- const css::uno::Sequence< css::uno::Sequence< double > >& aData )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override;
virtual void SAL_CALL setRowDescriptions(
- const css::uno::Sequence< OUString >& aRowDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< OUString >& aRowDescriptions ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override;
virtual void SAL_CALL setColumnDescriptions(
- const css::uno::Sequence< OUString >& aColumnDescriptions )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< OUString >& aColumnDescriptions ) override;
// ____ XChartData (base of XChartDataArray) ____
virtual void SAL_CALL addChartDataChangeEventListener(
- const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
virtual void SAL_CALL removeChartDataChangeEventListener(
- const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual double SAL_CALL getNotANumber()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override;
+ virtual double SAL_CALL getNotANumber() override;
virtual sal_Bool SAL_CALL isNotANumber(
- double nNumber )
- throw (css::uno::RuntimeException, std::exception) override;
+ double nNumber ) override;
// ____ XCloneable ____
- virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
// css::lang::XInitialization:
- virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments)
- throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override;
+ virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override;
private:
void addDataSequenceToMap(
diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx
index b36ba3298c3c..948b38898a0d 100644
--- a/chart2/source/inc/LabeledDataSequence.hxx
+++ b/chart2/source/inc/LabeledDataSequence.hxx
@@ -55,37 +55,27 @@ public:
virtual ~LabeledDataSequence() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
protected:
// ____ XLabeledDataSequence ____
- virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues() override;
virtual void SAL_CALL setValues(
- const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override;
+ virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel() override;
virtual void SAL_CALL setLabel(
- const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override;
// ____ XCloneable ____
- virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
// ____ XModifyBroadcaster ____
virtual void SAL_CALL addModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
virtual void SAL_CALL removeModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
private:
css::uno::Reference< css::chart2::data::XDataSequence > m_xData;
diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx
index ba652671103f..c3a648d26819 100644
--- a/chart2/source/inc/LifeTime.hxx
+++ b/chart2/source/inc/LifeTime.hxx
@@ -44,7 +44,7 @@ public:
bool impl_isDisposed( bool bAssert=true );
/// @throws css::uno::RuntimeException
- bool dispose() throw(css::uno::RuntimeException);
+ bool dispose();
public:
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer;
@@ -91,16 +91,13 @@ OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager() override;
OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true );
/// @throws css::uno::Exception
-OOO_DLLPUBLIC_CHARTTOOLS bool g_close_startTryClose(bool bDeliverOwnership)
- throw ( css::uno::Exception );
+OOO_DLLPUBLIC_CHARTTOOLS bool g_close_startTryClose(bool bDeliverOwnership);
/// @throws css::util::CloseVetoException
-OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex )
- throw ( css::util::CloseVetoException );
+OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex );
OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(bool bDeliverOwnership, bool bMyVeto );
OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose();
/// @throws css::uno::RuntimeException
-OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener )
- throw(css::uno::RuntimeException);
+OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener );
protected:
virtual bool impl_canStartApiCall() override;
diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
index df36c2d72d8d..11d323887b98 100644
--- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
@@ -36,8 +36,7 @@ private:
sal_Int32 aDegree,
sal_Bool aForceIntercept,
double aInterceptValue,
- sal_Int32 aPeriod)
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Int32 aPeriod) override;
virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
double min,
@@ -45,9 +44,7 @@ private:
sal_Int32 nPointCount,
const css::uno::Reference<css::chart2::XScaling>& xScalingX,
const css::uno::Reference<css::chart2::XScaling>& xScalingY,
- sal_Bool bMaySkipPointsInCalculation )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Bool bMaySkipPointsInCalculation ) override;
};
} // namespace chart
diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
index ec16964566aa..522756afe139 100644
--- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
@@ -39,12 +39,9 @@ private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
const css::uno::Sequence<double>& aXValues,
- const css::uno::Sequence<double>& aYValues )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence<double>& aYValues ) override;
- virtual double SAL_CALL getCurveValue( double x )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL getCurveValue( double x ) override;
virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
double min,
@@ -52,9 +49,7 @@ private:
sal_Int32 nPointCount,
const css::uno::Reference<css::chart2::XScaling>& xScalingX,
const css::uno::Reference<css::chart2::XScaling>& xScalingY,
- sal_Bool bMaySkipPointsInCalculation )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Bool bMaySkipPointsInCalculation ) override;
// formula is: f(x) = m_fSlope * log( x ) + m_fIntercept
double m_fSlope;
diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
index 4ccc817b4033..7c947bec4d8c 100644
--- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
@@ -39,12 +39,9 @@ private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
const css::uno::Sequence<double>& aXValues,
- const css::uno::Sequence<double>& aYValues )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence<double>& aYValues ) override;
- virtual double SAL_CALL getCurveValue( double x )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL getCurveValue( double x ) override;
virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
double min,
@@ -52,9 +49,7 @@ private:
sal_Int32 nPointCount,
const css::uno::Reference<css::chart2::XScaling>& xScalingX,
const css::uno::Reference<css::chart2::XScaling>& xScalingY,
- sal_Bool bMaySkipPointsInCalculation )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Bool bMaySkipPointsInCalculation ) override;
// formula is: f(x) = m_fMeanValue
double m_fMeanValue;
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index 5f167233da00..d26bb258839c 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -67,21 +67,17 @@ public:
protected:
// ____ XModifyBroadcaster ____
virtual void SAL_CALL addModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
virtual void SAL_CALL removeModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
// ____ XModifyListener ____
virtual void SAL_CALL modified(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
// ____ WeakComponentImplHelperBase ____
virtual void SAL_CALL disposing() override;
diff --git a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
index a43635a9cc06..fb6185098193 100644
--- a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx
@@ -40,12 +40,9 @@ private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
const css::uno::Sequence<double>& aXValues,
- const css::uno::Sequence<double>& aYValues )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence<double>& aYValues ) override;
- virtual double SAL_CALL getCurveValue( double x )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL getCurveValue( double x ) override;
virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
double min,
@@ -53,9 +50,7 @@ private:
sal_Int32 nPointCount,
const css::uno::Reference<css::chart2::XScaling>& xScalingX,
const css::uno::Reference<css::chart2::XScaling>& xScalingY,
- sal_Bool bMaySkipPointsInCalculation )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Bool bMaySkipPointsInCalculation ) override;
std::vector<double> aYList;
std::vector<double> aXList;
diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx
index 91c3a9970a33..268255bfc7c0 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -53,28 +53,28 @@ public:
virtual ~NameContainer() override;
// XServiceInfo
- virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getImplementationName( ) override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override;
// XNameContainer
- virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removeByName( const OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override;
+ virtual void SAL_CALL removeByName( const OUString& Name ) override;
// XNameReplace
- virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override;
// XNameAccess
- virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override;
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override;
// XElementAccess
- virtual sal_Bool SAL_CALL hasElements( ) throw( css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Type SAL_CALL getElementType( ) throw( css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL hasElements( ) override;
+ virtual css::uno::Type SAL_CALL getElementType( ) override;
// XCloneable
- virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
private: //member
const css::uno::Type m_aType;
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 0d0f5fa02157..fd5ad5632366 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -68,9 +68,7 @@ protected:
@throws css::beans::UnknownPropertyException
@throws css::uno::RuntimeException
*/
- virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException) = 0;
+ virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const = 0;
/** The InfoHelper table contains all property names and types of
this object.
@@ -110,8 +108,7 @@ protected:
( css::uno::Any & rConvertedValue,
css::uno::Any & rOldValue,
sal_Int32 nHandle,
- const css::uno::Any& rValue )
- throw (css::lang::IllegalArgumentException) override;
+ const css::uno::Any& rValue ) override;
/** The same as setFastProperyValue; nHandle is always valid.
The changes must not be broadcasted in this method.
@@ -132,8 +129,7 @@ protected:
*/
virtual void SAL_CALL setFastPropertyValue_NoBroadcast
( sal_Int32 nHandle,
- const css::uno::Any& rValue )
- throw (css::uno::Exception, std::exception) override;
+ const css::uno::Any& rValue ) override;
/**
The same as getFastProperyValue, but return the value through rValue and
@@ -156,68 +152,45 @@ protected:
// Interfaces
// ____ XInterface ____
- virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override;
// ____ XTypeProvider ____
virtual css::uno::Sequence< css::uno::Type > SAL_CALL
- getTypes()
- throw (css::uno::RuntimeException, std::exception) override;
+ getTypes() override;
virtual css::uno::Sequence< sal_Int8 > SAL_CALL
- getImplementationId()
- throw (css::uno::RuntimeException, std::exception) override;
+ getImplementationId() override;
// ____ XPropertyState ____
virtual css::beans::PropertyState SAL_CALL
- getPropertyState( const OUString& PropertyName )
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception) override;
+ getPropertyState( const OUString& PropertyName ) override;
virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL
- getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName )
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception) override;
+ getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
virtual void SAL_CALL
- setPropertyToDefault( const OUString& PropertyName )
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception) override;
+ setPropertyToDefault( const OUString& PropertyName ) override;
virtual css::uno::Any SAL_CALL
- getPropertyDefault( const OUString& aPropertyName )
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ getPropertyDefault( const OUString& aPropertyName ) override;
// ____ XMultiPropertyStates ____
// Note: getPropertyStates() is already implemented in XPropertyState with the
// same signature
virtual void SAL_CALL
- setAllPropertiesToDefault()
- throw (css::uno::RuntimeException, std::exception) override;
+ setAllPropertiesToDefault() override;
virtual void SAL_CALL
- setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames )
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException, std::exception) override;
+ setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
virtual css::uno::Sequence< css::uno::Any > SAL_CALL
- getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames )
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
// ____ XStyleSupplier ____
- virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle() override;
+ virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle ) override;
// ____ XMultiPropertySet ____
virtual void SAL_CALL setPropertyValues(
const css::uno::Sequence< OUString >& PropertyNames,
- const css::uno::Sequence< css::uno::Any >& Values )
- throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& Values ) override;
// ____ XFastPropertySet ____
- virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue )
- throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override;
// Note: it is assumed that the base class implements setPropertyValue by
// using setFastPropertyValue
diff --git a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
index a6e08c6115f7..6037fc742a78 100644
--- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx
@@ -36,16 +36,13 @@ protected:
const css::uno::Reference<css::util::XNumberFormatter>& xNumFormatter,
sal_Int32 nNumberFormatKey, sal_Int32* pFormulaMaxWidth = nullptr ) const override;
- virtual double SAL_CALL getCurveValue( double x )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL getCurveValue( double x ) override;
private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
const css::uno::Sequence<double>& aXValues,
- const css::uno::Sequence<double>& aYValues )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence<double>& aYValues ) override;
std::vector<double> mCoefficients;
};
diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
index 7a890617ca2a..06cdc5080316 100644
--- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
@@ -40,12 +40,9 @@ private:
// ____ XRegressionCurveCalculator ____
virtual void SAL_CALL recalculateRegression(
const css::uno::Sequence<double>& aXValues,
- const css::uno::Sequence<double>& aYValues )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence<double>& aYValues ) override;
- virtual double SAL_CALL getCurveValue( double x )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL getCurveValue( double x ) override;
virtual css::uno::Sequence<css::geometry::RealPoint2D> SAL_CALL getCurveValues(
double min,
@@ -53,9 +50,7 @@ private:
sal_Int32 nPointCount,
const css::uno::Reference<css::chart2::XScaling>& xScalingX,
const css::uno::Reference<css::chart2::XScaling>& xScalingY,
- sal_Bool bMaySkipPointsInCalculation )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Bool bMaySkipPointsInCalculation ) override;
// formula is: f(x) = x ^ m_fSlope * m_fSign * m_fIntercept
double m_fSlope;
diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx
index a7b67169fab8..01f408116bc8 100644
--- a/chart2/source/inc/RangeHighlighter.hxx
+++ b/chart2/source/inc/RangeHighlighter.hxx
@@ -55,24 +55,19 @@ public:
protected:
// ____ XRangeHighlighter ____
- virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() override;
virtual void SAL_CALL addSelectionChangeListener(
- const css::uno::Reference< css::view::XSelectionChangeListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
virtual void SAL_CALL removeSelectionChangeListener(
- const css::uno::Reference< css::view::XSelectionChangeListener >& xListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override;
// ____ XSelectionChangeListener ____
virtual void SAL_CALL selectionChanged(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
// ____ XEventListener (base of XSelectionChangeListener) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
// ____ WeakComponentImplHelperBase ____
// is called when dispose() is called at this component
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx
index ff063c8a8c96..aeab66d280fa 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -67,17 +67,13 @@ protected:
sal_Int32 aDegree,
sal_Bool aForceIntercept,
double aInterceptValue,
- sal_Int32 aPeriod)
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Int32 aPeriod) override;
virtual void SAL_CALL recalculateRegression(
const css::uno::Sequence< double >& aXValues,
- const css::uno::Sequence< double >& aYValues )
- throw (css::uno::RuntimeException, std::exception) override = 0;
+ const css::uno::Sequence< double >& aYValues ) override = 0;
- virtual double SAL_CALL getCurveValue( double x )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override = 0;
+ virtual double SAL_CALL getCurveValue( double x ) override = 0;
virtual css::uno::Sequence< css::geometry::RealPoint2D > SAL_CALL getCurveValues(
double min,
@@ -85,24 +81,18 @@ protected:
sal_Int32 nPointCount,
const css::uno::Reference< css::chart2::XScaling >& xScalingX,
const css::uno::Reference< css::chart2::XScaling >& xScalingY,
- sal_Bool bMaySkipPointsInCalculation )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ sal_Bool bMaySkipPointsInCalculation ) override;
- virtual double SAL_CALL getCorrelationCoefficient()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL getCorrelationCoefficient() override;
- virtual OUString SAL_CALL getRepresentation()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getRepresentation() override;
virtual OUString SAL_CALL getFormattedRepresentation(
const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumFmtSupplier,
- sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength )
- throw (css::uno::RuntimeException, std::exception) override;
+ sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) override;
virtual void SAL_CALL setXYNames(
- const OUString& aXName, const OUString& aYName )
- throw (css::uno::RuntimeException, std::exception) override;
+ const OUString& aXName, const OUString& aYName ) override;
};
} // namespace chart
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index 3b1b4ef14b05..b04d48bc1d4c 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -45,24 +45,19 @@ public:
virtual ~LogarithmicScaling() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XScaling ____
- virtual double SAL_CALL doScaling( double value )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL doScaling( double value ) override;
virtual css::uno::Reference<
css::chart2::XScaling > SAL_CALL
- getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+ getInverseScaling() override;
// ____ XServiceName ____
- virtual OUString SAL_CALL getServiceName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getServiceName() override;
private:
const double m_fBase;
@@ -83,24 +78,19 @@ public:
virtual ~ExponentialScaling() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XScaling ____
virtual double SAL_CALL
- doScaling( double value )
- throw (css::uno::RuntimeException, std::exception) override;
+ doScaling( double value ) override;
virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
- getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+ getInverseScaling() override;
// ____ XServiceName ____
- virtual OUString SAL_CALL getServiceName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getServiceName() override;
private:
const double m_fBase;
@@ -120,23 +110,18 @@ public:
virtual ~LinearScaling() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XScaling ____
- virtual double SAL_CALL doScaling( double value )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual double SAL_CALL doScaling( double value ) override;
virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
- getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+ getInverseScaling() override;
// ____ XServiceName ____
- virtual OUString SAL_CALL getServiceName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getServiceName() override;
private:
const double m_fSlope;
@@ -156,24 +141,19 @@ public:
virtual ~PowerScaling() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
// ____ XScaling ____
virtual double SAL_CALL
- doScaling( double value )
- throw (css::uno::RuntimeException, std::exception) override;
+ doScaling( double value ) override;
virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL
- getInverseScaling() throw (css::uno::RuntimeException, std::exception) override;
+ getInverseScaling() override;
// ____ XServiceName ____
- virtual OUString SAL_CALL getServiceName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getServiceName() override;
private:
const double m_fExponent;
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index bea4028d36d9..3077586c3803 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -91,12 +91,9 @@ public:
virtual ~UncachedDataSequence() override;
/// declare XServiceInfo methods
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
/// merge XInterface implementations
DECLARE_XINTERFACE()
@@ -106,78 +103,54 @@ public:
protected:
// ____ XPropertySet ____
/// @see css::beans::XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override;
/// @see ::comphelper::OPropertySetHelper
virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
/// @see ::comphelper::OPropertyArrayUsageHelper
virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override;
// ____ XDataSequence ____
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getSourceRangeRepresentation()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override;
+ virtual OUString SAL_CALL getSourceRangeRepresentation() override;
virtual css::uno::Sequence< OUString > SAL_CALL generateLabel(
- css::chart2::data::LabelOrigin nLabelOrigin )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
+ css::chart2::data::LabelOrigin nLabelOrigin ) override;
+ virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override;
// ____ XNumericalDataSequence ____
/// @see css::chart::data::XNumericalDataSequence
- virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override;
// ____ XTextualDataSequence ____
/// @see css::chart::data::XTextualDataSequence
- virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override;
// ____ XIndexReplace ____
- virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element )
- throw (css::lang::IllegalArgumentException,
- css::lang::IndexOutOfBoundsException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override;
// ____ XIndexAccess (base of XIndexReplace) ____
- virtual ::sal_Int32 SAL_CALL getCount()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index )
- throw (css::lang::IndexOutOfBoundsException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getCount() override;
+ virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override;
// ____ XElementAccess (base of XIndexAccess) ____
- virtual css::uno::Type SAL_CALL getElementType()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual sal_Bool SAL_CALL hasElements()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Type SAL_CALL getElementType() override;
+ virtual sal_Bool SAL_CALL hasElements() override;
// ____ XNamed (for setting a new range representation) ____
- virtual OUString SAL_CALL getName()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setName( const OUString& aName )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getName() override;
+ virtual void SAL_CALL setName( const OUString& aName ) override;
// ____ XCloneable ____
- virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
// ____ XModifiable ____
- virtual sal_Bool SAL_CALL isModified()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setModified( sal_Bool bModified )
- throw (css::beans::PropertyVetoException,
- css::uno::RuntimeException, std::exception) override;
+ virtual sal_Bool SAL_CALL isModified() override;
+ virtual void SAL_CALL setModified( sal_Bool bModified ) override;
// ____ XModifyBroadcaster (base of XModifiable) ____
virtual void SAL_CALL addModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
virtual void SAL_CALL removeModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
void fireModifyEvent();
diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx
index 9bbff96bc079..10b3b6357d94 100644
--- a/chart2/source/inc/WeakListenerAdapter.hxx
+++ b/chart2/source/inc/WeakListenerAdapter.hxx
@@ -56,8 +56,7 @@ public:
protected:
// ____ XEventListener (base of all listeners) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException) SAL_OVERRIDE
+ const css::lang::EventObject& Source ) SAL_OVERRIDE
{
css::uno::Reference< css::lang::XEventListener > xEventListener(
css::uno::Reference< Listener >( m_xListener), css::uno::UNO_QUERY );
@@ -84,8 +83,7 @@ public:
protected:
// ____ XModifyListener ____
- virtual void SAL_CALL modified( const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override;
};
class WeakSelectionChangeListenerAdapter :
@@ -99,8 +97,7 @@ public:
protected:
// ____ XSelectionChangeListener ____
virtual void SAL_CALL selectionChanged(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
};
} // namespace chart
diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx
index f0a9fed217ed..a3632118171d 100644
--- a/chart2/source/inc/WrappedDefaultProperty.hxx
+++ b/chart2/source/inc/WrappedDefaultProperty.hxx
@@ -34,20 +34,13 @@ public:
virtual ~WrappedDefaultProperty() override;
virtual void setPropertyToDefault(
- const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException) override;
+ const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
virtual css::uno::Any getPropertyDefault(
- const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException,
- css::lang::WrappedTargetException,
- css::uno::RuntimeException) override;
+ const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
virtual css::beans::PropertyState getPropertyState(
- const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException) override;
+ const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
private:
css::uno::Any m_aOuterDefaultValue;
};
diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx
index 1c97aa0a5cb8..ba2bc0aac459 100644
--- a/chart2/source/inc/WrappedDirectStateProperty.hxx
+++ b/chart2/source/inc/WrappedDirectStateProperty.hxx
@@ -34,9 +34,7 @@ public:
virtual ~WrappedDirectStateProperty() override;
virtual css::beans::PropertyState getPropertyState(
- const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException) override;
+ const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
};
} // namespace chart
diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx
index 70f0c37c9862..14bf3ddf514d 100644
--- a/chart2/source/inc/WrappedIgnoreProperty.hxx
+++ b/chart2/source/inc/WrappedIgnoreProperty.hxx
@@ -33,20 +33,15 @@ public:
WrappedIgnoreProperty( const OUString& rOuterName, const css::uno::Any& rDefaultValue );
virtual ~WrappedIgnoreProperty() override;
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override;
-SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
-SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override;
+SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
-SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override;
+SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override;
protected:
css::uno::Any m_aDefaultValue;
diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx
index c22a0cb828ef..d28b83e7c8a2 100644
--- a/chart2/source/inc/WrappedProperty.hxx
+++ b/chart2/source/inc/WrappedProperty.hxx
@@ -45,30 +45,25 @@ public:
/// @throws css::lang::IllegalArgumentException
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
- virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const;
/// @throws css::beans::UnknownPropertyException
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
- virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const;
/// @throws css::beans::UnknownPropertyException
/// @throws css::uno::RuntimeException
- virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+ virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const;
/// @throws css::beans::UnknownPropertyException
/// @throws css::lang::WrappedTargetException
/// @throws css::uno::RuntimeException
- virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+ virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const;
/// @throws css::beans::UnknownPropertyException
/// @throws css::uno::RuntimeException
- virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const
- throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+ virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const;
protected:
virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const;
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index cd2c89937e84..5f9f703430d4 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -53,35 +53,35 @@ public:
public:
//XPropertySet
- virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override;
- virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override;
+ virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override;
- virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- 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;
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override;
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override;
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
- virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+ virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
+ virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override;
//XPropertyState
- virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override;
+ virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override;
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override;
+ virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override;
//XMultiPropertyStates
//getPropertyStates() already declared in XPropertyState
- virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setAllPropertiesToDefault( ) override;
+ virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override;
+ virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override;
protected: //methods
/** give all the properties that should be visible to the outer side
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 019dd864a402..11e1a6bc57a0 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -195,7 +195,6 @@ XMLFilter::~XMLFilter()
// ____ XFilter ____
sal_Bool SAL_CALL XMLFilter::filter(
const Sequence< beans::PropertyValue >& aDescriptor )
- throw (uno::RuntimeException, std::exception)
{
bool bResult = false;
@@ -234,7 +233,6 @@ sal_Bool SAL_CALL XMLFilter::filter(
}
void SAL_CALL XMLFilter::cancel()
- throw (uno::RuntimeException, std::exception)
{
// if mutex is locked set "cancel state"
// note: is currently ignored in filter-method
@@ -247,8 +245,6 @@ void SAL_CALL XMLFilter::cancel()
// ____ XImporter ____
void SAL_CALL XMLFilter::setTargetDocument(
const Reference< lang::XComponent >& Document )
- throw (lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
MutexGuard aGuard( m_aMutex );
OSL_ENSURE( ! m_xSourceDoc.is(), "Setting target doc while source doc is set" );
@@ -259,8 +255,6 @@ void SAL_CALL XMLFilter::setTargetDocument(
// ____ XExporter ____
void SAL_CALL XMLFilter::setSourceDocument(
const Reference< lang::XComponent >& Document )
- throw (lang::IllegalArgumentException,
- uno::RuntimeException, std::exception)
{
MutexGuard aGuard( m_aMutex );
OSL_ENSURE( ! m_xTargetDoc.is(), "Setting source doc while target doc is set" );
@@ -744,19 +738,16 @@ OUString XMLFilter::getMediaType(bool _bOasis)
}
OUString SAL_CALL XMLFilter::getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
{
return OUString("com.sun.star.comp.chart2.XMLFilter");
}
sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName )
- throw( css::uno::RuntimeException, std::exception )
{
return cppu::supportsService(this, rServiceName);
}
css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
{
return {
"com.sun.star.document.ImportFilter",
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index ab73022b468b..73d7bf87a7a7 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -61,15 +61,13 @@ public:
virtual ~BaseCoordinateSystem() override;
// ____ OPropertySet ____
- virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw(css::beans::UnknownPropertyException) override;
+ virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
// ____ XPropertySet ____
virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL
- getPropertySetInfo()
- throw (css::uno::RuntimeException, std::exception) override;
+ getPropertySetInfo() override;
/// merge XInterface implementations
DECLARE_XINTERFACE()
@@ -78,55 +76,37 @@ public:
protected:
// ____ XCoordinateSystem ____
- virtual ::sal_Int32 SAL_CALL getDimension()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual ::sal_Int32 SAL_CALL getDimension() override;
virtual void SAL_CALL setAxisByDimension(
::sal_Int32 nDimension,
const css::uno::Reference< css::chart2::XAxis >& xAxis,
- ::sal_Int32 nIndex )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
+ ::sal_Int32 nIndex ) override;
virtual css::uno::Reference< css::chart2::XAxis > SAL_CALL getAxisByDimension(
- ::sal_Int32 nDimension, ::sal_Int32 nIndex )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
- virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
+ ::sal_Int32 nDimension, ::sal_Int32 nIndex ) override;
+ virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) override;
// ____ XChartTypeContainer ____
virtual void SAL_CALL addChartType(
- const css::uno::Reference< css::chart2::XChartType >& aChartType )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::chart2::XChartType >& aChartType ) override;
virtual void SAL_CALL removeChartType(
- const css::uno::Reference< css::chart2::XChartType >& aChartType )
- throw (css::container::NoSuchElementException,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::chart2::XChartType >& aChartType ) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes() override;
virtual void SAL_CALL setChartTypes(
- const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes )
- throw (css::lang::IllegalArgumentException,
- css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes ) override;
// ____ XModifyBroadcaster ____
virtual void SAL_CALL addModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
virtual void SAL_CALL removeModifyListener(
- const css::uno::Reference< css::util::XModifyListener >& aListener )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Reference< css::util::XModifyListener >& aListener ) override;
// ____ XModifyListener ____
virtual void SAL_CALL modified(
- const css::lang::EventObject& aEvent )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& aEvent ) override;
// ____ XEventListener (base of XModifyListener) ____
virtual void SAL_CALL disposing(
- const css::lang::EventObject& Source )
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::lang::EventObject& Source ) override;
// ____ OPropertySet ____
virtual void firePropertyChangeEvent() override;
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index 79aac4c21bb1..75d9aa2288b7 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -34,22 +34,16 @@ public:
virtual ~CartesianCoordinateSystem() override;
// ____ XCoordinateSystem ____
- virtual OUString SAL_CALL getCoordinateSystemType()
- throw (css::uno::RuntimeException, std::exception) override;
- virtual OUString SAL_CALL getViewServiceName()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual OUString SAL_CALL getCoordinateSystemType() override;
+ virtual OUString SAL_CALL getViewServiceName() override;
// ____ XCloneable ____
- virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override;
// ____ XServiceInfo ____
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
class CartesianCoordinateSystem2d : public CartesianCoordinateSystem
@@ -60,12 +54,9 @@ public:
virtual ~CartesianCoordinateSystem2d() override;
// ____ XServiceInfo ____
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
class CartesianCoordinateSystem3d : public CartesianCoordinateSystem
@@ -77,12 +68,9 @@ public:
virtual ~CartesianCoordinateSystem3d() override;
// ____ XServiceInfo ____
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
};
} // namespace chart
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index 30e2b24cffb1..2a49620e1dfd 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -45,29 +45,21 @@ public:
virtual OUString SAL_CALL
getImplementationName()
- throw( css::uno::RuntimeException, std::exception )
override;
virtual sal_Bool SAL_CALL
supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception )
override;
virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception )
override;
protected:
// ____ XMultiServiceFactory ____
- virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
- throw (css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override;
virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(
const OUString& ServiceSpecifier,
- const css::uno::Sequence< css::uno::Any >& Arguments )
- throw (css::uno::Exception,
- css::uno::RuntimeException, std::exception) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames()
- throw (css::uno::RuntimeException, std::exception) override;
+ const css::uno::Sequence< css::uno::Any >& Arguments ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override;
// ____ XChartTypeManager ____
// currently empty
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 7cac9977dfb7..3c477e0afefe 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -71,12 +71,9 @@ public:
virtual ~DataSeries() override;
/// XServiceInfo declarations
- virtual OUString SAL_CALL getImplementationName()
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
- throw( css::uno::RuntimeException, std::exception ) override;
- virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( css::uno::RuntimeException, std::exception ) override;
+ virtual OUString SAL_CALL getImplementationName() override;
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override;
/// merge XInterface implementations
DECLARE_XINTERFACE()
@@ -92,41 +89,31 @@ protected:
// ____ XDataSeries ____
/// @see css::chart2::XDataSeries
virtual css::uno::Reference< css::beans::XPropertySet >
- SAL_CALL getDataPointByIndex( sal_Int32 nIndex )
- throw (css::lang::IndexOutOfBoundsException,
- css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex )
- throw (css::uno::RuntimeException, std::exception) override;
- virtual void SAL_CALL resetAllDataPoints()
- throw (css::uno::RuntimeException, std::exception) override;
+ SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) override;
+ virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex ) override;
+ virtual void SAL_CALL resetAllDataPoints() override;
// ____ XDataSink ____
/// @see css::chart2::data::XDataSink
- virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData )
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override;
// ____ XDataSource ____
/// @see css::chart2::data::XDataSource
- virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
- throw (css::uno::RuntimeException, std::exception) override;
+ virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override;
// ____ OPropertySet ____
- virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const
- throw (css::beans::UnknownPropertyException,
- css::uno::RuntimeException) override;
+ virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override;
virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override;
virtual void SAL_CALL setFastPropertyValue_NoBroadcast
( sal_Int32 nHandle,
- const css::uno::Any& rValue )
- throw (css::uno::Exception, std::exception) override