[Libreoffice-commits] core.git: chart2/inc chart2/source chart2/workbench

Noel Grandin noel at peralex.com
Mon Mar 14 11:44:26 UTC 2016


 chart2/inc/ChartModel.hxx                                                          |  531 +++++-----
 chart2/inc/ChartView.hxx                                                           |  143 +-
 chart2/source/controller/accessibility/AccStatisticsObject.cxx                     |    4 
 chart2/source/controller/accessibility/AccStatisticsObject.hxx                     |    4 
 chart2/source/controller/accessibility/AccessibleBase.cxx                          |    4 
 chart2/source/controller/accessibility/AccessibleChartElement.cxx                  |    6 
 chart2/source/controller/accessibility/AccessibleChartElement.hxx                  |   46 
 chart2/source/controller/accessibility/AccessibleChartShape.cxx                    |    6 
 chart2/source/controller/accessibility/AccessibleChartShape.hxx                    |   44 
 chart2/source/controller/chartapiwrapper/AreaWrapper.cxx                           |    2 
 chart2/source/controller/chartapiwrapper/AreaWrapper.hxx                           |   44 
 chart2/source/controller/chartapiwrapper/AxisWrapper.cxx                           |   16 
 chart2/source/controller/chartapiwrapper/AxisWrapper.hxx                           |   78 -
 chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx                    |   15 
 chart2/source/controller/chartapiwrapper/Chart2ModelContact.hxx                    |   65 -
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx                      |   15 
 chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx                      |  119 --
 chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx                  |   66 -
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx                |   66 -
 chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx                |   58 -
 chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx                        |  126 +-
 chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx                        |  298 ++---
 chart2/source/controller/chartapiwrapper/GridWrapper.cxx                           |    2 
 chart2/source/controller/chartapiwrapper/GridWrapper.hxx                           |   20 
 chart2/source/controller/chartapiwrapper/LegendWrapper.cxx                         |   42 
 chart2/source/controller/chartapiwrapper/LegendWrapper.hxx                         |   48 
 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx                     |    2 
 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx                     |   62 -
 chart2/source/controller/chartapiwrapper/ReferenceSizePropertyProvider.hxx         |    4 
 chart2/source/controller/chartapiwrapper/TitleWrapper.hxx                          |   70 -
 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx                      |    2 
 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx                      |   64 -
 chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx                      |    2 
 chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx                      |   20 
 chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx                  |   32 
 chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx    |    2 
 chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx |   36 
 chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx        |   20 
 chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx          |   20 
 chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx          |    2 
 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx               |   14 
 chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx           |   24 
 chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx                  |   12 
 chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx                  |   18 
 chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx            |    2 
 chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx                  |   12 
 chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx        |   38 
 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx               |   30 
 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx               |    2 
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx            |  178 +--
 chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx            |    2 
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx                |   40 
 chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx                |    2 
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx               |   30 
 chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx               |    2 
 chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx           |    8 
 chart2/source/controller/dialogs/ChartTypeDialogController.hxx                     |   28 
 chart2/source/controller/dialogs/ChartTypeTemplateProvider.hxx                     |    3 
 chart2/source/controller/dialogs/DataBrowser.hxx                                   |    9 
 chart2/source/controller/dialogs/DataBrowserModel.hxx                              |   33 
 chart2/source/controller/dialogs/DialogModel.hxx                                   |   72 -
 chart2/source/controller/dialogs/ObjectNameProvider.cxx                            |    2 
 chart2/source/controller/dialogs/res_DataLabel.cxx                                 |    1 
 chart2/source/controller/dialogs/res_LegendPosition.cxx                            |    8 
 chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx                         |    4 
 chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx                           |    6 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx                       |    2 
 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx                       |   10 
 chart2/source/controller/dialogs/tp_AxisPositions.cxx                              |    2 
 chart2/source/controller/dialogs/tp_AxisPositions.hxx                              |    4 
 chart2/source/controller/dialogs/tp_ChartType.hxx                                  |    9 
 chart2/source/controller/dialogs/tp_DataSourceControls.hxx                         |    4 
 chart2/source/controller/dialogs/tp_ErrorBars.hxx                                  |    3 
 chart2/source/controller/dialogs/tp_RangeChooser.hxx                               |    5 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx                               |   18 
 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx                    |   12 
 chart2/source/controller/inc/AccessibleBase.hxx                                    |  137 +-
 chart2/source/controller/inc/AccessibleChartView.hxx                               |   53 
 chart2/source/controller/inc/AccessibleTextHelper.hxx                              |   44 
 chart2/source/controller/inc/ChartController.hxx                                   |  324 ++----
 chart2/source/controller/inc/ChartDocumentWrapper.hxx                              |  198 +--
 chart2/source/controller/inc/CommandDispatchContainer.hxx                          |   42 
 chart2/source/controller/inc/DrawViewWrapper.hxx                                   |    5 
 chart2/source/controller/inc/ErrorBarItemConverter.hxx                             |   16 
 chart2/source/controller/inc/GraphicPropertyItemConverter.hxx                      |   11 
 chart2/source/controller/inc/ItemConverter.hxx                                     |   19 
 chart2/source/controller/inc/LegendItemConverter.hxx                               |   10 
 chart2/source/controller/inc/ObjectHierarchy.hxx                                   |   11 
 chart2/source/controller/inc/ObjectNameProvider.hxx                                |   21 
 chart2/source/controller/inc/PositionAndSizeHelper.hxx                             |   12 
 chart2/source/controller/inc/RangeSelectionHelper.hxx                              |   17 
 chart2/source/controller/inc/RangeSelectionListener.hxx                            |   17 
 chart2/source/controller/inc/RegressionCurveItemConverter.hxx                      |   16 
 chart2/source/controller/inc/RegressionEquationItemConverter.hxx                   |   10 
 chart2/source/controller/inc/SelectionHelper.hxx                                   |   12 
 chart2/source/controller/inc/SeriesOptionsItemConverter.hxx                        |   24 
 chart2/source/controller/inc/StatisticsItemConverter.hxx                           |   13 
 chart2/source/controller/inc/TimerTriggeredControllerLock.hxx                      |    6 
 chart2/source/controller/inc/TitleDialogData.hxx                                   |   12 
 chart2/source/controller/inc/dlg_ChartType.hxx                                     |    6 
 chart2/source/controller/inc/dlg_ChartType_UNO.hxx                                 |   18 
 chart2/source/controller/inc/dlg_CreationWizard.hxx                                |   12 
 chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx                            |   56 -
 chart2/source/controller/inc/dlg_DataEditor.hxx                                    |   11 
 chart2/source/controller/inc/dlg_DataSource.hxx                                    |    6 
 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx                               |    4 
 chart2/source/controller/inc/dlg_InsertErrorBars.hxx                               |    9 
 chart2/source/controller/inc/dlg_InsertLegend.hxx                                  |    9 
 chart2/source/controller/inc/dlg_ObjectProperties.hxx                              |   13 
 chart2/source/controller/inc/dlg_View3D.hxx                                        |    2 
 chart2/source/controller/inc/res_ErrorBar.hxx                                      |    3 
 chart2/source/controller/inc/res_LegendPosition.hxx                                |   13 
 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx                      |   56 -
 chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx                  |   34 
 chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx                    |    9 
 chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx        |    3 
 chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx                |   34 
 chart2/source/controller/main/ChartController.cxx                                  |    4 
 chart2/source/controller/main/ChartController_EditData.cxx                         |    2 
 chart2/source/controller/main/ChartController_Insert.cxx                           |    2 
 chart2/source/controller/main/ChartController_TextEdit.cxx                         |    6 
 chart2/source/controller/main/ChartController_Tools.cxx                            |    2 
 chart2/source/controller/main/ChartDropTargetHelper.hxx                            |    7 
 chart2/source/controller/main/ChartFrameloader.hxx                                 |   27 
 chart2/source/controller/main/ChartModelClone.hxx                                  |   16 
 chart2/source/controller/main/ChartTransferable.hxx                                |    4 
 chart2/source/controller/main/ChartWindow.cxx                                      |    2 
 chart2/source/controller/main/ChartWindow.hxx                                      |    2 
 chart2/source/controller/main/CommandDispatch.cxx                                  |    2 
 chart2/source/controller/main/CommandDispatch.hxx                                  |   48 
 chart2/source/controller/main/ControllerCommandDispatch.cxx                        |    2 
 chart2/source/controller/main/ControllerCommandDispatch.hxx                        |   38 
 chart2/source/controller/main/DragMethod_Base.hxx                                  |    6 
 chart2/source/controller/main/DragMethod_PieSegment.hxx                            |    2 
 chart2/source/controller/main/DragMethod_RotateDiagram.hxx                         |    2 
 chart2/source/controller/main/DrawCommandDispatch.hxx                              |    9 
 chart2/source/controller/main/ElementSelector.cxx                                  |    2 
 chart2/source/controller/main/ElementSelector.hxx                                  |   17 
 chart2/source/controller/main/FeatureCommandDispatchBase.hxx                       |   21 
 chart2/source/controller/main/ObjectHierarchy.cxx                                  |    8 
 chart2/source/controller/main/PositionAndSizeHelper.cxx                            |    2 
 chart2/source/controller/main/ShapeController.hxx                                  |    9 
 chart2/source/controller/main/StatusBarCommandDispatch.hxx                         |   37 
 chart2/source/controller/main/UndoActions.hxx                                      |   24 
 chart2/source/controller/main/UndoCommandDispatch.hxx                              |   24 
 chart2/source/controller/main/UndoGuard.hxx                                        |   16 
 chart2/source/inc/AxisHelper.hxx                                                   |  216 +---
 chart2/source/inc/BaseGFXHelper.hxx                                                |   22 
 chart2/source/inc/CachedDataSequence.hxx                                           |   86 -
 chart2/source/inc/CharacterProperties.hxx                                          |    6 
 chart2/source/inc/ChartModelHelper.hxx                                             |   70 -
 chart2/source/inc/ChartTypeHelper.hxx                                              |   88 -
 chart2/source/inc/ChartViewHelper.hxx                                              |    2 
 chart2/source/inc/CloneHelper.hxx                                                  |   10 
 chart2/source/inc/ColorPerPointHelper.hxx                                          |    9 
 chart2/source/inc/CommonConverters.hxx                                             |   96 -
 chart2/source/inc/CommonFunctors.hxx                                               |   30 
 chart2/source/inc/ConfigColorScheme.hxx                                            |   22 
 chart2/source/inc/ContainerHelper.hxx                                              |    4 
 chart2/source/inc/ControllerLockGuard.hxx                                          |   12 
 chart2/source/inc/DataSeriesHelper.hxx                                             |  105 -
 chart2/source/inc/DataSource.hxx                                                   |   26 
 chart2/source/inc/DataSourceHelper.hxx                                             |   92 -
 chart2/source/inc/DiagramHelper.hxx                                                |  193 +--
 chart2/source/inc/DisposeHelper.hxx                                                |    7 
 chart2/source/inc/ErrorBar.hxx                                                     |  106 -
 chart2/source/inc/EventListenerHelper.hxx                                          |   30 
 chart2/source/inc/ExplicitCategoriesProvider.hxx                                   |   35 
 chart2/source/inc/FillProperties.hxx                                               |    2 
 chart2/source/inc/FormattedStringHelper.hxx                                        |   11 
 chart2/source/inc/InternalData.hxx                                                 |   20 
 chart2/source/inc/InternalDataProvider.hxx                                         |  183 +--
 chart2/source/inc/LabeledDataSequence.hxx                                          |   47 
 chart2/source/inc/LegendHelper.hxx                                                 |   14 
 chart2/source/inc/LifeTime.hxx                                                     |   23 
 chart2/source/inc/LineProperties.hxx                                               |   12 
 chart2/source/inc/LinePropertiesHelper.hxx                                         |   18 
 chart2/source/inc/MediaDescriptorHelper.hxx                                        |   46 
 chart2/source/inc/ModifyListenerCallBack.hxx                                       |    3 
 chart2/source/inc/ModifyListenerHelper.hxx                                         |  100 -
 chart2/source/inc/NameContainer.hxx                                                |   40 
 chart2/source/inc/NumberFormatterWrapper.hxx                                       |   10 
 chart2/source/inc/OPropertySet.hxx                                                 |  110 +-
 chart2/source/inc/ObjectIdentifier.hxx                                             |   85 -
 chart2/source/inc/PropertyHelper.hxx                                               |   41 
 chart2/source/inc/RangeHighlighter.hxx                                             |   45 
 chart2/source/inc/ReferenceSizeProvider.hxx                                        |   30 
 chart2/source/inc/RegressionCalculationHelper.hxx                                  |    4 
 chart2/source/inc/RegressionCurveCalculator.hxx                                    |   40 
 chart2/source/inc/RegressionCurveHelper.hxx                                        |    2 
 chart2/source/inc/RelativePositionHelper.hxx                                       |   32 
 chart2/source/inc/RelativeSizeHelper.hxx                                           |   12 
 chart2/source/inc/Scaling.hxx                                                      |   63 -
 chart2/source/inc/SceneProperties.hxx                                              |    2 
 chart2/source/inc/StatisticsHelper.hxx                                             |   51 
 chart2/source/inc/ThreeDHelper.hxx                                                 |   65 -
 chart2/source/inc/TitleHelper.hxx                                                  |   40 
 chart2/source/inc/UncachedDataSequence.hxx                                         |  105 -
 chart2/source/inc/UserDefinedProperties.hxx                                        |    2 
 chart2/source/inc/WeakListenerAdapter.hxx                                          |   35 
 chart2/source/inc/WrappedDefaultProperty.hxx                                       |   32 
 chart2/source/inc/WrappedDirectStateProperty.hxx                                   |    8 
 chart2/source/inc/WrappedIgnoreProperty.hxx                                        |   26 
 chart2/source/inc/WrappedProperty.hxx                                              |   24 
 chart2/source/inc/WrappedPropertySet.hxx                                           |   60 -
 chart2/source/inc/chartview/DataPointSymbolSupplier.hxx                            |   10 
 chart2/source/inc/chartview/DrawModelWrapper.hxx                                   |   24 
 chart2/source/inc/chartview/ExplicitScaleValues.hxx                                |   14 
 chart2/source/inc/chartview/ExplicitValueProvider.hxx                              |   42 
 chart2/source/model/filter/XMLFilter.cxx                                           |   26 
 chart2/source/model/inc/BaseCoordinateSystem.hxx                                   |   93 -
 chart2/source/model/inc/CartesianCoordinateSystem.hxx                              |   19 
 chart2/source/model/inc/ChartTypeManager.hxx                                       |   41 
 chart2/source/model/inc/DataSeries.hxx                                             |  121 +-
 chart2/source/model/inc/Diagram.hxx                                                |  157 +-
 chart2/source/model/inc/PolarCoordinateSystem.hxx                                  |   18 
 chart2/source/model/inc/StockBar.hxx                                               |   36 
 chart2/source/model/inc/XMLFilter.hxx                                              |  106 -
 chart2/source/model/main/Axis.cxx                                                  |   18 
 chart2/source/model/main/Axis.hxx                                                  |   91 -
 chart2/source/model/main/BaseCoordinateSystem.cxx                                  |    2 
 chart2/source/model/main/ChartModel.cxx                                            |    2 
 chart2/source/model/main/ChartModel_Persistence.cxx                                |    2 
 chart2/source/model/main/DataPoint.cxx                                             |    2 
 chart2/source/model/main/DataPoint.hxx                                             |   60 -
 chart2/source/model/main/DataPointProperties.hxx                                   |    2 
 chart2/source/model/main/DataSeries.cxx                                            |    4 
 chart2/source/model/main/DataSeriesProperties.hxx                                  |    2 
 chart2/source/model/main/Diagram.cxx                                               |    7 
 chart2/source/model/main/FormattedString.cxx                                       |    2 
 chart2/source/model/main/GridProperties.hxx                                        |   41 
 chart2/source/model/main/Legend.cxx                                                |    6 
 chart2/source/model/main/Legend.hxx                                                |   41 
 chart2/source/model/main/PageBackground.cxx                                        |    2 
 chart2/source/model/main/PageBackground.hxx                                        |   45 
 chart2/source/model/main/StockBar.cxx                                              |    2 
 chart2/source/model/main/Title.cxx                                                 |    6 
 chart2/source/model/main/Title.hxx                                                 |   59 -
 chart2/source/model/main/UndoManager.hxx                                           |   52 
 chart2/source/model/main/Wall.cxx                                                  |    2 
 chart2/source/model/main/Wall.hxx                                                  |   36 
 chart2/source/model/template/AreaChartType.hxx                                     |   20 
 chart2/source/model/template/AreaChartTypeTemplate.cxx                             |    2 
 chart2/source/model/template/AreaChartTypeTemplate.hxx                             |   30 
 chart2/source/model/template/BarChartType.hxx                                      |   24 
 chart2/source/model/template/BarChartTypeTemplate.cxx                              |    2 
 chart2/source/model/template/BarChartTypeTemplate.hxx                              |   38 
 chart2/source/model/template/BubbleChartType.cxx                                   |    4 
 chart2/source/model/template/BubbleChartType.hxx                                   |   43 
 chart2/source/model/template/BubbleChartTypeTemplate.cxx                           |    2 
 chart2/source/model/template/BubbleChartTypeTemplate.hxx                           |   31 
 chart2/source/model/template/BubbleDataInterpreter.hxx                             |   23 
 chart2/source/model/template/CandleStickChartType.cxx                              |    2 
 chart2/source/model/template/CandleStickChartType.hxx                              |   41 
 chart2/source/model/template/ChartType.hxx                                         |   95 -
 chart2/source/model/template/ChartTypeTemplate.hxx                                 |  132 +-
 chart2/source/model/template/ColumnChartType.cxx                                   |    2 
 chart2/source/model/template/ColumnChartType.hxx                                   |   32 
 chart2/source/model/template/ColumnLineChartTypeTemplate.cxx                       |    2 
 chart2/source/model/template/ColumnLineChartTypeTemplate.hxx                       |   55 -
 chart2/source/model/template/ColumnLineDataInterpreter.hxx                         |   13 
 chart2/source/model/template/DataInterpreter.hxx                                   |   59 -
 chart2/source/model/template/FilledNetChartType.hxx                                |   19 
 chart2/source/model/template/GL3DBarChartType.cxx                                  |    8 
 chart2/source/model/template/GL3DBarChartType.hxx                                  |   14 
 chart2/source/model/template/LineChartType.cxx                                     |    2 
 chart2/source/model/template/LineChartType.hxx                                     |   28 
 chart2/source/model/template/LineChartTypeTemplate.cxx                             |    2 
 chart2/source/model/template/LineChartTypeTemplate.hxx                             |   30 
 chart2/source/model/template/NetChartType.hxx                                      |   36 
 chart2/source/model/template/NetChartTypeTemplate.hxx                              |   22 
 chart2/source/model/template/PieChartType.cxx                                      |    2 
 chart2/source/model/template/PieChartType.hxx                                      |   37 
 chart2/source/model/template/PieChartTypeTemplate.cxx                              |    2 
 chart2/source/model/template/PieChartTypeTemplate.hxx                              |   71 -
 chart2/source/model/template/ScatterChartType.cxx                                  |    2 
 chart2/source/model/template/ScatterChartType.hxx                                  |   40 
 chart2/source/model/template/ScatterChartTypeTemplate.cxx                          |    2 
 chart2/source/model/template/ScatterChartTypeTemplate.hxx                          |   37 
 chart2/source/model/template/StockChartTypeTemplate.cxx                            |    2 
 chart2/source/model/template/StockChartTypeTemplate.hxx                            |   60 -
 chart2/source/model/template/StockDataInterpreter.hxx                              |   23 
 chart2/source/model/template/XYDataInterpreter.hxx                                 |   24 
 chart2/source/tools/AxisHelper.cxx                                                 |   10 
 chart2/source/tools/CharacterProperties.cxx                                        |    4 
 chart2/source/tools/ChartModelHelper.cxx                                           |   12 
 chart2/source/tools/ChartTypeHelper.cxx                                            |   76 -
 chart2/source/tools/ColorPerPointHelper.cxx                                        |    9 
 chart2/source/tools/DataSourceHelper.cxx                                           |   22 
 chart2/source/tools/DiagramHelper.cxx                                              |    7 
 chart2/source/tools/ErrorBar.cxx                                                   |   48 
 chart2/source/tools/ExplicitCategoriesProvider.cxx                                 |    9 
 chart2/source/tools/FillProperties.cxx                                             |    4 
 chart2/source/tools/ImplOPropertySet.hxx                                           |   16 
 chart2/source/tools/InternalDataProvider.cxx                                       |    8 
 chart2/source/tools/LegendHelper.cxx                                               |    6 
 chart2/source/tools/LifeTime.cxx                                                   |    4 
 chart2/source/tools/LinePropertiesHelper.cxx                                       |   16 
 chart2/source/tools/MediaDescriptorHelper.cxx                                      |   10 
 chart2/source/tools/ModifyListenerCallBack.cxx                                     |    3 
 chart2/source/tools/ModifyListenerHelper.cxx                                       |    8 
 chart2/source/tools/NameContainer.cxx                                              |   10 
 chart2/source/tools/PropertyHelper.cxx                                             |    4 
 chart2/source/tools/RangeHighlighter.cxx                                           |    4 
 chart2/source/tools/RegressionCurveModel.cxx                                       |    2 
 chart2/source/tools/RegressionCurveModel.hxx                                       |  113 --
 chart2/source/tools/RegressionEquation.cxx                                         |    2 
 chart2/source/tools/RegressionEquation.hxx                                         |   65 -
 chart2/source/tools/StatisticsHelper.cxx                                           |   10 
 chart2/source/tools/TitleHelper.cxx                                                |   12 
 chart2/source/tools/WeakListenerAdapter.cxx                                        |    4 
 chart2/source/tools/WrappedIgnoreProperty.cxx                                      |    2 
 chart2/source/tools/WrappedProperty.cxx                                            |    2 
 chart2/source/view/axes/DateHelper.cxx                                             |    6 
 chart2/source/view/axes/DateScaling.hxx                                            |   31 
 chart2/source/view/axes/MinimumAndMaximumSupplier.cxx                              |    2 
 chart2/source/view/axes/ScaleAutomatism.cxx                                        |   12 
 chart2/source/view/axes/Tickmarks.cxx                                              |    4 
 chart2/source/view/axes/Tickmarks.hxx                                              |    7 
 chart2/source/view/axes/Tickmarks_Dates.hxx                                        |    2 
 chart2/source/view/axes/Tickmarks_Equidistant.hxx                                  |   12 
 chart2/source/view/axes/VAxisBase.cxx                                              |    4 
 chart2/source/view/axes/VAxisBase.hxx                                              |   28 
 chart2/source/view/axes/VAxisOrGridBase.hxx                                        |    4 
 chart2/source/view/axes/VAxisProperties.cxx                                        |   36 
 chart2/source/view/axes/VAxisProperties.hxx                                        |   13 
 chart2/source/view/axes/VCartesianAxis.cxx                                         |    6 
 chart2/source/view/axes/VCartesianAxis.hxx                                         |    2 
 chart2/source/view/axes/VCartesianCoordinateSystem.cxx                             |    2 
 chart2/source/view/axes/VCartesianCoordinateSystem.hxx                             |    9 
 chart2/source/view/axes/VCartesianGrid.hxx                                         |   15 
 chart2/source/view/axes/VCoordinateSystem.cxx                                      |    2 
 chart2/source/view/axes/VPolarAngleAxis.hxx                                        |    4 
 chart2/source/view/axes/VPolarAxis.hxx                                             |    4 
 chart2/source/view/axes/VPolarCoordinateSystem.hxx                                 |   13 
 chart2/source/view/axes/VPolarGrid.hxx                                             |   12 
 chart2/source/view/axes/VPolarRadiusAxis.cxx                                       |    4 
 chart2/source/view/axes/VPolarRadiusAxis.hxx                                       |   21 
 chart2/source/view/charttypes/AreaChart.cxx                                        |   16 
 chart2/source/view/charttypes/AreaChart.hxx                                        |   37 
 chart2/source/view/charttypes/BarChart.cxx                                         |   16 
 chart2/source/view/charttypes/BarChart.hxx                                         |   23 
 chart2/source/view/charttypes/BubbleChart.cxx                                      |   10 
 chart2/source/view/charttypes/BubbleChart.hxx                                      |    7 
 chart2/source/view/charttypes/CandleStickChart.hxx                                 |    5 
 chart2/source/view/charttypes/NetChart.cxx                                         |   18 
 chart2/source/view/charttypes/NetChart.hxx                                         |   19 
 chart2/source/view/charttypes/PieChart.cxx                                         |    8 
 chart2/source/view/charttypes/PieChart.hxx                                         |   21 
 chart2/source/view/charttypes/Splines.cxx                                          |    4 
 chart2/source/view/charttypes/Splines.hxx                                          |    8 
 chart2/source/view/charttypes/VSeriesPlotter.cxx                                   |   44 
 chart2/source/view/inc/AbstractShapeFactory.hxx                                    |  261 ++--
 chart2/source/view/inc/Clipping.hxx                                                |    4 
 chart2/source/view/inc/LabelPositionHelper.hxx                                     |   15 
 chart2/source/view/inc/LegendEntryProvider.hxx                                     |   26 
 chart2/source/view/inc/Linear3DTransformation.hxx                                  |   26 
 chart2/source/view/inc/MinimumAndMaximumSupplier.hxx                               |    2 
 chart2/source/view/inc/OpenglShapeFactory.hxx                                      |  211 +--
 chart2/source/view/inc/PlotterBase.hxx                                             |   28 
 chart2/source/view/inc/PlottingPositionHelper.hxx                                  |   51 
 chart2/source/view/inc/PolarLabelPositionHelper.hxx                                |    8 
 chart2/source/view/inc/PropertyMapper.hxx                                          |   30 
 chart2/source/view/inc/ScaleAutomatism.hxx                                         |    8 
 chart2/source/view/inc/ShapeFactory.hxx                                            |  229 ++--
 chart2/source/view/inc/Stripe.hxx                                                  |   38 
 chart2/source/view/inc/VCoordinateSystem.hxx                                       |   81 -
 chart2/source/view/inc/VDiagram.hxx                                                |   55 -
 chart2/source/view/inc/VLegendSymbolFactory.hxx                                    |   16 
 chart2/source/view/inc/VLineProperties.hxx                                         |   13 
 chart2/source/view/inc/VPolarTransformation.hxx                                    |   20 
 chart2/source/view/inc/VSeriesPlotter.hxx                                          |  160 +--
 chart2/source/view/main/ChartItemPool.cxx                                          |    2 
 chart2/source/view/main/ChartView.cxx                                              |   24 
 chart2/source/view/main/DummyXShape.cxx                                            |   10 
 chart2/source/view/main/DummyXShape.hxx                                            |  126 +-
 chart2/source/view/main/PlottingPositionHelper.cxx                                 |    6 
 chart2/source/view/main/PolarLabelPositionHelper.cxx                               |   10 
 chart2/source/view/main/PropertyMapper.cxx                                         |    4 
 chart2/source/view/main/VDataSeries.cxx                                            |    4 
 chart2/source/view/main/VLegend.cxx                                                |   22 
 chart2/source/view/main/VLegend.hxx                                                |   40 
 chart2/source/view/main/VTitle.hxx                                                 |   30 
 chart2/workbench/addin/sampleaddin.cxx                                             |    2 
 chart2/workbench/addin/sampleaddin.hxx                                             |  148 +-
 385 files changed, 5640 insertions(+), 6607 deletions(-)

