summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/controller/accessibility/AccStatisticsObject.hxx4
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartElement.hxx10
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartShape.hxx10
-rw-r--r--chart2/source/controller/accessibility/AccessibleChartView.cxx1
-rw-r--r--chart2/source/controller/accessibility/AccessibleTextHelper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx13
-rw-r--r--chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx16
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx32
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.hxx16
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx34
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx3
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx10
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx1
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx1
-rw-r--r--chart2/source/controller/dialogs/ChartTypeDialogController.hxx8
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx2
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.hxx6
-rw-r--r--chart2/source/controller/dialogs/DialogModel.hxx16
-rw-r--r--chart2/source/controller/dialogs/RangeSelectionListener.cxx1
-rw-r--r--chart2/source/controller/dialogs/dlg_DataEditor.cxx1
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx1
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx1
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataSourceControls.cxx1
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx2
-rw-r--r--chart2/source/controller/inc/AccessibleBase.hxx10
-rw-r--r--chart2/source/controller/inc/AccessibleChartView.hxx4
-rw-r--r--chart2/source/controller/inc/AccessibleTextHelper.hxx4
-rw-r--r--chart2/source/controller/inc/CharacterPropertyItemConverter.hxx4
-rw-r--r--chart2/source/controller/inc/ChartDocumentWrapper.hxx16
-rw-r--r--chart2/source/controller/inc/DrawViewWrapper.hxx2
-rw-r--r--chart2/source/controller/inc/ItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/ObjectNameProvider.hxx26
-rw-r--r--chart2/source/controller/inc/PositionAndSizeHelper.hxx2
-rw-r--r--chart2/source/controller/inc/RangeSelectionHelper.hxx6
-rw-r--r--chart2/source/controller/inc/RangeSelectionListener.hxx6
-rw-r--r--chart2/source/controller/inc/TitleDialogData.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ChartType_UNO.hxx6
-rw-r--r--chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx14
-rw-r--r--chart2/source/controller/inc/dlg_InsertErrorBars.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_ObjectProperties.hxx12
-rw-r--r--chart2/source/controller/inc/res_ErrorBar.hxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/ItemConverter.cxx2
-rw-r--r--chart2/source/controller/main/ChartController.hxx26
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx1
-rw-r--r--chart2/source/controller/main/ChartController_Position.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Properties.cxx1
-rw-r--r--chart2/source/controller/main/ChartController_TextEdit.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx5
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx27
-rw-r--r--chart2/source/controller/main/ChartDropTargetHelper.cxx1
-rw-r--r--chart2/source/controller/main/ChartFrameloader.cxx6
-rw-r--r--chart2/source/controller/main/ChartTransferable.cxx1
-rw-r--r--chart2/source/controller/main/ChartWindow.cxx2
-rw-r--r--chart2/source/controller/main/CommandDispatch.cxx1
-rw-r--r--chart2/source/controller/main/CommandDispatch.hxx10
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.cxx1
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.hxx8
-rw-r--r--chart2/source/controller/main/ConfigurationAccess.cxx6
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.cxx3
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.hxx12
-rw-r--r--chart2/source/controller/main/DragMethod_Base.cxx4
-rw-r--r--chart2/source/controller/main/DragMethod_Base.hxx6
-rw-r--r--chart2/source/controller/main/DragMethod_PieSegment.cxx6
-rw-r--r--chart2/source/controller/main/DragMethod_PieSegment.hxx2
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.cxx2
-rw-r--r--chart2/source/controller/main/DragMethod_RotateDiagram.hxx2
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx30
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.hxx10
-rw-r--r--chart2/source/controller/main/ElementSelector.cxx14
-rw-r--r--chart2/source/controller/main/ElementSelector.hxx2
-rw-r--r--chart2/source/controller/main/FeatureCommandDispatchBase.cxx8
-rw-r--r--chart2/source/controller/main/FeatureCommandDispatchBase.hxx12
-rw-r--r--chart2/source/controller/main/ObjectHierarchy.cxx7
-rw-r--r--chart2/source/controller/main/PositionAndSizeHelper.cxx2
-rw-r--r--chart2/source/controller/main/SelectionHelper.cxx46
-rw-r--r--chart2/source/controller/main/SelectionHelper.hxx12
-rw-r--r--chart2/source/controller/main/ShapeController.cxx6
-rw-r--r--chart2/source/controller/main/ShapeController.hxx4
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.cxx12
-rw-r--r--chart2/source/controller/main/ShapeToolbarController.hxx14
-rw-r--r--chart2/source/controller/main/StatusBarCommandDispatch.cxx1
-rw-r--r--chart2/source/controller/main/StatusBarCommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/UndoActions.cxx11
-rw-r--r--chart2/source/controller/main/UndoActions.hxx8
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.cxx1
-rw-r--r--chart2/source/controller/main/UndoCommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/UndoGuard.cxx1
-rw-r--r--chart2/source/controller/main/UndoGuard.hxx10
-rw-r--r--chart2/source/inc/CachedDataSequence.hxx14
-rw-r--r--chart2/source/inc/ChartTypeHelper.hxx4
-rw-r--r--chart2/source/inc/CommonConverters.hxx8
-rw-r--r--chart2/source/inc/CommonFunctors.hxx24
-rw-r--r--chart2/source/inc/ConfigColorScheme.hxx2
-rw-r--r--chart2/source/inc/ConfigItemListener.hxx2
-rw-r--r--chart2/source/inc/ContainerHelper.hxx6
-rw-r--r--chart2/source/inc/DataSeriesHelper.hxx16
-rw-r--r--chart2/source/inc/DataSourceHelper.hxx20
-rw-r--r--chart2/source/inc/DiagramHelper.hxx8
-rw-r--r--chart2/source/inc/ExplicitCategoriesProvider.hxx16
-rw-r--r--chart2/source/inc/ExponentialRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/FormattedStringHelper.hxx2
-rw-r--r--chart2/source/inc/InternalDataProvider.hxx50
-rw-r--r--chart2/source/inc/LinearRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/MeanValueRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/MediaDescriptorHelper.hxx36
-rw-r--r--chart2/source/inc/NameContainer.hxx28
-rw-r--r--chart2/source/inc/NumberFormatterWrapper.hxx4
-rw-r--r--chart2/source/inc/OPropertySet.hxx14
-rw-r--r--chart2/source/inc/ObjectIdentifier.hxx118
-rw-r--r--chart2/source/inc/PotentialRegressionCurveCalculator.hxx2
-rw-r--r--chart2/source/inc/PropertyHelper.hxx24
-rw-r--r--chart2/source/inc/RegressionCurveCalculator.hxx8
-rw-r--r--chart2/source/inc/RegressionCurveHelper.hxx6
-rw-r--r--chart2/source/inc/Scaling.hxx8
-rw-r--r--chart2/source/inc/ServiceMacros.hxx24
-rw-r--r--chart2/source/inc/StatisticsHelper.hxx4
-rw-r--r--chart2/source/inc/TitleHelper.hxx6
-rw-r--r--chart2/source/inc/UncachedDataSequence.hxx22
-rw-r--r--chart2/source/inc/WrappedDefaultProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedDirectStateProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedIgnoreProperty.hxx2
-rw-r--r--chart2/source/inc/WrappedProperty.hxx10
-rw-r--r--chart2/source/inc/WrappedPropertySet.hxx34
-rw-r--r--chart2/source/inc/XMLRangeHelper.hxx6
-rw-r--r--chart2/source/inc/chartview/DrawModelWrapper.hxx2
-rw-r--r--chart2/source/inc/chartview/ExplicitValueProvider.hxx4
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx7
-rw-r--r--chart2/source/model/inc/CartesianCoordinateSystem.hxx4
-rw-r--r--chart2/source/model/inc/ChartTypeManager.hxx6
-rw-r--r--chart2/source/model/inc/PolarCoordinateSystem.hxx4
-rw-r--r--chart2/source/model/inc/XMLFilter.hxx20
-rw-r--r--chart2/source/model/main/Axis.cxx1
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx1
-rw-r--r--chart2/source/model/main/CartesianCoordinateSystem.cxx1
-rw-r--r--chart2/source/model/main/ChartModel.cxx25
-rw-r--r--chart2/source/model/main/ChartModel.hxx24
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx11
-rw-r--r--chart2/source/model/main/DataPoint.cxx1
-rw-r--r--chart2/source/model/main/DataPointProperties.cxx16
-rw-r--r--chart2/source/model/main/DataSeries.cxx1
-rw-r--r--chart2/source/model/main/DataSeriesProperties.cxx1
-rw-r--r--chart2/source/model/main/Diagram.cxx1
-rw-r--r--chart2/source/model/main/FormattedString.cxx5
-rw-r--r--chart2/source/model/main/FormattedString.hxx6
-rw-r--r--chart2/source/model/main/GridProperties.cxx1
-rw-r--r--chart2/source/model/main/Legend.cxx1
-rw-r--r--chart2/source/model/main/PageBackground.cxx4
-rw-r--r--chart2/source/model/main/PolarCoordinateSystem.cxx5
-rw-r--r--chart2/source/model/main/StockBar.cxx4
-rw-r--r--chart2/source/model/main/Title.cxx4
-rw-r--r--chart2/source/model/main/UndoManager.cxx14
-rw-r--r--chart2/source/model/main/UndoManager.hxx10
-rw-r--r--chart2/source/model/main/Wall.cxx4
-rw-r--r--chart2/source/model/template/AreaChartType.cxx6
-rw-r--r--chart2/source/model/template/AreaChartType.hxx2
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/BarChartType.cxx6
-rw-r--r--chart2/source/model/template/BarChartType.hxx2
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx1
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx11
-rw-r--r--chart2/source/model/template/BubbleChartType.hxx6
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.cxx1
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/BubbleDataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx9
-rw-r--r--chart2/source/model/template/CandleStickChartType.hxx8
-rw-r--r--chart2/source/model/template/ChartType.cxx1
-rw-r--r--chart2/source/model/template/ChartType.hxx8
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx1
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx5
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.hxx6
-rw-r--r--chart2/source/model/template/ColumnChartType.cxx6
-rw-r--r--chart2/source/model/template/ColumnChartType.hxx2
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/ColumnLineDataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/DataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/DataInterpreter.hxx6
-rw-r--r--chart2/source/model/template/FilledNetChartType.cxx7
-rw-r--r--chart2/source/model/template/FilledNetChartType.hxx2
-rw-r--r--chart2/source/model/template/LineChartType.cxx7
-rw-r--r--chart2/source/model/template/LineChartType.hxx2
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.cxx3
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/NetChartType.cxx7
-rw-r--r--chart2/source/model/template/NetChartType.hxx2
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.cxx3
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/PieChartType.cxx7
-rw-r--r--chart2/source/model/template/PieChartType.hxx2
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx7
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx15
-rw-r--r--chart2/source/model/template/ScatterChartType.hxx6
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx1
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx3
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.hxx2
-rw-r--r--chart2/source/model/template/StockDataInterpreter.cxx1
-rw-r--r--chart2/source/model/template/XYDataInterpreter.cxx1
-rw-r--r--chart2/source/tools/AxisHelper.cxx2
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx1
-rw-r--r--chart2/source/tools/CharacterProperties.cxx1
-rw-r--r--chart2/source/tools/ChartDebugTrace.cxx1
-rw-r--r--chart2/source/tools/ChartTypeHelper.cxx66
-rw-r--r--chart2/source/tools/CommonConverters.cxx10
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx1
-rw-r--r--chart2/source/tools/ControllerLockGuard.cxx1
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx2
-rw-r--r--chart2/source/tools/DataSource.cxx1
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx25
-rw-r--r--chart2/source/tools/DiagramHelper.cxx19
-rw-r--r--chart2/source/tools/ErrorBar.cxx6
-rw-r--r--chart2/source/tools/ExplicitCategoriesProvider.cxx17
-rw-r--r--chart2/source/tools/ExponentialRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/FillProperties.cxx8
-rw-r--r--chart2/source/tools/FormattedStringHelper.cxx1
-rw-r--r--chart2/source/tools/ImplOPropertySet.cxx1
-rw-r--r--chart2/source/tools/InternalData.cxx1
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx16
-rw-r--r--chart2/source/tools/LabeledDataSequence.cxx1
-rw-r--r--chart2/source/tools/LineProperties.cxx2
-rw-r--r--chart2/source/tools/LinearRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/MeanValueRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/ModifyListenerHelper.cxx1
-rw-r--r--chart2/source/tools/NameContainer.cxx3
-rw-r--r--chart2/source/tools/NumberFormatterWrapper.cxx8
-rw-r--r--chart2/source/tools/OPropertySet.cxx1
-rw-r--r--chart2/source/tools/ObjectIdentifier.cxx28
-rw-r--r--chart2/source/tools/PotentialRegressionCurveCalculator.cxx2
-rw-r--r--chart2/source/tools/PropertyHelper.cxx1
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx1
-rw-r--r--chart2/source/tools/ReferenceSizeProvider.cxx1
-rw-r--r--chart2/source/tools/RegressionCalculationHelper.hxx2
-rw-r--r--chart2/source/tools/RegressionCurveCalculator.cxx1
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx11
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx26
-rw-r--r--chart2/source/tools/RegressionCurveModel.hxx2
-rw-r--r--chart2/source/tools/RegressionEquation.cxx6
-rw-r--r--chart2/source/tools/RelativeSizeHelper.cxx1
-rw-r--r--chart2/source/tools/Scaling.cxx24
-rw-r--r--chart2/source/tools/StatisticsHelper.cxx2
-rw-r--r--chart2/source/tools/ThreeDHelper.cxx5
-rw-r--r--chart2/source/tools/TitleHelper.cxx14
-rw-r--r--chart2/source/tools/UncachedDataSequence.cxx3
-rw-r--r--chart2/source/tools/WeakListenerAdapter.cxx1
-rw-r--r--chart2/source/tools/WrappedDefaultProperty.cxx1
-rw-r--r--chart2/source/tools/WrappedDirectStateProperty.cxx1
-rw-r--r--chart2/source/tools/WrappedIgnoreProperty.cxx13
-rw-r--r--chart2/source/tools/WrappedProperty.cxx5
-rw-r--r--chart2/source/tools/WrappedPropertySet.cxx15
-rw-r--r--chart2/source/tools/XMLRangeHelper.cxx30
-rw-r--r--chart2/source/view/axes/DateScaling.cxx12
-rw-r--r--chart2/source/view/axes/DateScaling.hxx4
-rw-r--r--chart2/source/view/axes/Tickmarks.hxx2
-rw-r--r--chart2/source/view/axes/VAxisBase.cxx2
-rw-r--r--chart2/source/view/axes/VAxisBase.hxx4
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx12
-rw-r--r--chart2/source/view/axes/VCartesianCoordinateSystem.cxx6
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx14
-rw-r--r--chart2/source/view/axes/VPolarAngleAxis.cxx6
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.cxx2
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx2
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx10
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx8
-rw-r--r--chart2/source/view/charttypes/BubbleChart.cxx6
-rw-r--r--chart2/source/view/charttypes/CandleStickChart.cxx11
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx6
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx17
-rw-r--r--chart2/source/view/diagram/VDiagram.cxx10
-rw-r--r--chart2/source/view/inc/PlotterBase.hxx6
-rw-r--r--chart2/source/view/inc/PropertyMapper.hxx14
-rw-r--r--chart2/source/view/inc/ShapeFactory.hxx12
-rw-r--r--chart2/source/view/inc/VCoordinateSystem.hxx12
-rw-r--r--chart2/source/view/inc/VDataSeries.hxx28
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx6
-rw-r--r--chart2/source/view/main/ChartView.cxx81
-rw-r--r--chart2/source/view/main/ChartView.hxx26
-rw-r--r--chart2/source/view/main/DrawModelWrapper.cxx2
-rw-r--r--chart2/source/view/main/PlotterBase.cxx4
-rw-r--r--chart2/source/view/main/PropertyMapper.cxx10
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx18
-rw-r--r--chart2/source/view/main/VDataSeries.cxx34
-rw-r--r--chart2/source/view/main/VLegend.cxx4
-rw-r--r--chart2/source/view/main/VLegendSymbolFactory.cxx1
-rw-r--r--chart2/source/view/main/VTitle.cxx6
-rw-r--r--chart2/source/view/main/VTitle.hxx4
321 files changed, 1162 insertions, 1304 deletions
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
index 8dae44486eae..e738c75ab10a 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
@@ -34,10 +34,10 @@ public:
virtual ~AccStatisticsObject();
// ________ XAccessibleContext ________
- virtual ::rtl::OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException);
// ________ XServiceInfo ________
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
};
} // accessibility
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 4d58186cde4f..21d22b3fae05 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -85,17 +85,17 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// ________ XAccessibleContext ________
- virtual ::rtl::OUString SAL_CALL getAccessibleName()
+ virtual OUString SAL_CALL getAccessibleName()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+ virtual OUString SAL_CALL getAccessibleDescription()
throw (::com::sun::star::uno::RuntimeException);
// ________ XAccessibleExtendedComponent ________
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTitledBorderText()
+ virtual OUString SAL_CALL getTitledBorderText()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getToolTipText()
+ virtual OUString SAL_CALL getToolTipText()
throw (::com::sun::star::uno::RuntimeException);
// the following interface is implemented in AccessibleBase, however it is
@@ -114,7 +114,7 @@ public:
virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException);
// ________ XServiceInfo ________
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
private:
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index a2e206a49929..d6827e30fe80 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -50,7 +50,7 @@ public:
virtual ~AccessibleChartShape();
// ________ XServiceInfo ________
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
// ________ XAccessibleContext ________
@@ -62,9 +62,9 @@ public:
::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getAccessibleRole()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+ virtual OUString SAL_CALL getAccessibleDescription()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleName()
+ virtual OUString SAL_CALL getAccessibleName()
throw (::com::sun::star::uno::RuntimeException);
// ________ XAccessibleComponent ________
@@ -81,9 +81,9 @@ public:
// ________ XAccessibleExtendedComponent ________
virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTitledBorderText()
+ virtual OUString SAL_CALL getTitledBorderText()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getToolTipText()
+ virtual OUString SAL_CALL getToolTipText()
throw (::com::sun::star::uno::RuntimeException);
private:
diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 946cc3735e75..3b1be85ad49b 100644
--- a/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -48,7 +48,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::WeakReference;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
using osl::MutexGuard;
//.............................................................................
diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index 039b38520cb2..6a2b04235f5c 100644
--- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star::accessibility;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index 8fec5d533bf8..feac067d1f62 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -66,7 +66,7 @@ public:
::com::sun::star::uno::RuntimeException);
// ____ XShapeDescriptor (base of XShape) ____
- virtual ::rtl::OUString SAL_CALL getShapeType()
+ virtual OUString SAL_CALL getShapeType()
throw (::com::sun::star::uno::RuntimeException);
// ____ XComponent ____
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index 65ef53cac25c..f6290969a2a9 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -102,7 +102,7 @@ public:
::com::sun::star::uno::RuntimeException);
// ____ XShapeDescriptor (base of XShape) ____
- virtual ::rtl::OUString SAL_CALL getShapeType()
+ virtual OUString SAL_CALL getShapeType()
throw (::com::sun::star::uno::RuntimeException);
// ____ XNumberFormatsSupplier ____
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 13d5316f5c67..f892059f2ea9 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
@@ -233,7 +232,7 @@ awt::Size Chart2ModelContact::GetLegendSize() const
if( pProvider )
{
uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( m_xChartModel ) );
- rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) );
+ OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) );
aSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
}
return aSize;
@@ -246,7 +245,7 @@ awt::Point Chart2ModelContact::GetLegendPosition() const
if( pProvider )
{
uno::Reference< chart2::XLegend > xLegend( LegendHelper::getLegend( m_xChartModel ) );
- rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) );
+ OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xLegend, m_xChartModel ) );
aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) );
}
return aPoint;
@@ -259,7 +258,7 @@ awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference<
ExplicitValueProvider* pProvider( getExplicitValueProvider() );
if( pProvider && xTitle.is() )
{
- rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) );
+ OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) );
aSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
}
return aSize;
@@ -272,7 +271,7 @@ awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference<
ExplicitValueProvider* pProvider( getExplicitValueProvider() );
if( pProvider && xTitle.is() )
{
- rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) );
+ OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, m_xChartModel ) );
aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) );
}
return aPoint;
@@ -285,7 +284,7 @@ awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference<
ExplicitValueProvider* pProvider( getExplicitValueProvider() );
if( pProvider && xAxis.is() )
{
- rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) );
+ OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) );
aSize = ToSize( pProvider->getRectangleOfObject( aCID ) );
}
return aSize;
@@ -298,7 +297,7 @@ awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference<
ExplicitValueProvider* pProvider( getExplicitValueProvider() );
if( pProvider && xAxis.is() )
{
- rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) );
+ OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xAxis, m_xChartModel ) );
aPoint = ToPoint( pProvider->getRectangleOfObject( aCID ) );
}
return aPoint;
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
index a56ee6a07d06..86d9128df4d3 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx
@@ -149,7 +149,7 @@ private: //member
mutable ::com::sun::star::uno::Reference<
::com::sun::star::lang::XUnoTunnel > m_xChartView;
- typedef std::map< ::rtl::OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc.
+ typedef std::map< OUString, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > > tTableMap;//GradientTable, HatchTable etc.
tTableMap m_aTableMap;
};
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
index 44e22077c7e9..0ff551e9d61d 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx
@@ -77,17 +77,17 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setComplexRowDescriptions(
const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions )
+ ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setComplexColumnDescriptions(
const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions )
+ ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions )
throw (::com::sun::star::uno::RuntimeException);
// ____ XChartDataArray (base of XComplexDescriptionAccess) ____
@@ -100,16 +100,16 @@ protected:
double > >& aData )
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence<
- ::rtl::OUString > SAL_CALL getRowDescriptions()
+ OUString > SAL_CALL getRowDescriptions()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setRowDescriptions( const ::com::sun::star::uno::Sequence<
- ::rtl::OUString >& aRowDescriptions )
+ OUString >& aRowDescriptions )
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence<
- ::rtl::OUString > SAL_CALL getColumnDescriptions()
+ OUString > SAL_CALL getColumnDescriptions()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setColumnDescriptions( const ::com::sun::star::uno::Sequence<
- ::rtl::OUString >& aColumnDescriptions )
+ OUString >& aColumnDescriptions )
throw (::com::sun::star::uno::RuntimeException);
// ____ XChartData (base of XChartDataArray) ____
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index af34ef0dc924..48c39c180279 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -73,7 +73,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
using ::osl::MutexGuard;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
index e3dd0f8ca647..09d5596979ed 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx
@@ -104,14 +104,14 @@ protected:
// ____ WrappedPropertySet ____
virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence();
virtual const std::vector< WrappedProperty* > createWrappedProperties();
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > getInnerPropertySet();
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//own methods
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries > getDataSeries();
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index d7013539cdc6..edb3289c1cce 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -74,7 +74,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
using ::com::sun::star::chart::XAxis;
using ::osl::MutexGuard;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
index ee3a69017618..87323b186689 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx
@@ -95,7 +95,7 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// ____ XDiagram ____
- virtual ::rtl::OUString SAL_CALL getDiagramType()
+ virtual OUString SAL_CALL getDiagramType()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow )
@@ -118,7 +118,7 @@ public:
::com::sun::star::uno::RuntimeException);
// ____ XShapeDescriptor (base of XShape) ____
- virtual ::rtl::OUString SAL_CALL getShapeType()
+ virtual OUString SAL_CALL getShapeType()
throw (::com::sun::star::uno::RuntimeException);
// ____ XAxisSupplier ____
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 96ccd65e3edf..563817814c09 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -50,7 +50,6 @@ using ::osl::MutexGuard;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
//-----------------------------------------------------------------------------
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
index 1aed315740a2..94e05bf431b2 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx
@@ -74,7 +74,7 @@ public:
::com::sun::star::uno::RuntimeException);
// ____ XShapeDescriptor (base of XShape) ____
- virtual ::rtl::OUString SAL_CALL getShapeType()
+ virtual OUString SAL_CALL getShapeType()
throw (::com::sun::star::uno::RuntimeException);
// ____ XComponent ____
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
index d2b072c98874..29ecbf883db7 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx
@@ -77,33 +77,33 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
//XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XMultiPropertyStates
//getPropertyStates() already declared in XPropertyState
virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
private: //methods
::cppu::IPropertyArrayHelper& getInfoHelper();
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index 9c3d4a23f5a7..34af3c4d89f5 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -41,7 +41,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::beans::Property;
using ::osl::MutexGuard;
-using ::rtl::OUString;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
index f8ca9a575468..5a437115de86 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx
@@ -74,7 +74,7 @@ protected:
::com::sun::star::uno::RuntimeException);
// ____ XShapeDescriptor (base of XShape) ____
- virtual ::rtl::OUString SAL_CALL getShapeType()
+ virtual OUString SAL_CALL getShapeType()
throw (::com::sun::star::uno::RuntimeException);
// ____ XComponent ____
@@ -93,16 +93,16 @@ protected:
throw (::com::sun::star::uno::Exception);
// ____ WrappedPropertySet ____
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet();
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index d80169a0a3c6..ed66e266a63f 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -39,7 +39,6 @@ using ::osl::MutexGuard;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
index abb5b49ec779..cc63338de0dd 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx
@@ -76,33 +76,33 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
//XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XMultiPropertyStates
//getPropertyStates() already declared in XPropertyState
virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
private: //methods
::cppu::IPropertyArrayHelper& getInfoHelper();
@@ -111,7 +111,7 @@ private: //member
::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
::cppu::OInterfaceContainerHelper m_aEventListenerContainer;
- rtl::OUString m_aPropertySetName;
+ OUString m_aPropertySetName;
};
} // namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index c905e665b442..af7f07e34c33 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -23,7 +23,6 @@
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
using namespace ::com::sun::star;
//.............................................................................
@@ -72,7 +71,7 @@ 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)
{
- rtl::OUString aBaseDiagram;
+ OUString aBaseDiagram;
if( ! (rOuterValue >>= aBaseDiagram) )
throw lang::IllegalArgumentException( "BaseDiagram properties require type OUString", 0, 0 );
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 5fcdf8cde1f2..4bdb59ac315c 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -29,7 +29,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
//.............................................................................
namespace chart
@@ -52,7 +51,7 @@ public:
};
WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty()
- : ::chart::WrappedProperty( "AutomaticPosition" , rtl::OUString() )
+ : ::chart::WrappedProperty( "AutomaticPosition" , OUString() )
{
}
WrappedAutomaticPositionProperty::~WrappedAutomaticPositionProperty()
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index 5701dc58b87e..d21f485166fe 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
//.............................................................................
namespace chart
@@ -286,7 +285,7 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue
if( bNewValue )
{
- rtl::OUString aTitleText;
+ OUString aTitleText;
TitleHelper::createTitle( m_eTitleType, aTitleText
, m_spChart2ModelContact->getChartModel(), m_spChart2ModelContact->m_xContext );
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 1c82ac132c68..a8923502b4c7 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -26,7 +26,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
index 54d247f07da9..4f40de00153d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx
@@ -34,7 +34,7 @@ class ReferenceSizePropertyProvider;
class WrappedCharacterHeightProperty_Base : public WrappedProperty
{
public:
- WrappedCharacterHeightProperty_Base( const ::rtl::OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider );
+ WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider );
virtual ~WrappedCharacterHeightProperty_Base();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 6e34e4f7b6d8..5c4765297777 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -31,7 +31,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 67c8f31558fe..77083d950958 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -26,7 +26,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
index c2490cd9bd23..e018e72af6f0 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx
@@ -33,8 +33,8 @@ class WrappedBarPositionProperty_Base : public WrappedDefaultProperty
{
public:
WrappedBarPositionProperty_Base(
- const ::rtl::OUString& rOuterName
- , const ::rtl::OUString& rInnerSequencePropertyName
+ const OUString& rOuterName
+ , const OUString& rInnerSequencePropertyName
, sal_Int32 nDefaultValue
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact );
virtual ~WrappedBarPositionProperty_Base();
@@ -53,7 +53,7 @@ protected:
::boost::shared_ptr< Chart2ModelContact > m_spChart2ModelContact;
sal_Int32 m_nDefaultValue;
- ::rtl::OUString m_InnerSequencePropertyName;
+ OUString m_InnerSequencePropertyName;
mutable ::com::sun::star::uno::Any m_aOuterValue;
};
diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index cc0e6c262587..53ec6a5b08bb 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -24,7 +24,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
//.............................................................................
namespace chart
@@ -105,7 +104,7 @@ Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPr
//-----------------------------------------------------------------------------
WrappedLinkNumberFormatProperty::WrappedLinkNumberFormatProperty( WrappedNumberFormatProperty* pWrappedNumberFormatProperty )
- : WrappedProperty( "LinkNumberFormatToSource", rtl::OUString() )
+ : WrappedProperty( "LinkNumberFormatToSource", OUString() )
, m_pWrappedNumberFormatProperty( pWrappedNumberFormatProperty )
{
if( m_pWrappedNumberFormatProperty )
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index 175adf65b8ae..e3ffbea7331e 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -31,7 +31,6 @@ using ::com::sun::star::uno::Any;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::com::sun::star::chart::TimeIncrement;
//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 19bdcc0312bf..43fc6ba744dc 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -29,7 +29,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
//.............................................................................
namespace chart
@@ -55,7 +54,7 @@ private:
};
WrappedScaleTextProperty::WrappedScaleTextProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
- : ::chart::WrappedProperty( "ScaleText" , rtl::OUString() )
+ : ::chart::WrappedProperty( "ScaleText" , OUString() )
, m_spChart2ModelContact( spChart2ModelContact )
{
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index f2cacc74cf8f..621593c4a878 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -28,7 +28,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
index 327cc7ce3cd7..f31f14cfeb07 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
@@ -23,7 +23,6 @@
#include "macros.hxx"
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
//.............................................................................
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
index b2cfa390925a..9051aded4905 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.hxx
@@ -31,17 +31,17 @@ class DataSeriesPointWrapper;
class WrappedSeriesAreaOrLineProperty : public WrappedProperty
{
public:
- WrappedSeriesAreaOrLineProperty( const ::rtl::OUString& rOuterName
- , const ::rtl::OUString& rInnerAreaTypeName, const ::rtl::OUString& rInnerLineTypeName
+ WrappedSeriesAreaOrLineProperty( const OUString& rOuterName
+ , const OUString& rInnerAreaTypeName, const OUString& rInnerLineTypeName
, DataSeriesPointWrapper* pDataSeriesPointWrapper );
virtual ~WrappedSeriesAreaOrLineProperty();
- virtual ::rtl::OUString getInnerName() const;
+ virtual OUString getInnerName() const;
protected:
DataSeriesPointWrapper* m_pDataSeriesPointWrapper;
- ::rtl::OUString m_aInnerAreaTypeName;
- ::rtl::OUString m_aInnerLineTypeName;
+ OUString m_aInnerAreaTypeName;
+ OUString m_aInnerLineTypeName;
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index 5caee3847f46..3934c8e8bcf0 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -49,10 +49,10 @@ public:
virtual PROPERTYTYPE getValueFromSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet ) const =0;
virtual void setValueToSeries( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xSeriesPropertySet, PROPERTYTYPE aNewValue ) const =0;
- explicit WrappedSeriesOrDiagramProperty( const ::rtl::OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue
+ explicit WrappedSeriesOrDiagramProperty( const OUString& rName, const ::com::sun::star::uno::Any& rDefaulValue
, ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
- : WrappedProperty(rName,::rtl::OUString())
+ : WrappedProperty(rName,OUString())
, m_spChart2ModelContact(spChart2ModelContact)
, m_aOuterValue(rDefaulValue)
, m_aDefaultValue(rDefaulValue)
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 846dd0a5e489..2b0294107fff 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -30,7 +30,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 88dc00d6cfd3..23e7de1fbb19 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -40,7 +40,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 76a461a3d14e..fc8096067b9f 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -32,7 +32,6 @@ using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
//.............................................................................
namespace chart
diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index 9d9ba85a39dd..96fedf6f9b20 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -24,7 +24,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
//.............................................................................
diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
index 43ee9d836df4..d751df52992a 100644
--- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
+++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx
@@ -86,7 +86,7 @@ public:
bool bSortByXValues;
};
-typedef ::comphelper::MakeMap< ::rtl::OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap;
+typedef ::comphelper::MakeMap< OUString, ChartTypeParameter > tTemplateServiceChartTypeParameterMap;
class ChartTypeDialogController : public ChangingResource
{
@@ -114,13 +114,13 @@ public:
, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps=::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() ) const;
virtual void setTemplateProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xTemplateProps ) const throw (::com::sun::star::uno::RuntimeException);
- virtual bool isSubType( const rtl::OUString& rServiceName );
- virtual ChartTypeParameter getChartTypeParameterForService( const rtl::OUString& rServiceName, const ::com::sun::star::uno::Reference<
+ virtual bool isSubType( const OUString& rServiceName );
+ virtual ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet >& xTemplateProps );
virtual void adjustSubTypeAndEnableControls( ChartTypeParameter& rParameter );//if you have different counts of subtypes you may need to adjust the index
virtual void adjustParameterToSubType( ChartTypeParameter& rParameter );
virtual void adjustParameterToMainType( ChartTypeParameter& rParameter );
- virtual rtl::OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const;
+ virtual OUString getServiceNameForParameter( const ChartTypeParameter& rParameter ) const;
virtual bool commitToModel( const ChartTypeParameter& rParameter
, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel );
virtual ::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 3d5a5b88a586..a5bfad071e96 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -85,7 +85,7 @@ public:
*/
double GetCellNumber( long nRow, sal_uInt16 nColumnId ) const;
- bool isDateString( rtl::OUString aInputString, double& fOutDateValue );
+ bool isDateString( OUString aInputString, double& fOutDateValue );
// Window
virtual void Resize();
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index 83d0be282947..62e3e2ff1af0 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -77,21 +77,21 @@ public:
eCellType getCellType( sal_Int32 nAtColumn, sal_Int32 nAtRow ) const;
/// If getCellType( nAtColumn, nAtRow ) returns TEXT, the result will be Nan
double getCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow );
- ::rtl::OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow );
+ OUString getCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow );
::com::sun::star::uno::Any getCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow );
sal_uInt32 getNumberFormatKey( sal_Int32 nAtColumn, sal_Int32 nAtRow );
/// returns </sal_True> if the number could successfully be set at the given position
bool setCellNumber( sal_Int32 nAtColumn, sal_Int32 nAtRow, double fValue );
/// returns </sal_True> if the text could successfully be set at the given position
- bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::rtl::OUString & rText );
+ bool setCellText( sal_Int32 nAtColumn, sal_Int32 nAtRow, const OUString & rText );
bool setCellAny( sal_Int32 nAtColumn, sal_Int32 nAtRow, const ::com::sun::star::uno::Any & aValue );
sal_Int32 getColumnCount() const;
sal_Int32 getMaxRowCount() const;
// returns the UI string of the corresponding role
- ::rtl::OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const;
+ OUString getRoleOfColumn( sal_Int32 nColumnIndex ) const;
bool isCategoriesColumn( sal_Int32 nColumnIndex ) const;
struct tDataHeader
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index dc99c398c969..cc0b5aeb29d7 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -56,14 +56,14 @@ public:
~DialogModel();
typedef ::std::pair<
- ::rtl::OUString,
+ OUString,
::std::pair< ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries >,
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartType > > >
tSeriesWithChartTypeByName;
- typedef ::std::map< ::rtl::OUString, ::rtl::OUString >
+ typedef ::std::map< OUString, OUString >
tRolesWithRanges;
void setTemplate(
@@ -91,7 +91,7 @@ public:
tRolesWithRanges getRolesWithRanges(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > & xSeries,
- const ::rtl::OUString & aRoleOfSequenceForLabel,
+ const OUString & aRoleOfSequenceForLabel,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartType > & xChartType ) const;
@@ -127,12 +127,12 @@ public:
void setCategories( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > & xCategories );
- ::rtl::OUString getCategoriesRange() const;
+ OUString getCategoriesRange() const;
bool isCategoryDiagram() const;
void detectArguments(
- ::rtl::OUString & rOutRangeString,
+ OUString & rOutRangeString,
bool & rOutUseColumns, bool & rOutFirstCellAsLabel, bool & rOutHasCategories ) const;
bool allArgumentsForRectRangeDetected() const;
@@ -142,12 +142,12 @@ public:
void startControllerLockTimer();
- static ::rtl::OUString ConvertRoleFromInternalToUI( const ::rtl::OUString & rRoleString );
- static ::rtl::OUString GetRoleDataLabel();
+ static OUString ConvertRoleFromInternalToUI( const OUString & rRoleString );
+ static OUString GetRoleDataLabel();
// pass a role string (not translated) and get an index that serves for
// relative ordering, to get e.g. x-values and y-values in the right order
- static sal_Int32 GetRoleIndexForSorting( const ::rtl::OUString & rInternalRoleString );
+ static sal_Int32 GetRoleIndexForSorting( const OUString & rInternalRoleString );
private:
::com::sun::star::uno::Reference<
diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
index 032f0b528760..2662c1d20d9a 100644
--- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx
+++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx
@@ -24,7 +24,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 5fb035bfde94..9406c3bad501 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -40,7 +40,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index e7ed3a36cd49..80bc72355acf 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -39,7 +39,6 @@ using namespace ::chart;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
// --------------------------------------------------------------------------------
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 28075c5df2f7..4112ee228dbe 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/chart2/XAxis.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
-using ::rtl::OUString;
using ::com::sun::star::uno::Reference;
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 11a98c6efe2f..73dd06b475c2 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -316,7 +316,7 @@ void AxisPositionsTabPage::Reset(const SfxItemSet& rInAttrs)
else
{
m_aED_CrossesAtCategory.SetNoSelection();
- m_aED_CrossesAt.SetTextValue(rtl::OUString());
+ m_aED_CrossesAt.SetTextValue(OUString());
}
}
else
@@ -438,7 +438,7 @@ void AxisPositionsTabPage::SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCa
m_bCrossingAxisIsCategoryAxis = bCrossingAxisIsCategoryAxis;
}
-void AxisPositionsTabPage::SetCategories( const ::com::sun::star::uno::Sequence< rtl::OUString >& rCategories )
+void AxisPositionsTabPage::SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories )
{
m_aCategories = rCategories;
}
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 7e05ca19d094..aed839bf350b 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -46,7 +46,7 @@ public:
void SetNumFormatter( SvNumberFormatter* pFormatter );
void SetCrossingAxisIsCategoryAxis( bool bCrossingAxisIsCategoryAxis );
- void SetCategories( const ::com::sun::star::uno::Sequence< rtl::OUString >& rCategories );
+ void SetCategories( const ::com::sun::star::uno::Sequence< OUString >& rCategories );
void SupportAxisPositioning( bool bSupportAxisPositioning );
@@ -91,7 +91,7 @@ private: //member:
SvNumberFormatter* m_pNumFormatter;
bool m_bCrossingAxisIsCategoryAxis;
- ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories;
+ ::com::sun::star::uno::Sequence< OUString > m_aCategories;
bool m_bSupportAxisPositioning;
};
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 9413046a7d15..13a2fe4517e9 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -50,8 +50,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
// --------------------------------------------------------------------------------
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 8eed40cfe86d..c83e86cdd773 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -93,7 +93,7 @@ protected:
DECL_LINK( DownButtonClickedHdl, void* );
// ____ RangeSelectionListenerParent ____
- virtual void listeningFinished( const ::rtl::OUString & rNewRange );
+ virtual void listeningFinished( const OUString & rNewRange );
virtual void disposingRangeSelection();
void updateControlState();
@@ -146,7 +146,7 @@ private:
RangeEdit m_aEDT_CATEGORIES;
RangeSelectionButton m_aIMB_RANGE_CAT;
- ::rtl::OUString m_aFixedTextRange;
+ OUString m_aFixedTextRange;
ChartTypeTemplateProvider * m_pTemplateProvider;
DialogModel & m_rDialogModel;
diff --git a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
index 602831e464ce..f193943fe60a 100644
--- a/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
@@ -24,7 +24,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 2f0bc8d683bf..1cff9464e6e5 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -56,7 +56,7 @@ public:
virtual ~RangeChooserTabPage();
//RangeSelectionListenerParent
- virtual void listeningFinished( const ::rtl::OUString & rNewRange );
+ virtual void listeningFinished( const OUString & rNewRange );
virtual void disposingRangeSelection();
void commitPage();
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index 00f2231757d4..ea2ca55ebe38 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -254,7 +254,7 @@ protected:
virtual sal_Int16 SAL_CALL getAccessibleRole()
throw (::com::sun::star::uno::RuntimeException);
// has to be implemented by derived classes
-// virtual ::rtl::OUString SAL_CALL getAccessibleName()
+// virtual OUString SAL_CALL getAccessibleName()
// throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL
getAccessibleRelationSet()
@@ -266,7 +266,7 @@ protected:
throw (::com::sun::star::accessibility::IllegalAccessibleComponentStateException,
::com::sun::star::uno::RuntimeException);
// has to be implemented by derived classes
-// virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+// virtual OUString SAL_CALL getAccessibleDescription()
// throw (::com::sun::star::uno::RuntimeException);
// ________ XAccessibleComponent ________
@@ -293,12 +293,12 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// ________ XServiceInfo ________
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString& ServiceName )
+ const OUString& ServiceName )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
throw (::com::sun::star::uno::RuntimeException);
// ________ XEventListener ________
diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx
index 2dc75d4ceaa9..205f0257ec05 100644
--- a/chart2/source/controller/inc/AccessibleChartView.hxx
+++ b/chart2/source/controller/inc/AccessibleChartView.hxx
@@ -88,13 +88,13 @@ public:
virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
// ________ XAccessibleContext ________
- virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+ virtual OUString SAL_CALL getAccessibleDescription()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleParent()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int32 SAL_CALL getAccessibleIndexInParent()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleName()
+ virtual OUString SAL_CALL getAccessibleName()
throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL getAccessibleRole()
throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx
index 7683449b8526..008ac83da0b0 100644
--- a/chart2/source/controller/inc/AccessibleTextHelper.hxx
+++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx
@@ -82,9 +82,9 @@ public:
throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int16 SAL_CALL getAccessibleRole()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleDescription()
+ virtual OUString SAL_CALL getAccessibleDescription()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAccessibleName()
+ virtual OUString SAL_CALL getAccessibleName()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet()
throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
index 419f642a2b4a..6acda96287ab 100644
--- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
+++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx
@@ -45,7 +45,7 @@ public:
::com::sun::star::beans::XPropertySet > & rPropertySet,
SfxItemPool& rItemPool,
::std::auto_ptr< ::com::sun::star::awt::Size > pRefSize,
- const ::rtl::OUString & rRefSizePropertyName,
+ const OUString & rRefSizePropertyName,
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rRefSizePropSet =
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >() );
@@ -68,7 +68,7 @@ private:
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::com::sun::star::awt::Size > m_pRefSize;
SAL_WNODEPRECATED_DECLARATIONS_POP
- ::rtl::OUString m_aRefSizePropertyName;
+ OUString m_aRefSizePropertyName;
::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > m_xRefSizePropSet;
};
diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
index 685f1e40ab7d..fd9f75ca706c 100644
--- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx
+++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx
@@ -74,8 +74,8 @@ public:
void setUpdateAddIn( sal_Bool bUpdateAddIn );
sal_Bool getUpdateAddIn() const;
- void setBaseDiagram( const rtl::OUString& rBaseDiagram );
- rtl::OUString getBaseDiagram() const;
+ void setBaseDiagram( const OUString& rBaseDiagram );
+ OUString getBaseDiagram() const;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > getAdditionalShapes() const;
@@ -112,10 +112,10 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// ____ XModel ____
- virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& URL, const ::com::sun::star::uno::Sequence<
+ virtual sal_Bool SAL_CALL attachResource( const OUString& URL, const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& Arguments )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getURL()
+ virtual OUString SAL_CALL getURL()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > SAL_CALL getArgs()
@@ -167,17 +167,17 @@ protected:
// ____ XMultiServiceFactory ____
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
+ ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(
- const ::rtl::OUString& ServiceSpecifier,
+ const OUString& ServiceSpecifier,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence<
- ::rtl::OUString > SAL_CALL getAvailableServiceNames()
+ OUString > SAL_CALL getAvailableServiceNames()
throw (::com::sun::star::uno::RuntimeException);
// ____ XAggregation ____
@@ -209,7 +209,7 @@ private: //member
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xArea;
::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshable > m_xAddIn;
- rtl::OUString m_aBaseDiagram;
+ OUString m_aBaseDiagram;
sal_Bool m_bUpdateAddIn;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xChartView;
diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx
index 41434d629379..5831a2351909 100644
--- a/chart2/source/controller/inc/DrawViewWrapper.hxx
+++ b/chart2/source/controller/inc/DrawViewWrapper.hxx
@@ -82,7 +82,7 @@ public:
SfxItemSet getPositionAndSizeItemSetFromMarkedObject() const;
- SdrObject* getNamedSdrObject( const rtl::OUString& rName ) const;
+ SdrObject* getNamedSdrObject( const OUString& rName ) const;
bool IsObjectHit( SdrObject* pObj, const Point& rPnt ) const;
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 6f2eca96f514..d8762bac9c5d 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -82,7 +82,7 @@ public:
// typedefs -------------------------------
typedef sal_uInt16 tWhichIdType;
- typedef ::rtl::OUString tPropertyNameType;
+ typedef OUString tPropertyNameType;
typedef sal_uInt8 tMemberIdType;
typedef ::std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId;
diff --git a/chart2/source/controller/inc/ObjectNameProvider.hxx b/chart2/source/controller/inc/ObjectNameProvider.hxx
index 6c7f066bbec7..2ff51e53f754 100644
--- a/chart2/source/controller/inc/ObjectNameProvider.hxx
+++ b/chart2/source/controller/inc/ObjectNameProvider.hxx
@@ -37,40 +37,40 @@ namespace chart
class ObjectNameProvider
{
public:
- static rtl::OUString getName( ObjectType eObjectType, bool bPlural=false );
- static rtl::OUString getAxisName( const rtl::OUString& rObjectCID
+ static OUString getName( ObjectType eObjectType, bool bPlural=false );
+ static OUString getAxisName( const OUString& rObjectCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
- static rtl::OUString getGridName( const rtl::OUString& rObjectCID
+ static OUString getGridName( const OUString& rObjectCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
- static rtl::OUString getTitleName( const rtl::OUString& rObjectCID
+ static OUString getTitleName( const OUString& rObjectCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
- static rtl::OUString getTitleNameByType( TitleHelper::eTitleType eType );
+ static OUString getTitleNameByType( TitleHelper::eTitleType eType );
- static rtl::OUString getNameForCID(
- const rtl::OUString& rObjectCID,
+ static OUString getNameForCID(
+ const OUString& rObjectCID,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument >& xChartDocument );
- static rtl::OUString getName_ObjectForSeries(
+ static OUString getName_ObjectForSeries(
ObjectType eObjectType,
- const rtl::OUString& rSeriesCID,
+ const OUString& rSeriesCID,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument >& xChartDocument );
- static rtl::OUString getName_ObjectForAllSeries( ObjectType eObjectType );
+ static OUString getName_ObjectForAllSeries( ObjectType eObjectType );
/** Provides help texts for the various chart elements.
The parameter rObjectCID has to be a ClassifiedIdentifier - see class ObjectIdentifier.
*/
- static rtl::OUString getHelpText( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false );
- static rtl::OUString getHelpText( const rtl::OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument, bool bVerbose=false );
+ static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel, bool bVerbose=false );
+ static OUString getHelpText( const OUString& rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument, bool bVerbose=false );
/** This is used for showing the currently selected object in the status bar
(command "Context")
*/
- static rtl::OUString getSelectedObjectText( const rtl::OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument );
+ static OUString getSelectedObjectText( const OUString & rObjectCID, const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument );
};
//.............................................................................
diff --git a/chart2/source/controller/inc/PositionAndSizeHelper.hxx b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
index 0b246f432c58..07f9250259c8 100644
--- a/chart2/source/controller/inc/PositionAndSizeHelper.hxx
+++ b/chart2/source/controller/inc/PositionAndSizeHelper.hxx
@@ -40,7 +40,7 @@ public:
, const ::com::sun::star::awt::Rectangle& rNewPositionAndSize
, const ::com::sun::star::awt::Rectangle& rPageRectangle );
- static bool moveObject( const rtl::OUString& rObjectCID
+ static bool moveObject( const OUString& rObjectCID
, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel
, const ::com::sun::star::awt::Rectangle& rNewPositionAndSize
, const ::com::sun::star::awt::Rectangle& rPageRectangle );
diff --git a/chart2/source/controller/inc/RangeSelectionHelper.hxx b/chart2/source/controller/inc/RangeSelectionHelper.hxx
index f3016fc8f991..3d1456703823 100644
--- a/chart2/source/controller/inc/RangeSelectionHelper.hxx
+++ b/chart2/source/controller/inc/RangeSelectionHelper.hxx
@@ -48,11 +48,11 @@ public:
::com::sun::star::sheet::XRangeSelection > getRangeSelection();
void raiseRangeSelectionDocument();
bool chooseRange(
- const ::rtl::OUString & aCurrentRange,
- const ::rtl::OUString & aUIString,
+ const OUString & aCurrentRange,
+ const OUString & aUIString,
RangeSelectionListenerParent & rListenerParent );
void stopRangeListening( bool bRemoveListener = true );
- bool verifyCellRange( const ::rtl::OUString & rRangeStr );
+ bool verifyCellRange( const OUString & rRangeStr );
bool verifyArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments );
private:
diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx
index 4b0c72d679d6..79364423f35c 100644
--- a/chart2/source/controller/inc/RangeSelectionListener.hxx
+++ b/chart2/source/controller/inc/RangeSelectionListener.hxx
@@ -30,7 +30,7 @@ namespace chart
class RangeSelectionListenerParent
{
public:
- virtual void listeningFinished( const ::rtl::OUString & rNewRange ) = 0;
+ virtual void listeningFinished( const OUString & rNewRange ) = 0;
virtual void disposingRangeSelection() = 0;
protected:
@@ -46,7 +46,7 @@ class RangeSelectionListener : public
public:
explicit RangeSelectionListener(
RangeSelectionListenerParent & rParent,
- const ::rtl::OUString & rInitialRange,
+ const OUString & rInitialRange,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xModelToLockController );
virtual ~RangeSelectionListener();
@@ -64,7 +64,7 @@ protected:
private:
RangeSelectionListenerParent & m_rParent;
- ::rtl::OUString m_aRange;
+ OUString m_aRange;
ControllerLockGuard m_aControllerLockGuard;
};
diff --git a/chart2/source/controller/inc/TitleDialogData.hxx b/chart2/source/controller/inc/TitleDialogData.hxx
index 96dd48c774ee..c07df8998447 100644
--- a/chart2/source/controller/inc/TitleDialogData.hxx
+++ b/chart2/source/controller/inc/TitleDialogData.hxx
@@ -38,7 +38,7 @@ struct TitleDialogData
{
::com::sun::star::uno::Sequence< sal_Bool > aPossibilityList;
::com::sun::star::uno::Sequence< sal_Bool > aExistenceList;
- ::com::sun::star::uno::Sequence< rtl::OUString > aTextList;
+ ::com::sun::star::uno::Sequence< OUString > aTextList;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ReferenceSizeProvider > apReferenceSizeProvider;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
index ac3679fa93a4..a7746b0e16e6 100644
--- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx
@@ -39,8 +39,8 @@ public:
ChartTypeUnoDlg( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
// XServiceInfo - static methods
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void);
- static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void);
+ static OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >&);
private:
@@ -53,7 +53,7 @@ private:
// XTypeProvider
virtual com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(com::sun::star::uno::RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
// XPropertySet
diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
index 5396b2310e50..2c7328787ff0 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx
@@ -70,7 +70,7 @@ public:
APPHELPER_SERVICE_FACTORY_HELPER(CreationWizardUnoDlg)
// XExecutableDialog
- virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException);
virtual sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException);
// XInitialization
@@ -84,12 +84,12 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
DECL_LINK( DialogEventHdl, VclWindowEvent* );
diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
index 4c4c75803f83..9d14cac4e674 100644
--- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
+++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx
@@ -48,7 +48,7 @@ public:
::com::sun::star::frame::XModel >& xChartModel,
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xChartView,
- const ::rtl::OUString& rSelectedObjectCID );
+ const OUString& rSelectedObjectCID );
void FillItemSet( SfxItemSet& rOutAttrs );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
diff --git a/chart2/source/controller/inc/dlg_ObjectProperties.hxx b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
index 8daa13a7a592..8a8080e96c67 100644
--- a/chart2/source/controller/inc/dlg_ObjectProperties.hxx
+++ b/chart2/source/controller/inc/dlg_ObjectProperties.hxx
@@ -32,12 +32,12 @@ namespace chart
class ObjectPropertiesDialogParameter
{
public:
- ObjectPropertiesDialogParameter( const rtl::OUString& rObjectCID );
+ ObjectPropertiesDialogParameter( const OUString& rObjectCID );
virtual ~ObjectPropertiesDialogParameter();
void init( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel );
ObjectType getObjectType() const;
- rtl::OUString getLocalizedName() const;
+ OUString getLocalizedName() const;
bool HasGeometryProperties() const;
bool HasStatisticProperties() const;
@@ -55,7 +55,7 @@ public:
bool IsSupportingAxisPositioning() const;
bool ShowAxisOrigin() const;
bool IsCrossingAxisIsCategoryAxis() const;
- const ::com::sun::star::uno::Sequence< rtl::OUString >& GetCategories() const;
+ const ::com::sun::star::uno::Sequence< OUString >& GetCategories() const;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >
getDocument() const;
@@ -63,11 +63,11 @@ public:
bool IsComplexCategoriesAxis() const;
private:
- rtl::OUString m_aObjectCID;
+ OUString m_aObjectCID;
ObjectType m_eObjectType;
bool m_bAffectsMultipleObjects;//is true if more than one object of the given type will be changed (e.g. all axes or all titles)
- rtl::OUString m_aLocalizedName;
+ OUString m_aLocalizedName;
bool m_bHasGeometryProperties;
bool m_bHasStatisticProperties;
@@ -86,7 +86,7 @@ private:
bool m_bSupportingAxisPositioning;
bool m_bShowAxisOrigin;
bool m_bIsCrossingAxisIsCategoryAxis;
- ::com::sun::star::uno::Sequence< rtl::OUString > m_aCategories;
+ ::com::sun::star::uno::Sequence< OUString > m_aCategories;
::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartDocument;
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 98addc7dfd83..f0ea1c9e4b93 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -69,7 +69,7 @@ public:
void FillValueSets();
// ____ RangeSelectionListenerParent ____
- virtual void listeningFinished( const ::rtl::OUString & rNewRange );
+ virtual void listeningFinished( const OUString & rNewRange );
virtual void disposingRangeSelection();
private:
diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index 72cdcf714e54..5a6e5b1ed28e 100644
--- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -213,7 +213,7 @@ bool ItemConverter::ApplyItemSet( const SfxItemSet & rItemSet )
catch( const uno::Exception &ex )
{
(void)ex;
- OSL_FAIL( ::rtl::OUStringToOString(
+ OSL_FAIL( OUStringToOString(
ex.Message, RTL_TEXTENCODING_ASCII_US ).getStr());
}
}
diff --git a/chart2/source/controller/main/ChartController.hxx b/chart2/source/controller/main/ChartController.hxx
index 21bad8fcafe0..c3e98b01cab5 100644
--- a/chart2/source/controller/main/ChartController.hxx
+++ b/chart2/source/controller/main/ChartController.hxx
@@ -122,7 +122,7 @@ public:
*/
virtual bool requestQuickHelp(
::Point aAtLogicPosition, bool bIsBalloonHelp,
- ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0;
+ OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect ) = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() = 0;
};
@@ -219,7 +219,7 @@ public:
virtual ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatch> SAL_CALL
queryDispatch( const ::com::sun::star::util::URL& rURL
- , const rtl::OUString& rTargetFrameName
+ , const OUString& rTargetFrameName
, sal_Int32 nSearchFlags)
throw (::com::sun::star::uno::RuntimeException);
@@ -398,16 +398,16 @@ public:
// ::com::sun::star::lang XMultiServiceFactory
//-----------------------------------------------------------------
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- createInstance( const ::rtl::OUString& aServiceSpecifier )
+ createInstance( const OUString& aServiceSpecifier )
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier,
+ createInstanceWithArguments( const OUString& ServiceSpecifier,
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& Arguments )
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getAvailableServiceNames()
throw (::com::sun::star::uno::RuntimeException);
@@ -453,7 +453,7 @@ public:
virtual bool requestQuickHelp(
::Point aAtLogicPosition, bool bIsBalloonHelp,
- ::rtl::OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect );
+ OUString & rOutQuickHelpText, ::com::sun::star::awt::Rectangle & rOutEqualRect );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
@@ -599,9 +599,9 @@ private:
//executeDispatch methods
void SAL_CALL executeDispatch_ObjectProperties();
- void SAL_CALL executeDispatch_FormatObject( const ::rtl::OUString& rDispatchCommand );
- void SAL_CALL executeDlg_ObjectProperties( const ::rtl::OUString& rObjectCID );
- bool executeDlg_ObjectProperties_withoutUndoGuard( const ::rtl::OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso );
+ void SAL_CALL executeDispatch_FormatObject( const OUString& rDispatchCommand );
+ void SAL_CALL executeDlg_ObjectProperties( const OUString& rObjectCID );
+ bool executeDlg_ObjectProperties_withoutUndoGuard( const OUString& rObjectCID, bool bOkClickOnUnchangedDialogSouldBeRatedAsSuccessAlso );
void SAL_CALL executeDispatch_ChartType();
@@ -694,10 +694,10 @@ private:
};
/// @return </sal_True>, if resize/move was successful
bool impl_moveOrResizeObject(
- const ::rtl::OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY );
- bool impl_DragDataPoint( const ::rtl::OUString & rCID, double fOffset );
+ const OUString & rCID, eMoveOrResizeType eType, double fAmountLogicX, double fAmountLogicY );
+ bool impl_DragDataPoint( const OUString & rCID, double fOffset );
- ::std::set< ::rtl::OUString > impl_getAvailableCommands();
+ ::std::set< OUString > impl_getAvailableCommands();
/** Creates a helper accesibility class that must be initialized via XInitialization. For
parameters see
@@ -713,7 +713,7 @@ private:
void impl_PasteGraphic( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > & xGraphic,
const ::Point & aPosition );
void impl_PasteShapes( SdrModel* pModel );
- void impl_PasteStringAsTextShape( const ::rtl::OUString& rString, const ::com::sun::star::awt::Point& rPosition );
+ void impl_PasteStringAsTextShape( const OUString& rString, const ::com::sun::star::awt::Point& rPosition );
void impl_SetMousePointer( const MouseEvent & rEvent );
void impl_ClearSelection();
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 8c7c733ff59b..8741ec9a21b7 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -72,7 +72,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
//.............................................................................
diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx
index 8091aa63046f..b0c56b81fe26 100644
--- a/chart2/source/controller/main/ChartController_Position.cxx
+++ b/chart2/source/controller/main/ChartController_Position.cxx
@@ -116,7 +116,7 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectang
void SAL_CALL ChartController::executeDispatch_PositionAndSize()
{
- const ::rtl::OUString aCID( m_aSelection.getSelectedCID() );
+ const OUString aCID( m_aSelection.getSelectedCID() );
if( aCID.isEmpty() )
return;
diff --git a/chart2/source/controller/main/ChartController_Properties.cxx b/chart2/source/controller/main/ChartController_Properties.cxx
index 145e7e34ca8a..f06c271b5c89 100644
--- a/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/chart2/source/controller/main/ChartController_Properties.cxx
@@ -69,7 +69,6 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/controller/main/ChartController_TextEdit.cxx b/chart2/source/controller/main/ChartController_TextEdit.cxx
index 80056ac468b8..8fd50b0a64d7 100644
--- a/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -135,7 +135,7 @@ bool ChartController::EndTextEdit()
pOutliner->GetParagraph( 0 ),
pOutliner->GetParagraphCount() );
- ::rtl::OUString aObjectCID = m_aSelection.getSelectedCID();
+ OUString aObjectCID = m_aSelection.getSelectedCID();
if ( !aObjectCID.isEmpty() )
{
uno::Reference< beans::XPropertySet > xPropSet =
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 17581e3b06ab..889be4313877 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -84,7 +84,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
@@ -601,7 +600,7 @@ bool ChartController::executeDispatch_Delete()
bool bReturn = false;
// remove the selected object
- rtl::OUString aCID( m_aSelection.getSelectedCID() );
+ OUString aCID( m_aSelection.getSelectedCID() );
if( !aCID.isEmpty() )
{
if( !isObjectDeleteable( uno::Any( aCID ) ) )
@@ -759,7 +758,7 @@ bool ChartController::executeDispatch_Delete()
{
UndoGuard aUndoGuard = UndoGuard(
ActionDescriptionProvider::createDescription(
- ActionDescriptionProvider::DELETE, ::rtl::OUString( String(
+ ActionDescriptionProvider::DELETE, OUString( String(
SchResId( aObjectType == OBJECTTYPE_DATA_LABEL ? STR_OBJECT_LABEL : STR_OBJECT_DATALABELS )))),
m_xUndoManager );
chart2::DataPointLabel aLabel;
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index a104d13b9a60..0c748f13d7c5 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -82,7 +82,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
//.............................................................................
namespace chart
@@ -134,9 +133,9 @@ bool lcl_MoveObjectLogic(
void lcl_insertMenuCommand(
const uno::Reference< awt::XPopupMenu > & xMenu,
const uno::Reference< awt::XMenuExtended > & xMenuEx,
- sal_Int16 nId, const ::rtl::OUString & rCommand )
+ sal_Int16 nId, const OUString & rCommand )
{
- static ::rtl::OUString aEmptyString;
+ static OUString aEmptyString;
xMenu->insertItem( nId, aEmptyString, 0, -1 );
xMenuEx->setCommand( nId, rCommand );
}
@@ -729,7 +728,7 @@ void ChartController::execute_MouseButtonDown( const MouseEvent& rMEvt )
}
else
{
- rtl::OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) );
+ OUString aDragMethodServiceName( ObjectIdentifier::getDragMethodServiceName( m_aSelection.getSelectedCID() ) );
if( aDragMethodServiceName.equals( ObjectIdentifier::getPieSegmentDragMethodServiceName() ) )
pDragMethod = new DragMethod_PieSegment( *pDrawViewWrapper, m_aSelection.getSelectedCID(), getModel() );
}
@@ -936,7 +935,7 @@ void ChartController::execute_DoubleClick( const Point* pMousePixel )
bool bEditText = false;
if ( m_aSelection.hasSelection() )
{
- ::rtl::OUString aCID( m_aSelection.getSelectedCID() );
+ OUString aCID( m_aSelection.getSelectedCID() );
if ( !aCID.isEmpty() )
{
ObjectType eObjectType = ObjectIdentifier::getObjectType( aCID );
@@ -1404,7 +1403,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
nCode == KEY_DOWN )
{
bDrag = true;
- rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() ));
+ OUString aParameter( ObjectIdentifier::getDragParameterString( m_aSelection.getSelectedCID() ));
sal_Int32 nOffsetPercentDummy( 0 );
awt::Point aMinimumPosition( 0, 0 );
awt::Point aMaximumPosition( 0, 0 );
@@ -1577,7 +1576,7 @@ bool ChartController::execute_KeyInput( const KeyEvent& rKEvt )
bool ChartController::requestQuickHelp(
::Point aAtLogicPosition,
bool bIsBalloonHelp,
- ::rtl::OUString & rOutQuickHelpText,
+ OUString & rOutQuickHelpText,
awt::Rectangle & rOutEqualRect )
{
uno::Reference< frame::XModel > xChartModel;
@@ -1587,7 +1586,7 @@ bool ChartController::requestQuickHelp(
return false;
// help text
- ::rtl::OUString aCID;
+ OUString aCID;
if( m_pDrawViewWrapper )
{
aCID = SelectionHelper::getHitObjectCID(
@@ -1622,9 +1621,9 @@ bool ChartController::requestQuickHelp(
if ( rSelection.hasValue() )
{
const uno::Type& rType = rSelection.getValueType();
- if ( rType == ::getCppuType( static_cast< const ::rtl::OUString* >( 0 ) ) )
+ if ( rType == ::getCppuType( static_cast< const OUString* >( 0 ) ) )
{
- ::rtl::OUString aNewCID;
+ OUString aNewCID;
if ( ( rSelection >>= aNewCID ) && m_aSelection.setSelection( aNewCID ) )
{
bSuccess = true;
@@ -1672,7 +1671,7 @@ bool ChartController::requestQuickHelp(
uno::Any aReturn;
if ( m_aSelection.hasSelection() )
{
- ::rtl::OUString aCID( m_aSelection.getSelectedCID() );
+ OUString aCID( m_aSelection.getSelectedCID() );
if ( !aCID.isEmpty() )
{
aReturn = uno::makeAny( aCID );
@@ -1746,7 +1745,7 @@ void ChartController::impl_selectObjectAndNotiy()
}
bool ChartController::impl_moveOrResizeObject(
- const ::rtl::OUString & rCID,
+ const OUString & rCID,
eMoveOrResizeType eType,
double fAmountLogicX,
double fAmountLogicY )
@@ -1829,7 +1828,7 @@ bool ChartController::impl_moveOrResizeObject(
return bResult;
}
-bool ChartController::impl_DragDataPoint( const ::rtl::OUString & rCID, double fAdditionalOffset )
+bool ChartController::impl_DragDataPoint( const OUString & rCID, double fAdditionalOffset )
{
bool bResult = false;
if( fAdditionalOffset < -1.0 || fAdditionalOffset > 1.0 || fAdditionalOffset == 0.0 )
@@ -1985,7 +1984,7 @@ void ChartController::impl_SetMousePointer( const MouseEvent & rEvent )
return;
}
- ::rtl::OUString aHitObjectCID(
+ OUString aHitObjectCID(
SelectionHelper::getHitObjectCID(
aMousePos, *m_pDrawViewWrapper, true /*bGetDiagramInsteadOf_Wall*/ ));
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 83d075a045c5..e09c298ddfa0 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx
index 5b2c03b3aaf6..2e2713ba3b67 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -62,10 +62,10 @@ ChartFrameLoader::~ChartFrameLoader()
APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME)
- uno::Sequence< rtl::OUString > ChartFrameLoader
+ uno::Sequence< OUString > ChartFrameLoader
::getSupportedServiceNames_Static()
{
- uno::Sequence< rtl::OUString > aSNS( 1 );
+ uno::Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] = CHART_FRAMELOADER_SERVICE_NAME;
return aSNS;
}
@@ -146,7 +146,7 @@ APPHELPER_XSERVICEINFO_IMPL(ChartFrameLoader,CHART_FRAMELOADER_SERVICE_IMPLEMENT
comphelper::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find( aMediaDescriptor.PROP_URL()));
if( aIt != aMediaDescriptor.end())
{
- ::rtl::OUString aURL( (*aIt).second.get< ::rtl::OUString >());
+ OUString aURL( (*aIt).second.get< OUString >());
if( aURL.matchAsciiL(
RTL_CONSTASCII_STRINGPARAM( "private:factory/schart" )))
{
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx
index efc9782c1874..a1742ea40502 100644
--- a/chart2/source/controller/main/ChartTransferable.cxx
+++ b/chart2/source/controller/main/ChartTransferable.cxx
@@ -39,7 +39,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx
index d4b78aa7256b..2e1bd460a2e1 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -203,7 +203,7 @@ void ChartWindow::RequestHelp( const HelpEvent& rHEvt )
{
// Point aLogicHitPos = PixelToLogic( rHEvt.GetMousePosPixel()); // old chart: GetPointerPosPixel()
Point aLogicHitPos = PixelToLogic( GetPointerPosPixel());
- ::rtl::OUString aQuickHelpText;
+ OUString aQuickHelpText;
awt::Rectangle aHelpRect;
bool bIsBalloonHelp( Help::IsBalloonHelpEnabled() );
bHelpHandled = m_pWindowController->requestQuickHelp( aLogicHitPos, bIsBalloonHelp, aQuickHelpText, aHelpRect );
diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx
index 0f609260aea5..2c547fba4c04 100644
--- a/chart2/source/controller/main/CommandDispatch.cxx
+++ b/chart2/source/controller/main/CommandDispatch.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index c0a82ecb61ca..b1d8b9f14000 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -73,10 +73,10 @@ protected:
called with this parameter set to give an initial state.
*/
virtual void fireStatusEvent(
- const ::rtl::OUString & rURL,
+ const OUString & rURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener ) = 0;
- /** calls fireStatusEvent( ::rtl::OUString, xSingleListener )
+ /** calls fireStatusEvent( OUString, xSingleListener )
*/
void fireAllStatusEvents(
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
@@ -90,12 +90,12 @@ protected:
called with this parameter set to give an initial state.
*/
void fireStatusEventForURL(
- const ::rtl::OUString & rURL,
+ const OUString & rURL,
const ::com::sun::star::uno::Any & rState,
bool bEnabled,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener =
::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >(),
- const ::rtl::OUString & rFeatureDescriptor = ::rtl::OUString() );
+ const OUString & rFeatureDescriptor = OUString() );
// ____ XDispatch ____
virtual void SAL_CALL dispatch(
@@ -130,7 +130,7 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::util::XURLTransformer > m_xURLTransformer;
private:
- typedef ::std::map< ::rtl::OUString, ::cppu::OInterfaceContainerHelper* >
+ typedef ::std::map< OUString, ::cppu::OInterfaceContainerHelper* >
tListenerMap;
tListenerMap m_aListeners;
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index 2c02b0261291..483fedf4d9d3 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx
index 2e4a3b3131f6..0f568f7bf08c 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.hxx
@@ -84,7 +84,7 @@ public:
void setChartDispatch(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatch > xChartDispatch,
- const ::std::set< ::rtl::OUString > & rChartCommands );
+ const ::std::set< OUString > & rChartCommands );
/** Returns the dispatch that is able to do the command given in rURL, if
implemented here. If the URL is not implemented here, it should be
@@ -117,7 +117,7 @@ public:
private:
typedef
- ::std::map< ::rtl::OUString,
+ ::std::map< OUString,
::com::sun::star::uno::Reference<
::com::sun::star::frame::XDispatch > >
tDispatchMap;
@@ -132,9 +132,9 @@ private:
::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XModel > m_xModel;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > m_xChartDispatcher;
- ::std::set< ::rtl::OUString > m_aChartCommands;
+ ::std::set< OUString > m_aChartCommands;
- ::std::set< ::rtl::OUString > m_aContainerDocumentCommands;
+ ::std::set< OUString > m_aContainerDocumentCommands;
ChartController* m_pChartController;
DrawCommandDispatch* m_pDrawCommandDispatch;
diff --git a/chart2/source/controller/main/ConfigurationAccess.cxx b/chart2/source/controller/main/ConfigurationAccess.cxx
index 812dbe58a050..31a088120f35 100644
--- a/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -57,11 +57,11 @@ public:
FieldUnit getFieldUnit();
virtual void Commit();
- virtual void Notify( const uno::Sequence<rtl::OUString>& aPropertyNames);
+ virtual void Notify( const uno::Sequence<OUString>& aPropertyNames);
};
CalcConfigItem::CalcConfigItem()
- : ConfigItem( ::rtl::OUString( "Office.Calc/Layout" ))
+ : ConfigItem( OUString( "Office.Calc/Layout" ))
{
}
@@ -70,7 +70,7 @@ CalcConfigItem::~CalcConfigItem()
}
void CalcConfigItem::Commit() {}
-void CalcConfigItem::Notify( const uno::Sequence<rtl::OUString>& ) {}
+void CalcConfigItem::Notify( const uno::Sequence<OUString>& ) {}
FieldUnit CalcConfigItem::getFieldUnit()
{
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index bcde205f12e4..f4c1669c3753 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -48,7 +48,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
@@ -701,7 +700,7 @@ bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand )
return false;
}
-bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand )
+bool ControllerCommandDispatch::isShapeControllerCommandAvailable( const OUString& rCommand )
{
ShapeController* pShapeController = ( m_pDispatchContainer ? m_pDispatchContainer->getShapeController() : NULL );
if ( pShapeController )
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx
index bf0895edfabb..a165bc259b46 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.hxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx
@@ -82,7 +82,7 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
virtual void fireStatusEvent(
- const ::rtl::OUString & rURL,
+ const OUString & rURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
// ____ XModifyListener ____
@@ -97,13 +97,13 @@ protected:
private:
void fireStatusEventForURLImpl(
- const ::rtl::OUString & rURL,
+ const OUString & rURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
- bool commandAvailable( const ::rtl::OUString & rCommand );
+ bool commandAvailable( const OUString & rCommand );
void updateCommandAvailability();
- bool isShapeControllerCommandAvailable( const ::rtl::OUString& rCommand );
+ bool isShapeControllerCommandAvailable( const OUString& rCommand );
ChartController* m_pChartController;
::com::sun::star::uno::Reference<
@@ -116,8 +116,8 @@ private:
::std::auto_ptr< impl::ModelState > m_apModelState;
::std::auto_ptr< impl::ControllerState > m_apControllerState;
- mutable ::std::map< ::rtl::OUString, bool > m_aCommandAvailability;
- mutable ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > m_aCommandArguments;
+ mutable ::std::map< OUString, bool > m_aCommandAvailability;
+ mutable ::std::map< OUString, ::com::sun::star::uno::Any > m_aCommandArguments;
CommandDispatchContainer* m_pDispatchContainer;
};
diff --git a/chart2/source/controller/main/DragMethod_Base.cxx b/chart2/source/controller/main/DragMethod_Base.cxx
index 0c107d0a3538..2724551354a3 100644
--- a/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/chart2/source/controller/main/DragMethod_Base.cxx
@@ -41,7 +41,7 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::WeakReference;
DragMethod_Base::DragMethod_Base( DrawViewWrapper& rDrawViewWrapper
- , const rtl::OUString& rObjectCID
+ , const OUString& rObjectCID
, const Reference< frame::XModel >& xChartModel
, ActionDescriptionProvider::ActionType eActionType )
: SdrDragMethod( rDrawViewWrapper )
@@ -61,7 +61,7 @@ Reference< frame::XModel > DragMethod_Base::getChartModel() const
return Reference< frame::XModel >( m_xChartModel );
}
-rtl::OUString DragMethod_Base::getUndoDescription() const
+OUString DragMethod_Base::getUndoDescription() const
{
return ActionDescriptionProvider::createDescription(
m_eActionType,
diff --git a/chart2/source/controller/main/DragMethod_Base.hxx b/chart2/source/controller/main/DragMethod_Base.hxx
index 148378040243..28ffa918d6da 100644
--- a/chart2/source/controller/main/DragMethod_Base.hxx
+++ b/chart2/source/controller/main/DragMethod_Base.hxx
@@ -33,12 +33,12 @@ namespace chart
class DragMethod_Base : public SdrDragMethod
{
public:
- DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID
+ DragMethod_Base( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID
, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel
, ActionDescriptionProvider::ActionType eActionType = ActionDescriptionProvider::MOVE );
virtual ~DragMethod_Base();
- virtual rtl::OUString getUndoDescription() const;
+ virtual OUString getUndoDescription() const;
virtual void TakeSdrDragComment(String& rStr) const;
virtual Pointer GetSdrDragPointer() const;
@@ -48,7 +48,7 @@ protected:
protected:
DrawViewWrapper& m_rDrawViewWrapper;
- rtl::OUString m_aObjectCID;
+ OUString m_aObjectCID;
ActionDescriptionProvider::ActionType m_eActionType;
private:
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.cxx b/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 27267eaab5a6..abf58cbc149e 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -39,7 +39,7 @@ using ::com::sun::star::uno::Reference;
using ::basegfx::B2DVector;
DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper
- , const rtl::OUString& rObjectCID
+ , const OUString& rObjectCID
, const Reference< frame::XModel >& xChartModel )
: DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel )
, m_aStartVector(100.0,100.0)
@@ -48,7 +48,7 @@ DragMethod_PieSegment::DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper
, m_aDragDirection(1000.0,1000.0)
, m_fDragRange( 1.0 )
{
- rtl::OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) );
+ OUString aParameter( ObjectIdentifier::getDragParameterString( m_aObjectCID ) );
sal_Int32 nOffsetPercent(0);
awt::Point aMinimumPosition(0,0);
@@ -75,7 +75,7 @@ DragMethod_PieSegment::~DragMethod_PieSegment()
void DragMethod_PieSegment::TakeSdrDragComment(String& rStr) const
{
rStr = SCH_RESSTR(STR_STATUS_PIE_SEGMENT_EXPLODED);
- rStr.SearchAndReplaceAscii( "%PERCENTVALUE", rtl::OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
+ rStr.SearchAndReplaceAscii( "%PERCENTVALUE", OUString::valueOf( static_cast<sal_Int32>((m_fAdditionalOffset+m_fInitialOffset)*100.0) ));
}
bool DragMethod_PieSegment::BeginSdrDrag()
{
diff --git a/chart2/source/controller/main/DragMethod_PieSegment.hxx b/chart2/source/controller/main/DragMethod_PieSegment.hxx
index 022a188dda9a..a92a855e21ce 100644
--- a/chart2/source/controller/main/DragMethod_PieSegment.hxx
+++ b/chart2/source/controller/main/DragMethod_PieSegment.hxx
@@ -28,7 +28,7 @@ namespace chart
class DragMethod_PieSegment : public DragMethod_Base
{
public:
- DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const rtl::OUString& rObjectCID
+ DragMethod_PieSegment( DrawViewWrapper& rDrawViewWrapper, const OUString& rObjectCID
, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
virtual ~DragMethod_PieSegment();
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index ce8a0e120aaa..00cada78f8a1 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -47,7 +47,7 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
DragMethod_RotateDiagram::DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper
- , const rtl::OUString& rObjectCID
+ , const OUString& rObjectCID
, const Reference< frame::XModel >& xChartModel
, RotationDirection eRotationDirection )
: DragMethod_Base( rDrawViewWrapper, rObjectCID, xChartModel, ActionDescriptionProvider::ROTATE )
diff --git a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
index 04d6f6e46cff..e48ff981231a 100644
--- a/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
+++ b/chart2/source/controller/main/DragMethod_RotateDiagram.hxx
@@ -39,7 +39,7 @@ public:
};
DragMethod_RotateDiagram( DrawViewWrapper& rDrawViewWrapper
- , const rtl::OUString& rObjectCID
+ , const OUString& rObjectCID
, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel
, RotationDirection eRotationDirection
);
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 57b629e0fd05..ffe3ccb95cb8 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -59,13 +59,13 @@ namespace
//.............................................................................
// comparing two PropertyValue instances
- struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, ::rtl::OUString, bool >
+ struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString, bool >
{
- bool operator() ( const beans::PropertyValue& rPropValue, const ::rtl::OUString& rName ) const
+ bool operator() ( const beans::PropertyValue& rPropValue, const OUString& rName ) const
{
return rPropValue.Name.equals( rName );
}
- bool operator() ( const ::rtl::OUString& rName, const beans::PropertyValue& rPropValue ) const
+ bool operator() ( const OUString& rName, const beans::PropertyValue& rPropValue ) const
{
return rName.equals( rPropValue.Name );
}
@@ -97,11 +97,11 @@ void DrawCommandDispatch::initialize()
FeatureCommandDispatchBase::initialize();
}
-bool DrawCommandDispatch::isFeatureSupported( const ::rtl::OUString& rCommandURL )
+bool DrawCommandDispatch::isFeatureSupported( const OUString& rCommandURL )
{
sal_uInt16 nFeatureId = 0;
- ::rtl::OUString aBaseCommand;
- ::rtl::OUString aCustomShapeType;
+ OUString aBaseCommand;
+ OUString aCustomShapeType;
return parseCommandURL( rCommandURL, &nFeatureId, &aBaseCommand, &aCustomShapeType );
}
@@ -137,7 +137,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
sal_Bool bAttributesAppliedFromGallery = sal_False;
if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
{
- ::std::vector< ::rtl::OUString > aObjList;
+ ::std::vector< OUString > aObjList;
if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) )
{
for ( sal_uInt16 i = 0; i < aObjList.size(); ++i )
@@ -244,15 +244,15 @@ void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ )
{
}
-FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand )
+FeatureState DrawCommandDispatch::getState( const OUString& rCommand )
{
FeatureState aReturn;
aReturn.bEnabled = false;
aReturn.aState <<= false;
sal_uInt16 nFeatureId = 0;
- ::rtl::OUString aBaseCommand;
- ::rtl::OUString aCustomShapeType;
+ OUString aBaseCommand;
+ OUString aCustomShapeType;
if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) )
{
switch ( nFeatureId )
@@ -288,7 +288,7 @@ FeatureState DrawCommandDispatch::getState( const ::rtl::OUString& rCommand )
return aReturn;
}
-void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs )
+void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs )
{
(void)rArgs;
@@ -297,8 +297,8 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
bool bCreate = false;
sal_uInt16 nFeatureId = 0;
- ::rtl::OUString aBaseCommand;
- ::rtl::OUString aCustomShapeType;
+ OUString aBaseCommand;
+ OUString aCustomShapeType;
if ( parseCommandURL( rCommand, &nFeatureId, &aBaseCommand, &aCustomShapeType ) )
{
m_nFeatureId = nFeatureId;
@@ -382,7 +382,7 @@ void DrawCommandDispatch::execute( const ::rtl::OUString& rCommand, const Sequen
pDrawViewWrapper->SetCreateMode();
}
- const ::rtl::OUString sKeyModifier( "KeyModifier" );
+ const OUString sKeyModifier( "KeyModifier" );
const beans::PropertyValue* pIter = rArgs.getConstArray();
const beans::PropertyValue* pEnd = pIter + rArgs.getLength();
const beans::PropertyValue* pKeyModifier = ::std::find_if(
@@ -577,7 +577,7 @@ SdrObject* DrawCommandDispatch::createDefaultObject( const sal_uInt16 nID )
}
bool DrawCommandDispatch::parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId,
- OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType )
+ OUString* pBaseCommand, OUString* pCustomShapeType )
{
bool bFound = true;
sal_uInt16 nFeatureId = 0;
diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx
index 1510346f395b..afa6799ab11c 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.hxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.hxx
@@ -45,7 +45,7 @@ public:
// late initialisation, especially for adding as listener
virtual void initialize();
- virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL );
+ virtual bool isFeatureSupported( const OUString& rCommandURL );
void setAttributes( SdrObject* pObj );
void setLineEnds( SfxItemSet& rAttr );
@@ -59,10 +59,10 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// state of a feature
- virtual FeatureState getState( const ::rtl::OUString& rCommand );
+ virtual FeatureState getState( const OUString& rCommand );
// execute a feature
- virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs );
+ virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs );
// all the features which should be handled by this class
virtual void describeSupportedFeatures();
@@ -71,10 +71,10 @@ private:
void setInsertObj( sal_uInt16 eObj );
SdrObject* createDefaultObject( const sal_uInt16 nID );
- bool parseCommandURL( const ::rtl::OUString& rCommandURL, sal_uInt16* pnFeatureId, ::rtl::OUString* pBaseCommand, ::rtl::OUString* pCustomShapeType );
+ bool parseCommandURL( const OUString& rCommandURL, sal_uInt16* pnFeatureId, OUString* pBaseCommand, OUString* pCustomShapeType );
ChartController* m_pChartController;
- ::rtl::OUString m_aCustomShapeType;
+ OUString m_aCustomShapeType;
};
//.............................................................................
diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx
index b59945579bbb..2711702d8e7f 100644
--- a/chart2/source/controller/main/ElementSelector.cxx
+++ b/chart2/source/controller/main/ElementSelector.cxx
@@ -71,7 +71,7 @@ void lcl_addObjectsToList( const ObjectHierarchy& rHierarchy, const ObjectHierar
while( aIt != aChildren.end() )
{
ObjectHierarchy::tOID aOID = *aIt;
- ::rtl::OUString aCID = aOID.getObjectCID();
+ OUString aCID = aOID.getObjectCID();
ListBoxEntryData aEntry;
aEntry.OID = aOID;
aEntry.UIName += ObjectNameProvider::getNameForCID( aCID, xChartDoc );
@@ -97,7 +97,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
{
Reference< view::XSelectionSupplier > xSelectionSupplier( xChartController, uno::UNO_QUERY);
ObjectHierarchy::tOID aSelectedOID;
- rtl::OUString aSelectedCID;
+ OUString aSelectedCID;
if( xSelectionSupplier.is() )
{
aSelectedOID = ObjectIdentifier( xSelectionSupplier->getSelection() );
@@ -123,7 +123,7 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
{
if ( aSelectedOID.isAutoGeneratedObject() )
{
- rtl::OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) );
+ OUString aSeriesCID = ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::getSeriesParticleFromCID( aSelectedCID ) );
for( aIt = m_aEntries.begin(); aIt != m_aEntries.end(); ++aIt )
{
if( aIt->OID.getObjectCID().match( aSeriesCID ) )
@@ -144,8 +144,8 @@ void SelectorListBox::UpdateChartElementsListAndSelection()
{
ListBoxEntryData aEntry;
SdrObject* pSelectedObj = DrawViewWrapper::getSdrObject( aSelectedOID.getAdditionalShape() );
- rtl::OUString aName = pSelectedObj ? pSelectedObj->GetName() : rtl::OUString();
- aEntry.UIName = ( aName.isEmpty() ? ::rtl::OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName );
+ OUString aName = pSelectedObj ? pSelectedObj->GetName() : OUString();
+ aEntry.UIName = ( aName.isEmpty() ? OUString( String( SchResId( STR_OBJECT_SHAPE ) ) ) : aName );
aEntry.OID = aSelectedOID;
m_aEntries.push_back( aEntry );
}
@@ -252,9 +252,9 @@ Reference< ::com::sun::star::accessibility::XAccessible > SelectorListBox::Creat
APPHELPER_XSERVICEINFO_IMPL( ElementSelectorToolbarController, lcl_aServiceName );
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static()
+Sequence< OUString > ElementSelectorToolbarController::getSupportedServiceNames_Static()
{
- Sequence< ::rtl::OUString > aServices(1);
+ Sequence< OUString > aServices(1);
aServices[ 0 ] = "com.sun.star.frame.ToolbarController";
return aServices;
}
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index f32fa37c32f6..025500f9f2ef 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -37,7 +37,7 @@ namespace chart
struct ListBoxEntryData
{
- rtl::OUString UIName;
+ OUString UIName;
ObjectHierarchy::tOID OID;
sal_Int32 nHierarchyDepth;
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
index 5362827d47f1..c3b3ce7f5f58 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
@@ -44,7 +44,7 @@ void FeatureCommandDispatchBase::initialize()
fillSupportedFeatures();
}
-bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCommandURL )
+bool FeatureCommandDispatchBase::isFeatureSupported( const OUString& rCommandURL )
{
SupportedFeatures::const_iterator aIter = m_aSupportedFeatures.find( rCommandURL );
if ( aIter != m_aSupportedFeatures.end() )
@@ -54,7 +54,7 @@ bool FeatureCommandDispatchBase::isFeatureSupported( const ::rtl::OUString& rCom
return false;
}
-void FeatureCommandDispatchBase::fireStatusEvent( const ::rtl::OUString& rURL,
+void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL,
const Reference< frame::XStatusListener >& xSingleListener /* = 0 */ )
{
if ( rURL.isEmpty() )
@@ -78,7 +78,7 @@ void FeatureCommandDispatchBase::dispatch( const util::URL& URL,
const Sequence< beans::PropertyValue >& Arguments )
throw (uno::RuntimeException)
{
- ::rtl::OUString aCommand( URL.Complete );
+ OUString aCommand( URL.Complete );
if ( getState( aCommand ).bEnabled )
{
execute( aCommand, Arguments );
@@ -89,7 +89,7 @@ void FeatureCommandDispatchBase::implDescribeSupportedFeature( const sal_Char* p
sal_uInt16 nId, sal_Int16 nGroup )
{
ControllerFeature aFeature;
- aFeature.Command = ::rtl::OUString::createFromAscii( pAsciiCommandURL );
+ aFeature.Command = OUString::createFromAscii( pAsciiCommandURL );
aFeature.nFeatureId = nId;
aFeature.GroupId = nGroup;
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
index 06a534251cd5..59d1b32451b9 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
@@ -33,9 +33,9 @@ struct ControllerFeature: public ::com::sun::star::frame::DispatchInformation
sal_uInt16 nFeatureId;
};
-typedef ::std::map< ::rtl::OUString,
+typedef ::std::map< OUString,
ControllerFeature,
- ::std::less< ::rtl::OUString > > SupportedFeatures;
+ ::std::less< OUString > > SupportedFeatures;
struct FeatureState
{
@@ -57,7 +57,7 @@ public:
// late initialisation, especially for adding as listener
virtual void initialize();
- virtual bool isFeatureSupported( const ::rtl::OUString& rCommandURL );
+ virtual bool isFeatureSupported( const OUString& rCommandURL );
protected:
// XDispatch
@@ -65,14 +65,14 @@ protected:
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& Arguments )
throw (::com::sun::star::uno::RuntimeException);
- virtual void fireStatusEvent( const ::rtl::OUString& rURL,
+ virtual void fireStatusEvent( const OUString& rURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener >& xSingleListener );
// state of a feature
- virtual FeatureState getState( const ::rtl::OUString& rCommand ) = 0;
+ virtual FeatureState getState( const OUString& rCommand ) = 0;
// execute a feature
- virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0;
+ virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs ) = 0;
// all the features which should be handled by this class
virtual void describeSupportedFeatures() = 0;
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index 6ed11f9f64fd..ebcb60569747 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -50,7 +50,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
@@ -375,12 +374,12 @@ void ImplObjectHierarchy::createWallAndFloor(
if( bHasWall && bIsThreeD )
{
rContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) ) );
+ ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) ) );
Reference< beans::XPropertySet > xFloor( xDiagram->getFloor());
if( xFloor.is())
rContainer.push_back(
- ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, rtl::OUString() ) ) );
+ ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) ) );
}
}
@@ -443,7 +442,7 @@ void ImplObjectHierarchy::createDataSeriesTree(
// data lablels
if( DataSeriesHelper::hasDataLabelsAtSeries( xSeries ) )
{
- rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
+ OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
aChildParticle+=("=");
aSeriesSubContainer.push_back(
ObjectIdentifier( ObjectIdentifier::createClassifiedIdentifierForParticles( aSeriesParticle, aChildParticle ) ) );
diff --git a/chart2/source/controller/main/PositionAndSizeHelper.cxx b/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 047d55dd5709..fa57560005f7 100644
--- a/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -128,7 +128,7 @@ bool PositionAndSizeHelper::moveObject( ObjectType eObjectType
return true;
}
-bool PositionAndSizeHelper::moveObject( const rtl::OUString& rObjectCID
+bool PositionAndSizeHelper::moveObject( const OUString& rObjectCID
, const uno::Reference< frame::XModel >& xChartModel
, const awt::Rectangle& rNewPositionAndSize
, const awt::Rectangle& rPageRectangle
diff --git a/chart2/source/controller/main/SelectionHelper.cxx b/chart2/source/controller/main/SelectionHelper.cxx
index 16c795875aa6..950c05df949b 100644
--- a/chart2/source/controller/main/SelectionHelper.cxx
+++ b/chart2/source/controller/main/SelectionHelper.cxx
@@ -43,11 +43,11 @@ using namespace ::com::sun::star;
namespace
{
-rtl::OUString lcl_getObjectName( SdrObject* pObj )
+OUString lcl_getObjectName( SdrObject* pObj )
{
if(pObj)
return pObj->GetName();
- return rtl::OUString();
+ return OUString();
}
void impl_selectObject( SdrObject* pObjectToSelect, DrawViewWrapper& rDrawViewWrapper )
@@ -71,7 +71,7 @@ bool Selection::hasSelection()
return m_aSelectedOID.isValid();
}
-rtl::OUString Selection::getSelectedCID()
+OUString Selection::getSelectedCID()
{
return m_aSelectedOID.getObjectCID();
}
@@ -86,7 +86,7 @@ ObjectIdentifier Selection::getSelectedOID() const
return m_aSelectedOID;
}
-bool Selection::setSelection( const ::rtl::OUString& rCID )
+bool Selection::setSelection( const OUString& rCID )
{
if ( !rCID.equals( m_aSelectedOID.getObjectCID() ) )
{
@@ -256,7 +256,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
if ( !m_aSelectedOID.isAdditionalShape() )
{
- rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model
+ OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model
if ( !m_aSelectedOID.isAutoGeneratedObject() )
{
@@ -264,8 +264,8 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
}
//check whether the diagram was hit but not selected (e.g. because it has no filling):
- rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
- rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+ OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
+ OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
bool bBackGroundHit = m_aSelectedOID.getObjectCID().equals( aPageCID ) || m_aSelectedOID.getObjectCID().equals( aWallCID ) || !m_aSelectedOID.isAutoGeneratedObject();
if( bBackGroundHit )
{
@@ -283,7 +283,7 @@ void Selection::adaptSelectionToNewPos( const Point& rMousePos, DrawViewWrapper*
//check whether the legend was hit but not selected (e.g. because it has no filling):
if( bBackGroundHit || m_aSelectedOID.getObjectCID().equals( aDiagramCID ) )
{
- rtl::OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model
+ OUString aLegendCID( ObjectIdentifier::createClassifiedIdentifierForParticle( ObjectIdentifier::createParticleForLegend(0,0) ) );//@todo read CID from model
SdrObject* pLegend = pDrawViewWrapper->getNamedSdrObject( aLegendCID );
if( pLegend )
{
@@ -338,13 +338,13 @@ bool Selection::isAdditionalShapeSelected() const
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
- , rtl::OUString& rOutName
+ , OUString& rOutName
, bool bGivenObjectMayBeResult )
{
SolarMutexGuard aSolarGuard;
//find the deepest named group
SdrObject* pObj = pInOutObject;
- rtl::OUString aName;
+ OUString aName;
if( bGivenObjectMayBeResult )
aName = lcl_getObjectName( pObj );
@@ -374,7 +374,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
, ObjectIdentifier& rOutObject
, bool bGivenObjectMayBeResult )
{
- rtl::OUString aName;
+ OUString aName;
if ( findNamedParent( pInOutObject, aName, bGivenObjectMayBeResult ) )
{
rOutObject = ObjectIdentifier( aName );
@@ -384,7 +384,7 @@ bool SelectionHelper::findNamedParent( SdrObject*& pInOutObject
}
bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
- , const rtl::OUString& rNameOfSelectedObject
+ , const OUString& rNameOfSelectedObject
, const DrawViewWrapper& rDrawViewWrapper )
{
if(rNameOfSelectedObject.isEmpty())
@@ -398,14 +398,14 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
return true;
}
-::rtl::OUString SelectionHelper::getHitObjectCID(
+OUString SelectionHelper::getHitObjectCID(
const Point& rMPos,
DrawViewWrapper& rDrawViewWrapper,
bool bGetDiagramInsteadOf_Wall )
{
// //- solar mutex
SolarMutexGuard aSolarGuard;
- rtl::OUString aRet;
+ OUString aRet;
SdrObject* pNewObj = rDrawViewWrapper.getHitObject(rMPos);
aRet = lcl_getObjectName( pNewObj );//name of pNewObj
@@ -421,10 +421,10 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
//accept only named objects while searching for the object to select
if( !findNamedParent( pNewObj, aRet, true ) )
{
- aRet = ::rtl::OUString();
+ aRet = OUString();
}
- rtl::OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );//@todo read CID from model
+ OUString aPageCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );//@todo read CID from model
//get page when nothing was hit
if( aRet.isEmpty() && !pNewObj )
{
@@ -436,7 +436,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
{
if( aRet.equals( aPageCID ) )
{
- rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
+ OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
//todo: if more than one diagram is available in future do chack the list of all diagrams here
SdrObject* pDiagram = rDrawViewWrapper.getNamedSdrObject( aDiagramCID );
if( pDiagram )
@@ -449,11 +449,11 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
}
else if( bGetDiagramInsteadOf_Wall )
{
- rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+ OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
if( aRet.equals( aWallCID ) )
{
- rtl::OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) );
+ OUString aDiagramCID = ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) );
aRet = aDiagramCID;
}
}
@@ -463,7 +463,7 @@ bool SelectionHelper::isDragableObjectHitTwice( const Point& rMPos
// \\- solar mutex
}
-bool SelectionHelper::isRotateableObject( const ::rtl::OUString& rCID
+bool SelectionHelper::isRotateableObject( const OUString& rCID
, const uno::Reference< frame::XModel >& xChartModel )
{
if( !ObjectIdentifier::isRotateableObject( rCID ) )
@@ -497,7 +497,7 @@ SdrObject* SelectionHelper::getMarkHandlesObject( SdrObject* pObj )
{
if(!pObj)
return 0;
- rtl::OUString aName( lcl_getObjectName( pObj ) );
+ OUString aName( lcl_getObjectName( pObj ) );
if( aName.match("MarkHandles") || aName.match("HandlesOnly") )
return pObj;
if( !aName.isEmpty() )//dont't get the markhandles of a different object
@@ -643,7 +643,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
if( !pSubList )//no group object !pObj->IsGroupObject()
return false;
- rtl::OUString aName( lcl_getObjectName( pObj ) );
+ OUString aName( lcl_getObjectName( pObj ) );
ObjectType eObjectType( ObjectIdentifier::getObjectType( aName ) );
if( OBJECTTYPE_DATA_POINT == eObjectType
|| OBJECTTYPE_DATA_LABEL == eObjectType
@@ -660,7 +660,7 @@ bool SelectionHelper::getMarkHandles( SdrHdlList& rHdlList )
SdrObject* pSubObj = aIterator.Next();
if( OBJECTTYPE_DATA_SERIES == eObjectType )
{
- rtl::OUString aSubName( lcl_getObjectName( pSubObj ) );
+ OUString aSubName( lcl_getObjectName( pSubObj ) );
ObjectType eSubObjectType( ObjectIdentifier::getObjectType( aSubName ) );
if( eSubObjectType!=OBJECTTYPE_DATA_POINT )
return false;
diff --git a/chart2/source/controller/main/SelectionHelper.hxx b/chart2/source/controller/main/SelectionHelper.hxx
index 992043f68867..5a4273a7fb2a 100644
--- a/chart2/source/controller/main/SelectionHelper.hxx
+++ b/chart2/source/controller/main/SelectionHelper.hxx
@@ -41,7 +41,7 @@ class Selection
public: //methods
bool hasSelection();
- rtl::OUString getSelectedCID();
+ OUString getSelectedCID();
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > getSelectedAdditionalShape();
ObjectIdentifier getSelectedOID() const;
@@ -54,7 +54,7 @@ public: //methods
bool isAdditionalShapeSelected() const;
//returns true if selection has changed
- bool setSelection( const ::rtl::OUString& rCID );
+ bool setSelection( const OUString& rCID );
bool setSelection( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape );
@@ -87,7 +87,7 @@ class SelectionHelper : public MarkHandleProvider
{
public:
static bool findNamedParent( SdrObject*& pInOutObject
- , rtl::OUString& rOutName
+ , OUString& rOutName
, bool bGivenObjectMayBeResult );
static bool findNamedParent( SdrObject*& pInOutObject
, ObjectIdentifier& rOutObject
@@ -95,15 +95,15 @@ public:
static SdrObject* getMarkHandlesObject( SdrObject* pObj );
static E3dScene* getSceneToRotate( SdrObject* pObj );
static bool isDragableObjectHitTwice( const Point& rMPos
- , const rtl::OUString& rNameOfSelectedObject
+ , const OUString& rNameOfSelectedObject
, const DrawViewWrapper& rDrawViewWrapper );
- static ::rtl::OUString getHitObjectCID(
+ static OUString getHitObjectCID(
const Point& rMPos,
DrawViewWrapper& rDrawViewWrapper,
bool bGetDiagramInsteadOf_Wall=false );
- static bool isRotateableObject( const ::rtl::OUString& rCID
+ static bool isRotateableObject( const OUString& rCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 49c94d5b129d..1e7adfd522d4 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -83,7 +83,7 @@ void ShapeController::disposing( const lang::EventObject& /* Source */ )
{
}
-FeatureState ShapeController::getState( const ::rtl::OUString& rCommand )
+FeatureState ShapeController::getState( const OUString& rCommand )
{
FeatureState aReturn;
aReturn.bEnabled = false;
@@ -150,7 +150,7 @@ FeatureState ShapeController::getState( const ::rtl::OUString& rCommand )
return aReturn;
}
-void ShapeController::execute( const ::rtl::OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs )
+void ShapeController::execute( const OUString& rCommand, const Sequence< beans::PropertyValue>& rArgs )
{
(void)rArgs;
@@ -470,7 +470,7 @@ void ShapeController::executeDispatch_RenameObject()
SdrObject* pSelectedObj = pDrawViewWrapper->getSelectedObject();
if ( pSelectedObj )
{
- rtl::OUString aName = pSelectedObj->GetName();
+ OUString aName = pSelectedObj->GetName();
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
if ( pFact )
{
diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx
index 268f94e3e1a1..ff3b5a0afc6b 100644
--- a/chart2/source/controller/main/ShapeController.hxx
+++ b/chart2/source/controller/main/ShapeController.hxx
@@ -55,10 +55,10 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// state of a feature
- virtual FeatureState getState( const ::rtl::OUString& rCommand );
+ virtual FeatureState getState( const OUString& rCommand );
// execute a feature
- virtual void execute( const ::rtl::OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs );
+ virtual void execute( const OUString& rCommand, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rArgs );
// all the features which should be handled by this class
virtual void describeSupportedFeatures();
diff --git a/chart2/source/controller/main/ShapeToolbarController.cxx b/chart2/source/controller/main/ShapeToolbarController.cxx
index f3107688f053..4c5d70df90c8 100644
--- a/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -56,7 +56,7 @@ Sequence< OUString > ShapeToolbarController::getSupportedServiceNames_Static() t
return aSupported;
}
-::sal_Bool ShapeToolbarController::supportsService( const ::rtl::OUString& ServiceName ) throw (uno::RuntimeException)
+::sal_Bool ShapeToolbarController::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException)
{
return ::comphelper::existsValue( ServiceName, getSupportedServiceNames_Static() );
}
@@ -198,7 +198,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even
{
continue;
}
- ::rtl::OUString aCmd = rTb.GetItemCommand( nId );
+ OUString aCmd = rTb.GetItemCommand( nId );
if ( aCmd == Event.FeatureURL.Complete )
{
rTb.EnableItem( nId, Event.IsEnabled );
@@ -208,7 +208,7 @@ void ShapeToolbarController::statusChanged( const frame::FeatureStateEvent& Even
}
else
{
- ::rtl::OUString aItemText;
+ OUString aItemText;
if ( Event.State >>= aItemText )
{
rTb.SetItemText( nId, aItemText );
@@ -246,7 +246,7 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno
m_nSlotId == SID_DRAWTBX_CS_STAR );
}
-::rtl::OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException)
+OUString ShapeToolbarController::getSubToolbarName() throw (uno::RuntimeException)
{
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard(m_aMutex);
@@ -255,10 +255,10 @@ Reference< awt::XWindow > ShapeToolbarController::createPopupWindow() throw (uno
{
return xSub->getSubToolbarName();
}
- return ::rtl::OUString();
+ return OUString();
}
-void ShapeToolbarController::functionSelected( const ::rtl::OUString& rCommand ) throw (uno::RuntimeException)
+void ShapeToolbarController::functionSelected( const OUString& rCommand ) throw (uno::RuntimeException)
{
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard( m_aMutex );
diff --git a/chart2/source/controller/main/ShapeToolbarController.hxx b/chart2/source/controller/main/ShapeToolbarController.hxx
index 97390e9954db..c8c7d83e1fd8 100644
--- a/chart2/source/controller/main/ShapeToolbarController.hxx
+++ b/chart2/source/controller/main/ShapeToolbarController.hxx
@@ -61,15 +61,15 @@ public:
virtual void SAL_CALL release() throw ();
// ::com::sun::star::lang::XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);
// needed by registration
- static ::rtl::OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException );
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException);
+ static OUString getImplementationName_Static() throw( ::com::sun::star::uno::RuntimeException );
+ static ::com::sun::star::uno::Sequence< OUString > getSupportedServiceNames_Static(void) throw(::com::sun::star::uno::RuntimeException);
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
create( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext );
- virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
// ::com::sun::star::lang::XInitialization
virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
@@ -82,8 +82,8 @@ public:
// ::com::sun::star::frame::XSubToolbarController
virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL functionSelected( const ::rtl::OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException);
};
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 55da8a8bf1e1..db7cfc9be370 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -29,7 +29,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
index bfabd3d785de..39fef92a8ced 100644
--- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx
+++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx
@@ -79,7 +79,7 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
virtual void fireStatusEvent(
- const ::rtl::OUString & rURL,
+ const OUString & rURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
// ____ XSelectionChangeListener ____
diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx
index 7aca7704be7e..e27276cf18d0 100644
--- a/chart2/source/controller/main/UndoActions.cxx
+++ b/chart2/source/controller/main/UndoActions.cxx
@@ -37,7 +37,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
namespace chart
{
@@ -87,7 +86,7 @@ void SAL_CALL UndoElement::disposing()
}
// ---------------------------------------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException)
+OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException)
{
return m_sActionString;
}
@@ -133,10 +132,10 @@ ShapeUndoElement::~ShapeUndoElement()
}
// ---------------------------------------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException)
+OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException)
{
if ( !m_pAction )
- throw DisposedException( ::rtl::OUString(), *this );
+ throw DisposedException( OUString(), *this );
return m_pAction->GetComment();
}
@@ -144,7 +143,7 @@ ShapeUndoElement::~ShapeUndoElement()
void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException)
{
if ( !m_pAction )
- throw DisposedException( ::rtl::OUString(), *this );
+ throw DisposedException( OUString(), *this );
m_pAction->Undo();
}
@@ -152,7 +151,7 @@ void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeExce
void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException)
{
if ( !m_pAction )
- throw DisposedException( ::rtl::OUString(), *this );
+ throw DisposedException( OUString(), *this );
m_pAction->Redo();
}
diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx
index cda2b656b1e5..7f3687abdfa0 100644
--- a/chart2/source/controller/main/UndoActions.hxx
+++ b/chart2/source/controller/main/UndoActions.hxx
@@ -63,13 +63,13 @@ public:
is the cloned model from before the changes, which the Undo action represents, have been applied.
Upon <member>invoking</member>, the clone model is applied to the document model.
*/
- UndoElement( const ::rtl::OUString & i_actionString,
+ UndoElement( const OUString & i_actionString,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& i_documentModel,
const ::boost::shared_ptr< ChartModelClone >& i_modelClone
);
// XUndoAction
- virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
@@ -83,7 +83,7 @@ private:
void impl_toggleModelState();
private:
- ::rtl::OUString m_sActionString;
+ OUString m_sActionString;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > m_xDocumentModel;
::boost::shared_ptr< ChartModelClone > m_pModelClone;
};
@@ -98,7 +98,7 @@ public:
ShapeUndoElement( SdrUndoAction& i_sdrUndoAction );
// XUndoAction
- virtual ::rtl::OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getTitle() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL undo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL redo( ) throw (::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx
index 27d23d137a44..5d059915da4d 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx
index f0b9ae769978..88a727521ed1 100644
--- a/chart2/source/controller/main/UndoCommandDispatch.hxx
+++ b/chart2/source/controller/main/UndoCommandDispatch.hxx
@@ -59,7 +59,7 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
virtual void fireStatusEvent(
- const ::rtl::OUString & rURL,
+ const OUString & rURL,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > & xSingleListener );
private:
diff --git a/chart2/source/controller/main/UndoGuard.cxx b/chart2/source/controller/main/UndoGuard.cxx
index ac3be8abca98..01727c88b4a7 100644
--- a/chart2/source/controller/main/UndoGuard.cxx
+++ b/chart2/source/controller/main/UndoGuard.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/controller/main/UndoGuard.hxx b/chart2/source/controller/main/UndoGuard.hxx
index 85d6923b7eaa..755f38ff85bd 100644
--- a/chart2/source/controller/main/UndoGuard.hxx
+++ b/chart2/source/controller/main/UndoGuard.hxx
@@ -38,7 +38,7 @@ class UndoGuard
{
public:
explicit UndoGuard(
- const ::rtl::OUString& i_undoMessage,
+ const OUString& i_undoMessage,
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager,
const ModelFacet i_facet = E_MODEL
);
@@ -58,7 +58,7 @@ private:
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > m_xUndoManager;
::boost::shared_ptr< ChartModelClone > m_pDocumentSnapshot;
- rtl::OUString m_aUndoString;
+ OUString m_aUndoString;
bool m_bActionPosted;
};
@@ -69,7 +69,7 @@ class UndoLiveUpdateGuard : public UndoGuard
{
public:
explicit UndoLiveUpdateGuard(
- const ::rtl::OUString& i_undoMessage,
+ const OUString& i_undoMessage,
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
);
~UndoLiveUpdateGuard();
@@ -83,7 +83,7 @@ class UndoLiveUpdateGuardWithData :
{
public:
explicit UndoLiveUpdateGuardWithData(
- const ::rtl::OUString& i_undoMessage,
+ const OUString& i_undoMessage,
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
);
~UndoLiveUpdateGuardWithData();
@@ -93,7 +93,7 @@ class UndoGuardWithSelection : public UndoGuard
{
public:
explicit UndoGuardWithSelection(
- const ::rtl::OUString& i_undoMessage,
+ const OUString& i_undoMessage,
const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > & i_undoManager
);
virtual ~UndoGuardWithSelection();
diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx
index 5d4ef5e0228d..3fa9ee7b9034 100644
--- a/chart2/source/inc/CachedDataSequence.hxx
+++ b/chart2/source/inc/CachedDataSequence.hxx
@@ -75,7 +75,7 @@ public:
/** creates a sequence and initializes it with the given string. This is
especially useful for labels, which only have one element.
*/
- explicit CachedDataSequence( const ::rtl::OUString & rSingleText );
+ explicit CachedDataSequence( const OUString & rSingleText );
/// Copy CTOR
explicit CachedDataSequence( const CachedDataSequence & rSource );
@@ -105,9 +105,9 @@ protected:
// ____ XDataSequence ____
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation()
+ virtual OUString SAL_CALL getSourceRangeRepresentation()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel(
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel(
::com::sun::star::chart2::data::LabelOrigin nLabelOrigin )
throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
@@ -120,7 +120,7 @@ protected:
// ____ XTextualDataSequence ____
/// @see ::com::sun::star::chart::data::XTextualDataSequence
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException);
// ____ XCloneable ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
@@ -140,7 +140,7 @@ protected:
// <properties>
sal_Int32 m_nNumberFormatKey;
- ::rtl::OUString m_sRole;
+ OUString m_sRole;
// </properties>
enum DataType
@@ -161,7 +161,7 @@ private:
::com::sun::star::uno::Sequence< double > Impl_getNumericalData() const;
/** is used by interface method getTextualData().
*/
- ::com::sun::star::uno::Sequence< ::rtl::OUString > Impl_getTextualData() const;
+ ::com::sun::star::uno::Sequence< OUString > Impl_getTextualData() const;
/** is used by interface method getData().
*/
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > Impl_getMixedData() const;
@@ -170,7 +170,7 @@ private:
enum DataType m_eCurrentDataType;
::com::sun::star::uno::Sequence< double > m_aNumericalSequence;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aTextualSequence;
+ ::com::sun::star::uno::Sequence< OUString > m_aTextualSequence;
::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any > m_aMixedSequence;
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >
diff --git a/chart2/source/inc/ChartTypeHelper.hxx b/chart2/source/inc/ChartTypeHelper.hxx
index 2ea057e012ce..c1165429c2a8 100644
--- a/chart2/source/inc/ChartTypeHelper.hxx
+++ b/chart2/source/inc/ChartTypeHelper.hxx
@@ -79,10 +79,10 @@ public:
getAxisType( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartType >& xChartType
, sal_Int32 nDimensionIndex );
- static rtl::OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference<
+ static OUString getRoleOfSequenceForYAxisNumberFormatDetection( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartType >& xChartType );
- static rtl::OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference<
+ static OUString getRoleOfSequenceForDataLabelNumberFormatDetection( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartType >& xChartType );
static bool shouldLabelNumberFormatKeyBeDetectedFromYAxis( const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index cf4d7f069df5..32885299aab4 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -210,7 +210,7 @@ OOO_DLLPUBLIC_CHARTTOOLS
::com::sun::star::chart2::data::XDataSequence > & xDataSequence );
OOO_DLLPUBLIC_CHARTTOOLS
-::com::sun::star::uno::Sequence< rtl::OUString > DataSequenceToStringSequence(
+::com::sun::star::uno::Sequence< OUString > DataSequenceToStringSequence(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence > & xDataSequence );
@@ -261,9 +261,9 @@ OOO_DLLPUBLIC_CHARTTOOLS
sal_Int16 getShortForLongAlso( const ::com::sun::star::uno::Any& rAny );
OOO_DLLPUBLIC_CHARTTOOLS
-bool replaceParamterInString( rtl::OUString & rInOutResourceString,
- const rtl::OUString & rParamToReplace,
- const rtl::OUString & rReplaceWith );
+bool replaceParamterInString( OUString & rInOutResourceString,
+ const OUString & rParamToReplace,
+ const OUString & rReplaceWith );
//.............................................................................
} //namespace chart
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index a88650d6e797..458d29d7177f 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -70,18 +70,18 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< ::co
};
/** unary function to convert ::com::sun::star::uno::Any into an
- ::rtl::OUString.
+ OUString.
*/
-struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, ::rtl::OUString >
+struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::com::sun::star::uno::Any, OUString >
{
- ::rtl::OUString operator() ( const ::com::sun::star::uno::Any & rAny )
+ OUString operator() ( const ::com::sun::star::uno::Any & rAny )
{
::com::sun::star::uno::TypeClass eClass( rAny.getValueType().getTypeClass() );
if( eClass == ::com::sun::star::uno::TypeClass_DOUBLE )
{
const double* pDouble = reinterpret_cast< const double * >( rAny.getValue() );
if( ::rtl::math::isNan(*pDouble) )
- return ::rtl::OUString();
+ return OUString();
return ::rtl::math::doubleToUString(
* pDouble,
rtl_math_StringFormat_Automatic,
@@ -92,20 +92,20 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< ::co
}
else if( eClass == ::com::sun::star::uno::TypeClass_STRING )
{
- return * reinterpret_cast< const ::rtl::OUString * >( rAny.getValue() );
+ return * reinterpret_cast< const OUString * >( rAny.getValue() );
}
- return ::rtl::OUString();
+ return OUString();
}
};
-/** unary function to convert an ::rtl::OUString into a double number.
+/** unary function to convert an OUString into a double number.
<p>For conversion rtl::math::StringToDouble is used.</p>
*/
-struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< ::rtl::OUString, double >
+struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< OUString, double >
{
- double operator() ( const ::rtl::OUString & rStr )
+ double operator() ( const OUString & rStr )
{
rtl_math_ConversionStatus eConversionStatus;
double fResult = ::rtl::math::stringToDouble( rStr, '.', ',', & eConversionStatus, NULL );
@@ -117,13 +117,13 @@ struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function<
}
};
-/** unary function to convert a double number into an ::rtl::OUString.
+/** unary function to convert a double number into an OUString.
<p>For conversion rtl::math::DoubleToOUString is used.</p>
*/
-struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, ::rtl::OUString >
+struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, OUString >
{
- ::rtl::OUString operator() ( double fNumber )
+ OUString operator() ( double fNumber )
{
return ::rtl::math::doubleToUString(
fNumber,
diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx
index c22df438b4c8..e6d5a3686bce 100644
--- a/chart2/source/inc/ConfigColorScheme.hxx
+++ b/chart2/source/inc/ConfigColorScheme.hxx
@@ -66,7 +66,7 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// ____ ConfigItemListener ____
- SAL_DLLPRIVATE virtual void notify( const ::rtl::OUString & rPropertyName );
+ SAL_DLLPRIVATE virtual void notify( const OUString & rPropertyName );
private:
SAL_DLLPRIVATE void retrieveConfigColors();
diff --git a/chart2/source/inc/ConfigItemListener.hxx b/chart2/source/inc/ConfigItemListener.hxx
index 4526b4291bd5..d050fa59fcb3 100644
--- a/chart2/source/inc/ConfigItemListener.hxx
+++ b/chart2/source/inc/ConfigItemListener.hxx
@@ -28,7 +28,7 @@ namespace chart
class OOO_DLLPUBLIC_CHARTTOOLS ConfigItemListener
{
public:
- virtual void notify( const ::rtl::OUString & rPropertyName ) = 0;
+ virtual void notify( const OUString & rPropertyName ) = 0;
protected:
~ConfigItemListener() {}
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index 55c1a2247b0f..c92803097860 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -136,7 +136,7 @@ template< typename T >
example:
- ::std::multimap< sal_Int32, ::rtl::OUString > aMyMultiMap;
+ ::std::multimap< sal_Int32, OUString > aMyMultiMap;
uno::Sequence< sal_Int32 > aMyKeys( ContainerHelper::MapKeysToSequence( aMyMultiMap ));
// note: aMyKeys may contain duplicate keys here
*/
@@ -154,8 +154,8 @@ template< class Map >
example:
- ::std::map< sal_Int32, ::rtl::OUString > aMyMultiMap;
- uno::Sequence< ::rtl::OUString > aMyValues( ContainerHelper::MapValuesToSequence( aMyMultiMap ));
+ ::std::map< sal_Int32, OUString > aMyMultiMap;
+ uno::Sequence< OUString > aMyValues( ContainerHelper::MapValuesToSequence( aMyMultiMap ));
*/
template< class Map >
::com::sun::star::uno::Sequence< typename Map::mapped_type > MapValuesToSequence(
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index a8a2dc8aa470..02f64f8ee5f3 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -39,7 +39,7 @@ namespace chart
namespace DataSeriesHelper
{
-::rtl::OUString GetRole(
+OUString GetRole(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence );
@@ -56,7 +56,7 @@ namespace DataSeriesHelper
OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
getDataSequenceByRole( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSource > & xSource,
- ::rtl::OUString aRole,
+ OUString aRole,
bool bMatchPrefix = false );
/** Retrieves all data sequences in the given data source that match the given
@@ -73,7 +73,7 @@ OOO_DLLPUBLIC_CHARTTOOLS ::std::vector<
getAllDataSequencesByRole( const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > > & aDataSequences,
- ::rtl::OUString aRole,
+ OUString aRole,
bool bMatchPrefix = false );
/** Retrieves all data sequences found in the given data series and puts them
@@ -93,14 +93,14 @@ OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference<
The data sequence contained in xSeries that has this role will be used
to take its label.
*/
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getDataSeriesLabel(
+OOO_DLLPUBLIC_CHARTTOOLS OUString getDataSeriesLabel(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries > & xSeries,
- const ::rtl::OUString & rLabelSequenceRole );
+ const OUString & rLabelSequenceRole );
/** Get the label of a labeled sequence including neccessary automatic generation
*/
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString getLabelForLabeledDataSequence(
+OOO_DLLPUBLIC_CHARTTOOLS OUString getLabelForLabeledDataSequence(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > & xLabeledSeq );
@@ -157,13 +157,13 @@ void makeLinesThickOrThin( const ::com::sun::star::uno::Reference<
OOO_DLLPUBLIC_CHARTTOOLS void setPropertyAlsoToAllAttributedDataPoints(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries >& xSeries,
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rPropertyValue );
OOO_DLLPUBLIC_CHARTTOOLS bool hasAttributedDataPointDifferentValue(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDataSeries >& xSeries,
- const ::rtl::OUString& rPropertyName,
+ const OUString& rPropertyName,
const ::com::sun::star::uno::Any& rPropertyValue );
OOO_DLLPUBLIC_CHARTTOOLS bool areAllSeriesAttachedToSameAxis(
diff --git a/chart2/source/inc/DataSourceHelper.hxx b/chart2/source/inc/DataSourceHelper.hxx
index bfad44998bf2..d5ab613b5ada 100644
--- a/chart2/source/inc/DataSourceHelper.hxx
+++ b/chart2/source/inc/DataSourceHelper.hxx
@@ -53,7 +53,7 @@ public:
createCachedDataSequence();
static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence >
- createCachedDataSequence( const ::rtl::OUString & rSingleText );
+ createCachedDataSequence( const OUString & rSingleText );
static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence >
createLabeledDataSequence(
@@ -74,12 +74,12 @@ public:
static ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > createArguments(
- const ::rtl::OUString & rRangeRepresentation,
+ const OUString & rRangeRepresentation,
const ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping,
bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories );
SAL_DLLPRIVATE static void readArguments( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rArguments
- , ::rtl::OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
+ , OUString & rRangeRepresentation, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
, bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories );
static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >
@@ -90,13 +90,13 @@ public:
static void addRangeRepresentationsFromLabeledDataSequence(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence >& xLabeledDataSequence
- , ::std::vector< ::rtl::OUString >& rOutRangeRepresentations );
+ , ::std::vector< OUString >& rOutRangeRepresentations );
- SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges(
+ SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram > & xDiagram );
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getUsedDataRanges(
+ static ::com::sun::star::uno::Sequence< OUString > getUsedDataRanges(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xChartModel );
@@ -113,7 +113,7 @@ public:
static bool detectRangeSegmentation(
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel
- , ::rtl::OUString& rOutRangeString
+ , OUString& rOutRangeString
, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
, bool& rOutUseColumns
, bool& rOutFirstCellAsLabel
@@ -137,15 +137,15 @@ public:
static bool allArgumentsForRectRangeDetected(
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartDocument );
- SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromLabeledDataSequence(
+ SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromLabeledDataSequence(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq );
- SAL_DLLPRIVATE static ::rtl::OUString getRangeFromValues(
+ SAL_DLLPRIVATE static OUString getRangeFromValues(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence > & xLSeq );
- SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< ::rtl::OUString > getRangesFromDataSource(
+ SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString > getRangesFromDataSource(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSource > & xSource );
};
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index 51896e85b51e..5b1bb7bda23f 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -53,7 +53,7 @@ public:
typedef ::std::pair<
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartTypeTemplate >,
- ::rtl::OUString >
+ OUString >
tTemplateWithServiceName;
/** tries to find a template in the chart-type manager that matches the
@@ -75,7 +75,7 @@ public:
::com::sun::star::chart2::XDiagram > & xDiagram,
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & xChartTypeManager,
- const ::rtl::OUString & rPreferredTemplateName = ::rtl::OUString());
+ const OUString & rPreferredTemplateName = OUString());
/** Sets the "SwapXAndYAxis" property at all coordinate systems found in the
given diagram.
@@ -224,12 +224,12 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram > & xDiagram );
- static ::com::sun::star::uno::Sequence< rtl::OUString >
+ static ::com::sun::star::uno::Sequence< OUString >
getExplicitSimpleCategories(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDoc );
- SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< rtl::OUString >
+ SAL_DLLPRIVATE static ::com::sun::star::uno::Sequence< OUString >
generateAutomaticCategoriesFromCooSys(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XCoordinateSystem > & xCooSys );
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index d96ef67253a1..a8feca551032 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -34,10 +34,10 @@ namespace chart
struct OOO_DLLPUBLIC_CHARTTOOLS ComplexCategory
{
- rtl::OUString Text;
+ OUString Text;
sal_Int32 Count;
- ComplexCategory( const rtl::OUString& rText, sal_Int32 nCount ) : Text( rText ), Count (nCount)
+ ComplexCategory( const OUString& rText, sal_Int32 nCount ) : Text( rText ), Count (nCount)
{}
};
@@ -47,7 +47,7 @@ public:
virtual ~SplitCategoriesProvider();
virtual sal_Int32 getLevelCount() const = 0;
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0;
+ virtual ::com::sun::star::uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const = 0;
};
struct DatePlusIndex
@@ -83,20 +83,20 @@ public:
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence > getOriginalCategories();
- ::com::sun::star::uno::Sequence< ::rtl::OUString > getSimpleCategories();
+ ::com::sun::star::uno::Sequence< OUString > getSimpleCategories();
const std::vector<ComplexCategory>* getCategoriesByLevel( sal_Int32 nLevel );
- static ::rtl::OUString getCategoryByIndex(
+ static OUString getCategoryByIndex(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XCoordinateSystem >& xCooSysModel
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel
, sal_Int32 nIndex );
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > getExplicitSimpleCategories(
+ static ::com::sun::star::uno::Sequence< OUString > getExplicitSimpleCategories(
const SplitCategoriesProvider& rSplitCategoriesProvider );
- static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< rtl::OUString >& rOutTexts
+ static void convertCategoryAnysToText( ::com::sun::star::uno::Sequence< OUString >& rOutTexts
, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rInAnys
, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xChartModel );
@@ -119,7 +119,7 @@ private: //member
::com::sun::star::chart2::data::XLabeledDataSequence> m_xOriginalCategories;
bool m_bIsExplicitCategoriesInited;
- ::com::sun::star::uno::Sequence< ::rtl::OUString > m_aExplicitCategories;
+ ::com::sun::star::uno::Sequence< OUString > m_aExplicitCategories;
::std::vector< ::std::vector< ComplexCategory > > m_aComplexCats;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList;
diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
index bb80a956e280..b928db423322 100644
--- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx
@@ -32,7 +32,7 @@ public:
virtual ~ExponentialRegressionCurveCalculator();
protected:
- virtual ::rtl::OUString ImplGetRepresentation(
+ virtual OUString ImplGetRepresentation(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
::sal_Int32 nNumberFormatKey ) const;
diff --git a/chart2/source/inc/FormattedStringHelper.hxx b/chart2/source/inc/FormattedStringHelper.hxx
index ae964dc29a0d..0dadc937cea6 100644
--- a/chart2/source/inc/FormattedStringHelper.hxx
+++ b/chart2/source/inc/FormattedStringHelper.hxx
@@ -38,7 +38,7 @@ public:
createFormattedStringSequence(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > & xContext
- , const ::rtl::OUString & rString
+ , const OUString & rString
, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xTextProperties ) throw();
};
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index e2f93d4c4f3b..3b6cd9a46da0 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -83,13 +83,13 @@ public:
APPHELPER_SERVICE_FACTORY_HELPER(InternalDataProvider)
// ____ XInternalDataProvider ____
- virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const ::rtl::OUString& aRange )
+ virtual ::sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange )
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL
- getDataByRangeRepresentation( const ::rtl::OUString& aRange )
+ getDataByRangeRepresentation( const OUString& aRange )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setDataByRangeRepresentation(
- const ::rtl::OUString& aRange,
+ const OUString& aRange,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aNewData )
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex )
@@ -124,22 +124,22 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource >& xDataSource )
throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible(
- const ::rtl::OUString& aRangeRepresentation )
+ const OUString& aRangeRepresentation )
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation(
- const ::rtl::OUString& aRangeRepresentation )
+ const OUString& aRangeRepresentation )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XRangeSelection > SAL_CALL getRangeSelection()
throw (::com::sun::star::uno::RuntimeException);
// ____ XRangeXMLConversion ____
- virtual ::rtl::OUString SAL_CALL convertRangeToXML(
- const ::rtl::OUString& aRangeRepresentation )
+ virtual OUString SAL_CALL convertRangeToXML(
+ const OUString& aRangeRepresentation )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL convertRangeFromXML(
- const ::rtl::OUString& aXMLRange )
+ virtual OUString SAL_CALL convertRangeFromXML(
+ const OUString& aXMLRange )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
@@ -162,17 +162,17 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
getComplexRowDescriptions() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setComplexRowDescriptions(
const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aRowDescriptions )
+ ::com::sun::star::uno::Sequence< OUString > >& aRowDescriptions )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::rtl::OUString > > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< OUString > > SAL_CALL
getComplexColumnDescriptions() throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setComplexColumnDescriptions(
const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Sequence< ::rtl::OUString > >& aColumnDescriptions )
+ ::com::sun::star::uno::Sequence< OUString > >& aColumnDescriptions )
throw (::com::sun::star::uno::RuntimeException);
// ____ XChartDataArray (base of XComplexDescriptionAccess) ____
@@ -181,15 +181,15 @@ public:
virtual void SAL_CALL setData(
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< double > >& aData )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowDescriptions()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getRowDescriptions()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setRowDescriptions(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aRowDescriptions )
+ const ::com::sun::star::uno::Sequence< OUString >& aRowDescriptions )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getColumnDescriptions()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getColumnDescriptions()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setColumnDescriptions(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aColumnDescriptions )
+ const ::com::sun::star::uno::Sequence< OUString >& aColumnDescriptions )
throw (::com::sun::star::uno::RuntimeException);
// ____ XChartData (base of XChartDataArray) ____
@@ -214,28 +214,28 @@ public:
private:
void lcl_addDataSequenceToMap(
- const ::rtl::OUString & rRangeRepresentation,
+ const OUString & rRangeRepresentation,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence > & xSequence );
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence >
- lcl_createDataSequenceAndAddToMap( const ::rtl::OUString & rRangeRepresentation,
- const ::rtl::OUString & rRole );
+ lcl_createDataSequenceAndAddToMap( const OUString & rRangeRepresentation,
+ const OUString & rRole );
::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence >
- lcl_createDataSequenceAndAddToMap( const ::rtl::OUString & rRangeRepresentation );
+ lcl_createDataSequenceAndAddToMap( const OUString & rRangeRepresentation );
- void lcl_deleteMapReferences( const ::rtl::OUString & rRangeRepresentation );
+ void lcl_deleteMapReferences( const OUString & rRangeRepresentation );
void lcl_adaptMapReferences(
- const ::rtl::OUString & rOldRangeRepresentation,
- const ::rtl::OUString & rNewRangeRepresentation );
+ const OUString & rOldRangeRepresentation,
+ const OUString & rNewRangeRepresentation );
void lcl_increaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
void lcl_decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
- typedef ::std::multimap< ::rtl::OUString,
+ typedef ::std::multimap< OUString,
::com::sun::star::uno::WeakReference< ::com::sun::star::chart2::data::XDataSequence > >
tSequenceMap;
typedef ::std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange;
diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
index b48c6a3825b8..c2cc8807671b 100644
--- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx
@@ -32,7 +32,7 @@ public:
virtual ~LinearRegressionCurveCalculator();
protected:
- virtual ::rtl::OUString ImplGetRepresentation(
+ virtual OUString ImplGetRepresentation(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
::sal_Int32 nNumberFormatKey ) const;
diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
index 053cb5d8c413..b3709105b1f7 100644
--- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx
@@ -32,7 +32,7 @@ public:
virtual ~LogarithmicRegressionCurveCalculator();
protected:
- virtual ::rtl::OUString ImplGetRepresentation(
+ virtual OUString ImplGetRepresentation(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
::sal_Int32 nNumberFormatKey ) const;
diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
index 69be677cfe2e..bc842e513b03 100644
--- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx
@@ -32,7 +32,7 @@ public:
virtual ~MeanValueRegressionCurveCalculator();
protected:
- virtual ::rtl::OUString ImplGetRepresentation(
+ virtual OUString ImplGetRepresentation(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
::sal_Int32 nNumberFormatKey ) const;
diff --git a/chart2/source/inc/MediaDescriptorHelper.hxx b/chart2/source/inc/MediaDescriptorHelper.hxx
index 0976b1352bb6..48896c7c9003 100644
--- a/chart2/source/inc/MediaDescriptorHelper.hxx
+++ b/chart2/source/inc/MediaDescriptorHelper.hxx
@@ -80,34 +80,34 @@ public:
//@todo define this for debug only, except URL
sal_Bool AsTemplate; //document is a template.
sal_Bool ISSET_AsTemplate;
- ::rtl::OUString Author;
+ OUString Author;
sal_Bool ISSET_Author;
- ::rtl::OUString CharacterSet; //identifier of used character set.
+ OUString CharacterSet; //identifier of used character set.
sal_Bool ISSET_CharacterSet;
- ::rtl::OUString Comment;
+ OUString Comment;
sal_Bool ISSET_Comment;
::com::sun::star::uno::Any
ComponentData;
sal_Bool ISSET_ComponentData;
- ::rtl::OUString FileName; //deprecated, same as url
+ OUString FileName; //deprecated, same as url
sal_Bool ISSET_FileName;
::com::sun::star::uno::Any
FilterData;
sal_Bool ISSET_FilterData;
- ::rtl::OUString FilterName; //internal filter name.
+ OUString FilterName; //internal filter name.
sal_Bool ISSET_FilterName;
- ::rtl::OUString FilterFlags;//deprecated,
+ OUString FilterFlags;//deprecated,
sal_Bool ISSET_FilterFlags;
- ::rtl::OUString FilterOptions;
+ OUString FilterOptions;
sal_Bool ISSET_FilterOptions;
//not documented ... @todo remove?
- ::rtl::OUString FrameName; //name of target frame.
+ OUString FrameName; //name of target frame.
sal_Bool ISSET_FrameName;
sal_Bool Hidden; //load document, invisible.
sal_Bool ISSET_Hidden;
- ::rtl::OUString HierarchicalDocumentName;
+ OUString HierarchicalDocumentName;
sal_Bool ISSET_HierarchicalDocumentName;
@@ -121,17 +121,17 @@ public:
InteractionHandler; //::com::sun::star::task::XInteractionHandler
sal_Bool ISSET_InteractionHandler;
- ::rtl::OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself.
+ OUString JumpMark; //specifies the name of a mark within the document where the first view is to position itself.
sal_Bool ISSET_JumpMark;
- ::rtl::OUString MediaType; //mime type.
+ OUString MediaType; //mime type.
sal_Bool ISSET_MediaType;
- ::rtl::OUString OpenFlags; //deprecated
+ OUString OpenFlags; //deprecated
sal_Bool ISSET_OpenFlags;
sal_Bool OpenNewView; //opens a new view for an already loaded document.
sal_Bool ISSET_OpenNewView;
sal_Bool Overwrite; //opens a new view for an already loaded document.
sal_Bool ISSET_Overwrite;
- ::rtl::OUString Password;
+ OUString Password;
sal_Bool ISSET_Password;
//not documented ... @todo remove?
@@ -142,13 +142,13 @@ public:
::com::sun::star::uno::Sequence< sal_Int8 >
PostData; //contains the data for HTTP post method as a sequence of bytes.
sal_Bool ISSET_PostData;
- ::rtl::OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes.
+ OUString PostString; //deprecated, contains the data for HTTP post method as a sequence of bytes.
sal_Bool ISSET_PostString;
sal_Bool Preview; //show preview.
sal_Bool ISSET_Preview;
sal_Bool ReadOnly; //open document readonly.
sal_Bool ISSET_ReadOnly;
- ::rtl::OUString Referer; //name of document referrer.
+ OUString Referer; //name of document referrer.
sal_Bool ISSET_Referer;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
@@ -157,13 +157,13 @@ public:
//not documented ... @todo remove?
sal_Bool Silent; //prevents dialogs to query for more information.
sal_Bool ISSET_Silent;
- ::rtl::OUString TemplateName; //deprecated, name of the template instead of the URL.
+ OUString TemplateName; //deprecated, name of the template instead of the URL.
sal_Bool ISSET_TemplateName;
- ::rtl::OUString TemplateRegionName; //deprecated, name of the region of the template.
+ OUString TemplateRegionName; //deprecated, name of the region of the template.
sal_Bool ISSET_TemplateRegionName;
sal_Bool Unpacked;
sal_Bool ISSET_Unpacked;
- ::rtl::OUString URL;// FileName, URL of the document.
+ OUString URL;// FileName, URL of the document.
sal_Bool ISSET_URL;
sal_Int16 Version; //storage version.
sal_Bool ISSET_Version;
diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx
index 3ce68aa73a91..029f4521674e 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -35,7 +35,7 @@ namespace chart
//.............................................................................
OOO_DLLPUBLIC_CHARTTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > createNameContainer(
- const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName );
+ const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName );
namespace impl
{
@@ -49,26 +49,26 @@ typedef ::cppu::WeakImplHelper3<
class NameContainer : public impl::NameContainer_Base
{
public:
- NameContainer( const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName );
+ NameContainer( const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName );
explicit NameContainer( const NameContainer & rOther );
virtual ~NameContainer();
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException);
// XNameContainer
- virtual void SAL_CALL insertByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeByName( const rtl::OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL insertByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::ElementExistException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeByName( const OUString& Name ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
// XNameReplace
- virtual void SAL_CALL replaceByName( const rtl::OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL replaceByName( const OUString& aName, const com::sun::star::uno::Any& aElement ) throw( com::sun::star::lang::IllegalArgumentException, com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
// XNameAccess
- virtual com::sun::star::uno::Any SAL_CALL getByName( const rtl::OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
- virtual com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException);
- virtual sal_Bool SAL_CALL hasByName( const rtl::OUString& aName ) throw( com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Any SAL_CALL getByName( const OUString& aName ) throw( com::sun::star::container::NoSuchElementException, com::sun::star::lang::WrappedTargetException, com::sun::star::uno::RuntimeException);
+ virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( com::sun::star::uno::RuntimeException);
+ virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( com::sun::star::uno::RuntimeException);
// XElementAccess
virtual sal_Bool SAL_CALL hasElements( ) throw( com::sun::star::uno::RuntimeException);
@@ -82,10 +82,10 @@ private: //methods
private: //member
const ::com::sun::star::uno::Type m_aType;
- const rtl::OUString m_aServicename;
- const rtl::OUString m_aImplementationName;
+ const OUString m_aServicename;
+ const OUString m_aImplementationName;
- typedef ::std::map< ::rtl::OUString, com::sun::star::uno::Any > tContentMap;
+ typedef ::std::map< OUString, com::sun::star::uno::Any > tContentMap;
tContentMap m_aMap;
};
diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx
index d4f6441bcb1b..f15f65150464 100644
--- a/chart2/source/inc/NumberFormatterWrapper.hxx
+++ b/chart2/source/inc/NumberFormatterWrapper.hxx
@@ -43,7 +43,7 @@ public:
::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >
getNumberFormatsSupplier() { return m_xNumberFormatsSupplier; };
- rtl::OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
+ OUString getFormattedString( sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
Date getNullDate() const;
private: //private member
@@ -62,7 +62,7 @@ public:
, sal_Int32 nNumberFormatKey );
virtual ~FixedNumberFormatter();
- rtl::OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
+ OUString getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const;
private:
NumberFormatterWrapper m_aNumberFormatterWrapper;
diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx
index 5e26b7482d60..cc226a5031bd 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -172,19 +172,19 @@ protected:
// ____ XPropertyState ____
virtual ::com::sun::star::beans::PropertyState SAL_CALL
- getPropertyState( const ::rtl::OUString& PropertyName )
+ getPropertyState( const OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL
- getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName )
+ getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL
- setPropertyToDefault( const ::rtl::OUString& PropertyName )
+ setPropertyToDefault( const OUString& PropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL
- getPropertyDefault( const ::rtl::OUString& aPropertyName )
+ getPropertyDefault( const OUString& aPropertyName )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
@@ -196,11 +196,11 @@ protected:
setAllPropertiesToDefault()
throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL
- setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+ setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL
- getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames )
+ getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames )
throw (::com::sun::star::beans::UnknownPropertyException,
::com::sun::star::lang::WrappedTargetException,
::com::sun::star::uno::RuntimeException);
@@ -214,7 +214,7 @@ protected:
// ____ XMultiPropertySet ____
virtual void SAL_CALL setPropertyValues(
- const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames,
+ const ::com::sun::star::uno::Sequence< OUString >& PropertyNames,
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Values )
throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/inc/ObjectIdentifier.hxx b/chart2/source/inc/ObjectIdentifier.hxx
index 0c4b3c516621..b2e127dbb6be 100644
--- a/chart2/source/inc/ObjectIdentifier.hxx
+++ b/chart2/source/inc/ObjectIdentifier.hxx
@@ -93,7 +93,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS ObjectIdentifier
public:
ObjectIdentifier();
- ObjectIdentifier( const ::rtl::OUString& rObjectCID );
+ ObjectIdentifier( const OUString& rObjectCID );
ObjectIdentifier( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rxShape );
ObjectIdentifier( const ::com::sun::star::uno::Any& rAny );
virtual ~ObjectIdentifier();
@@ -104,152 +104,152 @@ public:
bool operator!=( const ObjectIdentifier& rOID ) const;
bool operator<( const ObjectIdentifier& rOID ) const;
- static rtl::OUString createClassifiedIdentifierForObject(
+ static OUString createClassifiedIdentifierForObject(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface >& xObject
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
- static rtl::OUString createClassifiedIdentifierForParticle(
- const rtl::OUString& rParticle );
+ static OUString createClassifiedIdentifierForParticle(
+ const OUString& rParticle );
- static rtl::OUString createClassifiedIdentifierForParticles(
- const rtl::OUString& rParentParticle
- , const rtl::OUString& rChildParticle
- , const rtl::OUString& rDragMethodServiceName = rtl::OUString()
- , const rtl::OUString& rDragParameterString = rtl::OUString() );
+ static OUString createClassifiedIdentifierForParticles(
+ const OUString& rParentParticle
+ , const OUString& rChildParticle
+ , const OUString& rDragMethodServiceName = OUString()
+ , const OUString& rDragParameterString = OUString() );
- static rtl::OUString createClassifiedIdentifierForGrid(
+ static OUString createClassifiedIdentifierForGrid(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAxis >& xAxis
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel
, sal_Int32 nSubIndex = -1 );//-1: main grid, 0: first subgrid etc
- SAL_DLLPRIVATE static rtl::OUString createParticleForDiagram(
+ SAL_DLLPRIVATE static OUString createParticleForDiagram(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XDiagram >& xDiagram
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
- static rtl::OUString createParticleForCoordinateSystem(
+ static OUString createParticleForCoordinateSystem(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XCoordinateSystem >& xCooSys
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
- static rtl::OUString createParticleForAxis(
+ static OUString createParticleForAxis(
sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
- static rtl::OUString createParticleForGrid(
+ static OUString createParticleForGrid(
sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
- static rtl::OUString createParticleForSeries( sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex
+ static OUString createParticleForSeries( sal_Int32 nDiagramIndex, sal_Int32 nCooSysIndex
, sal_Int32 nChartTypeIndex, sal_Int32 nSeriesIndex );
- static rtl::OUString createParticleForLegend(
+ static OUString createParticleForLegend(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XLegend >& xLegend
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
- static rtl::OUString addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle );
- static rtl::OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex );
- static sal_Int32 getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID );
+ static OUString addChildParticle( const OUString& rParticle, const OUString& rChildParticle );
+ static OUString createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex );
+ static sal_Int32 getIndexFromParticleOrCID( const OUString& rParticleOrCID );
- static rtl::OUString createClassifiedIdentifier(
+ static OUString createClassifiedIdentifier(
enum ObjectType eObjectType //e.g. OBJECTTYPE_DATA_SERIES
- , const rtl::OUString& rParticleID );//e.g. SeriesID
+ , const OUString& rParticleID );//e.g. SeriesID
- static rtl::OUString createClassifiedIdentifierWithParent(
+ static OUString createClassifiedIdentifierWithParent(
enum ObjectType //e.g. OBJECTTYPE_DATA_POINT or OBJECTTYPE_GRID
- , const rtl::OUString& rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object
- , const rtl::OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId"
- , const rtl::OUString& rDragMethodServiceName = rtl::OUString()
- , const rtl::OUString& rDragParameterString = rtl::OUString()
+ , const OUString& rParticleID //for points or subgrids this is an Index or otherwise an identifier from the model object
+ , const OUString& rParentPartical //e.g. "Series=SeriesID" or "Grid=GridId"
+ , const OUString& rDragMethodServiceName = OUString()
+ , const OUString& rDragParameterString = OUString()
);
- static bool isCID( const rtl::OUString& rName );
- static rtl::OUString getDragMethodServiceName( const rtl::OUString& rClassifiedIdentifier );
- static rtl::OUString getDragParameterString( const rtl::OUString& rCID );
- static bool isDragableObject( const rtl::OUString& rClassifiedIdentifier );
+ static bool isCID( const OUString& rName );
+ static OUString getDragMethodServiceName( const OUString& rClassifiedIdentifier );
+ static OUString getDragParameterString( const OUString& rCID );
+ static bool isDragableObject( const OUString& rClassifiedIdentifier );
bool isDragableObject();
- static bool isRotateableObject( const rtl::OUString& rClassifiedIdentifier );
- static bool isMultiClickObject( const rtl::OUString& rClassifiedIdentifier );
- static bool areSiblings( const rtl::OUString& rCID1, const rtl::OUString& rCID2 );//identical object is no sibling
- static bool areIdenticalObjects( const ::rtl::OUString& rCID1, const ::rtl::OUString& rCID2 );
+ static bool isRotateableObject( const OUString& rClassifiedIdentifier );
+ static bool isMultiClickObject( const OUString& rClassifiedIdentifier );
+ static bool areSiblings( const OUString& rCID1, const OUString& rCID2 );//identical object is no sibling
+ static bool areIdenticalObjects( const OUString& rCID1, const OUString& rCID2 );
- static rtl::OUString getStringForType( ObjectType eObjectType );
- static ObjectType getObjectType( const rtl::OUString& rCID );
+ static OUString getStringForType( ObjectType eObjectType );
+ static ObjectType getObjectType( const OUString& rCID );
ObjectType getObjectType();
- static rtl::OUString createSeriesSubObjectStub( ObjectType eSubObjectType
- , const rtl::OUString& rSeriesParticle
- , const rtl::OUString& rDragMethodServiceName = rtl::OUString()
- , const rtl::OUString& rDragParameterString = rtl::OUString() );
- static rtl::OUString createPointCID( const rtl::OUString& rPointCID_Stub, sal_Int32 nIndex );
+ static OUString createSeriesSubObjectStub( ObjectType eSubObjectType
+ , const OUString& rSeriesParticle
+ , const OUString& rDragMethodServiceName = OUString()
+ , const OUString& rDragParameterString = OUString() );
+ static OUString createPointCID( const OUString& rPointCID_Stub, sal_Int32 nIndex );
- static rtl::OUString createDataCurveCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine );
- static rtl::OUString createDataCurveEquationCID( const rtl::OUString& rSeriesParticle, sal_Int32 nCurveIndex );
+ static OUString createDataCurveCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex, bool bAverageLine );
+ static OUString createDataCurveEquationCID( const OUString& rSeriesParticle, sal_Int32 nCurveIndex );
- SAL_DLLPRIVATE static rtl::OUString getObjectID( const rtl::OUString& rCID );
- static rtl::OUString getParticleID( const rtl::OUString& rCID );
- static rtl::OUString getFullParentParticle( const rtl::OUString& rCID );
+ SAL_DLLPRIVATE static OUString getObjectID( const OUString& rCID );
+ static OUString getParticleID( const OUString& rCID );
+ static OUString getFullParentParticle( const OUString& rCID );
//returns the series particle of a CID when the CID is a child of the series
- static rtl::OUString getSeriesParticleFromCID( const rtl::OUString& rCID );
+ static OUString getSeriesParticleFromCID( const OUString& rCID );
//return the model object that is indicated by rObjectCID
static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
getObjectPropertySet(
- const rtl::OUString& rObjectCID
+ const OUString& rObjectCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
static ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
getObjectPropertySet(
- const rtl::OUString& rObjectCID
+ const OUString& rObjectCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument >& xChartDocument );
//return the axis object that belongs to rObjectCID if any
static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >
getAxisForCID(
- const rtl::OUString& rObjectCID
+ const OUString& rObjectCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
//return the series object that belongs to rObjectCID if any
static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDataSeries >
getDataSeriesForCID(
- const rtl::OUString& rObjectCID
+ const OUString& rObjectCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
static ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >
getDiagramForCID(
- const rtl::OUString& rObjectCID
+ const OUString& rObjectCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xChartModel );
- static const ::rtl::OUString& getPieSegmentDragMethodServiceName();
- static ::rtl::OUString createPieSegmentDragParameterString(
+ static const OUString& getPieSegmentDragMethodServiceName();
+ static OUString createPieSegmentDragParameterString(
sal_Int32 nOffsetPercent
, const ::com::sun::star::awt::Point& rMinimumPosition
, const ::com::sun::star::awt::Point& rMaximumPosition );
- static bool parsePieSegmentDragParameterString( const rtl::OUString& rDragParameterString
+ static bool parsePieSegmentDragParameterString( const OUString& rDragParameterString
, sal_Int32& rOffsetPercent
, ::com::sun::star::awt::Point& rMinimumPosition
, ::com::sun::star::awt::Point& rMaximumPosition );
- static TitleHelper::eTitleType getTitleTypeForCID( const ::rtl::OUString& rCID );
+ static TitleHelper::eTitleType getTitleTypeForCID( const OUString& rCID );
- static ::rtl::OUString getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward );
+ static OUString getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward );
bool isValid() const;
bool isAutoGeneratedObject() const;
bool isAdditionalShape() const;
- ::rtl::OUString getObjectCID() const;
+ OUString getObjectCID() const;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > getAdditionalShape() const;
::com::sun::star::uno::Any getAny() const;
@@ -259,7 +259,7 @@ private:
// for all other objects m_xAdditionalShape is set.
// Note, that if m_aObjectCID is set, m_xAdditionalShape must be empty
// and vice versa.
- ::rtl::OUString m_aObjectCID;
+ OUString m_aObjectCID;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > m_xAdditionalShape;
};
diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
index 452c96987f35..10a999047cbe 100644
--- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
+++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx
@@ -34,7 +34,7 @@ public:
virtual ~PotentialRegressionCurveCalculator();
protected:
- virtual ::rtl::OUString ImplGetRepresentation(
+ virtual OUString ImplGetRepresentation(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
::sal_Int32 nNumberFormatKey ) const;
diff --git a/chart2/source/inc/PropertyHelper.hxx b/chart2/source/inc/PropertyHelper.hxx
index ae3add738262..9bbcb84c3e01 100644
--- a/chart2/source/inc/PropertyHelper.hxx
+++ b/chart2/source/inc/PropertyHelper.hxx
@@ -44,22 +44,22 @@ namespace PropertyHelper
@return The name used for storing this element in the table
*/
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addLineDashUniqueNameToTable(
+OOO_DLLPUBLIC_CHARTTOOLS OUString addLineDashUniqueNameToTable(
const ::com::sun::star::uno::Any & rValue,
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & xFact,
- const ::rtl::OUString & rPreferredName );
+ const OUString & rPreferredName );
/** adds a gradient with a unique name to the gradient obtained by the given
factory.
@return The name used for storing this element in the table
*/
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addGradientUniqueNameToTable(
+OOO_DLLPUBLIC_CHARTTOOLS OUString addGradientUniqueNameToTable(
const ::com::sun::star::uno::Any & rValue,
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & xFact,
- const ::rtl::OUString & rPreferredName );
+ const OUString & rPreferredName );
/** adds a transparency gradient with a unique name to the gradient obtained
by the given factory.
@@ -67,33 +67,33 @@ OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addGradientUniqueNameToTable(
@return The name used for storing this element in the table
*/
OOO_DLLPUBLIC_CHARTTOOLS
-::rtl::OUString addTransparencyGradientUniqueNameToTable(
+OUString addTransparencyGradientUniqueNameToTable(
const ::com::sun::star::uno::Any & rValue,
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & xFact,
- const ::rtl::OUString & rPreferredName );
+ const OUString & rPreferredName );
/** adds a hatch with a unique name to the gradient obtained by the given
factory.
@return The name used for storing this element in the table
*/
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addHatchUniqueNameToTable(
+OOO_DLLPUBLIC_CHARTTOOLS OUString addHatchUniqueNameToTable(
const ::com::sun::star::uno::Any & rValue,
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & xFact,
- const ::rtl::OUString & rPreferredName );
+ const OUString & rPreferredName );
/** adds a bitmap with a unique name to the gradient obtained by the given
factory.
@return The name used for storing this element in the table
*/
-OOO_DLLPUBLIC_CHARTTOOLS ::rtl::OUString addBitmapUniqueNameToTable(
+OOO_DLLPUBLIC_CHARTTOOLS OUString addBitmapUniqueNameToTable(
const ::com::sun::star::uno::Any & rValue,
const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory > & xFact,
- const ::rtl::OUString & rPreferredName );
+ const OUString & rPreferredName );
// --------------------------------------------------------------------------------
@@ -170,7 +170,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS PropertyLess : public ::std::binary_function<
struct OOO_DLLPUBLIC_CHARTTOOLS PropertyValueNameEquals : public ::std::unary_function< ::com::sun::star::beans::PropertyValue, bool >
{
- explicit PropertyValueNameEquals( const ::rtl::OUString & rName ) :
+ explicit PropertyValueNameEquals( const OUString & rName ) :
m_aName( rName )
{}
@@ -180,7 +180,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS PropertyValueNameEquals : public ::std::unary_fu
}
private:
- ::rtl::OUString m_aName;
+ OUString m_aName;
};
} // namespace chart
diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx
index 01291c104c61..27af18bd5830 100644
--- a/chart2/source/inc/RegressionCurveCalculator.hxx
+++ b/chart2/source/inc/RegressionCurveCalculator.hxx
@@ -40,11 +40,11 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XScaling > & xScaling );
protected:
- virtual ::rtl::OUString ImplGetRepresentation(
+ virtual OUString ImplGetRepresentation(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
::sal_Int32 nNumberFormatKey ) const = 0;
- ::rtl::OUString getFormattedString(
+ OUString getFormattedString(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >& xNumFormatter,
::sal_Int32 nNumberFormatKey,
double fNumber ) const;
@@ -71,9 +71,9 @@ protected:
::com::sun::star::uno::RuntimeException);
virtual double SAL_CALL getCorrelationCoefficient()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getRepresentation()
+ virtual OUString SAL_CALL getRepresentation()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getFormattedRepresentation(
+ virtual OUString SAL_CALL getFormattedRepresentation(
const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumFmtSupplier,
::sal_Int32 nNumberFormatKey )
throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/inc/RegressionCurveHelper.hxx b/chart2/source/inc/RegressionCurveHelper.hxx
index 725112a20af7..743f0bd990d2 100644
--- a/chart2/source/inc/RegressionCurveHelper.hxx
+++ b/chart2/source/inc/RegressionCurveHelper.hxx
@@ -50,7 +50,7 @@ public:
createRegressionCurveByServiceName(
const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > & xContext,
- ::rtl::OUString aServiceName );
+ OUString aServiceName );
// ------------------------------------------------------------
@@ -163,7 +163,7 @@ public:
static ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XRegressionCurveCalculator >
createRegressionCurveCalculatorByServiceName(
- ::rtl::OUString aServiceName );
+ OUString aServiceName );
/** recalculates the regression parameters according to the data given in
the data source.
@@ -200,7 +200,7 @@ public:
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel > & xModel );
- static ::rtl::OUString getUINameForRegressionCurve( const ::com::sun::star::uno::Reference<
+ static OUString getUINameForRegressionCurve( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XRegressionCurve >& xCurve );
static ::std::vector< ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx
index 5a0ae97806cb..ac25d268d8a6 100644
--- a/chart2/source/inc/Scaling.hxx
+++ b/chart2/source/inc/Scaling.hxx
@@ -63,7 +63,7 @@ public:
getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
// ____ XServiceName ____
- virtual ::rtl::OUString SAL_CALL getServiceName()
+ virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException);
private:
@@ -105,7 +105,7 @@ public:
getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
// ____ XServiceName ____
- virtual ::rtl::OUString SAL_CALL getServiceName()
+ virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException);
private:
@@ -145,7 +145,7 @@ public:
getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
// ____ XServiceName ____
- virtual ::rtl::OUString SAL_CALL getServiceName()
+ virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException);
private:
@@ -186,7 +186,7 @@ public:
getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
// ____ XServiceName ____
- virtual ::rtl::OUString SAL_CALL getServiceName()
+ virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException);
private:
diff --git a/chart2/source/inc/ServiceMacros.hxx b/chart2/source/inc/ServiceMacros.hxx
index 9e0bba409be4..ab60ee5a6c04 100644
--- a/chart2/source/inc/ServiceMacros.hxx
+++ b/chart2/source/inc/ServiceMacros.hxx
@@ -23,7 +23,7 @@
to use these macros the supported services and the implementation name needs to be static
especially you need to implement (declaration is contained in macro already):
-static com::sun::star::uno::Sequence< rtl::OUString >
+static com::sun::star::uno::Sequence< OUString >
Class::getSupportedServiceNames_Static();
*/
@@ -36,18 +36,18 @@ namespace apphelper
{
#define APPHELPER_XSERVICEINFO_DECL() \
- virtual ::rtl::OUString SAL_CALL \
+ virtual OUString SAL_CALL \
getImplementationName() \
throw( ::com::sun::star::uno::RuntimeException ); \
virtual sal_Bool SAL_CALL \
- supportsService( const ::rtl::OUString& ServiceName ) \
+ supportsService( const OUString& ServiceName ) \
throw( ::com::sun::star::uno::RuntimeException ); \
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL \
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL \
getSupportedServiceNames() \
throw( ::com::sun::star::uno::RuntimeException ); \
\
- static ::rtl::OUString getImplementationName_Static(); \
- static ::com::sun::star::uno::Sequence< ::rtl::OUString > \
+ static OUString getImplementationName_Static(); \
+ static ::com::sun::star::uno::Sequence< OUString > \
getSupportedServiceNames_Static();
//=========================================================================
@@ -57,24 +57,24 @@ namespace apphelper
//=========================================================================
#define APPHELPER_XSERVICEINFO_IMPL( Class, ImplName ) \
-::rtl::OUString SAL_CALL Class::getImplementationName() \
+OUString SAL_CALL Class::getImplementationName() \
throw( ::com::sun::star::uno::RuntimeException ) \
{ \
return getImplementationName_Static(); \
} \
\
-::rtl::OUString Class::getImplementationName_Static() \
+OUString Class::getImplementationName_Static() \
{ \
return ImplName; \
} \
\
sal_Bool SAL_CALL \
-Class::supportsService( const ::rtl::OUString& ServiceName ) \
+Class::supportsService( const OUString& ServiceName ) \
throw( ::com::sun::star::uno::RuntimeException ) \
{ \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSNL = \
+ ::com::sun::star::uno::Sequence< OUString > aSNL = \
getSupportedServiceNames(); \
- const ::rtl::OUString* pArray = aSNL.getArray(); \
+ const OUString* pArray = aSNL.getArray(); \
for( sal_Int32 i = 0; i < aSNL.getLength(); i++ ) \
{ \
if( pArray[ i ] == ServiceName ) \
@@ -84,7 +84,7 @@ Class::supportsService( const ::rtl::OUString& ServiceName ) \
return sal_False; \
} \
\
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL \
+::com::sun::star::uno::Sequence< OUString > SAL_CALL \
Class::getSupportedServiceNames() \
throw( ::com::sun::star::uno::RuntimeException ) \
{ \
diff --git a/chart2/source/inc/StatisticsHelper.hxx b/chart2/source/inc/StatisticsHelper.hxx
index 695f22ff26fb..87c1b6099c53 100644
--- a/chart2/source/inc/StatisticsHelper.hxx
+++ b/chart2/source/inc/StatisticsHelper.hxx
@@ -76,10 +76,10 @@ public:
::com::sun::star::chart2::data::XDataSource > & xDataSource,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataProvider > & xDataProvider,
- const ::rtl::OUString & rNewRange,
+ const OUString & rNewRange,
bool bPositiveValue,
bool bYError = true,
- ::rtl::OUString * pXMLRange = 0 );
+ OUString * pXMLRange = 0 );
/// @return the newly created or existing error bar object
static ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/TitleHelper.hxx b/chart2/source/inc/TitleHelper.hxx
index fd4ef07c22e9..ec9db23e2401 100644
--- a/chart2/source/inc/TitleHelper.hxx
+++ b/chart2/source/inc/TitleHelper.hxx
@@ -60,7 +60,7 @@ public:
static ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XTitle >
createTitle( eTitleType nTitleIndex
- , const rtl::OUString& rTitleText
+ , const OUString& rTitleText
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xModel
, const ::com::sun::star::uno::Reference<
@@ -71,9 +71,9 @@ public:
, const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XModel >& xModel );
- static rtl::OUString getCompleteString( const ::com::sun::star::uno::Reference<
+ static OUString getCompleteString( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XTitle >& xTitle );
- static void setCompleteString( const rtl::OUString& rNewText
+ static void setCompleteString( const OUString& rNewText
, const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XTitle >& xTitle
, const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx
index 6b3e8a4bd7ca..6dc447be4045 100644
--- a/chart2/source/inc/UncachedDataSequence.hxx
+++ b/chart2/source/inc/UncachedDataSequence.hxx
@@ -75,12 +75,12 @@ public:
UncachedDataSequence(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv,
- const ::rtl::OUString & rRangeRepresentation );
+ const OUString & rRangeRepresentation );
UncachedDataSequence(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XInternalDataProvider > & xIntDataProv,
- const ::rtl::OUString & rRangeRepresentation,
- const ::rtl::OUString & rRole );
+ const OUString & rRangeRepresentation,
+ const OUString & rRole );
UncachedDataSequence( const UncachedDataSequence & rSource );
virtual ~UncachedDataSequence();
@@ -105,9 +105,9 @@ protected:
// ____ XDataSequence ____
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getData()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSourceRangeRepresentation()
+ virtual OUString SAL_CALL getSourceRangeRepresentation()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL generateLabel(
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL generateLabel(
::com::sun::star::chart2::data::LabelOrigin nLabelOrigin )
throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex )
@@ -120,7 +120,7 @@ protected:
// ____ XTextualDataSequence ____
/// @see ::com::sun::star::chart::data::XTextualDataSequence
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getTextualData() throw (::com::sun::star::uno::RuntimeException);
// ____ XIndexReplace ____
virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const ::com::sun::star::uno::Any& Element )
@@ -144,9 +144,9 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// ____ XNamed (for setting a new range representation) ____
- virtual ::rtl::OUString SAL_CALL getName()
+ virtual OUString SAL_CALL getName()
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setName( const ::rtl::OUString& aName )
+ virtual void SAL_CALL setName( const OUString& aName )
throw (::com::sun::star::uno::RuntimeException);
// ____ XCloneable ____
@@ -174,8 +174,8 @@ protected:
// <properties>
sal_Int32 m_nNumberFormatKey;
- ::rtl::OUString m_sRole;
- ::rtl::OUString m_aXMLRange;
+ OUString m_sRole;
+ OUString m_aXMLRange;
// </properties>
/** This method registers all properties. It should be called by all
@@ -186,7 +186,7 @@ protected:
private:
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XInternalDataProvider > m_xDataProvider;
- ::rtl::OUString m_aSourceRepresentation;
+ OUString m_aSourceRepresentation;
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >
m_xModifyEventForwarder;
};
diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx
index 961031f6663d..b90961f985c7 100644
--- a/chart2/source/inc/WrappedDefaultProperty.hxx
+++ b/chart2/source/inc/WrappedDefaultProperty.hxx
@@ -29,7 +29,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDefaultProperty : public WrappedProperty
{
public:
explicit WrappedDefaultProperty(
- const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName,
+ const OUString& rOuterName, const OUString& rInnerName,
const ::com::sun::star::uno::Any& rNewOuterDefault );
virtual ~WrappedDefaultProperty();
diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx
index cac3dd38d774..f292272b09b6 100644
--- a/chart2/source/inc/WrappedDirectStateProperty.hxx
+++ b/chart2/source/inc/WrappedDirectStateProperty.hxx
@@ -30,7 +30,7 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedDirectStateProperty :
{
public:
explicit WrappedDirectStateProperty(
- const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName );
+ const OUString& rOuterName, const OUString& rInnerName );
virtual ~WrappedDirectStateProperty();
virtual ::com::sun::star::beans::PropertyState getPropertyState(
diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx
index c95b3a143a94..9d55c8a94025 100644
--- a/chart2/source/inc/WrappedIgnoreProperty.hxx
+++ b/chart2/source/inc/WrappedIgnoreProperty.hxx
@@ -32,7 +32,7 @@ namespace chart
class OOO_DLLPUBLIC_CHARTTOOLS WrappedIgnoreProperty : public WrappedProperty
{
public:
- WrappedIgnoreProperty( const ::rtl::OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue );
+ WrappedIgnoreProperty( const OUString& rOuterName, const ::com::sun::star::uno::Any& rDefaultValue );
virtual ~WrappedIgnoreProperty();
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx
index d24d6ff2b7f5..1410ee1e37e6 100644
--- a/chart2/source/inc/WrappedProperty.hxx
+++ b/chart2/source/inc/WrappedProperty.hxx
@@ -36,11 +36,11 @@ class OOO_DLLPUBLIC_CHARTTOOLS WrappedProperty
a corresponding property of the inner PropertySet. Use this class to do the conversion between the two.
*/
public:
- WrappedProperty( const ::rtl::OUString& rOuterName, const ::rtl::OUString& rInnerName );
+ WrappedProperty( const OUString& rOuterName, const OUString& rInnerName );
virtual ~WrappedProperty();
- const ::rtl::OUString& getOuterName() const;
- virtual ::rtl::OUString getInnerName() const;
+ const OUString& getOuterName() const;
+ virtual OUString getInnerName() const;
virtual void setPropertyValue( const ::com::sun::star::uno::Any& rOuterValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xInnerPropertySet ) const
throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
@@ -62,8 +62,8 @@ protected:
virtual ::com::sun::star::uno::Any convertOuterToInnerValue( const ::com::sun::star::uno::Any& rOuterValue ) const;
protected:
- ::rtl::OUString m_aOuterName;
- ::rtl::OUString m_aInnerName;
+ OUString m_aOuterName;
+ OUString m_aInnerName;
};
//.............................................................................
diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx
index 9eed3075692b..6968f319ff9f 100644
--- a/chart2/source/inc/WrappedPropertySet.hxx
+++ b/chart2/source/inc/WrappedPropertySet.hxx
@@ -61,33 +61,33 @@ public:
//XPropertySet
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XMultiPropertySet
//getPropertySetInfo() already declared in XPropertySet
- virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
//XPropertyState
- virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< OUString >& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//XMultiPropertyStates
//getPropertyStates() already declared in XPropertyState
virtual void SAL_CALL setAllPropertiesToDefault( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( const ::com::sun::star::uno::Sequence< OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
protected: //methods
/** give all the properties that should be visible to the outer side
@@ -108,7 +108,7 @@ protected: //methods
::cppu::IPropertyArrayHelper& getInfoHelper();
SAL_DLLPRIVATE tWrappedPropertyMap& getWrappedPropertyMap();
- const WrappedProperty* getWrappedProperty( const ::rtl::OUString& rOuterName );
+ const WrappedProperty* getWrappedProperty( const OUString& rOuterName );
const WrappedProperty* getWrappedProperty( sal_Int32 nHandle );
protected: //member
diff --git a/chart2/source/inc/XMLRangeHelper.hxx b/chart2/source/inc/XMLRangeHelper.hxx
index ce95dc13a2ff..e583f5a67fd2 100644
--- a/chart2/source/inc/XMLRangeHelper.hxx
+++ b/chart2/source/inc/XMLRangeHelper.hxx
@@ -51,12 +51,12 @@ struct OOO_DLLPUBLIC_CHARTTOOLS CellRange
{
Cell aUpperLeft;
Cell aLowerRight;
- ::rtl::OUString aTableName;
+ OUString aTableName;
};
-CellRange getCellRangeFromXMLString( const ::rtl::OUString & rXMLString );
+CellRange getCellRangeFromXMLString( const OUString & rXMLString );
-::rtl::OUString getXMLStringFromCellRange( const CellRange & rRange );
+OUString getXMLStringFromCellRange( const CellRange & rRange );
} // namespace XMLRangeHelper
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 1e89f8c442fa..1872ed49534b 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -94,7 +94,7 @@ public:
XHatchListRef GetHatchList() const;
XBitmapListRef GetBitmapList() const;
- SdrObject* getNamedSdrObject( const rtl::OUString& rName );
+ SdrObject* getNamedSdrObject( const OUString& rName );
static SdrObject* getNamedSdrObject( const String& rName, SdrObjList* pObjList );
static bool removeShape( const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/inc/chartview/ExplicitValueProvider.hxx b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
index 4c518843cd41..dfe7afccaaad 100644
--- a/chart2/source/inc/chartview/ExplicitValueProvider.hxx
+++ b/chart2/source/inc/chartview/ExplicitValueProvider.hxx
@@ -58,12 +58,12 @@ public:
if bSnapRect is set to true you get the resulting visible position (left-top) and size
*/
virtual ::com::sun::star::awt::Rectangle
- getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false )=0;
+ getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false )=0;
virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes()=0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- getShapeForCID( const rtl::OUString& rObjectCID )=0;
+ getShapeForCID( const OUString& rObjectCID )=0;
virtual ::boost::shared_ptr< DrawModelWrapper > getDrawModelWrapper() = 0;
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 2555b25395e8..7ba2ca95da54 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -57,7 +57,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::osl::MutexGuard;
// ----------------------------------------
@@ -90,7 +89,7 @@ LOCAL_CONST_STR( sXML_import_chart_oasis_meta_service, "com.sun.star.comp.C
uno::Reference< embed::XStorage > lcl_getWriteStorage(
const Sequence< beans::PropertyValue >& rMediaDescriptor,
- const uno::Reference< uno::XComponentContext >& xContext,const ::rtl::OUString& _sMediaType)
+ const uno::Reference< uno::XComponentContext >& xContext,const OUString& _sMediaType)
{
uno::Reference< embed::XStorage > xStorage;
try
@@ -793,7 +792,7 @@ void XMLFilter::isOasisFormat(const Sequence< beans::PropertyValue >& _rMediaDes
rOutOASIS = aMDHelper.FilterName == "chart8";
}
// -----------------------------------------------------------------------------
-::rtl::OUString XMLFilter::getMediaType(bool _bOasis)
+OUString XMLFilter::getMediaType(bool _bOasis)
{
return _bOasis ? MIMETYPE_OASIS_OPENDOCUMENT_CHART : MIMETYPE_VND_SUN_XML_CHART;
}
@@ -809,7 +808,7 @@ void XMLReportFilterHelper::isOasisFormat(const Sequence< beans::PropertyValue >
rOutOASIS = aMDHelper.FilterName == "StarOffice XML (Base) Report Chart";
}
// -----------------------------------------------------------------------------
-::rtl::OUString XMLReportFilterHelper::getMediaType(bool )
+OUString XMLReportFilterHelper::getMediaType(bool )
{
return MIMETYPE_OASIS_OPENDOCUMENT_REPORT_CHART;
}
diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
index c702c6db366b..cfa3e66c4ce5 100644
--- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx
+++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx
@@ -37,9 +37,9 @@ public:
virtual ~CartesianCoordinateSystem();
// ____ XCoordinateSystem ____
- virtual ::rtl::OUString SAL_CALL getCoordinateSystemType()
+ virtual OUString SAL_CALL getCoordinateSystemType()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getViewServiceName()
+ virtual OUString SAL_CALL getViewServiceName()
throw (::com::sun::star::uno::RuntimeException);
// ____ XCloneable ____
diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx
index 6035d5ddc899..63fc3a7643d0 100644
--- a/chart2/source/model/inc/ChartTypeManager.hxx
+++ b/chart2/source/model/inc/ChartTypeManager.hxx
@@ -50,18 +50,18 @@ public:
protected:
// ____ XMultiServiceFactory ____
virtual ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
+ ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(
- const ::rtl::OUString& ServiceSpecifier,
+ const OUString& ServiceSpecifier,
const ::com::sun::star::uno::Sequence<
::com::sun::star::uno::Any >& Arguments )
throw (::com::sun::star::uno::Exception,
::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence<
- ::rtl::OUString > SAL_CALL getAvailableServiceNames()
+ OUString > SAL_CALL getAvailableServiceNames()
throw (::com::sun::star::uno::RuntimeException);
// ____ XChartTypeManager ____
diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx
index 1efe95e31ea7..f69d2b550306 100644
--- a/chart2/source/model/inc/PolarCoordinateSystem.hxx
+++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx
@@ -37,9 +37,9 @@ public:
virtual ~PolarCoordinateSystem();
// ____ XCoordinateSystem ____
- virtual ::rtl::OUString SAL_CALL getCoordinateSystemType()
+ virtual OUString SAL_CALL getCoordinateSystemType()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getViewServiceName()
+ virtual OUString SAL_CALL getViewServiceName()
throw (::com::sun::star::uno::RuntimeException);
// ____ XCloneable ____
diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx
index 76f0ef19553e..ad8e32f35f19 100644
--- a/chart2/source/model/inc/XMLFilter.hxx
+++ b/chart2/source/model/inc/XMLFilter.hxx
@@ -91,10 +91,10 @@ protected:
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- inline ::rtl::OUString getDocumentHandler() const { return m_sDocumentHandler; }
- inline void setDocumentHandler(const ::rtl::OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; }
+ inline OUString getDocumentHandler() const { return m_sDocumentHandler; }
+ inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; }
- virtual ::rtl::OUString getMediaType(bool _bOasis);
+ virtual OUString getMediaType(bool _bOasis);
/** fills the oasis flag only when a filtername was set
*
@@ -114,8 +114,8 @@ private:
::com::sun::star::beans::PropertyValue > & aMediaDescriptor );
/// @return a warning code, or 0 for successful operation
sal_Int32 impl_ImportStream(
- const ::rtl::OUString & rStreamName,
- const ::rtl::OUString & rServiceName,
+ const OUString & rStreamName,
+ const OUString & rServiceName,
const ::com::sun::star::uno::Reference<
::com::sun::star::embed::XStorage > & xStorage,
const ::com::sun::star::uno::Reference<
@@ -134,8 +134,8 @@ private:
::com::sun::star::beans::PropertyValue > & aMediaDescriptor );
/// @return a warning code, or 0 for successful operation
sal_Int32 impl_ExportStream(
- const ::rtl::OUString & rStreamName,
- const ::rtl::OUString & rServiceName,
+ const OUString & rStreamName,
+ const OUString & rServiceName,
const ::com::sun::star::uno::Reference<
::com::sun::star::embed::XStorage > & xStorage,
const ::com::sun::star::uno::Reference<
@@ -152,7 +152,7 @@ private:
::com::sun::star::lang::XComponent > m_xTargetDoc;
::com::sun::star::uno::Reference<
::com::sun::star::lang::XComponent > m_xSourceDoc;
- ::rtl::OUString m_sDocumentHandler; // when set it will be set as doc handler
+ OUString m_sDocumentHandler; // when set it will be set as doc handler
volatile bool m_bCancelOperation;
::osl::Mutex m_aMutex;
@@ -179,7 +179,7 @@ public:
return OUString( "com.sun.star.comp.chart2.report.XMLFilter" );
}
protected:
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName()
throw( ::com::sun::star::uno::RuntimeException )
{
@@ -207,7 +207,7 @@ protected:
XMLFilter::setSourceDocument(Document);
}
- virtual ::rtl::OUString getMediaType(bool _bOasis);
+ virtual OUString getMediaType(bool _bOasis);
};
} // namespace chart
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index b7ff37ad9171..59e3d126ea2a 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -48,7 +48,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans::PropertyAttribute;
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 048f38d4e579..7067a4f33726 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -39,7 +39,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
namespace
diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx
index db85d75bf644..e64a1ea40e13 100644
--- a/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -26,7 +26,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 0f15ee72ac11..e2157c4f2daa 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -66,7 +66,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
using ::osl::MutexGuard;
using namespace ::com::sun::star;
@@ -203,12 +202,12 @@ void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ )
// private methods
//-----------------------------------------------------------------
-::rtl::OUString ChartModel::impl_g_getLocation()
+OUString ChartModel::impl_g_getLocation()
{
LifeTimeGuard aGuard(m_aLifeTimeManager);
if(!aGuard.startApiCall())
- return ::rtl::OUString(); //behave passive if already disposed or closed or throw exception @todo?
+ return OUString(); //behave passive if already disposed or closed or throw exception @todo?
//mutex is acquired
return m_aResource;
}
@@ -310,9 +309,9 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV
APPHELPER_XSERVICEINFO_IMPL(ChartModel,CHART_MODEL_SERVICE_IMPLEMENTATION_NAME)
-uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ChartModel::getSupportedServiceNames_Static()
{
- uno::Sequence< rtl::OUString > aSNS( 3 );
+ uno::Sequence< OUString > aSNS( 3 );
aSNS[0] = CHART_MODEL_SERVICE_NAME;
aSNS[1] = "com.sun.star.document.OfficeDocument";
aSNS[2] = "com.sun.star.chart.ChartDocument";
@@ -324,7 +323,7 @@ uno::Sequence< rtl::OUString > ChartModel::getSupportedServiceNames_Static()
// frame::XModel (required interface)
//-----------------------------------------------------------------
-sal_Bool SAL_CALL ChartModel::attachResource( const ::rtl::OUString& rURL
+sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL
, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor )
throw(uno::RuntimeException)
{
@@ -350,7 +349,7 @@ sal_Bool SAL_CALL ChartModel::attachResource( const ::rtl::OUString& rURL
return sal_True;
}
-::rtl::OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException)
+OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException)
{
return impl_g_getLocation();
}
@@ -508,7 +507,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr
if ( xSelectionSupl.is() )
{
uno::Any aSel = xSelectionSupl->getSelection();
- rtl::OUString aObjectCID;
+ OUString aObjectCID;
if( aSel >>= aObjectCID )
xReturn.set( ObjectIdentifier::getObjectPropertySet( aObjectCID, Reference< XChartDocument >(this)));
}
@@ -1181,8 +1180,8 @@ enum eServiceType
SERVICE_NAMESPACE_MAP
};
-typedef ::std::map< ::rtl::OUString, enum eServiceType > tServiceNameMap;
-typedef ::comphelper::MakeMap< ::rtl::OUString, enum eServiceType > tMakeServiceNameMap;
+typedef ::std::map< OUString, enum eServiceType > tServiceNameMap;
+typedef ::comphelper::MakeMap< OUString, enum eServiceType > tMakeServiceNameMap;
tServiceNameMap & lcl_getStaticServiceNameMap()
{
@@ -1257,7 +1256,7 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments(
Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames()
throw( uno::RuntimeException )
{
- uno::Sequence< ::rtl::OUString > aResult;
+ uno::Sequence< OUString > aResult;
if( m_xOldModelAgg.is())
{
@@ -1347,7 +1346,7 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM
}
//XDumper
-rtl::OUString SAL_CALL ChartModel::dump()
+OUString SAL_CALL ChartModel::dump()
throw (uno::RuntimeException)
{
uno::Reference< qa::XDumper > xDumper(
@@ -1355,7 +1354,7 @@ rtl::OUString SAL_CALL ChartModel::dump()
if (xDumper.is())
return xDumper->dump();
- return rtl::OUString();
+ return OUString();
}
} // namespace chart
diff --git a/chart2/source/model/main/ChartModel.hxx b/chart2/source/model/main/ChartModel.hxx
index 1af220bce72b..f7d81b8dff92 100644
--- a/chart2/source/model/main/ChartModel.hxx
+++ b/chart2/source/model/main/ChartModel.hxx
@@ -122,7 +122,7 @@ private:
sal_Int32 m_nInLoad;
sal_Bool volatile m_bUpdateNotificationsPending;
- ::rtl::OUString m_aResource;
+ OUString m_aResource;
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aMediaDescriptor;
::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocumentProperties;
::rtl::Reference< UndoManager > m_pUndoManager;
@@ -174,7 +174,7 @@ private:
private:
//private methods
- ::rtl::OUString impl_g_getLocation();
+ OUString impl_g_getLocation();
sal_Bool
impl_isControllerConnected( const com::sun::star::uno::Reference<
@@ -248,12 +248,12 @@ public:
//-----------------------------------------------------------------
virtual sal_Bool SAL_CALL
- attachResource( const ::rtl::OUString& rURL
+ attachResource( const OUString& rURL
, const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getURL() throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
@@ -346,7 +346,7 @@ public:
virtual sal_Bool SAL_CALL
hasLocation() throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getLocation() throw (::com::sun::star::uno::RuntimeException);
virtual sal_Bool SAL_CALL
@@ -357,14 +357,14 @@ public:
, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL
- storeAsURL( const ::rtl::OUString& rURL
+ storeAsURL( const OUString& rURL
, const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
throw (::com::sun::star::io::IOException
, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL
- storeToURL( const ::rtl::OUString& rURL
+ storeToURL( const OUString& rURL
, const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
throw (::com::sun::star::io::IOException
@@ -468,7 +468,7 @@ public:
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getUsedRangeRepresentations()
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL getUsedData()
throw (::com::sun::star::uno::RuntimeException);
@@ -534,13 +534,13 @@ public:
// ____ XMultiServiceFactory ____
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- createInstance( const ::rtl::OUString& aServiceSpecifier )
+ createInstance( const OUString& aServiceSpecifier )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
- createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier
+ createInstanceWithArguments( const OUString& ServiceSpecifier
, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException);
// ____ XStorageBasedDocument ____
@@ -602,7 +602,7 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XDumper
- virtual rtl::OUString SAL_CALL dump()
+ virtual OUString SAL_CALL dump()
throw (com::sun::star::uno::RuntimeException);
};
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 2bc5cde61bf1..2984fdb8c944 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -58,7 +58,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::osl::MutexGuard;
namespace
@@ -223,7 +222,7 @@ sal_Bool SAL_CALL ChartModel::hasLocation()
return !m_aResource.isEmpty();
}
-::rtl::OUString SAL_CALL ChartModel::getLocation()
+OUString SAL_CALL ChartModel::getLocation()
throw(uno::RuntimeException)
{
return impl_g_getLocation();
@@ -244,7 +243,7 @@ void SAL_CALL ChartModel::store()
if(!aGuard.startApiCall(sal_True)) //start LongLastingCall
return; //behave passive if already disposed or closed or throw exception @todo?
- ::rtl::OUString aLocation = m_aResource;
+ OUString aLocation = m_aResource;
if( aLocation.isEmpty() )
throw io::IOException( "no location specified", static_cast< ::cppu::OWeakObject* >(this));
@@ -259,7 +258,7 @@ void SAL_CALL ChartModel::store()
}
void SAL_CALL ChartModel::storeAsURL(
- const ::rtl::OUString& rURL,
+ const OUString& rURL,
const uno::Sequence< beans::PropertyValue >& rMediaDescriptor )
throw(io::IOException, uno::RuntimeException)
{
@@ -285,7 +284,7 @@ void SAL_CALL ChartModel::storeAsURL(
}
void SAL_CALL ChartModel::storeToURL(
- const ::rtl::OUString& rURL,
+ const OUString& rURL,
const uno::Sequence< beans::PropertyValue >& rMediaDescriptor )
throw(io::IOException,
uno::RuntimeException)
@@ -618,7 +617,7 @@ void ChartModel::impl_loadGraphics(
if( xGraphicsStorage.is() )
{
- const uno::Sequence< ::rtl::OUString > aElementNames(
+ const uno::Sequence< OUString > aElementNames(
xGraphicsStorage->getElementNames() );
for( int i = 0; i < aElementNames.getLength(); ++i )
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 2537dba9f869..bcd7c4b02b75 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -37,7 +37,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
using ::osl::MutexGuard;
-using ::rtl::OUString;
// ____________________________________________________________
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index fb11ece86a93..de4f0b6e62f4 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -77,7 +77,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "TransparencyGradientName",
PROP_DATAPOINT_TRANSPARENCY_GRADIENT_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -85,7 +85,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "GradientName",
PROP_DATAPOINT_GRADIENT_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -101,7 +101,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "HatchName",
PROP_DATAPOINT_HATCH_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -109,7 +109,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "FillBitmapName",
PROP_DATAPOINT_FILL_BITMAP_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
@@ -144,7 +144,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "BorderDashName",
PROP_DATAPOINT_BORDER_DASH_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
rOutProperties.push_back(
@@ -177,7 +177,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "LineDashName",
LineProperties::PROP_LINE_DASH_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID ));
@@ -277,7 +277,7 @@ void DataPointProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "LabelSeparator",
PROP_DATAPOINT_LABEL_SEPARATOR,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -406,7 +406,7 @@ void DataPointProperties::AddDefaultsToMap(
sal_False // ShowLegendSymbol
));
- PropertyHelper::setPropertyValueDefault< rtl::OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " );
+ PropertyHelper::setPropertyValueDefault< OUString >( rOutMap, PROP_DATAPOINT_LABEL_SEPARATOR, " " );
//@todo maybe choose a different one here -> should be dynamically that of the attached axis
PropertyHelper::setPropertyValueDefault( rOutMap, PROP_DATAPOINT_ERROR_BAR_X, uno::Reference< beans::XPropertySet >());
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index c292e1822a5f..e6632ec7e235 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -38,7 +38,6 @@ using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
using ::osl::MutexGuard;
// ----------------------------------------
diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx
index 74ca6183f34c..5a270fcbddac 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -29,7 +29,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 1d0295a6c8a6..ec1637ba1f51 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -47,7 +47,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans::PropertyAttribute;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index e21beed575df..9505b33d8d0e 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -27,7 +27,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -127,14 +126,14 @@ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone()
}
// ____ XFormattedString ____
-::rtl::OUString SAL_CALL FormattedString::getString()
+OUString SAL_CALL FormattedString::getString()
throw (uno::RuntimeException)
{
MutexGuard aGuard( GetMutex());
return m_aString;
}
-void SAL_CALL FormattedString::setString( const ::rtl::OUString& String )
+void SAL_CALL FormattedString::setString( const OUString& String )
throw (uno::RuntimeException)
{
{
diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx
index 4f88a7af8996..c88fff0b21f1 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -68,9 +68,9 @@ protected:
explicit FormattedString( const FormattedString & rOther );
// ____ XFormattedString ____
- virtual ::rtl::OUString SAL_CALL getString()
+ virtual OUString SAL_CALL getString()
throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setString( const ::rtl::OUString& String )
+ virtual void SAL_CALL setString( const OUString& String )
throw (::com::sun::star::uno::RuntimeException);
// ____ OPropertySet ____
@@ -114,7 +114,7 @@ protected:
void fireModifyEvent();
private:
- ::rtl::OUString m_aString;
+ OUString m_aString;
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener > m_xModifyEventForwarder;
};
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index b810fe19febe..fd713a9aa5f2 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -35,7 +35,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
using ::osl::MutexGuard;
-using ::rtl::OUString;
// ____________________________________________________________
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 5edead84c863..2173f933c7be 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -39,7 +39,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans::PropertyAttribute;
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 050bbc05590b..5728f9c26fef 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -220,9 +220,9 @@ void PageBackground::fireModifyEvent()
// ================================================================================
-uno::Sequence< ::rtl::OUString > PageBackground::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PageBackground::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart2.PageBackground";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
return aServices;
diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx
index df77dd7a8e8a..f50c7b31cd7f 100644
--- a/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -26,7 +26,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::RuntimeException;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
@@ -58,13 +57,13 @@ PolarCoordinateSystem::~PolarCoordinateSystem()
{}
// ____ XCoordinateSystem ____
-::rtl::OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType()
+OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType()
throw (RuntimeException)
{
return CHART2_COOSYSTEM_POLAR_SERVICE_NAME;
}
-::rtl::OUString SAL_CALL PolarCoordinateSystem::getViewServiceName()
+OUString SAL_CALL PolarCoordinateSystem::getViewServiceName()
throw (RuntimeException)
{
return CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME;
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index ce97bd7db4b7..02d63f9bc7ef 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -232,9 +232,9 @@ void StockBar::fireModifyEvent()
// ================================================================================
-uno::Sequence< ::rtl::OUString > StockBar::getSupportedServiceNames_Static()
+uno::Sequence< OUString > StockBar::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart2.StockBar";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
return aServices;
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index c9ed149d4d9f..bd127e899ed9 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -373,9 +373,9 @@ void Title::fireModifyEvent()
// ================================================================================
-uno::Sequence< ::rtl::OUString > Title::getSupportedServiceNames_Static()
+uno::Sequence< OUString > Title::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 4 );
+ uno::Sequence< OUString > aServices( 4 );
aServices[ 0 ] = "com.sun.star.chart2.Title";
aServices[ 1 ] = "com.sun.star.style.ParagraphProperties";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx
index 82aae3668aea..4809510fbd45 100644
--- a/chart2/source/model/main/UndoManager.cxx
+++ b/chart2/source/model/main/UndoManager.cxx
@@ -143,7 +143,7 @@ namespace chart
void UndoManager_Impl::checkDisposed_lck()
{
if ( m_bDisposed )
- throw DisposedException( ::rtl::OUString(), getThis() );
+ throw DisposedException( OUString(), getThis() );
}
//==============================================================================================================
@@ -240,7 +240,7 @@ namespace chart
}
//------------------------------------------------------------------------------------------------------------------
- void SAL_CALL UndoManager::enterUndoContext( const ::rtl::OUString& i_title ) throw (RuntimeException)
+ void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException)
{
UndoManagerMethodGuard aGuard( *m_pImpl );
m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard );
@@ -300,28 +300,28 @@ namespace chart
}
//------------------------------------------------------------------------------------------------------------------
- ::rtl::OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException)
+ OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException)
{
UndoManagerMethodGuard aGuard( *m_pImpl );
return m_pImpl->getUndoHelper().getCurrentUndoActionTitle();
}
//------------------------------------------------------------------------------------------------------------------
- ::rtl::OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException)
+ OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException)
{
UndoManagerMethodGuard aGuard( *m_pImpl );
return m_pImpl->getUndoHelper().getCurrentRedoActionTitle();
}
//------------------------------------------------------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException)
{
UndoManagerMethodGuard aGuard( *m_pImpl );
return m_pImpl->getUndoHelper().getAllUndoActionTitles();
}
//------------------------------------------------------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException)
{
UndoManagerMethodGuard aGuard( *m_pImpl );
return m_pImpl->getUndoHelper().getAllRedoActionTitles();
@@ -395,7 +395,7 @@ namespace chart
{
UndoManagerMethodGuard aGuard( *m_pImpl );
(void)i_parent;
- throw NoSupportException( ::rtl::OUString(), m_pImpl->getThis() );
+ throw NoSupportException( OUString(), m_pImpl->getThis() );
}
//------------------------------------------------------------------------------------------------------------------
diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx
index c261b6c85024..2a1cf3035182 100644
--- a/chart2/source/model/main/UndoManager.hxx
+++ b/chart2/source/model/main/UndoManager.hxx
@@ -58,7 +58,7 @@ namespace chart
void disposing();
// XUndoManager
- virtual void SAL_CALL enterUndoContext( const ::rtl::OUString& i_title ) throw (::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL enterHiddenUndoContext( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL leaveUndoContext( ) throw (::com::sun::star::util::InvalidStateException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL addUndoAction( const ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoAction >& i_action ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
@@ -66,10 +66,10 @@ namespace chart
virtual void SAL_CALL redo( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::document::UndoFailedException, ::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isUndoPossible( ) throw (::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isRedoPossible( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+ virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (::com::sun::star::document::EmptyUndoStackException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clear( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL clearRedo( ) throw (::com::sun::star::document::UndoContextNotClosedException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL reset( ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index ab4570be985d..cc80cf6351a0 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -223,9 +223,9 @@ void Wall::fireModifyEvent()
// ================================================================================
-uno::Sequence< ::rtl::OUString > Wall::getSupportedServiceNames_Static()
+uno::Sequence< OUString > Wall::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = "com.sun.star.chart2.Wall";
aServices[ 1 ] = "com.sun.star.beans.PropertySet";
return aServices;
diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx
index 2a06ac188695..ef0b11485072 100644
--- a/chart2/source/model/template/AreaChartType.cxx
+++ b/chart2/source/model/template/AreaChartType.cxx
@@ -46,15 +46,15 @@ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone()
}
// ____ XChartType ____
-::rtl::OUString SAL_CALL AreaChartType::getChartType()
+OUString SAL_CALL AreaChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_AREA;
}
-uno::Sequence< ::rtl::OUString > AreaChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > AreaChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_AREA;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
return aServices;
diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx
index dcfffca24506..00a1fc10585f 100644
--- a/chart2/source/model/template/AreaChartType.hxx
+++ b/chart2/source/model/template/AreaChartType.hxx
@@ -42,7 +42,7 @@ protected:
explicit AreaChartType( const AreaChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
// ____ XCloneable ____
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 27fccbb09058..6bd6e5d89e5e 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -31,7 +31,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -126,7 +125,7 @@ namespace chart
AreaChartTypeTemplate::AreaChartTypeTemplate(
uno::Reference<
uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StackMode eStackMode,
sal_Int32 nDim /* = 2 */ ) :
ChartTypeTemplate( xContext, rServiceName ),
@@ -248,9 +247,9 @@ Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForN
// ----------------------------------------
-uno::Sequence< ::rtl::OUString > AreaChartTypeTemplate::getSupportedServiceNames_Static()
+uno::Sequence< OUString > AreaChartTypeTemplate::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = lcl_aServiceName;
aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
return aServices;
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx
index d7f347b7fcb7..92fd4b86f054 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.hxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx
@@ -38,7 +38,7 @@ public:
explicit AreaChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StackMode eStackMode,
sal_Int32 nDim = 2 );
virtual ~AreaChartTypeTemplate();
diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx
index cec160893c6c..3193cf60b35a 100644
--- a/chart2/source/model/template/BarChartType.cxx
+++ b/chart2/source/model/template/BarChartType.cxx
@@ -47,15 +47,15 @@ uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone()
}
// ____ XChartType ____
-::rtl::OUString SAL_CALL BarChartType::getChartType()
+OUString SAL_CALL BarChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_BAR;
}
-uno::Sequence< ::rtl::OUString > BarChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > BarChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BAR;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
return aServices;
diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx
index 649daabbcfe0..3495c6e7560e 100644
--- a/chart2/source/model/template/BarChartType.hxx
+++ b/chart2/source/model/template/BarChartType.hxx
@@ -42,7 +42,7 @@ protected:
explicit BarChartType( const BarChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
// ____ XCloneable ____
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 1c1ec10e069b..3cb469b1c400 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -36,7 +36,6 @@ using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::beans::Property;
using ::osl::MutexGuard;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx
index 68744a4e13af..e8f606169bf7 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.hxx
@@ -44,7 +44,7 @@ public:
explicit BarChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StackMode eStackMode,
BarDirection eDirection,
sal_Int32 nDim = 2 );
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index d18219356b6a..dc8302aa6de1 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -31,7 +31,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -158,16 +157,16 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
return xResult;
}
-::rtl::OUString SAL_CALL BubbleChartType::getChartType()
+OUString SAL_CALL BubbleChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles()
+uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles()
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aMandRolesSeq(4);
+ uno::Sequence< OUString > aMandRolesSeq(4);
aMandRolesSeq.realloc( 4 );
aMandRolesSeq[0] = "label";
aMandRolesSeq[1] = "values-x";
@@ -206,9 +205,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertyS
return *StaticBubbleChartTypeInfo::get();
}
-uno::Sequence< ::rtl::OUString > BubbleChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > BubbleChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 3 );
+ uno::Sequence< OUString > aServices( 3 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx
index e648f1479f79..c3e25e8c145f 100644
--- a/chart2/source/model/template/BubbleChartType.hxx
+++ b/chart2/source/model/template/BubbleChartType.hxx
@@ -43,16 +43,16 @@ protected:
explicit BubbleChartType( const BubbleChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedMandatoryRoles()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL
createCoordinateSystem( ::sal_Int32 DimensionCount )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
+ virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
throw (::com::sun::star::uno::RuntimeException);
// ____ OPropertySet ____
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index c85b12ee6ba3..3fd97691c2f1 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -36,7 +36,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Any;
using ::osl::MutexGuard;
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
index 867db887a984..4eca50973328 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
@@ -36,7 +36,7 @@ public:
explicit BubbleChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName );
+ const OUString & rServiceName );
virtual ~BubbleChartTypeTemplate();
/// XServiceInfo declarations
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx
index 8dc2ff9b1742..462da8a22d50 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -34,7 +34,6 @@ using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index d1ccc532ef0e..f5b723ffcca1 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -28,7 +28,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -216,13 +215,13 @@ uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone()
}
// ____ XChartType ____
-::rtl::OUString SAL_CALL CandleStickChartType::getChartType()
+OUString SAL_CALL CandleStickChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles()
+uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles()
throw (uno::RuntimeException)
{
bool bShowFirst = true;
@@ -328,9 +327,9 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast(
::property::OPropertySet::setFastPropertyValue_NoBroadcast( nHandle, rValue );
}
-uno::Sequence< ::rtl::OUString > CandleStickChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > CandleStickChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 3 );
+ uno::Sequence< OUString > aServices( 3 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx
index a05890f19689..75df4c24a8e8 100644
--- a/chart2/source/model/template/CandleStickChartType.hxx
+++ b/chart2/source/model/template/CandleStickChartType.hxx
@@ -42,15 +42,15 @@ protected:
explicit CandleStickChartType( const CandleStickChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedMandatoryRoles()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedOptionalRoles()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
+ virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
throw (::com::sun::star::uno::RuntimeException);
// ____ OPropertySet ____
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index d78d16ed0e89..bf8002dbaa12 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -31,7 +31,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index c153a261a349..96f3b8a64c49 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -66,19 +66,19 @@ protected:
// ____ XChartType ____
// still abstract ! implement !
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException) = 0;
virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL
createCoordinateSystem( ::sal_Int32 DimensionCount )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedMandatoryRoles()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedOptionalRoles()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
+ virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel()
throw (::com::sun::star::uno::RuntimeException);
// ____ XDataSeriesContainer ____
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index c72abbe06993..187d1c4f2717 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -47,7 +47,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 7858edf87cac..2312dc9a0725 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -44,7 +44,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
@@ -130,7 +129,7 @@ namespace chart
ChartTypeTemplate::ChartTypeTemplate(
Reference< uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName ) :
+ const OUString & rServiceName ) :
m_xContext( xContext ),
m_aServiceName( rServiceName )
{
@@ -523,7 +522,7 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram
}
// ____ XServiceName ____
- ::rtl::OUString SAL_CALL ChartTypeTemplate::getServiceName()
+ OUString SAL_CALL ChartTypeTemplate::getServiceName()
throw (uno::RuntimeException)
{
return m_aServiceName;
diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx
index 5e855b4ec5a6..061647d764ff 100644
--- a/chart2/source/model/template/ChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ChartTypeTemplate.hxx
@@ -79,7 +79,7 @@ public:
explicit ChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName );
+ const OUString & rServiceName );
virtual ~ChartTypeTemplate();
APPHELPER_XSERVICEINFO_DECL()
@@ -126,7 +126,7 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// ____ XServiceName ____
- virtual ::rtl::OUString SAL_CALL getServiceName()
+ virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException);
// Methods to overload for automatic creation
@@ -265,7 +265,7 @@ protected:
::com::sun::star::chart2::XDataInterpreter > m_xDataInterpreter;
private:
- const ::rtl::OUString m_aServiceName;
+ const OUString m_aServiceName;
private:
/** modifies the given diagram
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index 90bf825e42de..0427a844967a 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -148,7 +148,7 @@ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone()
}
// ____ XChartType ____
-::rtl::OUString SAL_CALL ColumnChartType::getChartType()
+OUString SAL_CALL ColumnChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_COLUMN;
@@ -178,9 +178,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertyS
}
-uno::Sequence< ::rtl::OUString > ColumnChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ColumnChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_COLUMN;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
return aServices;
diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx
index 80f9255000c6..068260d3b545 100644
--- a/chart2/source/model/template/ColumnChartType.hxx
+++ b/chart2/source/model/template/ColumnChartType.hxx
@@ -42,7 +42,7 @@ protected:
explicit ColumnChartType( const ColumnChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
// ____ OPropertySet ____
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 3355d9ee33a5..1013c0ef96e1 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -38,7 +38,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Any;
using ::osl::MutexGuard;
@@ -131,7 +130,7 @@ namespace chart
ColumnLineChartTypeTemplate::ColumnLineChartTypeTemplate(
Reference<
uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StackMode eStackMode,
sal_Int32 nNumberOfLines ) :
ChartTypeTemplate( xContext, rServiceName ),
@@ -419,9 +418,9 @@ Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInter
// ----------------------------------------
-uno::Sequence< ::rtl::OUString > ColumnLineChartTypeTemplate::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ColumnLineChartTypeTemplate::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = lcl_aServiceName;
aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
return aServices;
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
index 14d7a2194e5e..2363a6140b1d 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
@@ -38,7 +38,7 @@ public:
explicit ColumnLineChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StackMode eStackMode,
sal_Int32 nNumberOfLines );
virtual ~ColumnLineChartTypeTemplate();
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 51fbaf39690f..a111954387b2 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -36,7 +36,6 @@ using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx
index 696e2a1b1c99..5078346a6cc0 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -39,7 +39,6 @@ using namespace ::chart::ContainerHelper;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
#if OSL_DEBUG_LEVEL > 1
namespace
diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx
index f250fd970696..bba38e48e7e9 100644
--- a/chart2/source/model/template/DataInterpreter.hxx
+++ b/chart2/source/model/template/DataInterpreter.hxx
@@ -44,19 +44,19 @@ public:
APPHELPER_XSERVICEINFO_DECL()
// convenience methods
- static ::rtl::OUString GetRole(
+ static OUString GetRole(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence > & xSeq );
static void SetRole(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence > & xSeq,
- const ::rtl::OUString & rRole );
+ const OUString & rRole );
static ::com::sun::star::uno::Any GetProperty(
const ::com::sun::star::uno::Sequence<
::com::sun::star::beans::PropertyValue > & aArguments,
- const ::rtl::OUString & rName );
+ const OUString & rName );
static bool HasCategories(
const ::com::sun::star::uno::Sequence<
diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx
index 4c267fe40679..4a71becbcaa3 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -31,7 +31,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -62,15 +61,15 @@ uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone()
}
// ____ XChartType ____
-::rtl::OUString SAL_CALL FilledNetChartType::getChartType()
+OUString SAL_CALL FilledNetChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET;
}
-uno::Sequence< ::rtl::OUString > FilledNetChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > FilledNetChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 3 );
+ uno::Sequence< OUString > aServices( 3 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx
index 4a52aee0c929..0c5aeac28d0d 100644
--- a/chart2/source/model/template/FilledNetChartType.hxx
+++ b/chart2/source/model/template/FilledNetChartType.hxx
@@ -41,7 +41,7 @@ protected:
explicit FilledNetChartType( const FilledNetChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
// ____ XCloneable ____
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index d35dde6fe776..e7616c76a76e 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -27,7 +27,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -159,7 +158,7 @@ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone()
}
// ____ XChartType ____
-::rtl::OUString SAL_CALL LineChartType::getChartType()
+OUString SAL_CALL LineChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_LINE;
@@ -189,9 +188,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySet
return *StaticLineChartTypeInfo::get();
}
-uno::Sequence< ::rtl::OUString > LineChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LineChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 3 );
+ uno::Sequence< OUString > aServices( 3 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_LINE;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx
index df54fb70a974..2df426d13ca0 100644
--- a/chart2/source/model/template/LineChartType.hxx
+++ b/chart2/source/model/template/LineChartType.hxx
@@ -43,7 +43,7 @@ protected:
explicit LineChartType( const LineChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
// ____ OPropertySet ____
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index a0d370d36f7d..1b9d635c296d 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -35,7 +35,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Any;
using ::osl::MutexGuard;
@@ -148,7 +147,7 @@ namespace chart
LineChartTypeTemplate::LineChartTypeTemplate(
uno::Reference<
uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StackMode eStackMode,
bool bSymbols,
bool bHasLines /* = true */,
diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx
index 66dda4a24ccd..b0ed7dd2d7b2 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.hxx
@@ -38,7 +38,7 @@ public:
explicit LineChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StackMode eStackMode,
bool bSymbols,
bool bHasLines = true,
diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx
index ca3ddc545056..fd593daa6b51 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -32,7 +32,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -168,15 +167,15 @@ uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone()
}
// ____ XChartType ____
-::rtl::OUString SAL_CALL NetChartType::getChartType()
+OUString SAL_CALL NetChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_NET;
}
-uno::Sequence< ::rtl::OUString > NetChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > NetChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 3 );
+ uno::Sequence< OUString > aServices( 3 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_NET;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx
index 210df23e8d91..e4b1a25f2d9d 100644
--- a/chart2/source/model/template/NetChartType.hxx
+++ b/chart2/source/model/template/NetChartType.hxx
@@ -71,7 +71,7 @@ protected:
explicit NetChartType( const NetChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
// ____ XCloneable ____
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index 13f01f50fe9b..1672ba23f907 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::com::sun::star::uno::Any;
using ::osl::MutexGuard;
@@ -46,7 +45,7 @@ namespace chart
NetChartTypeTemplate::NetChartTypeTemplate(
Reference< uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StackMode eStackMode,
bool bSymbols,
bool bHasLines ,
diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx
index 683950f36cd6..2462f200a6f0 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.hxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.hxx
@@ -31,7 +31,7 @@ public:
explicit NetChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StackMode eStackMode,
bool bSymbols,
bool bHasLines = true,
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index b54d9769d41f..99d01bc8e938 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -30,7 +30,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -152,7 +151,7 @@ uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone()
}
// ____ XChartType ____
-::rtl::OUString SAL_CALL PieChartType::getChartType()
+OUString SAL_CALL PieChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_PIE;
@@ -220,9 +219,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetI
return *StaticPieChartTypeInfo::get();
}
-uno::Sequence< ::rtl::OUString > PieChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PieChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 3 );
+ uno::Sequence< OUString > aServices( 3 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_PIE;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx
index a737ae12ecbf..962da335231f 100644
--- a/chart2/source/model/template/PieChartType.hxx
+++ b/chart2/source/model/template/PieChartType.hxx
@@ -43,7 +43,7 @@ protected:
explicit PieChartType( const PieChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL
createCoordinateSystem( ::sal_Int32 DimensionCount )
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index ebf2c690568f..2fe296658cdb 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -40,7 +40,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -159,7 +158,7 @@ namespace chart
PieChartTypeTemplate::PieChartTypeTemplate(
uno::Reference<
uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
chart2::PieChartOffsetMode eMode,
bool bRings /* = false */,
sal_Int32 nDim /* = 2 */ ) :
@@ -620,9 +619,9 @@ void PieChartTypeTemplate::adaptDiagram( const uno::Reference< chart2::XDiagram
// ----------------------------------------
-uno::Sequence< ::rtl::OUString > PieChartTypeTemplate::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PieChartTypeTemplate::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = lcl_aServiceName;
aServices[ 1 ] = "com.sun.star.chart2.ChartTypeTemplate";
return aServices;
diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx
index f0a876c58ac2..697a00f8ab6c 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.hxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.hxx
@@ -38,7 +38,7 @@ public:
PieChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
::com::sun::star::chart2::PieChartOffsetMode eMode,
bool bRings = false,
sal_Int32 nDim = 2 );
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index 20e89cb15ff7..d4dd2014d8a4 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -31,7 +31,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
@@ -208,26 +207,26 @@ Reference< chart2::XCoordinateSystem > SAL_CALL
return xResult;
}
-::rtl::OUString SAL_CALL ScatterChartType::getChartType()
+OUString SAL_CALL ScatterChartType::getChartType()
throw (uno::RuntimeException)
{
return CHART2_SERVICE_NAME_CHARTTYPE_SCATTER;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles()
+uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles()
throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aMandRolesSeq(3);
+ uno::Sequence< OUString > aMandRolesSeq(3);
aMandRolesSeq[0] = "label";
aMandRolesSeq[1] = "values-x";
aMandRolesSeq[2] = "values-y";
return aMandRolesSeq;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles()
+uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedOptionalRoles()
throw (uno::RuntimeException)
{
- return uno::Sequence< ::rtl::OUString >();
+ return uno::Sequence< OUString >();
}
@@ -255,9 +254,9 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getProperty
return *StaticScatterChartTypeInfo::get();
}
-uno::Sequence< ::rtl::OUString > ScatterChartType::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ScatterChartType::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 3 );
+ uno::Sequence< OUString > aServices( 3 );
aServices[ 0 ] = CHART2_SERVICE_NAME_CHARTTYPE_SCATTER;
aServices[ 1 ] = "com.sun.star.chart2.ChartType";
aServices[ 2 ] = "com.sun.star.beans.PropertySet";
diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx
index 8e0ea71642a7..e39265e9497c 100644
--- a/chart2/source/model/template/ScatterChartType.hxx
+++ b/chart2/source/model/template/ScatterChartType.hxx
@@ -47,12 +47,12 @@ protected:
explicit ScatterChartType( const ScatterChartType & rOther );
// ____ XChartType ____
- virtual ::rtl::OUString SAL_CALL getChartType()
+ virtual OUString SAL_CALL getChartType()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedMandatoryRoles()
throw (::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
getSupportedOptionalRoles()
throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XCoordinateSystem > SAL_CALL
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 7496a5314ba2..da73968d3a15 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Any;
using ::osl::MutexGuard;
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
index ff26084d9b12..ef7afc26a7b2 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
@@ -37,7 +37,7 @@ public:
explicit ScatterChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
bool bSymbols,
bool bHasLines = true,
sal_Int32 nDim = 2 );
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 951aba452e20..8fb076771ea8 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -44,7 +44,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Any;
using ::osl::MutexGuard;
@@ -162,7 +161,7 @@ namespace chart
StockChartTypeTemplate::StockChartTypeTemplate(
uno::Reference<
uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StockVariant eVariant,
bool bJapaneseStyle ) :
ChartTypeTemplate( xContext, rServiceName ),
diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx
index 26b0f217e951..6c203d92d467 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.hxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.hxx
@@ -52,7 +52,7 @@ public:
explicit StockChartTypeTemplate(
::com::sun::star::uno::Reference<
::com::sun::star::uno::XComponentContext > const & xContext,
- const ::rtl::OUString & rServiceName,
+ const OUString & rServiceName,
StockVariant eVariant,
bool bJapaneseStyle );
virtual ~StockChartTypeTemplate();
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx
index 0cafbd98a14a..ba55fbd2f79d 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -37,7 +37,6 @@ using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using namespace ::chart::ContainerHelper;
namespace chart
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx
index 48d742421d83..3876d2a29d9c 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -34,7 +34,6 @@ using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 614236dff6d7..a91d05ace485 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -232,7 +232,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
Reference< XChartTypeContainer > xCTCnt( xCorrespondingCoordinateSystem, uno::UNO_QUERY_THROW );
if( xCTCnt.is() )
{
- ::rtl::OUString aRoleToMatch;
+ OUString aRoleToMatch;
if( nDimensionIndex == 0 )
aRoleToMatch = "values-x";
Sequence< Reference< XChartType > > aChartTypes( xCTCnt->getChartTypes());
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index 898699d50f19..deada2065cb3 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -37,7 +37,6 @@ using namespace ::chart::ContainerHelper;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
using ::osl::MutexGuard;
// necessary for MS compiler
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index 241f08add123..40c79a3cb55d 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -52,7 +52,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::beans::Property;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx
index c4f621e62098..a1817b0313a9 100644
--- a/chart2/source/tools/ChartDebugTrace.cxx
+++ b/chart2/source/tools/ChartDebugTrace.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx
index 51b760de355d..658b6b03ea91 100644
--- a/chart2/source/tools/ChartTypeHelper.cxx
+++ b/chart2/source/tools/ChartTypeHelper.cxx
@@ -50,7 +50,7 @@ bool ChartTypeHelper::isSupportingAxisSideBySide(
StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 );
if( eStackMode == StackMode_NONE && !bAmbiguous )
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
bResult = ( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ||
aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) );
}
@@ -68,7 +68,7 @@ sal_Bool ChartTypeHelper::isSupportingGeometryProperties( const uno::Reference<
{
if(nDimensionCount==3)
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
return sal_True;
if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) )
@@ -88,7 +88,7 @@ sal_Bool ChartTypeHelper::isSupportingStatisticProperties( const uno::Reference<
if(nDimensionCount==3)
return sal_False;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
return sal_False;
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
@@ -118,7 +118,7 @@ sal_Bool ChartTypeHelper::isSupportingAreaProperties( const uno::Reference< XCha
{
if(nDimensionCount==2)
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) )
return sal_False;
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) )
@@ -142,7 +142,7 @@ sal_Bool ChartTypeHelper::isSupportingSymbolProperties( const uno::Reference< XC
if(nDimensionCount==3)
return sal_False;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) )
return sal_True;
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) )
@@ -161,7 +161,7 @@ sal_Bool ChartTypeHelper::isSupportingMainAxis( const uno::Reference< XChartType
//@todo ask charttype itself --> need model change first
if(xChartType.is())
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
return sal_False;
@@ -181,7 +181,7 @@ sal_Bool ChartTypeHelper::isSupportingSecondaryAxis( const uno::Reference< XChar
if(nDimensionCount==3)
return sal_False;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
return sal_False;
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
@@ -203,7 +203,7 @@ sal_Bool ChartTypeHelper::isSupportingOverlapAndGapWidthProperties(
if(nDimensionCount==3)
return sal_False;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) )
return sal_True;
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
@@ -229,7 +229,7 @@ sal_Bool ChartTypeHelper::isSupportingBarConnectors(
if( eStackMode != StackMode_Y_STACKED || bAmbiguous )
return sal_False;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) )
return sal_True;
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) )
@@ -248,7 +248,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedLabelPlacements( const
if( !xChartType.is() )
return aRet;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
{
bool bDonut = false;
@@ -359,7 +359,7 @@ sal_Bool ChartTypeHelper::isSupportingRightAngledAxes( const uno::Reference< cha
{
if(xChartType.is())
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
return sal_False;
}
@@ -370,7 +370,7 @@ bool ChartTypeHelper::isSupportingStartingAngle( const uno::Reference< chart2::X
{
if(xChartType.is())
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
return true;
}
@@ -380,7 +380,7 @@ bool ChartTypeHelper::isSupportingBaseValue( const uno::Reference< chart2::XChar
{
if(xChartType.is())
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN)
|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR)
|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA)
@@ -394,7 +394,7 @@ bool ChartTypeHelper::isSupportingAxisPositioning( const uno::Reference< chart2:
{
if(xChartType.is())
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
return false;
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET) )
@@ -414,7 +414,7 @@ bool ChartTypeHelper::isSupportingDateAxis( const uno::Reference< chart2::XChart
sal_Int32 nType = ChartTypeHelper::getAxisType( xChartType, nDimensionIndex );
if( nType != AxisType::CATEGORY )
return false;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
return false;
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_NET) )
@@ -429,7 +429,7 @@ bool ChartTypeHelper::shiftCategoryPosAtXAxisPerDefault( const uno::Reference< c
{
if(xChartType.is())
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN)
|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR)
|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
@@ -442,7 +442,7 @@ bool ChartTypeHelper::noBordersForSimpleScheme( const uno::Reference< chart2::XC
{
if(xChartType.is())
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
return sal_True;
}
@@ -454,7 +454,7 @@ sal_Int32 ChartTypeHelper::getDefaultDirectLightColor( bool bSimple, const uno::
sal_Int32 nRet = static_cast< sal_Int32 >( 0x808080 ); // grey
if( xChartType .is() )
{
- rtl::OUString aChartType = xChartType->getChartType();
+ OUString aChartType = xChartType->getChartType();
if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
{
if( bSimple )
@@ -474,7 +474,7 @@ sal_Int32 ChartTypeHelper::getDefaultAmbientLightColor( bool bSimple, const uno:
sal_Int32 nRet = static_cast< sal_Int32 >( 0x999999 ); // grey40
if( xChartType .is() )
{
- rtl::OUString aChartType = xChartType->getChartType();
+ OUString aChartType = xChartType->getChartType();
if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
{
if( bSimple )
@@ -491,7 +491,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultSimpleLightDirection( const uno:
drawing::Direction3D aRet(0.0, 0.0, 1.0);
if( xChartType .is() )
{
- rtl::OUString aChartType = xChartType->getChartType();
+ OUString aChartType = xChartType->getChartType();
if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
aRet = drawing::Direction3D(0.0, 0.8, 0.5);
else if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_LINE)
@@ -506,7 +506,7 @@ drawing::Direction3D ChartTypeHelper::getDefaultRealisticLightDirection( const u
drawing::Direction3D aRet(0.0, 0.0, 1.0);
if( xChartType .is() )
{
- rtl::OUString aChartType = xChartType->getChartType();
+ OUString aChartType = xChartType->getChartType();
if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
aRet = drawing::Direction3D(0.6, 0.6, 0.6);
else if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_LINE)
@@ -525,7 +525,7 @@ sal_Int32 ChartTypeHelper::getAxisType( const uno::Reference<
if(!xChartType.is())
return AxisType::CATEGORY;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if(2==nDimensionIndex)//z-axis
return AxisType::SERIES;
if(1==nDimensionIndex)//y-axis
@@ -548,7 +548,7 @@ sal_Int32 ChartTypeHelper::getNumberOfDisplayedSeries(
{
try
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE))
{
uno::Reference< beans::XPropertySet > xChartTypeProp( xChartType, uno::UNO_QUERY_THROW );
@@ -580,7 +580,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments(
StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, 0 );
bStacked = bFound && (StackMode_Y_STACKED == eStackMode);
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) ||
aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BAR) ||
aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
@@ -634,30 +634,30 @@ bool ChartTypeHelper::isSeriesInFrontOfAxisLine( const uno::Reference< XChartTyp
{
if( xChartType.is() )
{
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match( CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET ) )
return false;
}
return true;
}
-rtl::OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const uno::Reference< XChartType >& xChartType )
+OUString ChartTypeHelper::getRoleOfSequenceForYAxisNumberFormatDetection( const uno::Reference< XChartType >& xChartType )
{
- rtl::OUString aRet( "values-y" );
+ OUString aRet( "values-y" );
if( !xChartType.is() )
return aRet;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK) )
aRet = xChartType->getRoleOfSequenceForSeriesLabel();
return aRet;
}
-rtl::OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const uno::Reference< XChartType >& xChartType )
+OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( const uno::Reference< XChartType >& xChartType )
{
- rtl::OUString aRet( "values-y" );
+ OUString aRet( "values-y" );
if( !xChartType.is() )
return aRet;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK)
|| aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
aRet = xChartType->getRoleOfSequenceForSeriesLabel();
@@ -667,7 +667,7 @@ rtl::OUString ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetectio
bool ChartTypeHelper::shouldLabelNumberFormatKeyBeDetectedFromYAxis( const uno::Reference< XChartType >& xChartType )
{
bool bRet = true;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE) )
bRet = false;
return bRet;
@@ -679,7 +679,7 @@ bool ChartTypeHelper::isSupportingOnlyDeepStackingFor3D( const uno::Reference< X
if( !xChartType.is() )
return bRet;
- rtl::OUString aChartTypeName = xChartType->getChartType();
+ OUString aChartTypeName = xChartType->getChartType();
if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_LINE) ||
aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER) ||
aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_AREA) )
diff --git a/chart2/source/tools/CommonConverters.cxx b/chart2/source/tools/CommonConverters.cxx
index f9c986225893..829780d02519 100644
--- a/chart2/source/tools/CommonConverters.cxx
+++ b/chart2/source/tools/CommonConverters.cxx
@@ -459,10 +459,10 @@ uno::Sequence< double > DataSequenceToDoubleSequence(
return aResult;
}
-uno::Sequence< rtl::OUString > DataSequenceToStringSequence(
+uno::Sequence< OUString > DataSequenceToStringSequence(
const uno::Reference< data::XDataSequence >& xDataSequence )
{
- uno::Sequence< rtl::OUString > aResult;
+ uno::Sequence< OUString > aResult;
if(!xDataSequence.is())
return aResult;
@@ -519,9 +519,9 @@ sal_Int16 getShortForLongAlso( const uno::Any& rAny )
return nRet;
}
-bool replaceParamterInString( rtl::OUString & rInOutResourceString,
- const rtl::OUString & rParamToReplace,
- const rtl::OUString & rReplaceWith )
+bool replaceParamterInString( OUString & rInOutResourceString,
+ const OUString & rParamToReplace,
+ const OUString & rReplaceWith )
{
sal_Int32 nPos = rInOutResourceString.indexOf( rParamToReplace );
if( nPos == -1 )
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index f56ce504d80d..d1425e9c8dd7 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/tools/ControllerLockGuard.cxx b/chart2/source/tools/ControllerLockGuard.cxx
index 727eef634f53..ce57ac442428 100644
--- a/chart2/source/tools/ControllerLockGuard.cxx
+++ b/chart2/source/tools/ControllerLockGuard.cxx
@@ -24,7 +24,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index f9a8b64dc792..d7ec4ac688db 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -49,8 +49,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
// ----------------------------------------
namespace
diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx
index 262e6fe2e11e..71b6a5cb40fe 100644
--- a/chart2/source/tools/DataSource.cxx
+++ b/chart2/source/tools/DataSource.cxx
@@ -21,7 +21,6 @@
#include "DataSource.hxx"
#include "LabeledDataSequence.hxx"
-using ::rtl::OUString;
using ::osl::MutexGuard;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index cef1dc179d89..fab7b55011b8 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -45,11 +45,10 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
-void lcl_addRanges( ::std::vector< ::rtl::OUString > & rOutResult,
+void lcl_addRanges( ::std::vector< OUString > & rOutResult,
const uno::Reference< data::XLabeledDataSequence > & xLabeledSeq )
{
if( ! xLabeledSeq.is())
@@ -63,7 +62,7 @@ void lcl_addRanges( ::std::vector< ::rtl::OUString > & rOutResult,
}
void lcl_addDataSourceRanges(
- ::std::vector< ::rtl::OUString > & rOutResult,
+ ::std::vector< OUString > & rOutResult,
const uno::Reference< data::XDataSource > & xDataSource )
{
if( xDataSource.is() )
@@ -75,7 +74,7 @@ void lcl_addDataSourceRanges(
}
void lcl_addErrorBarRanges(
- ::std::vector< ::rtl::OUString > & rOutResult,
+ ::std::vector< OUString > & rOutResult,
const uno::Reference< XDataSeries > & xDataSeries )
{
uno::Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY );
@@ -129,7 +128,7 @@ Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSeque
return new ::chart::CachedDataSequence();
}
-Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSequence( const ::rtl::OUString& rSingleText )
+Reference< chart2::data::XDataSequence > DataSourceHelper::createCachedDataSequence( const OUString& rSingleText )
{
return new ::chart::CachedDataSequence( rSingleText );
}
@@ -175,7 +174,7 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
}
uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
- const ::rtl::OUString & rRangeRepresentation,
+ const OUString & rRangeRepresentation,
const uno::Sequence< sal_Int32 >& rSequenceMapping,
bool bUseColumns, bool bFirstCellAsLabel, bool bHasCategories )
{
@@ -197,7 +196,7 @@ uno::Sequence< beans::PropertyValue > DataSourceHelper::createArguments(
}
void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue >& rArguments
- , ::rtl::OUString & rRangeRepresentation, uno::Sequence< sal_Int32 >& rSequenceMapping
+ , OUString & rRangeRepresentation, uno::Sequence< sal_Int32 >& rSequenceMapping
, bool& bUseColumns, bool& bFirstCellAsLabel, bool& bHasCategories )
{
const beans::PropertyValue* pArguments = rArguments.getConstArray();
@@ -269,10 +268,10 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR
return new DataSource( aResultSequence );
}
-uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges(
+uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges(
const uno::Reference< chart2::XDiagram > & xDiagram )
{
- ::std::vector< ::rtl::OUString > aResult;
+ ::std::vector< OUString > aResult;
if( xDiagram.is())
{
@@ -293,7 +292,7 @@ uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges(
return ContainerHelper::ContainerToSequence( aResult );
}
-uno::Sequence< ::rtl::OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< frame::XModel > & xChartModel )
+uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges( const uno::Reference< frame::XModel > & xChartModel )
{
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
return getUsedDataRanges( xDiagram );
@@ -334,7 +333,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
bool DataSourceHelper::detectRangeSegmentation(
const uno::Reference<
frame::XModel >& xChartModel
- , ::rtl::OUString& rOutRangeString
+ , OUString& rOutRangeString
, ::com::sun::star::uno::Sequence< sal_Int32 >& rSequenceMapping
, bool& rOutUseColumns
, bool& rOutFirstCellAsLabel
@@ -400,7 +399,7 @@ bool DataSourceHelper::allArgumentsForRectRangeDetected(
}
else if ( aProperty.Name == "CellRangeRepresentation" )
{
- ::rtl::OUString aRange;
+ OUString aRange;
bHasCellRangeRepresentation =
(aProperty.Value.hasValue() && (aProperty.Value >>= aRange) && !aRange.isEmpty());
}
@@ -435,7 +434,7 @@ void DataSourceHelper::setRangeSegmentation(
if( !xTemplateFactory.is() )
return;
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
bool bDummy;
uno::Sequence< sal_Int32 > aDummy;
readArguments( xDataProvider->detectArguments( pressUsedDataIntoRectangularFormat( xChartDocument )),
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 1b54b355edbe..1356237d5515 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -65,7 +65,6 @@ using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
using ::com::sun::star::chart2::XAnyDescriptionAccess;
namespace chart
@@ -955,12 +954,12 @@ Reference< data::XLabeledDataSequence >
}
void lcl_generateAutomaticCategoriesFromChartType(
- Sequence< rtl::OUString >& rRet,
+ Sequence< OUString >& rRet,
const Reference< XChartType >& xChartType )
{
if(!xChartType.is())
return;
- rtl::OUString aMainSeq( xChartType->getRoleOfSequenceForSeriesLabel() );
+ OUString aMainSeq( xChartType->getRoleOfSequenceForSeriesLabel() );
Reference< XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY );
if( xSeriesCnt.is() )
{
@@ -984,9 +983,9 @@ void lcl_generateAutomaticCategoriesFromChartType(
}
}
-Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( const Reference< XCoordinateSystem > & xCooSys )
+Sequence< OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys( const Reference< XCoordinateSystem > & xCooSys )
{
- Sequence< rtl::OUString > aRet;
+ Sequence< OUString > aRet;
Reference< XChartTypeContainer > xTypeCntr( xCooSys, uno::UNO_QUERY );
if( xTypeCntr.is() )
@@ -1002,10 +1001,10 @@ Sequence< rtl::OUString > DiagramHelper::generateAutomaticCategoriesFromCooSys(
return aRet;
}
-Sequence< rtl::OUString > DiagramHelper::getExplicitSimpleCategories(
+Sequence< OUString > DiagramHelper::getExplicitSimpleCategories(
const Reference< XChartDocument >& xChartDoc )
{
- Sequence< rtl::OUString > aRet;
+ Sequence< OUString > aRet;
uno::Reference< frame::XModel > xChartModel( xChartDoc, uno::UNO_QUERY );
if(xChartModel.is())
{
@@ -1251,8 +1250,8 @@ bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartTy
if( !xFirstType.is() || !xSecondType.is() )
return false;
- ::std::vector< ::rtl::OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) );
- ::std::vector< ::rtl::OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) );
+ ::std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) );
+ ::std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) );
::std::sort( aFirstRoles.begin(), aFirstRoles.end() );
::std::sort( aSecondRoles.begin(), aSecondRoles.end() );
return ( aFirstRoles == aSecondRoles );
@@ -1497,7 +1496,7 @@ bool DiagramHelper::isPieOrDonutChart( const ::com::sun::star::uno::Reference<
if( xChartType .is() )
{
- rtl::OUString aChartType = xChartType->getChartType();
+ OUString aChartType = xChartType->getChartType();
if( aChartType.equals(CHART2_SERVICE_NAME_CHARTTYPE_PIE) )
return true;
}
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 3e9a3d7c5e38..29f40e8c9925 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -33,8 +33,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using ::com::sun::star::beans::Property;
using ::osl::MutexGuard;
@@ -327,9 +325,9 @@ void ErrorBar::fireModifyEvent()
// ================================================================================
-uno::Sequence< ::rtl::OUString > ErrorBar::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ErrorBar::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = lcl_aServiceName;
aServices[ 1 ] = "com.sun.star.chart2.ErrorBar";
return aServices;
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 538a9d0dad80..949e18990ade 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::std::vector;
@@ -109,7 +108,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2:
if( !aSeries.empty() )
{
uno::Reference< data::XDataSource > xSeriesSource( aSeries.front(), uno::UNO_QUERY );
- ::rtl::OUString aStringDummy;
+ OUString aStringDummy;
bool bDummy;
uno::Sequence< sal_Int32 > aSeqDummy;
DataSourceHelper::readArguments( xDataProvider->detectArguments( xSeriesSource),
@@ -180,7 +179,7 @@ std::vector<sal_Int32> lcl_getLimitingBorders( const std::vector< ComplexCategor
return aLimitingBorders;
}
-void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl::OUString >& rOutTexts, const uno::Sequence< uno::Any >& rInAnys, Reference< frame::XModel > xChartModel )
+void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< OUString >& rOutTexts, const uno::Sequence< uno::Any >& rInAnys, Reference< frame::XModel > xChartModel )
{
sal_Int32 nCount = rInAnys.getLength();
if(!nCount)
@@ -207,7 +206,7 @@ void ExplicitCategoriesProvider::convertCategoryAnysToText( uno::Sequence< rtl::
for(sal_Int32 nN=0;nN<nCount;nN++)
{
- rtl::OUString aText;
+ OUString aText;
uno::Any aAny = rInAnys[nN];
if( aAny.hasValue() )
{
@@ -247,7 +246,7 @@ public:
{}
virtual sal_Int32 getLevelCount() const;
- virtual uno::Sequence< rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const;
+ virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const;
private:
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference<
@@ -260,9 +259,9 @@ sal_Int32 SplitCategoriesProvider_ForLabeledDataSequences::getLevelCount() const
{
return m_rSplitCategoriesList.getLength();
}
-uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForLabeledDataSequences::getStringsForLevel( sal_Int32 nLevel ) const
+uno::Sequence< OUString > SplitCategoriesProvider_ForLabeledDataSequences::getStringsForLevel( sal_Int32 nLevel ) const
{
- uno::Sequence< rtl::OUString > aRet;
+ uno::Sequence< OUString > aRet;
Reference< data::XLabeledDataSequence > xLabeledDataSequence( m_rSplitCategoriesList[nLevel] );
if( xLabeledDataSequence.is() )
{
@@ -274,7 +273,7 @@ uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForLabeledDataSequences::
}
std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector(
- const uno::Sequence< rtl::OUString >& rStrings
+ const uno::Sequence< OUString >& rStrings
, const std::vector<sal_Int32>& rLimitingBorders, bool bCreateSingleCategories )
{
std::vector< ComplexCategory > aResult;
@@ -535,7 +534,7 @@ void ExplicitCategoriesProvider::init()
}
-Sequence< ::rtl::OUString > ExplicitCategoriesProvider::getSimpleCategories()
+Sequence< OUString > ExplicitCategoriesProvider::getSimpleCategories()
{
if( !m_bIsExplicitCategoriesInited )
{
diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 75e66ce52a32..c76138ac809f 100644
--- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -26,8 +26,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace chart
{
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index 64b822edd314..f70332535489 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -61,7 +61,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
rOutProperties.push_back(
Property( "FillTransparenceGradientName",
FillProperties::PROP_FILL_TRANSPARENCE_GRADIENT_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -69,7 +69,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
rOutProperties.push_back(
Property( "FillGradientName",
FillProperties::PROP_FILL_GRADIENT_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -84,7 +84,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< ::com::s
rOutProperties.push_back(
Property( "FillHatchName",
FillProperties::PROP_FILL_HATCH_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::MAYBEDEFAULT ));
@@ -104,7 +104,7 @@ void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< ::com::sun:
rOutProperties.push_back(
Property( "FillBitmapName",
FillProperties::PROP_FILL_BITMAP_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEVOID
| beans::PropertyAttribute::MAYBEDEFAULT ));
diff --git a/chart2/source/tools/FormattedStringHelper.cxx b/chart2/source/tools/FormattedStringHelper.cxx
index 43593bcd49f7..82ad2392bf69 100644
--- a/chart2/source/tools/FormattedStringHelper.cxx
+++ b/chart2/source/tools/FormattedStringHelper.cxx
@@ -31,7 +31,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using rtl::OUString;
Sequence< Reference< chart2::XFormattedString > >
FormattedStringHelper::createFormattedStringSequence(
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index db2031d52918..27632e1d070d 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -27,7 +27,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index e8d4def8f24d..61dfaa96598f 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -27,7 +27,6 @@
#include <iterator>
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::std;
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 3a4303b08528..147afc8a2935 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -52,8 +52,6 @@ using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace chart
{
@@ -329,7 +327,7 @@ InternalDataProvider::InternalDataProvider( const Reference< chart2::XChartDocum
//data in columns?
{
- ::rtl::OUString aRangeString;
+ OUString aRangeString;
bool bFirstCellAsLabel = true;
bool bHasCategories = true;
uno::Sequence< sal_Int32 > aSequenceMapping;
@@ -1269,7 +1267,7 @@ public:
{}
virtual sal_Int32 getLevelCount() const;
- virtual uno::Sequence< rtl::OUString > getStringsForLevel( sal_Int32 nIndex ) const;
+ virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const;
private:
const ::std::vector< ::std::vector< uno::Any > >& m_rComplexDescriptions;
@@ -1279,9 +1277,9 @@ sal_Int32 SplitCategoriesProvider_ForComplexDescriptions::getLevelCount() const
{
return lcl_getInnerLevelCount( m_rComplexDescriptions );
}
-uno::Sequence< rtl::OUString > SplitCategoriesProvider_ForComplexDescriptions::getStringsForLevel( sal_Int32 nLevel ) const
+uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStringsForLevel( sal_Int32 nLevel ) const
{
- uno::Sequence< rtl::OUString > aResult;
+ uno::Sequence< OUString > aResult;
if( nLevel < lcl_getInnerLevelCount( m_rComplexDescriptions ) )
{
aResult.realloc( m_rComplexDescriptions.size() );
@@ -1354,15 +1352,15 @@ Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDes
{
return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() );
}
-void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aRowDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException)
{
m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) );
}
-Sequence< Sequence< ::rtl::OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException)
+Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException)
{
return lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() );
}
-void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< ::rtl::OUString > >& aColumnDescriptions ) throw (uno::RuntimeException)
+void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException)
{
m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) );
}
diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx
index a7ac13fb9b15..8b8785d5d353 100644
--- a/chart2/source/tools/LabeledDataSequence.cxx
+++ b/chart2/source/tools/LabeledDataSequence.cxx
@@ -26,7 +26,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/LineProperties.cxx b/chart2/source/tools/LineProperties.cxx
index 54de032cf02c..e3c88d9860c3 100644
--- a/chart2/source/tools/LineProperties.cxx
+++ b/chart2/source/tools/LineProperties.cxx
@@ -54,7 +54,7 @@ void LineProperties::AddPropertiesToVector(
rOutProperties.push_back(
Property( "LineDashName",
PROP_LINE_DASH_NAME,
- ::getCppuType( reinterpret_cast< const ::rtl::OUString * >(0)),
+ ::getCppuType( reinterpret_cast< const OUString * >(0)),
beans::PropertyAttribute::BOUND
| beans::PropertyAttribute::MAYBEDEFAULT
| beans::PropertyAttribute::MAYBEVOID ));
diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index f168f63429d3..5b388ee4139e 100644
--- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -26,8 +26,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace chart
{
diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index 29ea58f996ff..af56a64e19c6 100644
--- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -26,8 +26,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace chart
{
diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index 0551cbdbb901..10bebac3c077 100644
--- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -25,8 +25,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace chart
{
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 3cb8953f0c3a..359017940244 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -30,7 +30,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx
index fe181d360dbd..130d277329f6 100644
--- a/chart2/source/tools/NameContainer.cxx
+++ b/chart2/source/tools/NameContainer.cxx
@@ -25,7 +25,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
//.............................................................................
@@ -34,7 +33,7 @@ namespace chart
//.............................................................................
uno::Reference< container::XNameContainer > createNameContainer(
- const ::com::sun::star::uno::Type& rType, const rtl::OUString& rServicename, const rtl::OUString& rImplementationName )
+ const ::com::sun::star::uno::Type& rType, const OUString& rServicename, const OUString& rImplementationName )
{
return new NameContainer( rType, rServicename, rImplementationName );
}
diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx
index 508e2716f489..a1080b34c792 100644
--- a/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -46,7 +46,7 @@ FixedNumberFormatter::~FixedNumberFormatter()
{
}
-rtl::OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
+OUString FixedNumberFormatter::getFormattedString( double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
{
return m_aNumberFormatterWrapper.getFormattedString(
m_nNumberFormatKey, fValue, rLabelColor, rbColorChanged );
@@ -62,7 +62,7 @@ NumberFormatterWrapper::NumberFormatterWrapper( const uno::Reference< util::XNum
{
uno::Reference<beans::XPropertySet> xProp(m_xNumberFormatsSupplier,uno::UNO_QUERY);
- rtl::OUString sNullDate( "NullDate" );
+ OUString sNullDate( "NullDate" );
if ( xProp.is() && xProp->getPropertySetInfo()->hasPropertyByName(sNullDate) )
m_aNullDate = xProp->getPropertyValue(sNullDate);
SvNumberFormatsSupplierObj* pSupplierObj = SvNumberFormatsSupplierObj::getImplementation( xSupplier );
@@ -99,7 +99,7 @@ Date NumberFormatterWrapper::getNullDate() const
return aRet;
}
-rtl::OUString NumberFormatterWrapper::getFormattedString(
+OUString NumberFormatterWrapper::getFormattedString(
sal_Int32 nNumberFormatKey, double fValue, sal_Int32& rLabelColor, bool& rbColorChanged ) const
{
String aText;
@@ -130,7 +130,7 @@ rtl::OUString NumberFormatterWrapper::getFormattedString(
{
m_pNumberFormatter->ChangeNullDate(nDay,nMonth,nYear);
}
- rtl::OUString aRet( aText );
+ OUString aRet( aText );
if(pTextColor)
{
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index a6f437686add..f244f955a894 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -33,7 +33,6 @@ using ::com::sun::star::style::XStyleSupplier;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
using ::osl::MutexGuard;
// needed for MS compiler
diff --git a/chart2/source/tools/ObjectIdentifier.cxx b/chart2/source/tools/ObjectIdentifier.cxx
index 8779f1dd9942..1097984274e3 100644
--- a/chart2/source/tools/ObjectIdentifier.cxx
+++ b/chart2/source/tools/ObjectIdentifier.cxx
@@ -46,8 +46,6 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using rtl::OUString;
-using rtl::OUStringBuffer;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
@@ -366,11 +364,11 @@ OUString ObjectIdentifier::createClassifiedIdentifierForObject(
if( xAxis.is() )
{
Reference< XCoordinateSystem > xCooSys( AxisHelper::getCoordinateSystemOfAxis( xAxis, ChartModelHelper::findDiagram( xChartModel ) ) );
- rtl::OUString aCooSysParticle( createParticleForCoordinateSystem( xCooSys, xChartModel ) );
+ OUString aCooSysParticle( createParticleForCoordinateSystem( xCooSys, xChartModel ) );
sal_Int32 nDimensionIndex=-1;
sal_Int32 nAxisIndex=-1;
AxisHelper::getIndicesForAxis( xAxis, xCooSys, nDimensionIndex, nAxisIndex );
- rtl::OUString aAxisParticle( createParticleForAxis( nDimensionIndex, nAxisIndex ) );
+ OUString aAxisParticle( createParticleForAxis( nDimensionIndex, nAxisIndex ) );
return createClassifiedIdentifierForParticles( aCooSysParticle, aAxisParticle );
}
@@ -515,8 +513,8 @@ OUString ObjectIdentifier::createClassifiedIdentifierForGrid(
{
//-1: main grid, 0: first subgrid etc
- rtl::OUString aAxisCID( createClassifiedIdentifierForObject( xAxis, xChartModel ) );
- rtl::OUString aGridCID( addChildParticle( aAxisCID
+ OUString aAxisCID( createClassifiedIdentifierForObject( xAxis, xChartModel ) );
+ OUString aGridCID( addChildParticle( aAxisCID
, createChildParticleWithIndex( OBJECTTYPE_GRID, 0 ) ) );
if( nSubGridIndex >= 0 )
{
@@ -1004,7 +1002,7 @@ OUString ObjectIdentifier::createDataCurveEquationCID(
return createClassifiedIdentifierWithParent( OBJECTTYPE_DATA_CURVE_EQUATION, aParticleID, rSeriesParticle );
}
-OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, const rtl::OUString& rChildParticle )
+OUString ObjectIdentifier::addChildParticle( const OUString& rParticle, const OUString& rChildParticle )
{
OUStringBuffer aRet(rParticle);
@@ -1016,7 +1014,7 @@ OUString ObjectIdentifier::addChildParticle( const rtl::OUString& rParticle, con
return aRet.makeStringAndClear();
}
-rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex )
+OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObjectType, sal_Int32 nIndex )
{
OUStringBuffer aRet( getStringForType( eObjectType ) );
if( aRet.getLength() )
@@ -1027,7 +1025,7 @@ rtl::OUString ObjectIdentifier::createChildParticleWithIndex( ObjectType eObject
return aRet.makeStringAndClear();
}
-sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rParticleOrCID )
+sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const OUString& rParticleOrCID )
{
sal_Int32 nRet = -1;
@@ -1039,9 +1037,9 @@ sal_Int32 ObjectIdentifier::getIndexFromParticleOrCID( const rtl::OUString& rPar
}
OUString ObjectIdentifier::createSeriesSubObjectStub( ObjectType eSubObjectType
- , const rtl::OUString& rSeriesParticle
- , const rtl::OUString& rDragMethodServiceName
- , const rtl::OUString& rDragParameterString )
+ , const OUString& rSeriesParticle
+ , const OUString& rDragMethodServiceName
+ , const OUString& rDragParameterString )
{
OUString aChildParticle( getStringForType( eSubObjectType ) );
aChildParticle+=("=");
@@ -1084,7 +1082,7 @@ OUString ObjectIdentifier::getFullParentParticle( const OUString& rCID )
return aRet;
}
-OUString ObjectIdentifier::getObjectID( const rtl::OUString& rCID )
+OUString ObjectIdentifier::getObjectID( const OUString& rCID )
{
OUString aRet;
@@ -1341,7 +1339,7 @@ Reference< XDataSeries > ObjectIdentifier::getDataSeriesForCID(
}
Reference< XDiagram > ObjectIdentifier::getDiagramForCID(
- const rtl::OUString& rObjectCID
+ const OUString& rObjectCID
, const uno::Reference< frame::XModel >& xChartModel )
{
Reference< XDiagram > xDiagram;
@@ -1385,7 +1383,7 @@ OUString ObjectIdentifier::getSeriesParticleFromCID( const OUString& rCID )
return ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCooSysIndex, nChartTypeIndex, nSeriesIndex );
}
-OUString ObjectIdentifier::getMovedSeriesCID( const ::rtl::OUString& rObjectCID, sal_Bool bForward )
+OUString ObjectIdentifier::getMovedSeriesCID( const OUString& rObjectCID, sal_Bool bForward )
{
sal_Int32 nDiagramIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CID/D=" ) );
sal_Int32 nCooSysIndex = lcl_StringToIndex( lcl_getIndexStringAfterString( rObjectCID, "CS=" ) );
diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index b84032790e06..ef53b5dc4a55 100644
--- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -26,8 +26,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
namespace chart
{
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 746cf6a1a35b..fb6b0bfadd84 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -30,7 +30,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
-using ::rtl::OUString;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 545e4e697626..1d1a1d22edf8 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace
{
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index f039aa67f7ce..9e41285f2afc 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -37,7 +37,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
// ================================================================================
diff --git a/chart2/source/tools/RegressionCalculationHelper.hxx b/chart2/source/tools/RegressionCalculationHelper.hxx
index da1c0ca9c5d0..4cf49663e678 100644
--- a/chart2/source/tools/RegressionCalculationHelper.hxx
+++ b/chart2/source/tools/RegressionCalculationHelper.hxx
@@ -25,7 +25,7 @@
#include <functional>
#include <vector>
-#define NUMBER_TO_STR(number) (::rtl::OStringToOUString(::rtl::math::doubleToString( \
+#define NUMBER_TO_STR(number) (OStringToOUString(::rtl::math::doubleToString( \
number, rtl_math_StringFormat_G, 4, '.', true ),RTL_TEXTENCODING_ASCII_US ))
#define UC_SPACE (sal_Unicode(' '))
diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx
index 8d811aef8f7d..b2f6b52f6db0 100644
--- a/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -32,7 +32,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 4c346c6f6938..08228bc0961f 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -43,7 +43,6 @@ using ::com::sun::star::uno::XComponentContext;
using ::com::sun::star::lang::XServiceName;
using ::com::sun::star::beans::XPropertySet;
using ::com::sun::star::uno::Exception;
-using ::rtl::OUString;
namespace
{
@@ -87,7 +86,7 @@ Reference< XRegressionCurve > RegressionCurveHelper::createMeanValueLine(
Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServiceName(
const Reference< XComponentContext > & xContext,
- ::rtl::OUString aServiceName )
+ OUString aServiceName )
{
Reference< XRegressionCurve > xResult;
@@ -115,7 +114,7 @@ Reference< XRegressionCurve > RegressionCurveHelper::createRegressionCurveByServ
// ------------------------------------------------------------
Reference< XRegressionCurveCalculator > RegressionCurveHelper::createRegressionCurveCalculatorByServiceName(
- ::rtl::OUString aServiceName )
+ OUString aServiceName )
{
Reference< XRegressionCurveCalculator > xResult;
@@ -166,7 +165,7 @@ void RegressionCurveHelper::initializeCurveCalculator(
{
Reference< data::XDataSequence > xSeq( aDataSeqs[i]->getValues());
Reference< XPropertySet > xProp( xSeq, uno::UNO_QUERY_THROW );
- ::rtl::OUString aRole;
+ OUString aRole;
if( xProp->getPropertyValue( "Role" ) >>= aRole )
{
if( bUseXValuesIfAvailable && !bXValuesFound && aRole == "values-x" )
@@ -349,7 +348,7 @@ void RegressionCurveHelper::addRegressionCurve(
}
uno::Reference< chart2::XRegressionCurve > xCurve;
- ::rtl::OUString aServiceName( lcl_getServiceNameForType( eType ));
+ OUString aServiceName( lcl_getServiceNameForType( eType ));
if( !aServiceName.isEmpty())
{
@@ -508,7 +507,7 @@ RegressionCurveHelper::tRegressionType RegressionCurveHelper::getRegressionType(
Reference< lang::XServiceName > xServName( xCurve, uno::UNO_QUERY );
if( xServName.is())
{
- ::rtl::OUString aServiceName( xServName->getServiceName() );
+ OUString aServiceName( xServName->getServiceName() );
if( aServiceName == "com.sun.star.chart2.LinearRegressionCurve" )
{
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 7312081755be..0522af8b4cc5 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -32,8 +32,6 @@
using namespace ::com::sun::star;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using ::com::sun::star::beans::Property;
using ::osl::MutexGuard;
@@ -176,7 +174,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference<
}
// ____ XServiceName ____
-::rtl::OUString SAL_CALL RegressionCurveModel::getServiceName()
+OUString SAL_CALL RegressionCurveModel::getServiceName()
throw (uno::RuntimeException)
{
switch( m_eRegressionCurveType )
@@ -193,7 +191,7 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference<
return OUString("com.sun.star.chart2.PotentialRegressionCurve");
}
- return ::rtl::OUString();
+ return OUString();
}
// ____ XModifyBroadcaster ____
@@ -299,9 +297,9 @@ MeanValueRegressionCurve::MeanValueRegressionCurve(
{}
MeanValueRegressionCurve::~MeanValueRegressionCurve()
{}
-uno::Sequence< ::rtl::OUString > MeanValueRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > MeanValueRegressionCurve::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = lcl_aServiceName;
aServices[ 1 ] = "com.sun.star.chart2.MeanValueRegressionCurve";
return aServices;
@@ -327,9 +325,9 @@ LinearRegressionCurve::LinearRegressionCurve(
{}
LinearRegressionCurve::~LinearRegressionCurve()
{}
-uno::Sequence< ::rtl::OUString > LinearRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LinearRegressionCurve::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = lcl_aServiceName;
aServices[ 1 ] = "com.sun.star.chart2.LinearRegressionCurve";
return aServices;
@@ -355,9 +353,9 @@ LogarithmicRegressionCurve::LogarithmicRegressionCurve(
{}
LogarithmicRegressionCurve::~LogarithmicRegressionCurve()
{}
-uno::Sequence< ::rtl::OUString > LogarithmicRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LogarithmicRegressionCurve::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = lcl_aServiceName;
aServices[ 1 ] = "com.sun.star.chart2.LogarithmicRegressionCurve";
return aServices;
@@ -383,9 +381,9 @@ ExponentialRegressionCurve::ExponentialRegressionCurve(
{}
ExponentialRegressionCurve::~ExponentialRegressionCurve()
{}
-uno::Sequence< ::rtl::OUString > ExponentialRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ExponentialRegressionCurve::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = lcl_aServiceName;
aServices[ 1 ] = "com.sun.star.chart2.ExponentialRegressionCurve";
return aServices;
@@ -411,9 +409,9 @@ PotentialRegressionCurve::PotentialRegressionCurve(
{}
PotentialRegressionCurve::~PotentialRegressionCurve()
{}
-uno::Sequence< ::rtl::OUString > PotentialRegressionCurve::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PotentialRegressionCurve::getSupportedServiceNames_Static()
{
- uno::Sequence< ::rtl::OUString > aServices( 2 );
+ uno::Sequence< OUString > aServices( 2 );
aServices[ 0 ] = lcl_aServiceName;
aServices[ 1 ] = "com.sun.star.chart2.PotentialRegressionCurve";
return aServices;
diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx
index 1670316defdf..8434d21731de 100644
--- a/chart2/source/tools/RegressionCurveModel.hxx
+++ b/chart2/source/tools/RegressionCurveModel.hxx
@@ -99,7 +99,7 @@ protected:
throw (::com::sun::star::uno::RuntimeException);
// ____ XServiceName ____
- virtual ::rtl::OUString SAL_CALL getServiceName()
+ virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException);
// ____ XCloneable ____
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index ef2c4934d93c..16f771a16729 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -115,7 +115,7 @@ private:
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW, false );
::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SHOW_CORRELATION_COEFF, false );
- //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, ::rtl::OUString( sal_Unicode( '\n' )));
+ //::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_EQUATION_SEPARATOR, OUString( sal_Unicode( '\n' )));
// override other defaults
::chart::PropertyHelper::setPropertyValue( rOutMap, ::chart::FillProperties::PROP_FILL_STYLE, drawing::FillStyle_NONE );
@@ -309,11 +309,11 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference<
// ================================================================================
-uno::Sequence< ::rtl::OUString > RegressionEquation::getSupportedServiceNames_Static()
+uno::Sequence< OUString > RegressionEquation::getSupportedServiceNames_Static()
{
const sal_Int32 nNumServices( 5 );
sal_Int32 nI = 0;
- uno::Sequence< ::rtl::OUString > aServices( nNumServices );
+ uno::Sequence< OUString > aServices( nNumServices );
aServices[ nI++ ] = lcl_aServiceName;
aServices[ nI++ ] = "com.sun.star.beans.PropertySet";
aServices[ nI++ ] = "com.sun.star.drawing.FillProperties";
diff --git a/chart2/source/tools/RelativeSizeHelper.cxx b/chart2/source/tools/RelativeSizeHelper.cxx
index 53883ae0c1f7..bc4dca1bf67a 100644
--- a/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/chart2/source/tools/RelativeSizeHelper.cxx
@@ -30,7 +30,6 @@ using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::makeAny;
using ::com::sun::star::uno::Exception;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx
index 04ce78c5fcb8..5dc408359749 100644
--- a/chart2/source/tools/Scaling.cxx
+++ b/chart2/source/tools/Scaling.cxx
@@ -74,16 +74,16 @@ LogarithmicScaling::getInverseScaling()
return new ExponentialScaling( m_fBase );
}
- ::rtl::OUString SAL_CALL
+ OUString SAL_CALL
LogarithmicScaling::getServiceName()
throw (uno::RuntimeException)
{
return lcl_aServiceName_Logarithmic;
}
-uno::Sequence< ::rtl::OUString > LogarithmicScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LogarithmicScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Logarithmic, 1 );
+ return uno::Sequence< OUString >( & lcl_aServiceName_Logarithmic, 1 );
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
@@ -125,16 +125,16 @@ ExponentialScaling::getInverseScaling()
return new LogarithmicScaling( m_fBase );
}
- ::rtl::OUString SAL_CALL
+ OUString SAL_CALL
ExponentialScaling::getServiceName()
throw (uno::RuntimeException)
{
return lcl_aServiceName_Exponential;
}
-uno::Sequence< ::rtl::OUString > ExponentialScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > ExponentialScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Exponential, 1 );
+ return uno::Sequence< OUString >( & lcl_aServiceName_Exponential, 1 );
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
@@ -178,16 +178,16 @@ uno::Reference< XScaling > SAL_CALL
return new LinearScaling( 1.0 / m_fSlope, m_fOffset / m_fSlope );
}
- ::rtl::OUString SAL_CALL
+ OUString SAL_CALL
LinearScaling::getServiceName()
throw (uno::RuntimeException)
{
return lcl_aServiceName_Linear;
}
-uno::Sequence< ::rtl::OUString > LinearScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > LinearScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Linear, 1 );
+ return uno::Sequence< OUString >( & lcl_aServiceName_Linear, 1 );
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
@@ -229,16 +229,16 @@ uno::Reference< XScaling > SAL_CALL
return new PowerScaling( 1.0 / m_fExponent );
}
- ::rtl::OUString SAL_CALL
+ OUString SAL_CALL
PowerScaling::getServiceName()
throw (uno::RuntimeException)
{
return lcl_aServiceName_Power;
}
-uno::Sequence< ::rtl::OUString > PowerScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > PowerScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_Power, 1 );
+ return uno::Sequence< OUString >( & lcl_aServiceName_Power, 1 );
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
diff --git a/chart2/source/tools/StatisticsHelper.cxx b/chart2/source/tools/StatisticsHelper.cxx
index 81f47e0c2da9..99d9e4267835 100644
--- a/chart2/source/tools/StatisticsHelper.cxx
+++ b/chart2/source/tools/StatisticsHelper.cxx
@@ -33,8 +33,6 @@
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
using namespace ::com::sun::star;
namespace
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index 4805390c4b8c..32406a57770b 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
using ::rtl::math::cos;
using ::rtl::math::sin;
using ::rtl::math::tan;
@@ -1339,8 +1338,8 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() );
- rtl::OUString aPercentDiagonalPropertyName( "PercentDiagonal" );
- rtl::OUString aBorderStylePropertyName( "BorderStyle" );
+ OUString aPercentDiagonalPropertyName( "PercentDiagonal" );
+ OUString aBorderStylePropertyName( "BorderStyle" );
for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS )
{
diff --git a/chart2/source/tools/TitleHelper.cxx b/chart2/source/tools/TitleHelper.cxx
index f618780e8876..c5b74b54fcd9 100644
--- a/chart2/source/tools/TitleHelper.cxx
+++ b/chart2/source/tools/TitleHelper.cxx
@@ -132,7 +132,7 @@ uno::Reference< XTitle > TitleHelper::getTitle( TitleHelper::eTitleType nTitleIn
uno::Reference< XTitle > TitleHelper::createTitle(
TitleHelper::eTitleType eTitleType
- , const rtl::OUString& rTitleText
+ , const OUString& rTitleText
, const uno::Reference< frame::XModel >& xModel
, const uno::Reference< uno::XComponentContext > & xContext
, ReferenceSizeProvider * pRefSizeProvider )
@@ -239,9 +239,9 @@ uno::Reference< XTitle > TitleHelper::createTitle(
}
-rtl::OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle )
+OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xTitle )
{
- rtl::OUString aRet;
+ OUString aRet;
if(!xTitle.is())
return aRet;
uno::Sequence< uno::Reference< XFormattedString > > aStringList = xTitle->getText();
@@ -250,7 +250,7 @@ rtl::OUString TitleHelper::getCompleteString( const uno::Reference< XTitle >& xT
return aRet;
}
-void TitleHelper::setCompleteString( const rtl::OUString& rNewText
+void TitleHelper::setCompleteString( const OUString& rNewText
, const uno::Reference< XTitle >& xTitle
, const uno::Reference< uno::XComponentContext > & xContext
, float * pDefaultCharHeight /* = 0 */ )
@@ -259,7 +259,7 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText
if(!xTitle.is())
return;
- rtl::OUString aNewText = rNewText;
+ OUString aNewText = rNewText;
bool bStacked = false;
uno::Reference< beans::XPropertySet > xTitleProperties( xTitle, uno::UNO_QUERY );
@@ -269,8 +269,8 @@ void TitleHelper::setCompleteString( const rtl::OUString& rNewText
if( bStacked )
{
//#i99841# remove linebreaks that were added for vertical stacking
- rtl::OUStringBuffer aUnstackedStr;
- rtl::OUStringBuffer aSource(rNewText);
+ OUStringBuffer aUnstackedStr;
+ OUStringBuffer aSource(rNewText);
bool bBreakIgnored = false;
sal_Int32 nLen = rNewText.getLength();
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 59c26759add0..33c99e554f2c 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
using ::osl::MutexGuard;
// necessary for MS compiler
@@ -282,7 +281,7 @@ uno::Type SAL_CALL UncachedDataSequence::getElementType()
}
// ____ XNamed ____
-::rtl::OUString SAL_CALL UncachedDataSequence::getName()
+OUString SAL_CALL UncachedDataSequence::getName()
throw (uno::RuntimeException)
{
return m_aSourceRepresentation;
diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx
index 899e28dd7bb2..0c8b9736c6aa 100644
--- a/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/chart2/source/tools/WeakListenerAdapter.cxx
@@ -24,7 +24,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx
index f75c62b4d657..6304660930e2 100644
--- a/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -25,7 +25,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx
index f98c029d8b07..7ba667b355bf 100644
--- a/chart2/source/tools/WrappedDirectStateProperty.cxx
+++ b/chart2/source/tools/WrappedDirectStateProperty.cxx
@@ -25,7 +25,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
namespace chart
{
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index 069d18ab2b00..101fd03bd3fe 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -32,7 +32,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
//.............................................................................
namespace chart
@@ -85,7 +84,7 @@ beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< b
void WrappedIgnoreProperties::addIgnoreLineProperties( std::vector< WrappedProperty* >& rList )
{
rList.push_back( new WrappedIgnoreProperty( "LineStyle", uno::makeAny( drawing::LineStyle_SOLID ) ) );
- rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( rtl::OUString() ) ) );
+ rList.push_back( new WrappedIgnoreProperty( "LineDashName", uno::makeAny( OUString() ) ) );
rList.push_back( new WrappedIgnoreProperty( "LineColor", uno::makeAny( sal_Int32(0) ) ) );
rList.push_back( new WrappedIgnoreProperty( "LineTransparence", uno::makeAny( sal_Int16(0) ) ) );
rList.push_back( new WrappedIgnoreProperty( "LineWidth", uno::makeAny( sal_Int32(0) ) ) );
@@ -103,20 +102,20 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties(
rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::makeAny( drawing::FillStyle_SOLID ) ) );
rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::makeAny( sal_Int32(-1) ) ) );
rList.push_back( new WrappedIgnoreProperty( "FillTransparence", uno::makeAny( sal_Int16(0) ) ) );
- rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( ::rtl::OUString() ) ) );
+ rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradientName", uno::makeAny( OUString() ) ) );
// rList.push_back( new WrappedIgnoreProperty( "FillTransparenceGradient", uno::makeAny( awt::Gradient() ) ) );
- rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( ::rtl::OUString() ) ) );
+ rList.push_back( new WrappedIgnoreProperty( "FillGradientName", uno::makeAny( OUString() ) ) );
// rList.push_back( new WrappedIgnoreProperty( "FillGradient", uno::makeAny( awt::Gradient() ) ) );
- rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( ::rtl::OUString() ) ) );
+ rList.push_back( new WrappedIgnoreProperty( "FillHatchName", uno::makeAny( OUString() ) ) );
// rList.push_back( new WrappedIgnoreProperty( "FillHatch", uno::makeAny( drawing::Hatch() ) ) );
rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::makeAny( sal_Bool(sal_False) ) ) );
}
void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
{
-// rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( ::rtl::OUString() ) ) );
+// rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::makeAny( OUString() ) ) );
// rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::makeAny( uno::Reference< awt::XBitmap > (0) ) ) );
-// rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( ::rtl::OUString() ) ) );
+// rList.push_back( new WrappedIgnoreProperty( "FillBitmapURL", uno::makeAny( OUString() ) ) );
rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetX", uno::makeAny( sal_Int16(0) ) ) );
rList.push_back( new WrappedIgnoreProperty( "FillBitmapOffsetY", uno::makeAny( sal_Int16(0) ) ) );
rList.push_back( new WrappedIgnoreProperty( "FillBitmapPositionOffsetX", uno::makeAny( sal_Int16(0) ) ) );
diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx
index c4156a4efff7..dd4d6e93a5ec 100644
--- a/chart2/source/tools/WrappedProperty.cxx
+++ b/chart2/source/tools/WrappedProperty.cxx
@@ -25,7 +25,6 @@
using namespace ::com::sun::star;
using ::com::sun::star::uno::Any;
using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
//.............................................................................
@@ -47,7 +46,7 @@ const OUString& WrappedProperty::getOuterName() const
return m_aOuterName;
}
-::rtl::OUString WrappedProperty::getInnerName() const
+OUString WrappedProperty::getInnerName() const
{
return m_aInnerName;
}
@@ -108,7 +107,7 @@ beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::
throw (beans::UnknownPropertyException, uno::RuntimeException)
{
beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE;
- rtl::OUString aInnerName( this->getInnerName() );
+ OUString aInnerName( this->getInnerName() );
if( xInnerPropertyState.is() && !aInnerName.isEmpty() )
aState = xInnerPropertyState->getPropertyState( aInnerName );
else
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 5b82509d70d1..07a0cdfc6147 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -33,7 +33,6 @@ using namespace ::com::sun::star;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using ::rtl::OUString;
WrappedPropertySet::WrappedPropertySet()
: MutexContainer()
@@ -248,7 +247,7 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >&
sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<nMinCount; nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
try
{
this->setPropertyValue( aPropertyName, rValueSeq[nN] );
@@ -276,7 +275,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence<
{
try
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
aRetSeq[nN] = this->getPropertyValue( aPropertyName );
}
catch( const beans::UnknownPropertyException& ex )
@@ -328,7 +327,7 @@ beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUStri
return aState;
}
-const WrappedProperty* WrappedPropertySet::getWrappedProperty( const ::rtl::OUString& rOuterName )
+const WrappedProperty* WrappedPropertySet::getWrappedProperty( const OUString& rOuterName )
{
sal_Int32 nHandle = getInfoHelper().getHandleByName( rOuterName );
return getWrappedProperty( nHandle );
@@ -351,7 +350,7 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates(
aRetSeq.realloc( rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
aRetSeq[nN] = this->getPropertyState( aPropertyName );
}
}
@@ -394,7 +393,7 @@ void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( )
const Sequence< beans::Property >& rPropSeq = getPropertySequence();
for(sal_Int32 nN=0; nN<rPropSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rPropSeq[nN].Name );
+ OUString aPropertyName( rPropSeq[nN].Name );
this->setPropertyToDefault( aPropertyName );
}
}
@@ -403,7 +402,7 @@ void SAL_CALL WrappedPropertySet::setPropertiesToDefault( const Sequence< OUStri
{
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
this->setPropertyToDefault( aPropertyName );
}
}
@@ -416,7 +415,7 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence
aRetSeq.realloc( rNameSeq.getLength() );
for(sal_Int32 nN=0; nN<rNameSeq.getLength(); nN++)
{
- ::rtl::OUString aPropertyName( rNameSeq[nN] );
+ OUString aPropertyName( rNameSeq[nN] );
aRetSeq[nN] = this->getPropertyDefault( aPropertyName );
}
}
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index 77b79820d552..387bfd0fa4c1 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -25,8 +25,6 @@
#include <algorithm>
#include <functional>
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
// ================================================================================
@@ -39,7 +37,7 @@ namespace
class lcl_Escape : public ::std::unary_function< sal_Unicode, void >
{
public:
- lcl_Escape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
+ lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
void operator() ( sal_Unicode aChar )
{
static const sal_Unicode m_aQuote( '\'' );
@@ -52,7 +50,7 @@ public:
}
private:
- ::rtl::OUStringBuffer & m_aResultBuffer;
+ OUStringBuffer & m_aResultBuffer;
};
// ----------------------------------------
@@ -64,7 +62,7 @@ private:
class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void >
{
public:
- lcl_UnEscape( ::rtl::OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
+ lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
void operator() ( sal_Unicode aChar )
{
static const sal_Unicode m_aBackslash( '\\' );
@@ -74,12 +72,12 @@ public:
}
private:
- ::rtl::OUStringBuffer & m_aResultBuffer;
+ OUStringBuffer & m_aResultBuffer;
};
// ----------------------------------------
-void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, rtl::OUStringBuffer * output )
+void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, OUStringBuffer * output )
{
OSL_ASSERT(output != 0);
@@ -113,7 +111,7 @@ void lcl_getXMLStringForCell( const ::chart::XMLRangeHelper::Cell & rCell, rtl::
}
void lcl_getSingleCellAddressFromXMLString(
- const ::rtl::OUString& rXMLString,
+ const OUString& rXMLString,
sal_Int32 nStartPos, sal_Int32 nEndPos,
::chart::XMLRangeHelper::Cell & rOutCell )
{
@@ -121,7 +119,7 @@ void lcl_getSingleCellAddressFromXMLString(
static const sal_Unicode aDollar( '$' );
static const sal_Unicode aLetterA( 'A' );
- ::rtl::OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase();
+ OUString aCellStr = rXMLString.copy( nStartPos, nEndPos - nStartPos + 1 ).toAsciiUpperCase();
const sal_Unicode* pStrArray = aCellStr.getStr();
sal_Int32 nLength = aCellStr.getLength();
sal_Int32 i = nLength - 1, nColumn = 0;
@@ -157,10 +155,10 @@ void lcl_getSingleCellAddressFromXMLString(
}
bool lcl_getCellAddressFromXMLString(
- const ::rtl::OUString& rXMLString,
+ const OUString& rXMLString,
sal_Int32 nStartPos, sal_Int32 nEndPos,
::chart::XMLRangeHelper::Cell & rOutCell,
- ::rtl::OUString& rOutTableName )
+ OUString& rOutTableName )
{
static const sal_Unicode aDot( '.' );
static const sal_Unicode aQuote( '\'' );
@@ -191,7 +189,7 @@ bool lcl_getCellAddressFromXMLString(
{
// there is a table name before the address
- ::rtl::OUStringBuffer aTableNameBuffer;
+ OUStringBuffer aTableNameBuffer;
const sal_Unicode * pTableName = rXMLString.getStr();
// remove escapes from table name
@@ -204,7 +202,7 @@ bool lcl_getCellAddressFromXMLString(
if( pBuf[ 0 ] == aQuote &&
pBuf[ aTableNameBuffer.getLength() - 1 ] == aQuote )
{
- ::rtl::OUString aName = aTableNameBuffer.makeStringAndClear();
+ OUString aName = aTableNameBuffer.makeStringAndClear();
rOutTableName = aName.copy( 1, aName.getLength() - 2 );
}
else
@@ -232,7 +230,7 @@ bool lcl_getCellAddressFromXMLString(
}
bool lcl_getCellRangeAddressFromXMLString(
- const ::rtl::OUString& rXMLString,
+ const OUString& rXMLString,
sal_Int32 nStartPos, sal_Int32 nEndPos,
::chart::XMLRangeHelper::CellRange & rOutRange )
{
@@ -275,7 +273,7 @@ bool lcl_getCellRangeAddressFromXMLString(
if( rOutRange.aTableName.isEmpty() )
bResult = false;
- ::rtl::OUString sTableSecondName;
+ OUString sTableSecondName;
if( bResult )
{
bResult = lcl_getCellAddressFromXMLString( rXMLString, nDelimiterPos + 1, nEndPos,
@@ -359,7 +357,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
static const sal_Unicode aSpace( ' ' );
static const sal_Unicode aQuote( '\'' );
- ::rtl::OUStringBuffer aBuffer;
+ OUStringBuffer aBuffer;
if( !(rRange.aTableName).isEmpty())
{
diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx
index 2839c4d51bcf..934a01f85e60 100644
--- a/chart2/source/view/axes/DateScaling.cxx
+++ b/chart2/source/view/axes/DateScaling.cxx
@@ -99,15 +99,15 @@ uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling()
return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted );
}
-::rtl::OUString SAL_CALL DateScaling::getServiceName()
+OUString SAL_CALL DateScaling::getServiceName()
throw (uno::RuntimeException)
{
return lcl_aServiceName_DateScaling;
}
-uno::Sequence< ::rtl::OUString > DateScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > DateScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_DateScaling, 1 );
+ return uno::Sequence< OUString >( & lcl_aServiceName_DateScaling, 1 );
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
@@ -180,15 +180,15 @@ uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling()
return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted );
}
-::rtl::OUString SAL_CALL InverseDateScaling::getServiceName()
+OUString SAL_CALL InverseDateScaling::getServiceName()
throw (uno::RuntimeException)
{
return lcl_aServiceName_InverseDateScaling;
}
-uno::Sequence< ::rtl::OUString > InverseDateScaling::getSupportedServiceNames_Static()
+uno::Sequence< OUString > InverseDateScaling::getSupportedServiceNames_Static()
{
- return uno::Sequence< ::rtl::OUString >( & lcl_aServiceName_InverseDateScaling, 1 );
+ return uno::Sequence< OUString >( & lcl_aServiceName_InverseDateScaling, 1 );
}
// implement XServiceInfo methods basing upon getSupportedServiceNames_Static
diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx
index 67a92bff985d..1ef6b448ca55 100644
--- a/chart2/source/view/axes/DateScaling.hxx
+++ b/chart2/source/view/axes/DateScaling.hxx
@@ -58,7 +58,7 @@ public:
getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
// ____ XServiceName ____
- virtual ::rtl::OUString SAL_CALL getServiceName()
+ virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException);
private:
@@ -90,7 +90,7 @@ public:
getInverseScaling() throw (::com::sun::star::uno::RuntimeException);
// ____ XServiceName ____
- virtual ::rtl::OUString SAL_CALL getServiceName()
+ virtual OUString SAL_CALL getServiceName()
throw (::com::sun::star::uno::RuntimeException);
private:
diff --git a/chart2/source/view/axes/Tickmarks.hxx b/chart2/source/view/axes/Tickmarks.hxx
index 1fd4e42378e7..ae9a15228601 100644
--- a/chart2/source/view/axes/Tickmarks.hxx
+++ b/chart2/source/view/axes/Tickmarks.hxx
@@ -51,7 +51,7 @@ struct TickInfo
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape > xTextShape;
- rtl::OUString aText;//used only for complex categories so far
+ OUString aText;//used only for complex categories so far
sal_Int32 nFactorForLimitedTextWidth;//categories in higher levels of complex categories can have more place than a single simple category
//methods:
diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx
index c2a12a6bcb7a..48b4f6698004 100644
--- a/chart2/source/view/axes/VAxisBase.cxx
+++ b/chart2/source/view/axes/VAxisBase.cxx
@@ -195,7 +195,7 @@ bool VAxisBase::prepareShapeCreation()
return true;
}
-sal_Int32 VAxisBase::getIndexOfLongestLabel( const uno::Sequence< rtl::OUString >& rLabels )
+sal_Int32 VAxisBase::getIndexOfLongestLabel( const uno::Sequence< OUString >& rLabels )
{
sal_Int32 nRet = 0;
sal_Int32 nLength = 0;
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx
index fa609241a785..c037ff5cf67b 100644
--- a/chart2/source/view/axes/VAxisBase.hxx
+++ b/chart2/source/view/axes/VAxisBase.hxx
@@ -66,7 +66,7 @@ public:
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
protected: //methods
- sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< rtl::OUString >& rLabels );
+ sal_Int32 getIndexOfLongestLabel( const ::com::sun::star::uno::Sequence< OUString >& rLabels );
void removeTextShapesFromTicks();
void updateUnscaledValuesAtTicks( TickIter& rIter );
@@ -82,7 +82,7 @@ protected: //member
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xNumberFormatsSupplier;
AxisProperties m_aAxisProperties;
AxisLabelProperties m_aAxisLabelProperties;
- ::com::sun::star::uno::Sequence< rtl::OUString > m_aTextLabels;
+ ::com::sun::star::uno::Sequence< OUString > m_aTextLabels;
bool m_bUseTextLabels;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > m_xGroupShape_Shapes;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index fee4c6b8878c..9d62fac1b35c 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -79,7 +79,7 @@ Reference< drawing::XShape > createSingleLabel(
const Reference< lang::XMultiServiceFactory>& xShapeFactory
, const Reference< drawing::XShapes >& xTarget
, const awt::Point& rAnchorScreenPosition2D
- , const rtl::OUString& rLabel
+ , const OUString& rLabel
, const AxisLabelProperties& rAxisLabelProperties
, const AxisProperties& rAxisProperties
, const tNameSequence& rPropNames
@@ -92,7 +92,7 @@ Reference< drawing::XShape > createSingleLabel(
// #i78696# use mathematically correct rotation now
const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0));
uno::Any aATransformation = ShapeFactory::makeTransformation( rAnchorScreenPosition2D, fRotationAnglePi );
- rtl::OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters );
+ OUString aLabel = ShapeFactory::getStackedString( rLabel, rAxisLabelProperties.bStackCharacters );
Reference< drawing::XShape > xShape2DText = ShapeFactory(xShapeFactory)
.createText( xTarget, aLabel, rPropNames, rPropValues, aATransformation );
@@ -447,11 +447,11 @@ bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed( const AxisLabelProperties&
struct ComplexCategoryPlacement
{
- rtl::OUString Text;
+ OUString Text;
sal_Int32 Count;
double TickValue;
- ComplexCategoryPlacement( const rtl::OUString& rText, sal_Int32 nCount, double fTickValue )
+ ComplexCategoryPlacement( const OUString& rText, sal_Int32 nCount, double fTickValue )
: Text(rText), Count(nCount), TickValue(fTickValue)
{}
};
@@ -629,7 +629,7 @@ bool VCartesianAxis::createTextShapes(
}
}
- uno::Sequence< rtl::OUString >* pCategories = 0;
+ uno::Sequence< OUString >* pCategories = 0;
if( m_bUseTextLabels && !m_aAxisProperties.m_bComplexCategories )
pCategories = &m_aTextLabels;
@@ -712,7 +712,7 @@ bool VCartesianAxis::createTextShapes(
bool bHasExtraColor=false;
sal_Int32 nExtraColor=0;
- rtl::OUString aLabel;
+ OUString aLabel;
if(pCategories)
{
sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0
diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index 031d3cc9571f..c79a1a16b3ad 100644
--- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -43,7 +43,7 @@ class TextualDataProvider : public ::cppu::WeakImplHelper1<
>
{
public:
- TextualDataProvider( const uno::Sequence< ::rtl::OUString >& rTextSequence )
+ TextualDataProvider( const uno::Sequence< OUString >& rTextSequence )
: m_aTextSequence( rTextSequence )
{
}
@@ -52,14 +52,14 @@ public:
}
//XTextualDataSequence
- virtual uno::Sequence< ::rtl::OUString > SAL_CALL getTextualData()
+ virtual uno::Sequence< OUString > SAL_CALL getTextualData()
throw ( uno::RuntimeException)
{
return m_aTextSequence;
}
private: //member
- uno::Sequence< ::rtl::OUString > m_aTextSequence;
+ uno::Sequence< OUString > m_aTextSequence;
};
//.............................................................................
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 90343690ee59..314d8121e4ef 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -56,7 +56,7 @@ VCoordinateSystem* VCoordinateSystem::createCoordinateSystem(
if( !xCooSysModel.is() )
return 0;
- rtl::OUString aViewServiceName = xCooSysModel->getViewServiceName();
+ OUString aViewServiceName = xCooSysModel->getViewServiceName();
//@todo: in future the coordinatesystems should be instanciated via service factory
VCoordinateSystem* pRet=NULL;
@@ -125,7 +125,7 @@ void VCoordinateSystem::initPlottingTargets( const Reference< drawing::XShapes
m_xShapeFactory = xShapeFactory;
}
-void VCoordinateSystem::setParticle( const rtl::OUString& rCooSysParticle )
+void VCoordinateSystem::setParticle( const OUString& rCooSysParticle )
{
m_aCooSysParticle = rCooSysParticle;
}
@@ -325,14 +325,14 @@ ExplicitIncrementData VCoordinateSystem::getExplicitIncrement( sal_Int32 nDimens
return aRet;
}
-rtl::OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
+OUString VCoordinateSystem::createCIDForAxis( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
{
- rtl::OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) );
+ OUString aAxisParticle( ObjectIdentifier::createParticleForAxis( nDimensionIndex, nAxisIndex ) );
return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aAxisParticle );
}
-rtl::OUString VCoordinateSystem::createCIDForGrid( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
+OUString VCoordinateSystem::createCIDForGrid( const Reference< chart2::XAxis >& /* xAxis */, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
{
- rtl::OUString aGridParticle( ObjectIdentifier::createParticleForGrid( nDimensionIndex, nAxisIndex ) );
+ OUString aGridParticle( ObjectIdentifier::createParticleForGrid( nDimensionIndex, nAxisIndex ) );
return ObjectIdentifier::createClassifiedIdentifierForParticles( m_aCooSysParticle, aGridParticle );
}
@@ -574,7 +574,7 @@ bool VCoordinateSystem::needSeriesNamesForAxis() const
{
return ( m_xCooSysModel.is() && m_xCooSysModel->getDimension() == 3 );
}
-void VCoordinateSystem::setSeriesNamesForAxis( const Sequence< rtl::OUString >& rSeriesNames )
+void VCoordinateSystem::setSeriesNamesForAxis( const Sequence< OUString >& rSeriesNames )
{
m_aSeriesNamesForZAxis = rSeriesNames;
}
diff --git a/chart2/source/view/axes/VPolarAngleAxis.cxx b/chart2/source/view/axes/VPolarAngleAxis.cxx
index 8d65bc74f392..981a9b6311d7 100644
--- a/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -78,7 +78,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
if(pColorAny)
*pColorAny >>= nColor;
- const uno::Sequence< rtl::OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0;
+ const uno::Sequence< OUString >* pLabels = m_bUseTextLabels? &m_aTextLabels : 0;
//------------------------------------------------
@@ -107,7 +107,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
bool bHasExtraColor=false;
sal_Int32 nExtraColor=0;
- rtl::OUString aLabel;
+ OUString aLabel;
if(pLabels)
{
sal_Int32 nIndex = static_cast< sal_Int32 >(pTickInfo->getUnscaledTickValue()) - 1; //first category (index 0) matches with real number 1.0
@@ -133,7 +133,7 @@ bool VPolarAngleAxis::createTextShapes_ForAngleAxis(
const double fRotationAnglePi(rAxisLabelProperties.fRotationAngleDegree * (F_PI / -180.0));
uno::Any aATransformation = ShapeFactory::makeTransformation( aAnchorScreenPosition2D, fRotationAnglePi );
- rtl::OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters );
+ OUString aStackedLabel = ShapeFactory::getStackedString( aLabel, rAxisLabelProperties.bStackCharacters );
pTickInfo->xTextShape = aShapeFactory.createText( xTarget, aStackedLabel, aPropNames, aPropValues, aATransformation );
}
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx
index af151e2fede6..67f2dc5715dd 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -73,7 +73,7 @@ void VPolarRadiusAxis::setExplicitScaleAndIncrement(
void VPolarRadiusAxis::initPlotter( const uno::Reference< drawing::XShapes >& xLogicTarget
, const uno::Reference< drawing::XShapes >& xFinalTarget
, const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
- , const rtl::OUString& rCID )
+ , const OUString& rCID )
throw (uno::RuntimeException)
{
VPolarAxis::initPlotter( xLogicTarget, xFinalTarget, xShapeFactory, rCID );
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx
index cf10f167739c..6114a46f3689 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.hxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx
@@ -49,7 +49,7 @@ public:
::com::sun::star::drawing::XShapes >& xFinalTarget
, const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xFactory
- , const rtl::OUString& rCID
+ , const OUString& rCID
) throw (::com::sun::star::uno::RuntimeException );
virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index 03f13b17db62..b4b3940a8b73 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -719,13 +719,13 @@ void AreaChart::createShapes()
//therefore create an own group for the texts and the error bars to move them to front
//(because the text group is created after the series group the texts are displayed on top)
- m_xSeriesTarget = createGroupShape( m_xLogicTarget,rtl::OUString() );
+ m_xSeriesTarget = createGroupShape( m_xLogicTarget,OUString() );
if( m_bArea )
- m_xErrorBarTarget = createGroupShape( m_xLogicTarget,rtl::OUString() );
+ m_xErrorBarTarget = createGroupShape( m_xLogicTarget,OUString() );
else
m_xErrorBarTarget = m_xSeriesTarget;
- m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() );
- m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() );
+ m_xTextTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() );
+ m_xRegressionCurveEquationTarget = m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() );
//---------------------------------------------
//check necessary here that different Y axis can not be stacked in the same group? ... hm?
@@ -979,7 +979,7 @@ void AreaChart::createShapes()
continue;
//create a group shape for this point and add to the series shape:
- rtl::OUString aPointCID = ObjectIdentifier::createPointCID(
+ OUString aPointCID = ObjectIdentifier::createPointCID(
(*aSeriesIter)->getPointCID_Stub(), nIndex );
uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(
createGroupShape(xSeriesGroupShape_Shapes,aPointCID) );
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index c78a495506d3..c8942b6049bb 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -419,16 +419,16 @@ void BarChart::createShapes()
//to achieve this the regression curve target is created after the series target and before the text target
uno::Reference< drawing::XShapes > xSeriesTarget(
- createGroupShape( m_xLogicTarget,rtl::OUString() ));
+ createGroupShape( m_xLogicTarget,OUString() ));
uno::Reference< drawing::XShapes > xRegressionCurveTarget(
- createGroupShape( m_xLogicTarget,rtl::OUString() ));
+ createGroupShape( m_xLogicTarget,OUString() ));
uno::Reference< drawing::XShapes > xTextTarget(
- m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+ m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
//---------------------------------------------
uno::Reference< drawing::XShapes > xRegressionCurveEquationTarget(
- m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+ m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
//check necessary here that different Y axis can not be stacked in the same group? ... hm?
double fLogicZ = 1.0;//as defined
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index 0352621b3ca4..c06ebd5e7bcf 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -207,9 +207,9 @@ void BubbleChart::createShapes()
//therefore create an own group for the texts and the error bars to move them to front
//(because the text group is created after the series group the texts are displayed on top)
uno::Reference< drawing::XShapes > xSeriesTarget(
- createGroupShape( m_xLogicTarget,rtl::OUString() ));
+ createGroupShape( m_xLogicTarget,OUString() ));
uno::Reference< drawing::XShapes > xTextTarget(
- m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+ m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
//update/create information for current group
double fLogicZ = 1.0;//as defined
@@ -311,7 +311,7 @@ void BubbleChart::createShapes()
continue;
//create a group shape for this point and add to the series shape:
- rtl::OUString aPointCID = ObjectIdentifier::createPointCID(
+ OUString aPointCID = ObjectIdentifier::createPointCID(
pSeries->getPointCID_Stub(), nIndex );
uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(
createGroupShape(xSeriesGroupShape_Shapes,aPointCID) );
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 98ad906708e9..1860b39c1874 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -40,7 +40,6 @@ using namespace ::com::sun::star;
using namespace ::rtl::math;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
-using ::rtl::OUString;
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
@@ -106,15 +105,15 @@ void CandleStickChart::createShapes()
//(because the text group is created after the series group the texts are displayed on top)
uno::Reference< drawing::XShapes > xSeriesTarget(
- createGroupShape( m_xLogicTarget,rtl::OUString() ));
+ createGroupShape( m_xLogicTarget,OUString() ));
uno::Reference< drawing::XShapes > xLossTarget(
createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier(
- OBJECTTYPE_DATA_STOCK_LOSS, rtl::OUString() )));
+ OBJECTTYPE_DATA_STOCK_LOSS, OUString() )));
uno::Reference< drawing::XShapes > xGainTarget(
createGroupShape( m_xLogicTarget, ObjectIdentifier::createClassifiedIdentifier(
- OBJECTTYPE_DATA_STOCK_GAIN, rtl::OUString() )));
+ OBJECTTYPE_DATA_STOCK_GAIN, OUString() )));
uno::Reference< drawing::XShapes > xTextTarget(
- m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+ m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
//---------------------------------------------
//check necessary here that different Y axis can not be stacked in the same group? ... hm?
@@ -242,7 +241,7 @@ void CandleStickChart::createShapes()
uno::Reference< beans::XPropertySet > xPointProp( (*aSeriesIter)->getPropertiesOfPoint( nIndex ));
uno::Reference< drawing::XShapes > xPointGroupShape_Shapes(0);
{
- rtl::OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex );
+ OUString aPointCID = ObjectIdentifier::createPointCID( (*aSeriesIter)->getPointCID_Stub(), nIndex );
uno::Reference< drawing::XShapes > xSeriesGroupShape_Shapes( getSeriesGroupShape(*aSeriesIter, xSeriesTarget) );
xPointGroupShape_Shapes = createGroupShape(xSeriesGroupShape_Shapes,aPointCID);
}
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index 80ec134a94d3..06be798a46e1 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -324,9 +324,9 @@ void PieChart::createShapes()
//therefore create an own group for the texts to move them to front
//(because the text group is created after the series group the texts are displayed on top)
uno::Reference< drawing::XShapes > xSeriesTarget(
- createGroupShape( m_xLogicTarget,rtl::OUString() ));
+ createGroupShape( m_xLogicTarget,OUString() ));
uno::Reference< drawing::XShapes > xTextTarget(
- m_pShapeFactory->createGroup2D( m_xFinalTarget,rtl::OUString() ));
+ m_pShapeFactory->createGroup2D( m_xFinalTarget,OUString() ));
//---------------------------------------------
//check necessary here that different Y axis can not be stacked in the same group? ... hm?
@@ -531,7 +531,7 @@ void PieChart::createShapes()
aNewOrigin, m_xLogicTarget, m_pShapeFactory, m_nDimension ) );
//enable draging of piesegments
- rtl::OUString aPointCIDStub( ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT
+ OUString aPointCIDStub( ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT
, pSeries->getSeriesParticle()
, ObjectIdentifier::getPieSegmentDragMethodServiceName()
, ObjectIdentifier::createPieSegmentDragParameterString(
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 884df9a6dcd5..a49fed9edddb 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -79,7 +79,6 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using rtl::OUString;
//-----------------------------------------------------------------------------
@@ -477,8 +476,8 @@ uno::Reference< drawing::XShape > VSeriesPlotter::createDataLabel( const uno::Re
}
//prepare text
- ::rtl::OUStringBuffer aText;
- ::rtl::OUString aSeparator(sal_Unicode(' '));
+ OUStringBuffer aText;
+ OUString aSeparator(sal_Unicode(' '));
double fRotationDegrees = 0.0;
try
{
@@ -1088,7 +1087,7 @@ void VSeriesPlotter::createRegressionCurveEquationShapes(
if( ! (bShowEquation || bShowCorrCoeff))
return;
- ::rtl::OUStringBuffer aFormula;
+ OUStringBuffer aFormula;
sal_Int32 nNumberFormatKey = 0;
xEquationProperties->getPropertyValue( "NumberFormat") >>= nNumberFormatKey;
@@ -1895,11 +1894,11 @@ VDataSeries* VSeriesPlotter::getFirstSeries() const
return 0;
}
-uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const
+uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const
{
- ::std::vector< rtl::OUString > aRetVector;
+ ::std::vector< OUString > aRetVector;
- rtl::OUString aRole;
+ OUString aRole;
if( m_xChartTypeModel.is() )
aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel();
@@ -1919,7 +1918,7 @@ uno::Sequence< rtl::OUString > VSeriesPlotter::getSeriesNames() const
uno::Reference< XDataSeries > xSeries( pSeries ? pSeries->getModel() : 0 );
if( xSeries.is() )
{
- rtl::OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) );
+ OUString aSeriesName( DataSeriesHelper::getDataSeriesLabel( xSeries, aRole ) );
aRetVector.push_back( aSeriesName );
}
}
@@ -2385,7 +2384,7 @@ VSeriesPlotter* VSeriesPlotter::createSeriesPlotter(
, sal_Int32 nDimensionCount
, bool bExcludingPositioning )
{
- rtl::OUString aChartType = xChartTypeModel->getChartType();
+ OUString aChartType = xChartTypeModel->getChartType();
//@todo: in future the plotter should be instanciated via service factory
VSeriesPlotter* pRet=NULL;
diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx
index 4c26350b802f..5b018c5235c8 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -206,7 +206,7 @@ void VDiagram::createShapes_2d()
else
{
//CID for selection handling
- rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+ OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
xProp->setPropertyValue( UNO_NAME_MISC_OBJ_NAME, uno::makeAny( aWallCID ) );
}
}
@@ -499,7 +499,7 @@ void VDiagram::createShapes_3d()
//-------------------------------------------------------------------------
//create additional group to manipulate the aspect ratio of the whole diagram:
- xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, rtl::OUString() );
+ xOuterGroup_Shapes = m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, OUString() );
m_xAspectRatio3D = uno::Reference< beans::XPropertySet >( xOuterGroup_Shapes, uno::UNO_QUERY );
@@ -516,9 +516,9 @@ void VDiagram::createShapes_3d()
if( m_xDiagram.is() )
xWallProp=uno::Reference< beans::XPropertySet >( m_xDiagram->getWall());
- rtl::OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, rtl::OUString() ) );//@todo read CID from model
+ OUString aWallCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_WALL, OUString() ) );//@todo read CID from model
if( !bAddFloorAndWall )
- aWallCID = rtl::OUString();
+ aWallCID = OUString();
uno::Reference< drawing::XShapes > xWallGroup_Shapes( m_pShapeFactory->createGroup3D( xOuterGroup_Shapes, aWallCID ) );
CuboidPlanePosition eLeftWallPos( ThreeDHelper::getAutomaticCuboidPlanePositionForStandardLeftWall( uno::Reference< beans::XPropertySet >( m_xDiagram, uno::UNO_QUERY ) ) );
@@ -657,7 +657,7 @@ void VDiagram::createShapes_3d()
}
else
{
- rtl::OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, rtl::OUString() ) );//@todo read CID from model
+ OUString aFloorCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM_FLOOR, OUString() ) );//@todo read CID from model
ShapeFactory::setShapeName( xShape, aFloorCID );
}
}
diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index 25d0989420da..cb04561deac1 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -53,7 +53,7 @@ public:
::com::sun::star::drawing::XShapes >& xFinalTarget
, const ::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory >& xFactory
- , const rtl::OUString& rCID
+ , const OUString& rCID
) throw (::com::sun::star::uno::RuntimeException );
virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
@@ -72,7 +72,7 @@ protected: //methods
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
createGroupShape( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& xTarget
- , ::rtl::OUString rName=::rtl::OUString() );
+ , OUString rName=OUString() );
protected: //member
::com::sun::star::uno::Reference<
@@ -82,7 +82,7 @@ protected: //member
::com::sun::star::uno::Reference<
::com::sun::star::lang::XMultiServiceFactory> m_xShapeFactory;
ShapeFactory* m_pShapeFactory;
- rtl::OUString m_aCID;
+ OUString m_aCID;
sal_Int32 m_nDimension;
// needs to be created and deleted by the derived class
diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx
index 60982bc98004..04159ed9b588 100644
--- a/chart2/source/view/inc/PropertyMapper.hxx
+++ b/chart2/source/view/inc/PropertyMapper.hxx
@@ -32,14 +32,14 @@ namespace chart
/**
*/
-typedef ::std::map< ::rtl::OUString, ::rtl::OUString > tPropertyNameMap;
-typedef ::comphelper::MakeMap< ::rtl::OUString, ::rtl::OUString > tMakePropertyNameMap;
+typedef ::std::map< OUString, OUString > tPropertyNameMap;
+typedef ::comphelper::MakeMap< OUString, OUString > tMakePropertyNameMap;
-typedef ::std::map< ::rtl::OUString, ::com::sun::star::uno::Any > tPropertyNameValueMap;
-typedef ::comphelper::MakeMap< ::rtl::OUString, ::com::sun::star::uno::Any > tMakePropertyNameValueMap;
+typedef ::std::map< OUString, ::com::sun::star::uno::Any > tPropertyNameValueMap;
+typedef ::comphelper::MakeMap< OUString, ::com::sun::star::uno::Any > tMakePropertyNameValueMap;
-typedef ::com::sun::star::uno::Sequence< rtl::OUString > tNameSequence;
-typedef ::comphelper::MakeSequence< rtl::OUString > tMakeNameSequence;
+typedef ::com::sun::star::uno::Sequence< OUString > tNameSequence;
+typedef ::comphelper::MakeSequence< OUString > tMakeNameSequence;
typedef ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > tAnySequence;
typedef ::comphelper::MakeSequence< ::com::sun::star::uno::Any > tMakeAnySequence;
@@ -78,7 +78,7 @@ public:
static ::com::sun::star::uno::Any*
getValuePointer( tAnySequence& rPropValues
, const tNameSequence& rPropNames
- , const rtl::OUString& rPropName );
+ , const OUString& rPropName );
static ::com::sun::star::uno::Any*
getValuePointerForLimitedSpace( tAnySequence& rPropValues
diff --git a/chart2/source/view/inc/ShapeFactory.hxx b/chart2/source/view/inc/ShapeFactory.hxx
index 7401edd09b2c..83ee1a89ca45 100644
--- a/chart2/source/view/inc/ShapeFactory.hxx
+++ b/chart2/source/view/inc/ShapeFactory.hxx
@@ -49,14 +49,14 @@ public:
createGroup2D(
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& xTarget
- , ::rtl::OUString aName = ::rtl::OUString() );
+ , OUString aName = OUString() );
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
createGroup3D(
const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShapes >& xTarget
- , ::rtl::OUString aName = ::rtl::OUString() );
+ , OUString aName = OUString() );
//------
@@ -163,7 +163,7 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
createText( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& xTarget2D
- , const ::rtl::OUString& rText
+ , const OUString& rText
, const tNameSequence& rPropNames
, const tAnySequence& rPropValues
, const ::com::sun::star::uno::Any& rATransformation
@@ -189,14 +189,14 @@ public:
static void setShapeName( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape
- , const rtl::OUString& rName );
+ , const OUString& rName );
- static rtl::OUString getShapeName( const ::com::sun::star::uno::Reference<
+ static OUString getShapeName( const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape >& xShape );
static ::com::sun::star::uno::Any makeTransformation( const ::com::sun::star::awt::Point& rScreenPosition2D, double fRotationAnglePi=0.0 );
- static rtl::OUString getStackedString( const rtl::OUString& rString, bool bStacked=true );
+ static OUString getStackedString( const OUString& rString, bool bStacked=true );
static bool hasPolygonAnyLines( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly );
static bool isPolygonEmptyOrSinglePoint( ::com::sun::star::drawing::PolyPolygonShape3D& rPoly );
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index b6c199d66947..6c33b3719015 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -66,7 +66,7 @@ public:
::com::sun::star::drawing::XShapes >& xLogicTargetForSeriesBehindAxis )
throw (::com::sun::star::uno::RuntimeException);
- void setParticle( const rtl::OUString& rCooSysParticle );
+ void setParticle( const OUString& rCooSysParticle );
virtual void setTransformationSceneToScreen( const ::com::sun::star::drawing::HomogenMatrix& rMatrix );
::com::sun::star::drawing::HomogenMatrix getTransformationSceneToScreen();
@@ -122,7 +122,7 @@ public:
sal_Int32 getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) const;
virtual bool needSeriesNamesForAxis() const;
- void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< rtl::OUString >& rSeriesNames );
+ void setSeriesNamesForAxis( const ::com::sun::star::uno::Sequence< OUString >& rSeriesNames );
protected: //methods
VCoordinateSystem( const ::com::sun::star::uno::Reference<
@@ -135,10 +135,10 @@ protected: //methods
VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
- rtl::OUString createCIDForAxis( const ::com::sun::star::uno::Reference<
+ OUString createCIDForAxis( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAxis >& xAxis
, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
- rtl::OUString createCIDForGrid( const ::com::sun::star::uno::Reference<
+ OUString createCIDForGrid( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XAxis >& xAxis
, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
@@ -155,7 +155,7 @@ protected: //member
::com::sun::star::uno::Reference<
::com::sun::star::chart2::XCoordinateSystem > m_xCooSysModel;
- rtl::OUString m_aCooSysParticle;
+ OUString m_aCooSysParticle;
typedef std::pair< sal_Int32, sal_Int32 > tFullAxisIndex; //first index is the dimension, second index is the axis index that indicates whether this is a main or secondary axis
@@ -177,7 +177,7 @@ protected: //member
//
MergedMinimumAndMaximumSupplier m_aMergedMinimumAndMaximumSupplier; //this is used only for autoscaling purpose
- ::com::sun::star::uno::Sequence< rtl::OUString > m_aSeriesNamesForZAxis;
+ ::com::sun::star::uno::Sequence< OUString > m_aSeriesNamesForZAxis;
typedef std::map< tFullAxisIndex, ::boost::shared_ptr< VAxisBase > > tVAxisMap;
diff --git a/chart2/source/view/inc/VDataSeries.hxx b/chart2/source/view/inc/VDataSeries.hxx
index 56aff51b4371..38c7929bc3e7 100644
--- a/chart2/source/view/inc/VDataSeries.hxx
+++ b/chart2/source/view/inc/VDataSeries.hxx
@@ -73,7 +73,7 @@ public:
::com::sun::star::chart2::data::XDataSequence >& xValues );
void setXValuesIfNone( const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::data::XDataSequence >& xValues );
- void setParticle( const rtl::OUString& rSeriesParticle );
+ void setParticle( const OUString& rSeriesParticle );
void setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex );
void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
@@ -137,7 +137,7 @@ public:
void setStartingAngle( sal_Int32 nStartingAngle );
sal_Int32 getStartingAngle() const;
- void setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole );
+ void setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole );
//this is only temporarily here for area chart:
::com::sun::star::drawing::PolyPolygonShape3D m_aPolyPolygonShape3D;
@@ -148,19 +148,19 @@ public:
//this is here for deep stacking:
double m_fLogicZPos;//from 0 to series count -1
- rtl::OUString getCID() const;
- rtl::OUString getSeriesParticle() const;
- rtl::OUString getPointCID_Stub() const;
- rtl::OUString getErrorBarsCID( bool bYError ) const;
- rtl::OUString getLabelsCID() const;
- rtl::OUString getLabelCID_Stub() const;
- rtl::OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const;
+ OUString getCID() const;
+ OUString getSeriesParticle() const;
+ OUString getPointCID_Stub() const;
+ OUString getErrorBarsCID( bool bYError ) const;
+ OUString getLabelsCID() const;
+ OUString getLabelCID_Stub() const;
+ OUString getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const;
::com::sun::star::chart2::DataPointLabel*
getDataPointLabelIfLabel( sal_Int32 index ) const;
bool getTextLabelMultiPropertyLists( sal_Int32 index, tNameSequence*& pPropNames, tAnySequence*& pPropValues ) const;
- rtl::OUString getDataCurveEquationCID( sal_Int32 nCurveIndex ) const;
+ OUString getDataCurveEquationCID( sal_Int32 nCurveIndex ) const;
bool isAttributedDataPoint( sal_Int32 index ) const;
bool isVaryColorsByPoint() const;
@@ -224,10 +224,10 @@ private: //member
sal_Int32 m_nStartingAngle;
- rtl::OUString m_aSeriesParticle;
- rtl::OUString m_aCID;
- rtl::OUString m_aPointCID_Stub;
- rtl::OUString m_aLabelCID_Stub;
+ OUString m_aSeriesParticle;
+ OUString m_aCID;
+ OUString m_aPointCID_Stub;
+ OUString m_aLabelCID_Stub;
sal_Int32 m_nGlobalSeriesIndex;
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index c3bba76ad5aa..ce6596aa0f63 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -251,7 +251,7 @@ public:
void setExplicitCategoriesProvider( ExplicitCategoriesProvider* pExplicitCategoriesProvider );
//get series names for the z axis labels
- ::com::sun::star::uno::Sequence< rtl::OUString > getSeriesNames() const;
+ ::com::sun::star::uno::Sequence< OUString > getSeriesNames() const;
void setPageReferenceSize( const ::com::sun::star::awt::Size & rPageRefSize );
//better performance for big data
@@ -317,7 +317,7 @@ protected:
, LabelAlignment eAlignment=LABEL_ALIGN_CENTER
, sal_Int32 nOffset=0 );
- ::rtl::OUString getLabelTextForValue( VDataSeries& rDataSeries
+ OUString getLabelTextForValue( VDataSeries& rDataSeries
, sal_Int32 nPointIndex
, double fValue
, bool bAsPercentage );
@@ -370,7 +370,7 @@ protected:
::com::sun::star::drawing::XShapes >& xEquationTarget
, bool bMaySkipPointsInRegressionCalculation );
- virtual void createRegressionCurveEquationShapes( const ::rtl::OUString & rEquationCID
+ virtual void createRegressionCurveEquationShapes( const OUString & rEquationCID
, const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & xEquationProperties
, const ::com::sun::star::uno::Reference<
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 0a55a7ff2c82..620558b06357 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -116,7 +116,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
-using rtl::OUString;
namespace
{
@@ -366,10 +365,10 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla
APPHELPER_XSERVICEINFO_IMPL(ChartView,CHART_VIEW_SERVICE_IMPLEMENTATION_NAME)
- uno::Sequence< rtl::OUString > ChartView
+ uno::Sequence< OUString > ChartView
::getSupportedServiceNames_Static()
{
- uno::Sequence< rtl::OUString > aSNS( 1 );
+ uno::Sequence< OUString > aSNS( 1 );
aSNS.getArray()[ 0 ] = CHART_VIEW_SERVICE_NAME;
return aSNS;
}
@@ -410,7 +409,7 @@ VCoordinateSystem* addCooSysToList( std::vector< VCoordinateSystem* >& rVCooSysL
pVCooSys = VCoordinateSystem::createCoordinateSystem(xCooSys );
if(pVCooSys)
{
- rtl::OUString aCooSysParticle( ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel ) );
+ OUString aCooSysParticle( ObjectIdentifier::createParticleForCoordinateSystem( xCooSys, xChartModel ) );
pVCooSys->setParticle(aCooSysParticle);
pVCooSys->setExplicitCategoriesProvider( new ExplicitCategoriesProvider(xCooSys,xChartModel) );
@@ -726,7 +725,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
pSeries->setMissingValueTreatment( nMissingValueTreatment );
- rtl::OUString aSeriesParticle( ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCS, nT, nS ) );
+ OUString aSeriesParticle( ObjectIdentifier::createParticleForSeries( nDiagramIndex, nCS, nT, nS ) );
pSeries->setParticle(aSeriesParticle);
OUString aRole( ChartTypeHelper::getRoleOfSequenceForDataLabelNumberFormatDetection( xChartType ) );
@@ -769,7 +768,7 @@ void SeriesPlotterContainer::initializeCooSysAndSeriesPlotter(
//transport seriesnames to the coordinatesystems if needed
if( !m_aSeriesPlotterList.empty() )
{
- uno::Sequence< rtl::OUString > aSeriesNames;
+ uno::Sequence< OUString > aSeriesNames;
bool bSeriesNamesInitialized = false;
for( size_t nC=0; nC < m_rVCooSysList.size(); nC++)
{
@@ -1224,7 +1223,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod
uno::Reference< container::XNameAccess > xPageStyles( xStylesFamilies->getByName( "PageStyles" ), uno::UNO_QUERY );
if( xPageStyles.is() )
{
- rtl::OUString aPageStyle;
+ OUString aPageStyle;
uno::Reference< text::XTextDocument > xTextDocument( xParentProps, uno::UNO_QUERY );
if( xTextDocument.is() )
@@ -1238,7 +1237,7 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod
uno::Reference< container::XNameAccess > xEmbeddedObjects( xTextEmbeddedObjectsSupplier->getEmbeddedObjects() );
if( xEmbeddedObjects.is() )
{
- uno::Sequence< rtl::OUString > aNames( xEmbeddedObjects->getElementNames() );
+ uno::Sequence< OUString > aNames( xEmbeddedObjects->getElementNames() );
sal_Int32 nCount = aNames.getLength();
for( sal_Int32 nN=0; nN<nCount; nN++ )
@@ -1246,8 +1245,8 @@ void lcl_setDefaultWritingMode( ::boost::shared_ptr< DrawModelWrapper > pDrawMod
uno::Reference< beans::XPropertySet > xEmbeddedProps( xEmbeddedObjects->getByName( aNames[nN] ), uno::UNO_QUERY );
if( xEmbeddedProps.is() )
{
- static rtl::OUString aChartCLSID = rtl::OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName());
- rtl::OUString aCLSID;
+ static OUString aChartCLSID = OUString( SvGlobalName( SO3_SCH_CLASSID ).GetHexName());
+ OUString aCLSID;
xEmbeddedProps->getPropertyValue( "CLSID" ) >>= aCLSID;
if( aCLSID.equals(aChartCLSID) )
{
@@ -1500,7 +1499,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
{
//------------ set transformation to plotter / create series
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
- rtl::OUString aCID; //III
+ OUString aCID; //III
uno::Reference< drawing::XShapes > xSeriesTarget(0);
if( pSeriesPlotter->WantToPlotInFrontOfAxisLine() )
xSeriesTarget = xSeriesTargetInFrontOfAxis;
@@ -1701,7 +1700,7 @@ SdrPage* ChartView::getSdrPage()
return pPage;
}
-uno::Reference< drawing::XShape > ChartView::getShapeForCID( const rtl::OUString& rObjectCID )
+uno::Reference< drawing::XShape > ChartView::getShapeForCID( const OUString& rObjectCID )
{
SolarMutexGuard aSolarGuard;
SdrObject* pObj = DrawModelWrapper::getNamedSdrObject( rObjectCID, this->getSdrPage() );
@@ -1716,7 +1715,7 @@ awt::Rectangle ChartView::getDiagramRectangleExcludingAxes()
return m_aResultingDiagramRectangleExcludingAxes;
}
-awt::Rectangle ChartView::getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect )
+awt::Rectangle ChartView::getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect )
{
impl_updateView();
@@ -1828,7 +1827,7 @@ sal_Int32 ExplicitValueProvider::getExplicitNumberFormatKeyForDataLabel(
if( !xSeriesOrPointProp.is() )
return nFormat;
- rtl::OUString aPropName( "NumberFormat" );
+ OUString aPropName( "NumberFormat" );
if( !(xSeriesOrPointProp->getPropertyValue(aPropName) >>= nFormat) )
{
uno::Reference< chart2::XChartType > xChartType( DataSeriesHelper::getChartTypeOfSeries( xSeries, xDiagram ) );
@@ -1907,28 +1906,28 @@ awt::Rectangle ExplicitValueProvider::addAxisTitleSizes(
if( xTitle_Height.is() )
{
- rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) );
+ OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) );
nTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
if( nTitleSpaceHeight )
nTitleSpaceHeight+=lcl_getDiagramTitleSpace();
}
if( xTitle_Width.is() )
{
- rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) );
+ OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) );
nTitleSpaceWidth = pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
if(nTitleSpaceWidth)
nTitleSpaceWidth+=lcl_getDiagramTitleSpace();
}
if( xSecondTitle_Height.is() )
{
- rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) );
+ OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) );
nSecondTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
if( nSecondTitleSpaceHeight )
nSecondTitleSpaceHeight+=lcl_getDiagramTitleSpace();
}
if( xSecondTitle_Width.is() )
{
- rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) );
+ OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) );
nSecondTitleSpaceWidth += pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
if( nSecondTitleSpaceWidth )
nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace();
@@ -1974,28 +1973,28 @@ awt::Rectangle ExplicitValueProvider::substractAxisTitleSizes(
if( xTitle_Height.is() )
{
- rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) );
+ OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Height, xChartModel ) );
nTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
if( nTitleSpaceHeight )
nTitleSpaceHeight+=lcl_getDiagramTitleSpace();
}
if( xTitle_Width.is() )
{
- rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) );
+ OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle_Width, xChartModel ) );
nTitleSpaceWidth = pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
if(nTitleSpaceWidth)
nTitleSpaceWidth+=lcl_getDiagramTitleSpace();
}
if( xSecondTitle_Height.is() )
{
- rtl::OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) );
+ OUString aCID_X( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Height, xChartModel ) );
nSecondTitleSpaceHeight = pExplicitValueProvider->getRectangleOfObject( aCID_X, true ).Height;
if( nSecondTitleSpaceHeight )
nSecondTitleSpaceHeight+=lcl_getDiagramTitleSpace();
}
if( xSecondTitle_Width.is() )
{
- rtl::OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) );
+ OUString aCID_Y( ObjectIdentifier::createClassifiedIdentifierForObject( xSecondTitle_Width, xChartModel ) );
nSecondTitleSpaceWidth += pExplicitValueProvider->getRectangleOfObject( aCID_Y, true ).Width;
if( nSecondTitleSpaceWidth )
nSecondTitleSpaceWidth+=lcl_getDiagramTitleSpace();
@@ -2169,12 +2168,12 @@ boost::shared_ptr<VTitle> lcl_createTitle( TitleHelper::eTitleType eType
}
uno::Reference< XTitle > xTitle( TitleHelper::getTitle( eType, xChartModel ) );
- rtl::OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) );
+ OUString aCompleteString( TitleHelper::getCompleteString( xTitle ) );
if( !aCompleteString.isEmpty() )
{
//create title
apVTitle.reset(new VTitle(xTitle));
- rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ) );
+ OUString aCID( ObjectIdentifier::createClassifiedIdentifierForObject( xTitle, xChartModel ) );
apVTitle->init(xPageShapes,xShapeFactory,aCID);
apVTitle->createShapes( awt::Point(0,0), rPageSize );
awt::Size aTitleUnrotatedSize = apVTitle->getUnrotatedSize();
@@ -2349,8 +2348,8 @@ void formatPage(
tPropertyNameValueMap aNameValueMap;
PropertyMapper::getValueMap( aNameValueMap, PropertyMapper::getPropertyNameMapForFillAndLineProperties(), xModelPage );
- rtl::OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, rtl::OUString() ) );
- aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID rtl::OUString
+ OUString aCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_PAGE, OUString() ) );
+ aNameValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( aCID ) ) ); //CID OUString
tNameSequence aNames;
tAnySequence aValues;
@@ -2473,7 +2472,7 @@ void ChartView::createShapes()
//create the group shape for diagram and axes first to have title and legends on top of it
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartModel ) );
- rtl::OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, rtl::OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible
+ OUString aDiagramCID( ObjectIdentifier::createClassifiedIdentifier( OBJECTTYPE_DIAGRAM, OUString::valueOf( sal_Int32(0) ) ) );//todo: other index if more than one diagram is possible
uno::Reference< drawing::XShapes > xDiagramPlusAxesPlusMarkHandlesGroup_Shapes( ShapeFactory(m_xShapeFactory).createGroup2D(xPageShapes,aDiagramCID) );
uno::Reference< drawing::XShape > xDiagram_MarkHandles( ShapeFactory(m_xShapeFactory).createInvisibleRectangle(
@@ -2713,7 +2712,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
uno::Reference< view::XSelectionSupplier > xSelectionSupplier( m_xChartModel->getCurrentController(), uno::UNO_QUERY );
if ( xSelectionSupplier.is() )
{
- ::rtl::OUString aSelObjCID;
+ OUString aSelObjCID;
uno::Any aSelObj( xSelectionSupplier->getSelection() );
aSelObj >>= aSelObjCID;
if ( !aSelObjCID.isEmpty() )
@@ -2764,7 +2763,7 @@ void ChartView::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
xModifiable->setModified( sal_True );
}
-void ChartView::impl_notifyModeChangeListener( const rtl::OUString& rNewMode )
+void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode )
{
try
{
@@ -2835,7 +2834,7 @@ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo()
return 0;
}
-void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName
+void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName
, const Any& rValue )
throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException
, lang::WrappedTargetException, uno::RuntimeException)
@@ -2890,7 +2889,7 @@ void SAL_CALL ChartView::setPropertyValue( const ::rtl::OUString& rPropertyName
throw beans::UnknownPropertyException( "unknown property was tried to set to chart wizard", 0 );
}
-Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName )
+Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
Any aRet;
@@ -2904,25 +2903,25 @@ Any SAL_CALL ChartView::getPropertyValue( const ::rtl::OUString& rPropertyName )
}
void SAL_CALL ChartView::addPropertyChangeListener(
- const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ )
+ const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
void SAL_CALL ChartView::removePropertyChangeListener(
- const ::rtl::OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ )
+ const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL ChartView::addVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
+void SAL_CALL ChartView::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL("not implemented");
}
-void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
+void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ )
throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
{
OSL_FAIL("not implemented");
@@ -2930,7 +2929,7 @@ void SAL_CALL ChartView::removeVetoableChangeListener( const ::rtl::OUString& /*
// ____ XMultiServiceFactory ____
-Reference< uno::XInterface > ChartView::createInstance( const ::rtl::OUString& aServiceSpecifier )
+Reference< uno::XInterface > ChartView::createInstance( const OUString& aServiceSpecifier )
throw (uno::Exception, uno::RuntimeException)
{
SdrModel* pModel = ( m_pDrawModelWrapper ? &m_pDrawModelWrapper->getSdrModel() : NULL );
@@ -2989,7 +2988,7 @@ Reference< uno::XInterface > ChartView::createInstance( const ::rtl::OUString& a
return 0;
}
-Reference< uno::XInterface > ChartView::createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments )
+Reference< uno::XInterface > ChartView::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments )
throw (uno::Exception, uno::RuntimeException)
{
OSL_ENSURE( Arguments.getLength(), "ChartView::createInstanceWithArguments: arguments are ignored" );
@@ -2997,9 +2996,9 @@ Reference< uno::XInterface > ChartView::createInstanceWithArguments( const ::rtl
return createInstance( ServiceSpecifier );
}
-uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException)
+uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aServiceNames( 6 );
+ uno::Sequence< OUString > aServiceNames( 6 );
aServiceNames[0] = "com.sun.star.drawing.DashTable";
aServiceNames[1] = "com.sun.star.drawing.GradientTable";
@@ -3011,14 +3010,14 @@ uno::Sequence< ::rtl::OUString > ChartView::getAvailableServiceNames() throw (un
return aServiceNames;
}
-rtl::OUString ChartView::dump() throw (uno::RuntimeException)
+OUString ChartView::dump() throw (uno::RuntimeException)
{
impl_updateView();
uno::Reference<drawing::XShapes> xPageShapes( ShapeFactory(m_xShapeFactory)
.getOrCreateChartRootShape( m_xDrawPage ) );
if (!xPageShapes.is())
- return rtl::OUString();
+ return OUString();
else
{
XShapeDumper dumper;
diff --git a/chart2/source/view/main/ChartView.hxx b/chart2/source/view/main/ChartView.hxx
index 5b58d5d3c746..a6e9e916807c 100644
--- a/chart2/source/view/main/ChartView.hxx
+++ b/chart2/source/view/main/ChartView.hxx
@@ -94,9 +94,9 @@ public:
, ExplicitScaleData& rExplicitScale
, ExplicitIncrementData& rExplicitIncrement );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
- getShapeForCID( const rtl::OUString& rObjectCID );
+ getShapeForCID( const OUString& rObjectCID );
- virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const rtl::OUString& rObjectCID, bool bSnapRect=false );
+ virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false );
virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes();
@@ -147,22 +147,22 @@ public:
// ::com::sun::star::beans::XPropertySet
//-----------------------------------------------------------------
virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
- virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
+ virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
//-----------------------------------------------------------------
// ::com::sun::star::lang::XMultiServiceFactory
//-----------------------------------------------------------------
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const ::rtl::OUString& aServiceSpecifier )
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments(
- const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
+ const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException);
// for ExplicitValueProvider
// ____ XUnoTunnel ___
@@ -170,7 +170,7 @@ public:
throw (::com::sun::star::uno::RuntimeException);
// XDumper
- virtual rtl::OUString SAL_CALL dump()
+ virtual OUString SAL_CALL dump()
throw(::com::sun::star::uno::RuntimeException);
private: //methods
@@ -183,7 +183,7 @@ private: //methods
void impl_setChartModel( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xChartModel );
void impl_deleteCoordinateSystems();
- void impl_notifyModeChangeListener( const rtl::OUString& rNewMode );
+ void impl_notifyModeChangeListener( const OUString& rNewMode );
void impl_refreshAddIn();
bool impl_AddInDrawsAllByItself();
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index ff2a6c8e56ea..2a2bc1838db1 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -353,7 +353,7 @@ XBitmapListRef DrawModelWrapper::GetBitmapList() const
return this->SdrModel::GetBitmapList();
}
-SdrObject* DrawModelWrapper::getNamedSdrObject( const rtl::OUString& rName )
+SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName )
{
if( rName.isEmpty() )
return 0;
diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx
index 709f22fd4b76..0067632842b8 100644
--- a/chart2/source/view/main/PlotterBase.cxx
+++ b/chart2/source/view/main/PlotterBase.cxx
@@ -48,7 +48,7 @@ PlotterBase::PlotterBase( sal_Int32 nDimensionCount )
void PlotterBase::initPlotter( const uno::Reference< drawing::XShapes >& xLogicTarget
, const uno::Reference< drawing::XShapes >& xFinalTarget
, const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory
- , const rtl::OUString& rCID )
+ , const OUString& rCID )
throw (uno::RuntimeException)
{
OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters");
@@ -82,7 +82,7 @@ void PlotterBase::setTransformationSceneToScreen( const drawing::HomogenMatrix&
uno::Reference< drawing::XShapes > PlotterBase::createGroupShape(
const uno::Reference< drawing::XShapes >& xTarget
- , ::rtl::OUString rName )
+ , OUString rName )
{
if(!m_xShapeFactory.is())
return NULL;
diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx
index 08bc546fe16d..811a7de04a2d 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -84,8 +84,8 @@ void PropertyMapper::getValueMap(
for( ; aIt != aEnd; ++aIt )
{
- rtl::OUString aTarget = aIt->first;
- rtl::OUString aSource = aIt->second;
+ OUString aTarget = aIt->first;
+ OUString aSource = aIt->second;
try
{
uno::Any aAny( xSourceProp->getPropertyValue(aSource) );
@@ -143,7 +143,7 @@ void PropertyMapper::getMultiPropertyListsFromValueMap(
uno::Any* PropertyMapper::getValuePointer( tAnySequence& rPropValues
, const tNameSequence& rPropNames
- , const rtl::OUString& rPropName )
+ , const OUString& rPropName )
{
sal_Int32 nCount = rPropNames.getLength();
for( sal_Int32 nN = 0; nN < nCount; nN++ )
@@ -373,7 +373,7 @@ void PropertyMapper::setMultiProperties(
try
{
sal_Int32 nCount = std::max( rNames.getLength(), rValues.getLength() );
- rtl::OUString aPropName;
+ OUString aPropName;
uno::Any aValue;
for( sal_Int32 nN = 0; nN < nCount; nN++ )
{
@@ -416,7 +416,7 @@ void PropertyMapper::getTextLabelMultiPropertyLists(
aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowHeight", uno::makeAny(sal_True) ) ); // sal_Bool
aValueMap.insert( tPropertyNameValueMap::value_type( "TextAutoGrowWidth", uno::makeAny(sal_True) ) ); // sal_Bool
if( bName )
- aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( rtl::OUString() ) ) ); //CID rtl::OUString - needs to be overwritten for each point
+ aValueMap.insert( tPropertyNameValueMap::value_type( "Name", uno::makeAny( OUString() ) ) ); //CID OUString - needs to be overwritten for each point
if( nLimitedSpace > 0 )
{
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index e83445fe8e58..5ce6f7290597 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -67,7 +67,7 @@ namespace chart
//-----------------------------------------------------------------------------
void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape
- , const rtl::OUString& rName )
+ , const OUString& rName )
{
if(!xShape.is())
return;
@@ -89,9 +89,9 @@ void ShapeFactory::setShapeName( const uno::Reference< drawing::XShape >& xShape
//-----------------------------------------------------------------------------
-rtl::OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape )
+OUString ShapeFactory::getShapeName( const uno::Reference< drawing::XShape >& xShape )
{
- rtl::OUString aRet;
+ OUString aRet;
uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY );
OSL_ENSURE(xProp.is(), "shape offers no XPropertySet");
@@ -540,7 +540,7 @@ uno::Reference<drawing::XShape>
if( !xTarget.is() )
return 0;
- Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, rtl::OUString() ) );
+ Reference< drawing::XShapes > xGroup( ShapeFactory::createGroup3D( xTarget, OUString() ) );
sal_Bool bDoubleSided = false;
short nRotatedTexture = 0;
@@ -1872,7 +1872,7 @@ uno::Reference< drawing::XShape >
uno::Reference< drawing::XShapes >
ShapeFactory::createGroup2D( const uno::Reference< drawing::XShapes >& xTarget
- , ::rtl::OUString aName )
+ , OUString aName )
{
if( !xTarget.is() )
return 0;
@@ -1907,7 +1907,7 @@ uno::Reference< drawing::XShapes >
uno::Reference< drawing::XShapes >
ShapeFactory::createGroup3D( const uno::Reference< drawing::XShapes >& xTarget
- , ::rtl::OUString aName )
+ , OUString aName )
{
if( !xTarget.is() )
return 0;
@@ -2188,7 +2188,7 @@ uno::Reference< drawing::XShape > ShapeFactory::createInvisibleRectangle(
uno::Reference< drawing::XShape >
ShapeFactory::createText( const uno::Reference< drawing::XShapes >& xTarget
- , const ::rtl::OUString& rText
+ , const OUString& rText
, const tNameSequence& rPropNames
, const tAnySequence& rPropValues
, const uno::Any& rATransformation )
@@ -2230,13 +2230,13 @@ uno::Reference< drawing::XShape >
return xShape;
}
-rtl::OUString ShapeFactory::getStackedString( const rtl::OUString& rString, bool bStacked )
+OUString ShapeFactory::getStackedString( const OUString& rString, bool bStacked )
{
sal_Int32 nLen = rString.getLength();
if(!bStacked || !nLen)
return rString;
- rtl::OUStringBuffer aStackStr;
+ OUStringBuffer aStackStr;
//add a newline after each letter
//as we do not no letters here add a newline after each char
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index a5059dcec222..ac6da72da1d2 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -118,7 +118,7 @@ void lcl_clearIfNoValuesButTextIsContained( VDataSequence& rData, const uno::Ref
}
//no double value is countained
//is there any text?
- uno::Sequence< rtl::OUString > aStrings( DataSequenceToStringSequence( xDataSequence ) );
+ uno::Sequence< OUString > aStrings( DataSequenceToStringSequence( xDataSequence ) );
sal_Int32 nTextCount = aStrings.getLength();
for( sal_Int32 j = 0; j < nTextCount; ++j )
{
@@ -216,7 +216,7 @@ VDataSeries::VDataSeries( const uno::Reference< XDataSeries >& xDataSeries )
try
{
uno::Any aARole = xProp->getPropertyValue("Role");
- rtl::OUString aRole;
+ OUString aRole;
aARole >>= aRole;
if (aRole == "values-x")
@@ -363,7 +363,7 @@ void VDataSeries::setGlobalSeriesIndex( sal_Int32 nGlobalSeriesIndex )
m_nGlobalSeriesIndex = nGlobalSeriesIndex;
}
-void VDataSeries::setParticle( const rtl::OUString& rSeriesParticle )
+void VDataSeries::setParticle( const OUString& rSeriesParticle )
{
m_aSeriesParticle = rSeriesParticle;
@@ -372,51 +372,51 @@ void VDataSeries::setParticle( const rtl::OUString& rSeriesParticle )
m_aPointCID_Stub = ObjectIdentifier::createSeriesSubObjectStub( OBJECTTYPE_DATA_POINT, m_aSeriesParticle );
m_aLabelCID_Stub = ObjectIdentifier::createClassifiedIdentifierWithParent(
- OBJECTTYPE_DATA_LABEL, ::rtl::OUString(), getLabelsCID() );
+ OBJECTTYPE_DATA_LABEL, OUString(), getLabelsCID() );
}
-rtl::OUString VDataSeries::getSeriesParticle() const
+OUString VDataSeries::getSeriesParticle() const
{
return m_aSeriesParticle;
}
-rtl::OUString VDataSeries::getCID() const
+OUString VDataSeries::getCID() const
{
return m_aCID;
}
-rtl::OUString VDataSeries::getPointCID_Stub() const
+OUString VDataSeries::getPointCID_Stub() const
{
return m_aPointCID_Stub;
}
-rtl::OUString VDataSeries::getErrorBarsCID(bool bYError) const
+OUString VDataSeries::getErrorBarsCID(bool bYError) const
{
- rtl::OUString aChildParticle( ObjectIdentifier::getStringForType(
+ OUString aChildParticle( ObjectIdentifier::getStringForType(
bYError ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X ) );
aChildParticle += "=";
return ObjectIdentifier::createClassifiedIdentifierForParticles(
m_aSeriesParticle, aChildParticle );
}
-rtl::OUString VDataSeries::getLabelsCID() const
+OUString VDataSeries::getLabelsCID() const
{
- rtl::OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
+ OUString aChildParticle( ObjectIdentifier::getStringForType( OBJECTTYPE_DATA_LABELS ) );
aChildParticle += "=";
return ObjectIdentifier::createClassifiedIdentifierForParticles(
m_aSeriesParticle, aChildParticle );
}
-rtl::OUString VDataSeries::getLabelCID_Stub() const
+OUString VDataSeries::getLabelCID_Stub() const
{
return m_aLabelCID_Stub;
}
-rtl::OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const
+OUString VDataSeries::getDataCurveCID( sal_Int32 nCurveIndex, bool bAverageLine ) const
{
- rtl::OUString aRet;
+ OUString aRet;
aRet = ObjectIdentifier::createDataCurveCID( m_aSeriesParticle, nCurveIndex, bAverageLine );
return aRet;
}
-rtl::OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) const
+OUString VDataSeries::getDataCurveEquationCID( sal_Int32 nCurveIndex ) const
{
- rtl::OUString aRet;
+ OUString aRet;
aRet = ObjectIdentifier::createDataCurveEquationCID( m_aSeriesParticle, nCurveIndex );
return aRet;
}
@@ -555,7 +555,7 @@ sal_Int32 VDataSeries::getExplicitNumberFormat( sal_Int32 nPointIndex, bool bFor
xPointProp->getPropertyValue(aPropName) >>= nNumberFormat;
return nNumberFormat;
}
-void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( const rtl::OUString& rRole )
+void VDataSeries::setRoleOfSequenceForDataLabelNumberFormatDetection( const OUString& rRole )
{
if (rRole == "values-y")
m_pValueSequenceForDataLabelNumberFormatDetection = &m_aValues_Y;
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 764274883e74..4b7d699d9ab0 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -47,8 +47,6 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::rtl::OUString;
-using ::rtl::OUStringBuffer;
//.............................................................................
namespace chart
@@ -300,7 +298,7 @@ awt::Size lcl_placeLegendEntries(
const sal_Int32 nSymbolToTextDistance = static_cast< sal_Int32 >( std::max( 100.0, fViewFontSize * 0.22 ) );//minimum 1mm
const sal_Int32 nSymbolPlusDistanceWidth = rMaxSymbolExtent.Width + nSymbolToTextDistance;
sal_Int32 nMaxTextWidth = rAvailableSpace.Width - (2 * nXPadding) - nSymbolPlusDistanceWidth;
- rtl::OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" );
+ OUString aPropNameTextMaximumFrameWidth( "TextMaximumFrameWidth" );
uno::Any* pFrameWidth