New commits:
commit 8353667d35bc511378c9b14261b6bb11b7bd56aa
Author: Noel Grandin <noel at peralex.com>
Date:   Fri Nov 27 11:14:38 2015 +0200

    com::sun::star->css in chart2
    
    Change-Id: I04320d32d6d5c54e461cfabef58645f8b772bc69

diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index fa099df..215c0f04 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -76,31 +76,31 @@ namespace impl
 
 // Note: needed for queryInterface (if it calls the base-class implementation)
 typedef cppu::WeakImplHelper<
-//       ::com::sun::star::frame::XModel        //comprehends XComponent (required interface), base of XChartDocument
-         ::com::sun::star::util::XCloseable     //comprehends XCloseBroadcaster
-        ,::com::sun::star::frame::XStorable2    //(extension of XStorable)
-        ,::com::sun::star::util::XModifiable    //comprehends XModifyBroadcaster (required interface)
-        ,::com::sun::star::lang::XServiceInfo
-        ,::com::sun::star::lang::XInitialization
-        ,::com::sun::star::chart2::XChartDocument  // derived from XModel
-        ,::com::sun::star::chart2::data::XDataReceiver   // public API
-        ,::com::sun::star::chart2::XTitled
-        ,::com::sun::star::frame::XLoadable
-        ,::com::sun::star::util::XCloneable
-        ,::com::sun::star::embed::XVisualObject
-        ,::com::sun::star::lang::XMultiServiceFactory
-        ,::com::sun::star::document::XStorageBasedDocument
-        ,::com::sun::star::lang::XUnoTunnel
-        ,::com::sun::star::util::XNumberFormatsSupplier
-        ,::com::sun::star::container::XChild
-        ,::com::sun::star::util::XModifyListener
-        ,::com::sun::star::datatransfer::XTransferable
-        ,::com::sun::star::document::XDocumentPropertiesSupplier
-        ,::com::sun::star::chart2::data::XDataSource
-        ,::com::sun::star::document::XUndoManagerSupplier
-        ,::com::sun::star::chart2::X3DChartWindowProvider
-        ,::com::sun::star::util::XUpdatable
-        ,::com::sun::star::qa::XDumper
+//       css::frame::XModel        //comprehends XComponent (required interface), base of XChartDocument
+         css::util::XCloseable     //comprehends XCloseBroadcaster
+        ,css::frame::XStorable2    //(extension of XStorable)
+        ,css::util::XModifiable    //comprehends XModifyBroadcaster (required interface)
+        ,css::lang::XServiceInfo
+        ,css::lang::XInitialization
+        ,css::chart2::XChartDocument  // derived from XModel
+        ,css::chart2::data::XDataReceiver   // public API
+        ,css::chart2::XTitled
+        ,css::frame::XLoadable
+        ,css::util::XCloneable
+        ,css::embed::XVisualObject
+        ,css::lang::XMultiServiceFactory
+        ,css::document::XStorageBasedDocument
+        ,css::lang::XUnoTunnel
+        ,css::util::XNumberFormatsSupplier
+        ,css::container::XChild
+        ,css::util::XModifyListener
+        ,css::datatransfer::XTransferable
+        ,css::document::XDocumentPropertiesSupplier
+        ,css::chart2::data::XDataSource
+        ,css::document::XUndoManagerSupplier
+        ,css::chart2::X3DChartWindowProvider
+        ,css::util::XUpdatable
+        ,css::qa::XDumper
         >
     ChartModel_Base;
 }
@@ -122,54 +122,54 @@ private:
 
     bool mbTimeBased;
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface > xChartView; // for the ref count
+    css::uno::Reference< css::uno::XInterface > xChartView; // for the ref count
     ChartView* mpChartView;
 
     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;
+    css::uno::Sequence< css::beans::PropertyValue >   m_aMediaDescriptor;
+    css::uno::Reference< css::document::XDocumentProperties > m_xDocumentProperties;
+    ::rtl::Reference< UndoManager >                    m_pUndoManager;
 
-    ::comphelper::OInterfaceContainerHelper2                                           m_aControllers;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >    m_xCurrentController;
-    sal_uInt16                                                                  m_nControllerLockCount;
+    ::comphelper::OInterfaceContainerHelper2           m_aControllers;
+    css::uno::Reference< css::frame::XController >     m_xCurrentController;
+    sal_uInt16                                         m_nControllerLockCount;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >      m_xOldModelAgg;
+    css::uno::Reference< css::uno::XComponentContext > m_xContext;
+    css::uno::Reference< css::uno::XAggregation >      m_xOldModelAgg;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >        m_xStorage;
+    css::uno::Reference< css::embed::XStorage >        m_xStorage;
     //the content of this should be always synchronized with the current m_xViewWindow size. The variable is necessary to hold the information as long as no view window exists.
-    ::com::sun::star::awt::Size                                                  m_aVisualAreaSize;
-    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >          m_xParent;
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > m_xRangeHighlighter;
-    ::std::vector< GraphicObject >                                               m_aGraphicObjectVector;
+    css::awt::Size                                     m_aVisualAreaSize;
+    css::uno::Reference< css::frame::XModel >          m_xParent;
+    css::uno::Reference< css::chart2::data::XRangeHighlighter > m_xRangeHighlighter;
+    ::std::vector< GraphicObject >                            m_aGraphicObjectVector;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider >   m_xDataProvider;
+    css::uno::Reference< css::chart2::data::XDataProvider >   m_xDataProvider;
     /** is only valid if m_xDataProvider is set. If m_xDataProvider is set to an
         external data provider this reference must be set to 0
     */
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider >   m_xInternalDataProvider;
+    css::uno::Reference< css::chart2::data::XDataProvider >   m_xInternalDataProvider;
 
-    ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >
+    css::uno::Reference< css::util::XNumberFormatsSupplier >
                                 m_xOwnNumberFormatsSupplier;
-    ::com::sun::star::uno::Reference< com::sun::star::util::XNumberFormatsSupplier >
+    css::uno::Reference< css::util::XNumberFormatsSupplier >
                                 m_xNumberFormatsSupplier;
     std::unique_ptr< SvNumberFormatter > m_apSvNumberFormatter; // #i113784# avoid memory leak
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager >
+    css::uno::Reference< css::chart2::XChartTypeManager >
         m_xChartTypeManager;
 
     // Diagram Access
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >
+    css::uno::Reference< css::chart2::XDiagram >
         m_xDiagram;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >
+    css::uno::Reference< css::chart2::XTitle >
                                           m_xTitle;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >
+    css::uno::Reference< css::beans::XPropertySet >
                                           m_xPageBackground;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess>     m_xXMLNamespaceMap;
+    css::uno::Reference< css::container::XNameAccess>     m_xXMLNamespaceMap;
 
 private:
     //private methods
@@ -177,48 +177,48 @@ private:
     OUString impl_g_getLocation();
 
     bool
-        impl_isControllerConnected( const com::sun::star::uno::Reference< com::sun::star::frame::XController >& xController );
+        impl_isControllerConnected( const css::uno::Reference< com::sun::star::frame::XController >& xController );
 
-    com::sun::star::uno::Reference< com::sun::star::frame::XController >
+    css::uno::Reference< css::frame::XController >
         impl_getCurrentController()
-                            throw( com::sun::star::uno::RuntimeException);
+                            throw( css::uno::RuntimeException);
 
     void SAL_CALL
         impl_notifyModifiedListeners()
-                            throw( com::sun::star::uno::RuntimeException);
+                            throw( css::uno::RuntimeException);
     void SAL_CALL
         impl_notifyCloseListeners()
-                            throw( com::sun::star::uno::RuntimeException);
+                            throw( css::uno::RuntimeException);
     void SAL_CALL
         impl_notifyStorageChangeListeners()
-                            throw(::com::sun::star::uno::RuntimeException);
+                            throw(css::uno::RuntimeException);
 
     void impl_store(
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > & xStorage );
+        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor,
+        const css::uno::Reference< css::embed::XStorage > & xStorage );
     void impl_load(
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor,
+        const css::uno::Reference< css::embed::XStorage >& xStorage );
     void impl_loadGraphics(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
-    ::com::sun::star::uno::Reference< ::com::sun::star::document::XFilter >
-        impl_createFilter( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & rMediaDescriptor );
+        const css::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+    css::uno::Reference< css::document::XFilter >
+        impl_createFilter( const css::uno::Sequence< css::beans::PropertyValue > & rMediaDescriptor );
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeTemplate > impl_createDefaultChartTypeTemplate();
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > impl_createDefaultData();
+    css::uno::Reference< css::chart2::XChartTypeTemplate > impl_createDefaultChartTypeTemplate();
+    css::uno::Reference< css::chart2::data::XDataSource > impl_createDefaultData();
 
     void impl_adjustAdditionalShapesPositionAndSize(
-        const ::com::sun::star::awt::Size& aVisualAreaSize );
+        const css::awt::Size& aVisualAreaSize );
 
     void insertDefaultChart();
 
 public:
     //no default constructor
-    ChartModel(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & xContext);
+    ChartModel(css::uno::Reference< css::uno::XComponentContext > const & xContext);
     explicit ChartModel( const ChartModel & rOther );
     virtual ~ChartModel();
 
-    // ::com::sun::star::lang::XServiceInfo
+    // css::lang::XServiceInfo
 
     virtual OUString SAL_CALL getImplementationName()
             throw( css::uno::RuntimeException, std::exception ) override;
@@ -230,190 +230,190 @@ public:
     static OUString getImplementationName_Static();
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
-    // ::com::sun::star::lang::XInitialization
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-                throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    // css::lang::XInitialization
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+                throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::frame::XModel (required interface)
+    // css::frame::XModel (required interface)
 
     virtual sal_Bool SAL_CALL
-        attachResource( const OUString& rURL
-                            , const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        attachResource( const OUString& rURL,
+                        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
     virtual OUString SAL_CALL
-        getURL()            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        getURL()            throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL
-        getArgs()           throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL
+        getArgs()           throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        connectController( const css::uno::Reference< css::frame::XController >& xController )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        disconnectController( const css::uno::Reference< css::frame::XController >& xController )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        lockControllers()   throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        lockControllers()   throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        unlockControllers() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        unlockControllers() throw (css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL
         hasControllersLocked()
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                            throw (css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL
+    virtual css::uno::Reference< css::frame::XController > SAL_CALL
         getCurrentController()
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                            throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController )
-                            throw (::com::sun::star::container::NoSuchElementException
-                            , ::com::sun::star::uno::RuntimeException, std::exception) override;
+        setCurrentController( const css::uno::Reference< css::frame::XController >& xController )
+                            throw (css::container::NoSuchElementException
+                            , css::uno::RuntimeException, std::exception) override;
 
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
         getCurrentSelection()
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                            throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::lang::XComponent (base of XModel)
+    // css::lang::XComponent (base of XModel)
     virtual void SAL_CALL
-        dispose()           throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        dispose()           throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & xListener )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::util::XCloseable
+    // css::util::XCloseable
     virtual void SAL_CALL
         close( sal_Bool bDeliverOwnership )
-                            throw(::com::sun::star::util::CloseVetoException,
-                                  ::com::sun::star::uno::RuntimeException, std::exception) override;
+                            throw(css::util::CloseVetoException,
+                                  css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::util::XCloseBroadcaster (base of XCloseable)
+    // css::util::XCloseBroadcaster (base of XCloseable)
     virtual void SAL_CALL
-        addCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        removeCloseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseListener > & xListener )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::frame::XStorable2 (extension of XStorable)
+    // css::frame::XStorable2 (extension of XStorable)
     virtual void SAL_CALL storeSelf(
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
+        throw (css::lang::IllegalArgumentException,
+               css::io::IOException,
+               css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::frame::XStorable (required interface)
+    // css::frame::XStorable (required interface)
     virtual sal_Bool SAL_CALL
-        hasLocation()       throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        hasLocation()       throw (css::uno::RuntimeException, std::exception) override;
 
     virtual OUString SAL_CALL
-        getLocation()       throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        getLocation()       throw (css::uno::RuntimeException, std::exception) override;
 
     virtual sal_Bool SAL_CALL
-        isReadonly()        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        isReadonly()        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        store()             throw (::com::sun::star::io::IOException
-                            , ::com::sun::star::uno::RuntimeException, std::exception) override;
+        store()             throw (css::io::IOException
+                            , css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        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, std::exception) override;
+        storeAsURL( const OUString& rURL,
+                    const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
+                            throw (css::io::IOException
+                            , css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        storeToURL( 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, std::exception) override;
+        storeToURL( const OUString& rURL,
+                    const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
+                            throw (css::io::IOException
+                            , css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::util::XModifiable (required interface)
+    // css::util::XModifiable (required interface)
     virtual sal_Bool SAL_CALL
-        isModified()        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        isModified()        throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
         setModified( sal_Bool bModified )
-                            throw (::com::sun::star::beans::PropertyVetoException
-                            , ::com::sun::star::uno::RuntimeException, std::exception) override;
+                            throw (css::beans::PropertyVetoException
+                            , css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::util::XModifyBroadcaster (base of XModifiable)
+    // css::util::XModifyBroadcaster (base of XModifiable)
     virtual void SAL_CALL
-        addModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL
-        removeModifyListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifyListener >& xListener )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XModifyListener ____
     virtual void SAL_CALL modified(
-        const ::com::sun::star::lang::EventObject& aEvent )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XEventListener (base of XModifyListener) ____
     virtual void SAL_CALL disposing(
-        const ::com::sun::star::lang::EventObject& Source )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& Source )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ datatransferable::XTransferable ____
-    virtual ::com::sun::star::uno::Any SAL_CALL getTransferData(
-        const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
-        throw (::com::sun::star::datatransfer::UnsupportedFlavorException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getTransferData(
+        const css::datatransfer::DataFlavor& aFlavor )
+        throw (css::datatransfer::UnsupportedFlavorException,
+               css::io::IOException,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL isDataFlavorSupported(
-        const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::datatransfer::DataFlavor& aFlavor )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // lang::XTypeProvider (override method of WeakImplHelper)
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL
-        getTypes() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL
+        getTypes() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ document::XDocumentPropertiesSupplier ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > SAL_CALL
-        getDocumentProperties(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL
+        getDocumentProperties(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ document::XUndoManagerSupplier ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XUndoManager > SAL_CALL
-        getUndoManager(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL
+        getUndoManager(  ) throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::chart2::XChartDocument
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram > SAL_CALL
-        getFirstDiagram()       throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    // css::chart2::XChartDocument
+    virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL
+        getFirstDiagram() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setFirstDiagram(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XDiagram >& xDiagram )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::chart2::XDiagram >& xDiagram )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL
         createInternalDataProvider( sal_Bool bCloneExistingData )
-            throw (::com::sun::star::util::CloseVetoException,
-                   ::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::util::CloseVetoException,
+                   css::uno::RuntimeException, std::exception) override;
     virtual sal_Bool SAL_CALL hasInternalDataProvider()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider > SAL_CALL
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::data::XDataProvider > SAL_CALL
         getDataProvider()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL
-        setChartTypeManager( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager >& xNewManager )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartTypeManager > SAL_CALL
+        setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XChartTypeManager > SAL_CALL
         getChartTypeManager()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL
         getPageBackground()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+            throw (css::uno::RuntimeException, std::exception) override;
 
     virtual void SAL_CALL createDefaultChart() throw (css::uno::RuntimeException, std::exception) override;
 
@@ -421,156 +421,157 @@ public:
 
     // ____ XDataReceiver (public API) ____
     virtual void SAL_CALL
-        attachDataProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataProvider >& xProvider )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider )
+            throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setArguments(
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArguments )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSource > SAL_CALL getUsedData()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL attachNumberFormatsSupplier( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xSupplier )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Sequence< css::beans::PropertyValue >& aArguments )
+        throw (css::lang::IllegalArgumentException,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL attachNumberFormatsSupplier( const css::uno::Reference<
+        css::util::XNumberFormatsSupplier >& xSupplier )
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter()
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XTitled ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle > SAL_CALL getTitleObject()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setTitleObject( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTitle >& Title )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XInterface (for old API wrapper) ____
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XLoadable ____
     virtual void SAL_CALL initNew()
-        throw (::com::sun::star::frame::DoubleInitializationException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL load( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
-        throw (::com::sun::star::frame::DoubleInitializationException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::frame::DoubleInitializationException,
+               css::io::IOException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
+        throw (css::frame::DoubleInitializationException,
+               css::io::IOException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XCloneable ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone()
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XVisualObject ____
     virtual void SAL_CALL setVisualAreaSize(
         ::sal_Int64 nAspect,
-        const ::com::sun::star::awt::Size& aSize )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::embed::WrongStateException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getVisualAreaSize(
+        const css::awt::Size& aSize )
+        throw (css::lang::IllegalArgumentException,
+               css::embed::WrongStateException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getVisualAreaSize(
         ::sal_Int64 nAspect )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::embed::WrongStateException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation(
+        throw (css::lang::IllegalArgumentException,
+               css::embed::WrongStateException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation(
         ::sal_Int64 nAspect )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::embed::WrongStateException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::IllegalArgumentException,
+               css::embed::WrongStateException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
     virtual ::sal_Int32 SAL_CALL getMapUnit(
         ::sal_Int64 nAspect )
-        throw (::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XMultiServiceFactory ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
         createInstance( const OUString& aServiceSpecifier )
-            throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL
         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, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL
-        getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+                                   , const css::uno::Sequence< css::uno::Any >& Arguments )
+            throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL
+        getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XStorageBasedDocument ____
     virtual void SAL_CALL loadFromStorage(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::frame::DoubleInitializationException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::embed::XStorage >& xStorage,
+        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
+        throw (css::lang::IllegalArgumentException,
+               css::frame::DoubleInitializationException,
+               css::io::IOException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL storeToStorage(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
-        const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rMediaDescriptor )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::embed::XStorage >& xStorage,
+        const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor )
+        throw (css::lang::IllegalArgumentException,
+               css::io::IOException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL switchToStorage(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::io::IOException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > SAL_CALL getDocumentStorage()
-        throw (::com::sun::star::io::IOException,
-               ::com::sun::star::uno::Exception,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::embed::XStorage >& xStorage )
+        throw (css::lang::IllegalArgumentException,
+               css::io::IOException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage()
+        throw (css::io::IOException,
+               css::uno::Exception,
+               css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL addStorageChangeListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL removeStorageChangeListener(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::document::XStorageChangeListener >& xListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::document::XStorageChangeListener >& xListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // for SvNumberFormatsSupplierObj
     // ____ XUnoTunnel ___
-    virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier )
+            throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XNumberFormatsSupplier ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings()
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats()
+            throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XChild ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getParent()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL setParent(
-        const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& Parent )
-        throw (::com::sun::star::lang::NoSupportException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::uno::Reference< css::uno::XInterface >& Parent )
+        throw (css::lang::NoSupportException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XDataSource ____ allows access to the currently used data and data ranges
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences()
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // X3DChartWindowProvider
     virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XUpdatable
     virtual void SAL_CALL update()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // XDumper
     virtual OUString SAL_CALL dump()
-        throw (com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // normal methods
-    ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >
+    css::uno::Reference< css::util::XNumberFormatsSupplier >
         getNumberFormatsSupplier();
 
-    com::sun::star::uno::Reference< com::sun::star::uno::XInterface > getChartView() { return xChartView;}
+    css::uno::Reference< css::uno::XInterface > getChartView() { return xChartView;}
 
     bool isTimeBased() const { return mbTimeBased;}
     void setTimeBased(bool bTimeBased);
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index 079c6ea..013335b 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -88,16 +88,16 @@ struct TimeBasedInfo
  * done by the ChartWindow).
  */
 class ChartView : public ::cppu::WeakImplHelper<
-    ::com::sun::star::lang::XInitialization
-        ,::com::sun::star::lang::XServiceInfo
-        ,::com::sun::star::datatransfer::XTransferable
-        ,::com::sun::star::lang::XUnoTunnel
-        ,::com::sun::star::util::XModifyListener
-        ,::com::sun::star::util::XModeChangeBroadcaster
-        ,::com::sun::star::util::XUpdatable2
-        ,::com::sun::star::beans::XPropertySet
-        ,::com::sun::star::lang::XMultiServiceFactory
-        ,::com::sun::star::qa::XDumper
+    css::lang::XInitialization
+        ,css::lang::XServiceInfo
+        ,css::datatransfer::XTransferable
+        ,css::lang::XUnoTunnel
+        ,css::util::XModifyListener
+        ,css::util::XModeChangeBroadcaster
+        ,css::util::XUpdatable2
+        ,css::beans::XPropertySet
+        ,css::lang::XMultiServiceFactory
+        ,css::qa::XDumper
         >
         , public ExplicitValueProvider
         , private SfxListener
@@ -107,8 +107,7 @@ private:
     void init();
 
 public:
-    ChartView(::com::sun::star::uno::Reference<
-               ::com::sun::star::uno::XComponentContext > const & xContext,
+    ChartView(css::uno::Reference< css::uno::XComponentContext > const & xContext,
                ChartModel& rModel);
 
     virtual ~ChartView();
@@ -125,85 +124,85 @@ public:
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // ___lang::XInitialization___
-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments )
-                throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+                throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
 
     // ___ExplicitValueProvider___
     virtual bool getExplicitValuesForAxis(
-        ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > xAxis
+        css::uno::Reference< css::chart2::XAxis > xAxis
         , ExplicitScaleData&  rExplicitScale
         , ExplicitIncrementData& rExplicitIncrement ) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >
+    virtual css::uno::Reference< css::drawing::XShape >
         getShapeForCID( const OUString& rObjectCID ) override;
 
-    virtual ::com::sun::star::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false ) override;
+    virtual css::awt::Rectangle getRectangleOfObject( const OUString& rObjectCID, bool bSnapRect=false ) override;
 
-    virtual ::com::sun::star::awt::Rectangle getDiagramRectangleExcludingAxes() override;
+    virtual css::awt::Rectangle getDiagramRectangleExcludingAxes() override;
 
     std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() override;
 
     // ___XTransferable___
-    virtual ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
-                throw (::com::sun::star::datatransfer::UnsupportedFlavorException
-                     , ::com::sun::star::io::IOException
-                     , ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
-                throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor )
-                throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-
-    // ::com::sun::star::util::XEventListener (base of XCloseListener and XModifyListener)
+    virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor )
+                throw (css::datatransfer::UnsupportedFlavorException
+                     , css::io::IOException
+                     , css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors(  )
+                throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor )
+                throw (css::uno::RuntimeException, std::exception) override;
+
+    // css::util::XEventListener (base of XCloseListener and XModifyListener)
     virtual void SAL_CALL
-        disposing( const ::com::sun::star::lang::EventObject& Source )
-                            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        disposing( const css::lang::EventObject& Source )
+                            throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::util::XModifyListener
+    // css::util::XModifyListener
     virtual void SAL_CALL modified(
-        const ::com::sun::star::lang::EventObject& aEvent )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        const css::lang::EventObject& aEvent )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     //SfxListener
     virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
-    // ::com::sun::star::util::XModeChangeBroadcaster
+    // css::util::XModeChangeBroadcaster
 
-    virtual void SAL_CALL addModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModeChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeListener >& _rxListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeModeChangeApproveListener( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XModeChangeApproveListener >& _rxListener ) throw (::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override;
 
-    // ::com::sun::star::util::XUpdatable
-    virtual void SAL_CALL update() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    // css::util::XUpdatable
+    virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override;
 
     // util::XUpdatable2
     virtual void SAL_CALL updateSoft() throw (css::uno::RuntimeException, std::exception) override;
     virtual void SAL_CALL updateHard() throw (css::uno::RuntimeException, std::exception) override;
 
-    // ::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, std::exception) override;
-    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, std::exception) override;
-    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, std::exception) override;
-    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, std::exception) override;
-    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, std::exception) override;
-    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, std::exception) override;
-    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, std::exception) override;
-
-    // ::com::sun::star::lang::XMultiServiceFactory
-    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, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL 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, std::exception) override;
-    virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    // css::beans::XPropertySet
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override;
+
+    // css::lang::XMultiServiceFactory
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier )
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments(
+        const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments )
+        throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override;
 
     // for ExplicitValueProvider
     // ____ XUnoTunnel ___
-    virtual ::sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< ::sal_Int8 >& aIdentifier )
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier )
+            throw (css::uno::RuntimeException, std::exception) override;
 
     // XDumper
     virtual OUString SAL_CALL dump()
-            throw(::com::sun::star::uno::RuntimeException,
+            throw(css::uno::RuntimeException,
                   std::exception) override;
 
     void setViewDirty();
@@ -217,7 +216,7 @@ private: //methods
     bool createAxisTitleShapes2D( CreateShapeParam2D& rParam, const css::awt::Size& rPageSize );
     void createShapes3D();
     bool isReal3DChart();
-    void getMetaFile( const ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream >& xOutStream
+    void getMetaFile( const css::uno::Reference< css::io::XOutputStream >& xOutStream
                       , bool bUseHighContrast );
     SdrPage* getSdrPage();
 
@@ -237,24 +236,24 @@ private: //methods
 private: //member
     ::osl::Mutex m_aMutex;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext>
+    css::uno::Reference< css::uno::XComponentContext>
             m_xCC;
 
     chart::ChartModel& mrChartModel;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>
+    css::uno::Reference< css::lang::XMultiServiceFactory>
             m_xShapeFactory;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage>
+    css::uno::Reference< css::drawing::XDrawPage>
             m_xDrawPage;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >
+    css::uno::Reference< css::drawing::XShapes >
             mxRootShape;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDashTable;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xGradientTable;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xHatchTable;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xBitmapTable;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xTransGradientTable;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xMarkerTable;
+    css::uno::Reference< css::uno::XInterface > m_xDashTable;
+    css::uno::Reference< css::uno::XInterface > m_xGradientTable;
+    css::uno::Reference< css::uno::XInterface > m_xHatchTable;
+    css::uno::Reference< css::uno::XInterface > m_xBitmapTable;
+    css::uno::Reference< css::uno::XInterface > m_xTransGradientTable;
+    css::uno::Reference< css::uno::XInterface > m_xMarkerTable;
 
     std::shared_ptr< DrawModelWrapper > m_pDrawModelWrapper;
 
@@ -269,7 +268,7 @@ private: //member
     bool m_bRefreshAddIn;
 
     //better performance for big data
-    ::com::sun::star::awt::Size m_aPageResolution;
+    css::awt::Size m_aPageResolution;
     bool m_bPointsWereSkipped;
 
     //#i75867# poor quality of ole's alternative view with 3D scenes and zoomfactors besides 100%
@@ -280,7 +279,7 @@ private: //member
 
     bool m_bSdrViewIsInEditMode;
 
-    ::com::sun::star::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes;
+    css::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes;
 
     std::shared_ptr<GL3DPlotterBase> m_pGL3DPlotter;
     TimeBasedInfo maTimeBased;
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
index 9305469..fbdc160 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.cxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.cxx
@@ -36,13 +36,13 @@ AccStatisticsObject::~AccStatisticsObject()
 }
 
 OUString SAL_CALL AccStatisticsObject::getAccessibleName()
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (css::uno::RuntimeException)
 {
     return getToolTipText();
 }
 
 OUString SAL_CALL AccStatisticsObject::getImplementationName()
-    throw (::com::sun::star::uno::RuntimeException)
+    throw (css::uno::RuntimeException)
 {
     return OUString( "StatisticsObject" );
 }
diff --git a/chart2/source/controller/accessibility/AccStatisticsObject.hxx b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
index 9c8fcc7..4688ae4 100644
--- a/chart2/source/controller/accessibility/AccStatisticsObject.hxx
+++ b/chart2/source/controller/accessibility/AccStatisticsObject.hxx
@@ -34,10 +34,10 @@ public:
     virtual ~AccStatisticsObject();
 
     // ________ XAccessibleContext ________
-    virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getAccessibleName() throw (css::uno::RuntimeException);
 
     // ________ XServiceInfo ________
-    virtual OUString SAL_CALL getImplementationName() throw (::com::sun::star::uno::RuntimeException);
+    virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException);
 };
 
 }  // accessibility
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 350a593..6888666 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -118,8 +118,8 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId
     {
         // event is addressed to this object
 
-        ::com::sun::star::uno::Any aEmpty;
-        ::com::sun::star::uno::Any aSelected;
+        css::uno::Any aEmpty;
+        css::uno::Any aSelected;
         aSelected <<= AccessibleStateType::SELECTED;
         switch( eEventType )
         {
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index 767cfba..375f63c 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -154,7 +154,7 @@ OUString SAL_CALL AccessibleChartElement::getImplementationName()
 
 // ________ AccessibleChartElement::XAccessibleContext (override) ________
 OUString SAL_CALL AccessibleChartElement::getAccessibleName()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     return ObjectNameProvider::getNameForCID(
         GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument );
@@ -162,7 +162,7 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName()
 
 // ________ AccessibleChartElement::XAccessibleContext (override) ________
 OUString SAL_CALL AccessibleChartElement::getAccessibleDescription()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     return getToolTipText();
 }
@@ -197,7 +197,7 @@ OUString SAL_CALL AccessibleChartElement::getTitledBorderText()
 }
 
 OUString SAL_CALL AccessibleChartElement::getToolTipText()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     CheckDisposeState();
 
diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
index 7e4e754..b6aef8b 100644
--- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx
@@ -60,7 +60,7 @@ namespace impl
 {
 typedef ::cppu::ImplInheritanceHelper<
         AccessibleBase,
-        ::com::sun::star::accessibility::XAccessibleExtendedComponent
+        css::accessibility::XAccessibleExtendedComponent
         > AccessibleChartElement_Base;
 }
 
@@ -75,51 +75,49 @@ public:
 
     // ________ AccessibleBase ________
     virtual bool ImplUpdateChildren() override;
-    virtual ::com::sun::star::uno::Reference<
-            ::com::sun::star::accessibility::XAccessible >
+    virtual css::uno::Reference< css::accessibility::XAccessible >
         ImplGetAccessibleChildById( sal_Int32 i ) const
-        throw (::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::uno::RuntimeException) override;
+        throw (css::lang::IndexOutOfBoundsException,
+               css::uno::RuntimeException) override;
     virtual sal_Int32 ImplGetAccessibleChildCount() const
-        throw (::com::sun::star::uno::RuntimeException) override;
+        throw (css::uno::RuntimeException) override;
 
     // ________ XAccessibleContext ________
     virtual OUString SAL_CALL getAccessibleName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getAccessibleDescription()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ________ XAccessibleExtendedComponent ________
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getTitledBorderText()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getToolTipText()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // the following interface is implemented in AccessibleBase, however it is
     // also a (non-virtual) base class of XAccessibleExtendedComponent Thus
     // these methods have to be overridden and forward to AccessibleBase
 
     // ________ XAccessibleComponent ________
-    virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override;
 
     // ________ XServiceInfo ________
     virtual OUString SAL_CALL getImplementationName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     bool                m_bHasText;
-    ::com::sun::star::uno::Reference<
-            ::com::sun::star::accessibility::XAccessibleContext >
+    css::uno::Reference< css::accessibility::XAccessibleContext >
                         m_xTextHelper;
 
     void InitTextEdit();
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index 3dc509b..e7b4eed 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -116,7 +116,7 @@ sal_Int16 AccessibleChartShape::getAccessibleRole()
 }
 
 OUString AccessibleChartShape::getAccessibleDescription()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     OUString aDescription;
     if ( m_pAccShape.is() )
@@ -127,7 +127,7 @@ OUString AccessibleChartShape::getAccessibleDescription()
 }
 
 OUString AccessibleChartShape::getAccessibleName()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     OUString aName;
     if ( m_pAccShape.is() )
@@ -256,7 +256,7 @@ OUString AccessibleChartShape::getTitledBorderText()
 }
 
 OUString AccessibleChartShape::getToolTipText()
-    throw (::com::sun::star::uno::RuntimeException, std::exception)
+    throw (css::uno::RuntimeException, std::exception)
 {
     OUString aText;
     if ( m_pAccShape.is() )
diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
index 42ea91e..97bbb8d 100644
--- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx
+++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx
@@ -37,7 +37,7 @@ namespace impl
 {
 typedef ::cppu::ImplInheritanceHelper<
     AccessibleBase,
-    ::com::sun::star::accessibility::XAccessibleExtendedComponent > AccessibleChartShape_Base;
+    css::accessibility::XAccessibleExtendedComponent > AccessibleChartShape_Base;
 }
 
 class AccessibleChartShape :
@@ -50,40 +50,40 @@ public:
 
     // ________ XServiceInfo ________
     virtual OUString SAL_CALL getImplementationName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ________ XAccessibleContext ________
     virtual sal_Int32 SAL_CALL getAccessibleChildCount()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL
         getAccessibleChild( sal_Int32 i )
-        throw (::com::sun::star::lang::IndexOutOfBoundsException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::lang::IndexOutOfBoundsException,
+               css::uno::RuntimeException, std::exception) override;
     virtual sal_Int16 SAL_CALL getAccessibleRole()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getAccessibleDescription()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getAccessibleName()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ________ XAccessibleComponent ________
-    virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const ::com::sun::star::awt::Point& aPoint ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Rectangle SAL_CALL getBounds() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocation() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Point SAL_CALL getLocationOnScreen() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL grabFocus() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getForeground() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual sal_Int32 SAL_CALL getBackground() throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override;
+    virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override;
 
     // ________ XAccessibleExtendedComponent ________
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XFont > SAL_CALL getFont()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont()
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getTitledBorderText()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
     virtual OUString SAL_CALL getToolTipText()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
 private:
     rtl::Reference<accessibility::AccessibleShape> m_pAccShape;
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 42f5d7f..958b6ba 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -54,7 +54,7 @@ struct StaticAreaWrapperPropertyArray_Initializer
 private:
     static Sequence< Property > lcl_GetPropertySequence()
     {
-        ::std::vector< ::com::sun::star::beans::Property > aProperties;
+        ::std::vector< css::beans::Property > aProperties;
         ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
         ::chart::FillProperties::AddPropertiesToVector( aProperties );
         ::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
index 6ba98ac..1f983f4 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx
@@ -41,9 +41,9 @@ class Chart2ModelContact;
 
 class AreaWrapper : public ::cppu::ImplInheritanceHelper<
                       WrappedPropertySet
-                    , com::sun::star::drawing::XShape
-                    , com::sun::star::lang::XComponent
-                    , com::sun::star::lang::XServiceInfo
+                    , css::drawing::XShape
+                    , css::lang::XComponent
+                    , css::lang::XServiceInfo
                     >
 {
 public:
@@ -62,35 +62,35 @@ public:
     static css::uno::Sequence< OUString > getSupportedServiceNames_Static();
 
     // ____ XShape ____
-    virtual ::com::sun::star::awt::Point SAL_CALL getPosition()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize )
-        throw (::com::sun::star::beans::PropertyVetoException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize )
+        throw (css::beans::PropertyVetoException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XShapeDescriptor (base of XShape) ____
     virtual OUString SAL_CALL getShapeType()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XComponent ____
     virtual void SAL_CALL dispose()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference<
-                                            ::com::sun::star::lang::XEventListener >& xListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference<
-                                               ::com::sun::star::lang::XEventListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference<
+                                            css::lang::XEventListener >& xListener )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference<
+                                               css::lang::XEventListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
 protected:
     // ____ WrappedPropertySet ____
-    virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override;
+    virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override;
     virtual const std::vector< WrappedProperty* > createWrappedProperties() override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override;
+    virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override;
 
 private:
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index aa09857..f574bba 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -177,21 +177,21 @@ void lcl_AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "AxisType",
                   PROP_AXIS_TYPE,
-                  cppu::UnoType<sal_Int32>::get(), //type com::sun::star::chart::ChartAxisType
+                  cppu::UnoType<sal_Int32>::get(), //type css::chart::ChartAxisType
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
         Property( "TimeIncrement",
                   PROP_AXIS_TIME_INCREMENT,
-                  cppu::UnoType<com::sun::star::chart::TimeIncrement>::get(),
+                  cppu::UnoType<css::chart::TimeIncrement>::get(),
                   //#i111967# no PropertyChangeEvent is fired on change so far
                   beans::PropertyAttribute::MAYBEVOID ));
 
     rOutProperties.push_back(
         Property( "ExplicitTimeIncrement",
                   PROP_AXIS_EXPLICIT_TIME_INCREMENT,
-                  cppu::UnoType<com::sun::star::chart::TimeIncrement>::get(),
+                  cppu::UnoType<css::chart::TimeIncrement>::get(),
                   beans::PropertyAttribute::READONLY |
                   beans::PropertyAttribute::MAYBEVOID ));
 
@@ -220,7 +220,7 @@ void lcl_AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "CrossoverPosition",
                   PROP_AXIS_CROSSOVER_POSITION,
-                  cppu::UnoType<com::sun::star::chart::ChartAxisPosition>::get(),
+                  cppu::UnoType<css::chart::ChartAxisPosition>::get(),
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
@@ -261,7 +261,7 @@ void lcl_AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "MarkPosition",
                   PROP_AXIS_MARK_POSITION,
-                  cppu::UnoType<com::sun::star::chart::ChartAxisMarkPosition>::get(),
+                  cppu::UnoType<css::chart::ChartAxisMarkPosition>::get(),
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     //Properties for labels:
@@ -289,7 +289,7 @@ void lcl_AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "LabelPosition",
                   PROP_AXIS_LABEL_POSITION,
-                  cppu::UnoType<com::sun::star::chart::ChartAxisLabelPosition>::get(),
+                  cppu::UnoType<css::chart::ChartAxisLabelPosition>::get(),
                   beans::PropertyAttribute::MAYBEDEFAULT ));
 
     rOutProperties.push_back(
@@ -302,7 +302,7 @@ void lcl_AddPropertiesToVector(
     rOutProperties.push_back(
         Property( "ArrangeOrder",
                   PROP_AXIS_ARRANGE_ORDER,
-                  cppu::UnoType<com::sun::star::chart::ChartAxisArrangeOrderType>::get(),
+                  cppu::UnoType<css::chart::ChartAxisArrangeOrderType>::get(),
                   beans::PropertyAttribute::BOUND
                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 
@@ -379,7 +379,7 @@ struct StaticAxisWrapperPropertyArray_Initializer
 private:
     static Sequence< Property > lcl_GetPropertySequence()
     {
-        ::std::vector< ::com::sun::star::beans::Property > aProperties;
+        ::std::vector< css::beans::Property > aProperties;
         lcl_AddPropertiesToVector( aProperties );
         ::chart::CharacterProperties::AddPropertiesToVector( aProperties );
         ::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
index e0dcf25..2ba3dc0 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx
@@ -43,11 +43,11 @@ class Chart2ModelContact;
 
 class AxisWrapper : public ::cppu::ImplInheritanceHelper<
                       WrappedPropertySet
-                    , com::sun::star::chart::XAxis
-                    , com::sun::star::drawing::XShape
-                    , com::sun::star::lang::XComponent
-                    , com::sun::star::lang::XServiceInfo
-                    , com::sun::star::util::XNumberFormatsSupplier
+                    , css::chart::XAxis
+                    , css::drawing::XShape
+                    , css::lang::XComponent
+                    , css::lang::XServiceInfo
+                    , css::util::XNumberFormatsSupplier
                     >
                     , public ReferenceSizePropertyProvider
 {
@@ -79,55 +79,55 @@ public:
 
     //ReferenceSizePropertyProvider
     virtual void updateReferenceSize() override;
-    virtual ::com::sun::star::uno::Any getReferenceSize() override;
-    virtual ::com::sun::star::awt::Size getCurrentSizeForReference() override;
+    virtual css::uno::Any getReferenceSize() override;
+    virtual css::awt::Size getCurrentSizeForReference() override;
 
     // ____ XComponent ____
     virtual void SAL_CALL dispose()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference<
-                                            ::com::sun::star::lang::XEventListener >& xListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference<
-                                               ::com::sun::star::lang::XEventListener >& aListener )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL addEventListener( const css::uno::Reference<
+                                            css::lang::XEventListener >& xListener )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL removeEventListener( const css::uno::Reference<
+                                               css::lang::XEventListener >& aListener )
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ chart::XAxis ____
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getAxisTitle(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMajorGrid(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getMinorGrid(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid(  ) throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid(  ) throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XShape ____
-    virtual ::com::sun::star::awt::Point SAL_CALL getPosition()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition )
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::awt::Size SAL_CALL getSize()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize )
-        throw (::com::sun::star::beans::PropertyVetoException,
-               ::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Point SAL_CALL getPosition()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setPosition( const css::awt::Point& aPosition )
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::awt::Size SAL_CALL getSize()
+        throw (css::uno::RuntimeException, std::exception) override;
+    virtual void SAL_CALL setSize( const css::awt::Size& aSize )
+        throw (css::beans::PropertyVetoException,
+               css::uno::RuntimeException, std::exception) override;
 
     // ____ XShapeDescriptor (base of XShape) ____
     virtual OUString SAL_CALL getShapeType()
-        throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+        throw (css::uno::RuntimeException, std::exception) override;
 
     // ____ XNumberFormatsSupplier ____
-    virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::beans::XPropertySet > SAL_CALL getNumberFormatSettings()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
-    virtual ::com::sun::star::uno::Reference<
-                ::com::sun::star::util::XNumberFormats > SAL_CALL getNumberFormats()
-            throw (::com::sun::star::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<
+                css::beans::XPropertySet > SAL_CALL getNumberFormatSettings()
+            throw (css::uno::RuntimeException, std::exception) override;
+    virtual css::uno::Reference<
+                css::util::XNumberFormats > SAL_CALL getNumberFormats()
+            throw (css::uno::RuntimeException, std::exception) override;
 
 protected:
     // ____ WrappedPropertySet ____
-    virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::Property >& getPropertySequence() override;
+    virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override;
     virtual const std::vector< WrappedProperty* > createWrappedProperties() override;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > getInnerPropertySet() override;
+    virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override;
 
 private: //methods
-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxis();
+    css::uno::Reference< css::chart2::XAxis > getAxis();
 
 private: //member
     std::shared_ptr< Chart2ModelContact >   m_spChart2ModelContact;
@@ -135,9 +135,9 @@ private: //member
 
     tAxisType           m_eType;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xAxisTitle;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xMajorGrid;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >   m_xMinorGrid;
+    css::uno::Reference< css::beans::XPropertySet >   m_xAxisTitle;
+    css::uno::Reference< css::beans::XPropertySet >   m_xMajorGrid;
+    css::uno::Reference< css::beans::XPropertySet >   m_xMinorGrid;
 };
 
 } //  namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 9741197..1553de4 100644
--- a/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -56,8 +56,7 @@ Chart2ModelContact::~Chart2ModelContact()
     this->clear();
 }
 
-void Chart2ModelContact::setModel( const ::com::sun::star::uno::Reference<
-                       ::com::sun::star::frame::XModel >& xChartModel )
+void Chart2ModelContact::setModel( const css::uno::Reference< css::frame::XModel >& xChartModel )
 {
     this->clear();
     m_xChartModel = xChartModel;
@@ -252,8 +251,7 @@ awt::Point Chart2ModelContact::GetLegendPosition() const
     return aPoint;
 }
 
-awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference<
-        ::com::sun::star::chart2::XTitle > & xTitle ) const
+awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference< css::chart2::XTitle > & xTitle ) const
 {
     awt::Size aSize;
     ExplicitValueProvider* pProvider( getExplicitValueProvider() );
@@ -265,8 +263,7 @@ awt::Size Chart2ModelContact::GetTitleSize( const uno::Reference<
     return aSize;
 }
 
-awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference<
-        ::com::sun::star::chart2::XTitle > & xTitle ) const
+awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference< css::chart2::XTitle > & xTitle ) const
 {
     awt::Point aPoint;
     ExplicitValueProvider* pProvider( getExplicitValueProvider() );
@@ -278,8 +275,7 @@ awt::Point Chart2ModelContact::GetTitlePosition( const uno::Reference<
     return aPoint;
 }
 
-awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference<
-        ::com::sun::star::chart2::XAxis > & xAxis ) const
+awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference< css::chart2::XAxis > & xAxis ) const
 {
     awt::Size aSize;
     ExplicitValueProvider* pProvider( getExplicitValueProvider() );
@@ -291,8 +287,7 @@ awt::Size Chart2ModelContact::GetAxisSize( const uno::Reference<
     return aSize;
 }
 
-awt::Point Chart2ModelContact::GetAxisPosition( const uno::Reference<

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list