summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--canvas/source/cairo/cairo_canvashelper.cxx4
-rw-r--r--canvas/source/cairo/cairo_spritecanvashelper.cxx16
-rw-r--r--canvas/source/cairo/cairo_spritecanvashelper.hxx4
-rw-r--r--canvas/source/cairo/cairo_textlayout.cxx4
-rw-r--r--canvas/source/directx/dx_9rm.cxx12
-rw-r--r--canvas/source/directx/dx_canvascustomsprite.cxx2
-rw-r--r--canvas/source/directx/dx_canvascustomsprite.hxx2
-rw-r--r--canvas/source/directx/dx_canvashelper.cxx4
-rw-r--r--canvas/source/directx/dx_canvashelper_texturefill.cxx4
-rw-r--r--canvas/source/directx/dx_impltools.cxx10
-rw-r--r--canvas/source/directx/dx_spritecanvashelper.cxx8
-rw-r--r--canvas/source/directx/dx_spritecanvashelper.hxx8
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.cxx8
-rw-r--r--canvas/source/directx/dx_spritedevicehelper.hxx4
-rw-r--r--canvas/source/directx/dx_textlayout_drawhelper.cxx2
-rw-r--r--canvas/source/directx/dx_winstuff.hxx2
-rw-r--r--canvas/source/opengl/ogl_canvashelper.cxx20
-rw-r--r--canvas/source/opengl/ogl_textlayout.cxx2
-rw-r--r--canvas/source/tools/canvascustomspritehelper.cxx6
-rw-r--r--canvas/source/tools/canvastools.cxx12
-rw-r--r--canvas/source/tools/spriteredrawmanager.cxx28
-rw-r--r--canvas/source/tools/surface.cxx8
-rw-r--r--canvas/source/tools/surfaceproxy.cxx4
-rw-r--r--canvas/source/vcl/canvascustomsprite.cxx4
-rw-r--r--canvas/source/vcl/canvashelper.cxx6
-rw-r--r--canvas/source/vcl/canvashelper_texturefill.cxx4
-rw-r--r--canvas/source/vcl/spritecanvashelper.cxx20
-rw-r--r--canvas/source/vcl/spritecanvashelper.hxx4
-rw-r--r--canvas/source/vcl/textlayout.cxx8
-rw-r--r--chart2/inc/ChartModel.hxx2
-rw-r--r--chart2/inc/ChartView.hxx2
-rw-r--r--chart2/source/controller/accessibility/AccessibleBase.cxx22
-rw-r--r--chart2/source/controller/chartapiwrapper/AreaWrapper.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/AxisWrapper.cxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx14
-rw-r--r--chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx12
-rw-r--r--chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx20
-rw-r--r--chart2/source/controller/chartapiwrapper/GridWrapper.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/LegendWrapper.cxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/TitleWrapper.cxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx4
-rw-r--r--chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx8
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx64
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx6
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx2
-rw-r--r--chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx2
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx8
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.hxx2
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.cxx26
-rw-r--r--chart2/source/controller/dialogs/DataBrowserModel.hxx4
-rw-r--r--chart2/source/controller/dialogs/DialogModel.cxx58
-rw-r--r--chart2/source/controller/dialogs/DialogModel.hxx12
-rw-r--r--chart2/source/controller/dialogs/ObjectNameProvider.cxx4
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx2
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx4
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx14
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx6
-rw-r--r--chart2/source/controller/drawinglayer/DrawViewWrapper.cxx2
-rw-r--r--chart2/source/controller/inc/AccessibleBase.hxx4
-rw-r--r--chart2/source/controller/inc/AxisItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/CommandDispatchContainer.hxx8
-rw-r--r--chart2/source/controller/inc/DataPointItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/DrawViewWrapper.hxx2
-rw-r--r--chart2/source/controller/inc/ItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/ItemPropertyMap.hxx2
-rw-r--r--chart2/source/controller/inc/LegendItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/MultipleItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/ObjectHierarchy.hxx4
-rw-r--r--chart2/source/controller/inc/RegressionEquationItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/TitleItemConverter.hxx2
-rw-r--r--chart2/source/controller/inc/dlg_DataSource.hxx4
-rw-r--r--chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx8
-rw-r--r--chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx6
-rw-r--r--chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx2
-rw-r--r--chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx2
-rw-r--r--chart2/source/controller/main/ChartController.cxx4
-rw-r--r--chart2/source/controller/main/ChartController_Insert.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Tools.cxx2
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx4
-rw-r--r--chart2/source/controller/main/ChartDropTargetHelper.cxx6
-rw-r--r--chart2/source/controller/main/CommandDispatch.hxx2
-rw-r--r--chart2/source/controller/main/CommandDispatchContainer.cxx2
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.cxx6
-rw-r--r--chart2/source/controller/main/ControllerCommandDispatch.hxx8
-rw-r--r--chart2/source/controller/main/DrawCommandDispatch.cxx8
-rw-r--r--chart2/source/controller/main/ElementSelector.hxx2
-rw-r--r--chart2/source/controller/main/FeatureCommandDispatchBase.hxx2
-rw-r--r--chart2/source/controller/main/ObjectHierarchy.cxx16
-rw-r--r--chart2/source/inc/CharacterProperties.hxx2
-rw-r--r--chart2/source/inc/ChartModelHelper.hxx6
-rw-r--r--chart2/source/inc/CloneHelper.hxx12
-rw-r--r--chart2/source/inc/CommonConverters.hxx10
-rw-r--r--chart2/source/inc/CommonFunctors.hxx10
-rw-r--r--chart2/source/inc/ConfigColorScheme.hxx2
-rw-r--r--chart2/source/inc/ContainerHelper.hxx12
-rw-r--r--chart2/source/inc/DataSeriesHelper.hxx2
-rw-r--r--chart2/source/inc/DiagramHelper.hxx4
-rw-r--r--chart2/source/inc/ErrorBar.hxx2
-rw-r--r--chart2/source/inc/EventListenerHelper.hxx8
-rw-r--r--chart2/source/inc/ExplicitCategoriesProvider.hxx2
-rw-r--r--chart2/source/inc/FillProperties.hxx2
-rw-r--r--chart2/source/inc/InternalData.hxx16
-rw-r--r--chart2/source/inc/InternalDataProvider.hxx6
-rw-r--r--chart2/source/inc/LinePropertiesHelper.hxx2
-rw-r--r--chart2/source/inc/ModifyListenerHelper.hxx24
-rw-r--r--chart2/source/inc/NameContainer.hxx2
-rw-r--r--chart2/source/inc/RegressionCalculationHelper.hxx16
-rw-r--r--chart2/source/inc/SceneProperties.hxx2
-rw-r--r--chart2/source/inc/UserDefinedProperties.hxx2
-rw-r--r--chart2/source/inc/WrappedProperty.hxx2
-rw-r--r--chart2/source/inc/chartview/ExplicitScaleValues.hxx2
-rw-r--r--chart2/source/model/filter/XMLFilter.cxx4
-rw-r--r--chart2/source/model/inc/BaseCoordinateSystem.hxx4
-rw-r--r--chart2/source/model/inc/DataSeries.hxx6
-rw-r--r--chart2/source/model/inc/Diagram.hxx2
-rw-r--r--chart2/source/model/main/Axis.cxx6
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx12
-rw-r--r--chart2/source/model/main/ChartModel.cxx2
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx4
-rw-r--r--chart2/source/model/main/DataPoint.cxx4
-rw-r--r--chart2/source/model/main/DataPointProperties.cxx2
-rw-r--r--chart2/source/model/main/DataPointProperties.hxx2
-rw-r--r--chart2/source/model/main/DataSeries.cxx14
-rw-r--r--chart2/source/model/main/DataSeriesProperties.cxx2
-rw-r--r--chart2/source/model/main/DataSeriesProperties.hxx2
-rw-r--r--chart2/source/model/main/Diagram.cxx16
-rw-r--r--chart2/source/model/main/FormattedString.cxx4
-rw-r--r--chart2/source/model/main/GridProperties.cxx6
-rw-r--r--chart2/source/model/main/Legend.cxx6
-rw-r--r--chart2/source/model/main/PageBackground.cxx4
-rw-r--r--chart2/source/model/main/StockBar.cxx4
-rw-r--r--chart2/source/model/main/Title.cxx6
-rw-r--r--chart2/source/model/main/Wall.cxx4
-rw-r--r--chart2/source/model/template/AreaChartTypeTemplate.cxx10
-rw-r--r--chart2/source/model/template/BarChartTypeTemplate.cxx10
-rw-r--r--chart2/source/model/template/BubbleChartType.cxx4
-rw-r--r--chart2/source/model/template/BubbleChartTypeTemplate.cxx4
-rw-r--r--chart2/source/model/template/CandleStickChartType.cxx10
-rw-r--r--chart2/source/model/template/ChartType.cxx4
-rw-r--r--chart2/source/model/template/ChartType.hxx2
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx6
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx4
-rw-r--r--chart2/source/model/template/ColumnChartType.cxx6
-rw-r--r--chart2/source/model/template/ColumnLineChartTypeTemplate.cxx10
-rw-r--r--chart2/source/model/template/ColumnLineDataInterpreter.cxx4
-rw-r--r--chart2/source/model/template/LineChartType.cxx6
-rw-r--r--chart2/source/model/template/LineChartTypeTemplate.cxx10
-rw-r--r--chart2/source/model/template/NetChartTypeTemplate.cxx4
-rw-r--r--chart2/source/model/template/PieChartType.cxx6
-rw-r--r--chart2/source/model/template/PieChartTypeTemplate.cxx12
-rw-r--r--chart2/source/model/template/ScatterChartType.cxx6
-rw-r--r--chart2/source/model/template/ScatterChartTypeTemplate.cxx10
-rw-r--r--chart2/source/model/template/StockChartTypeTemplate.cxx10
-rw-r--r--chart2/source/tools/AxisHelper.cxx16
-rw-r--r--chart2/source/tools/CachedDataSequence.cxx12
-rw-r--r--chart2/source/tools/CharacterProperties.cxx2
-rw-r--r--chart2/source/tools/ChartModelHelper.cxx10
-rw-r--r--chart2/source/tools/ColorPerPointHelper.cxx2
-rw-r--r--chart2/source/tools/ConfigColorScheme.cxx2
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx36
-rw-r--r--chart2/source/tools/DataSourceHelper.cxx38
-rw-r--r--chart2/source/tools/DiagramHelper.cxx30
-rw-r--r--chart2/source/tools/ExplicitCategoriesProvider.cxx10
-rw-r--r--chart2/source/tools/FillProperties.cxx6
-rw-r--r--chart2/source/tools/ImplOPropertySet.cxx24
-rw-r--r--chart2/source/tools/ImplOPropertySet.hxx6
-rw-r--r--chart2/source/tools/InternalData.cxx60
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx60
-rw-r--r--chart2/source/tools/LinePropertiesHelper.cxx2
-rw-r--r--chart2/source/tools/ModifyListenerHelper.cxx6
-rw-r--r--chart2/source/tools/OPropertySet.cxx4
-rw-r--r--chart2/source/tools/PropertyHelper.cxx26
-rw-r--r--chart2/source/tools/RangeHighlighter.cxx2
-rw-r--r--chart2/source/tools/ReferenceSizeProvider.cxx8
-rw-r--r--chart2/source/tools/RegressionCurveHelper.cxx4
-rw-r--r--chart2/source/tools/RegressionCurveModel.cxx6
-rw-r--r--chart2/source/tools/RegressionEquation.cxx6
-rw-r--r--chart2/source/tools/SceneProperties.cxx2
-rw-r--r--chart2/source/tools/ThreeDHelper.cxx4
-rw-r--r--chart2/source/tools/UncachedDataSequence.cxx4
-rw-r--r--chart2/source/tools/UserDefinedProperties.cxx2
-rw-r--r--chart2/source/tools/WrappedIgnoreProperty.cxx4
-rw-r--r--chart2/source/tools/XMLRangeHelper.cxx8
-rw-r--r--chart2/source/view/axes/ScaleAutomatism.cxx6
-rw-r--r--chart2/source/view/axes/VAxisProperties.hxx2
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx22
-rw-r--r--chart2/source/view/axes/VCartesianGrid.cxx4
-rw-r--r--chart2/source/view/axes/VCartesianGrid.hxx2
-rw-r--r--chart2/source/view/axes/VPolarAxis.hxx2
-rw-r--r--chart2/source/view/axes/VPolarGrid.cxx6
-rw-r--r--chart2/source/view/axes/VPolarGrid.hxx4
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx2
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx40
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx34
-rw-r--r--chart2/source/view/charttypes/BubbleChart.cxx28
-rw-r--r--chart2/source/view/charttypes/CandleStickChart.cxx14
-rw-r--r--chart2/source/view/charttypes/NetChart.cxx40
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx12
-rw-r--r--chart2/source/view/charttypes/PieChart.hxx4
-rw-r--r--chart2/source/view/charttypes/Splines.cxx24
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx134
-rw-r--r--chart2/source/view/inc/MinimumAndMaximumSupplier.hxx2
-rw-r--r--chart2/source/view/inc/PlotterBase.hxx2
-rw-r--r--chart2/source/view/inc/PlottingPositionHelper.hxx6
-rw-r--r--chart2/source/view/inc/PropertyMapper.hxx4
-rw-r--r--chart2/source/view/inc/VCoordinateSystem.hxx4
-rw-r--r--chart2/source/view/inc/VSeriesPlotter.hxx8
-rw-r--r--chart2/source/view/main/ChartItemPool.cxx4
-rw-r--r--chart2/source/view/main/ChartView.cxx36
-rw-r--r--chart2/source/view/main/ShapeFactory.cxx6
-rw-r--r--chart2/source/view/main/VDataSeries.cxx6
-rw-r--r--chart2/source/view/main/VLegend.cxx20
-rw-r--r--cli_ure/source/uno_bridge/cli_base.h6
-rw-r--r--comphelper/source/container/embeddedobjectcontainer.cxx2
-rw-r--r--comphelper/source/container/enumerablemap.cxx14
-rw-r--r--comphelper/source/eventattachermgr/eventattachermgr.cxx48
-rw-r--r--comphelper/source/misc/accessibleeventnotifier.cxx14
-rw-r--r--comphelper/source/misc/accessibletexthelper.cxx4
-rw-r--r--comphelper/source/misc/anycompare.cxx4
-rw-r--r--comphelper/source/misc/asyncnotification.cxx6
-rw-r--r--comphelper/source/misc/backupfilehelper.cxx8
-rw-r--r--comphelper/source/misc/componentmodule.cxx2
-rw-r--r--comphelper/source/misc/configurationhelper.cxx2
-rw-r--r--comphelper/source/misc/docpasswordhelper.cxx6
-rw-r--r--comphelper/source/misc/namedvaluecollection.cxx12
-rw-r--r--comphelper/source/misc/numberedcollection.cxx4
-rw-r--r--comphelper/source/misc/simplefileaccessinteraction.cxx2
-rw-r--r--comphelper/source/misc/stillreadwriteinteraction.cxx4
-rw-r--r--comphelper/source/property/opropertybag.cxx22
-rw-r--r--comphelper/source/property/opropertybag.hxx8
-rw-r--r--comphelper/source/property/propagg.cxx14
-rw-r--r--comphelper/source/property/property.cxx4
-rw-r--r--comphelper/source/property/propertybag.cxx2
-rw-r--r--comphelper/source/property/propertycontainerhelper.cxx16
-rw-r--r--comphelper/source/xml/attributelist.cxx6
-rw-r--r--connectivity/source/commontools/ConnectionWrapper.cxx4
-rw-r--r--connectivity/source/commontools/RowFunctionParser.cxx4
-rw-r--r--connectivity/source/commontools/TDatabaseMetaDataBase.cxx32
-rw-r--r--connectivity/source/commontools/TIndex.cxx4
-rw-r--r--connectivity/source/commontools/TIndexColumns.cxx2
-rw-r--r--connectivity/source/commontools/TIndexes.cxx2
-rw-r--r--connectivity/source/commontools/TKey.cxx2
-rw-r--r--connectivity/source/commontools/TKeyColumns.cxx2
-rw-r--r--connectivity/source/commontools/TSkipDeletedSet.cxx10
-rw-r--r--connectivity/source/commontools/TSortIndex.cxx18
-rw-r--r--connectivity/source/commontools/TTableHelper.cxx34
-rw-r--r--connectivity/source/commontools/dbtools.cxx32
-rw-r--r--connectivity/source/commontools/dbtools2.cxx4
-rw-r--r--connectivity/source/commontools/parameters.cxx20
-rw-r--r--connectivity/source/commontools/paramwrapper.cxx4
-rw-r--r--connectivity/source/commontools/propertyids.cxx2
-rw-r--r--connectivity/source/commontools/sqlerror.cxx4
-rw-r--r--connectivity/source/cpool/ZConnectionPool.cxx14
-rw-r--r--connectivity/source/cpool/ZConnectionPool.hxx8
-rw-r--r--connectivity/source/drivers/ado/AColumn.cxx2
-rw-r--r--connectivity/source/drivers/ado/AColumns.cxx2
-rw-r--r--connectivity/source/drivers/ado/AConnection.cxx4
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx6
-rw-r--r--connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx10
-rw-r--r--connectivity/source/drivers/ado/ADriver.cxx2
-rw-r--r--connectivity/source/drivers/ado/APreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/ado/AStatement.cxx6
-rw-r--r--connectivity/source/drivers/calc/CTable.cxx2
-rw-r--r--connectivity/source/drivers/dbase/DDriver.cxx2
-rw-r--r--connectivity/source/drivers/dbase/DTable.cxx20
-rw-r--r--connectivity/source/drivers/dbase/dindexnode.cxx2
-rw-r--r--connectivity/source/drivers/evoab2/NPreparedStatement.hxx2
-rw-r--r--connectivity/source/drivers/evoab2/NResultSetMetaData.hxx2
-rw-r--r--connectivity/source/drivers/evoab2/NStatement.hxx2
-rw-r--r--connectivity/source/drivers/file/FCatalog.cxx2
-rw-r--r--connectivity/source/drivers/file/FDateFunctions.cxx8
-rw-r--r--connectivity/source/drivers/file/FDriver.cxx2
-rw-r--r--connectivity/source/drivers/file/FNoException.cxx4
-rw-r--r--connectivity/source/drivers/file/FNumericFunctions.cxx6
-rw-r--r--connectivity/source/drivers/file/FPreparedStatement.cxx4
-rw-r--r--connectivity/source/drivers/file/FResultSet.cxx16
-rw-r--r--connectivity/source/drivers/file/FStatement.cxx16
-rw-r--r--connectivity/source/drivers/file/FStringFunctions.cxx28
-rw-r--r--connectivity/source/drivers/file/fanalyzer.cxx12
-rw-r--r--connectivity/source/drivers/file/fcode.cxx8
-rw-r--r--connectivity/source/drivers/firebird/Connection.hxx2
-rw-r--r--connectivity/source/drivers/firebird/DatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Indexes.hxx2
-rw-r--r--connectivity/source/drivers/firebird/Util.hxx2
-rw-r--r--connectivity/source/drivers/flat/EDriver.cxx2
-rw-r--r--connectivity/source/drivers/flat/EResultSet.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HCatalog.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/HDriver.cxx6
-rw-r--r--connectivity/source/drivers/hsqldb/HStorageMap.cxx4
-rw-r--r--connectivity/source/drivers/hsqldb/HTable.cxx2
-rw-r--r--connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx4
-rw-r--r--connectivity/source/drivers/jdbc/DatabaseMetaData.cxx8
-rw-r--r--connectivity/source/drivers/jdbc/JDriver.cxx2
-rw-r--r--connectivity/source/drivers/jdbc/JStatement.cxx2
-rw-r--r--connectivity/source/drivers/kab/KResultSetMetaData.hxx2
-rw-r--r--connectivity/source/drivers/kab/KStatement.hxx2
-rw-r--r--connectivity/source/drivers/kab/korder.hxx2
-rw-r--r--connectivity/source/drivers/macab/MacabAddressBook.cxx10
-rw-r--r--connectivity/source/drivers/macab/MacabAddressBook.hxx4
-rw-r--r--connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx2
-rw-r--r--connectivity/source/drivers/macab/MacabResultSetMetaData.hxx2
-rw-r--r--connectivity/source/drivers/macab/MacabStatement.hxx2
-rw-r--r--connectivity/source/drivers/macab/macaborder.hxx2
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaData.cxx4
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx8
-rw-r--r--connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx2
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.cxx6
-rw-r--r--connectivity/source/drivers/mork/MPreparedStatement.hxx2
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.cxx16
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.hxx2
-rw-r--r--connectivity/source/drivers/mork/MResultSet.cxx22
-rw-r--r--connectivity/source/drivers/mork/MResultSet.hxx20
-rw-r--r--connectivity/source/drivers/mork/MStatement.cxx2
-rw-r--r--connectivity/source/drivers/mork/MStatement.hxx6
-rw-r--r--connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx2
-rw-r--r--connectivity/source/drivers/mysql/YCatalog.cxx2
-rw-r--r--connectivity/source/drivers/mysql/YDriver.cxx4
-rw-r--r--connectivity/source/drivers/odbc/OConnection.cxx14
-rw-r--r--connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx6
-rw-r--r--connectivity/source/drivers/odbc/ODriver.cxx2
-rw-r--r--connectivity/source/drivers/odbc/OPreparedStatement.cxx2
-rw-r--r--connectivity/source/drivers/odbc/OResultSet.cxx6
-rw-r--r--connectivity/source/drivers/odbc/OResultSetMetaData.cxx4
-rw-r--r--connectivity/source/drivers/odbc/OStatement.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.cxx4
-rw-r--r--connectivity/source/drivers/postgresql/pq_connection.hxx2
-rw-r--r--connectivity/source/drivers/postgresql/pq_updateableresultset.hxx2
-rw-r--r--connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx4
-rw-r--r--connectivity/source/inc/TDatabaseMetaDataBase.hxx28
-rw-r--r--connectivity/source/inc/TKeyValue.hxx6
-rw-r--r--connectivity/source/inc/TSkipDeletedSet.hxx2
-rw-r--r--connectivity/source/inc/TSortIndex.hxx16
-rw-r--r--connectivity/source/inc/ado/AConnection.hxx2
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaData.hxx2
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx16
-rw-r--r--connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx6
-rw-r--r--connectivity/source/inc/ado/AResultSet.hxx2
-rw-r--r--connectivity/source/inc/ado/AStatement.hxx4
-rw-r--r--connectivity/source/inc/calc/CTable.hxx6
-rw-r--r--connectivity/source/inc/dbase/DTable.hxx8
-rw-r--r--connectivity/source/inc/dbase/dindexnode.hxx2
-rw-r--r--connectivity/source/inc/file/FDateFunctions.hxx8
-rw-r--r--connectivity/source/inc/file/FNumericFunctions.hxx6
-rw-r--r--connectivity/source/inc/file/FPreparedStatement.hxx2
-rw-r--r--connectivity/source/inc/file/FResultSet.hxx14
-rw-r--r--connectivity/source/inc/file/FStatement.hxx10
-rw-r--r--connectivity/source/inc/file/FStringFunctions.hxx12
-rw-r--r--connectivity/source/inc/file/fanalyzer.hxx6
-rw-r--r--connectivity/source/inc/file/fcode.hxx4
-rw-r--r--connectivity/source/inc/file/fcomp.hxx2
-rw-r--r--connectivity/source/inc/flat/ETable.hxx12
-rw-r--r--connectivity/source/inc/hsqldb/HDriver.hxx8
-rw-r--r--connectivity/source/inc/mysql/YDriver.hxx6
-rw-r--r--connectivity/source/inc/odbc/OConnection.hxx4
-rw-r--r--connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx4
-rw-r--r--connectivity/source/inc/odbc/OResultSet.hxx16
-rw-r--r--connectivity/source/inc/odbc/OResultSetMetaData.hxx6
-rw-r--r--connectivity/source/inc/odbc/OStatement.hxx2
-rw-r--r--connectivity/source/inc/propertyids.hxx2
-rw-r--r--connectivity/source/inc/resource/sharedresources.hxx2
-rw-r--r--connectivity/source/manager/mdrivermanager.cxx38
-rw-r--r--connectivity/source/parse/sqliterator.cxx8
-rw-r--r--connectivity/source/parse/sqlnode.cxx12
-rw-r--r--connectivity/source/resource/sharedresources.cxx8
-rw-r--r--connectivity/source/sdbcx/VCollection.cxx18
-rw-r--r--connectivity/source/sdbcx/VDescriptor.cxx8
-rw-r--r--connectivity/workben/skeleton/SResultSet.hxx10
-rw-r--r--cppcanvas/source/inc/implrenderer.hxx6
-rw-r--r--cppcanvas/source/mtfrenderer/implrenderer.cxx26
-rw-r--r--cppcanvas/source/mtfrenderer/mtftools.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/textaction.cxx16
-rw-r--r--cppcanvas/source/mtfrenderer/transparencygroupaction.hxx4
-rw-r--r--cppu/source/threadpool/jobqueue.hxx2
-rw-r--r--cppu/source/threadpool/thread.cxx2
-rw-r--r--cppu/source/threadpool/threadpool.hxx8
-rw-r--r--cppuhelper/source/component_context.cxx2
-rw-r--r--cppuhelper/source/factory.cxx2
-rw-r--r--cppuhelper/source/interfacecontainer.cxx4
-rw-r--r--cppuhelper/source/propshlp.cxx24
-rw-r--r--cui/source/customize/cfgutil.cxx22
-rw-r--r--cui/source/customize/macropg.cxx12
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx4
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx12
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx2
-rw-r--r--cui/source/dialogs/iconcdlg.cxx2
-rw-r--r--cui/source/dialogs/pastedlg.cxx4
-rw-r--r--cui/source/dialogs/screenshotannotationdlg.cxx4
-rw-r--r--cui/source/factory/dlgfact.cxx2
-rw-r--r--cui/source/factory/dlgfact.hxx2
-rw-r--r--cui/source/inc/cfgutil.hxx4
-rw-r--r--cui/source/inc/cuifmsearch.hxx4
-rw-r--r--cui/source/inc/cuigaldlg.hxx8
-rw-r--r--cui/source/inc/cuitabline.hxx2
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx2
-rw-r--r--cui/source/inc/iconcdlg.hxx2
-rw-r--r--cui/source/inc/macropg.hxx4
-rw-r--r--cui/source/inc/pastedlg.hxx2
-rw-r--r--cui/source/inc/treeopt.hxx6
-rw-r--r--cui/source/options/cfgchart.hxx2
-rw-r--r--cui/source/options/dbregistersettings.hxx2
-rw-r--r--cui/source/options/optasian.cxx4
-rw-r--r--cui/source/options/optchart.cxx2
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/options/sdbcdriverenum.cxx4
-rw-r--r--cui/source/options/sdbcdriverenum.hxx2
-rw-r--r--cui/source/tabpages/border.cxx6
-rw-r--r--cui/source/tabpages/page.cxx2
423 files changed, 1678 insertions, 1678 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index c733a25bb567..2bfd634694e2 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -861,9 +861,9 @@ namespace cairocanvas
// use at least three steps, and at utmost the number of color
// steps
const unsigned int nStepCount(
- ::std::max(
+ std::max(
3U,
- ::std::min(
+ std::min(
nGradientSize / nStripSize,
128U )) + 1 );
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index 8ffa34e4da9c..7f419e02e66c 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.cxx
@@ -266,7 +266,7 @@ namespace cairocanvas
::canvas::tools::spritePixelAreaFromB2DRange( rMoveEnd ) );
::basegfx::B2IPoint aDestPos( rDestRect.getMinimum() );
- ::std::vector< ::basegfx::B2IRange > aUnscrollableAreas;
+ std::vector< ::basegfx::B2IRange > aUnscrollableAreas;
// TODO(E3): This is plain buggy (but copies the behaviour of
// the old Impress slideshow) - the scrolled area might
@@ -352,7 +352,7 @@ namespace cairocanvas
// repaint uncovered areas from backbuffer - take the
// _rounded_ rectangles from above, to have the update
// consistent with the scroll above.
- ::std::vector< ::basegfx::B2DRange > aUncoveredAreas;
+ std::vector< ::basegfx::B2DRange > aUncoveredAreas;
::basegfx::computeSetDifference( aUncoveredAreas,
rUpdateArea.maTotalBounds,
::basegfx::B2DRange( rDestRect ) );
@@ -370,7 +370,7 @@ namespace cairocanvas
}
void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
ENSURE_OR_THROW( mpOwningSpriteCanvas &&
mpOwningSpriteCanvas->getBufferSurface(),
@@ -415,7 +415,7 @@ namespace cairocanvas
}
void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange& rRequestedArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
// TODO
SAL_INFO("canvas.cairo", "SpriteCanvasHelper::genericUpdate called");
@@ -437,17 +437,17 @@ namespace cairocanvas
// otherwise, truncation of size below might leave visible
// areas uncovered by VDev.
const Point aOutputPosition(
- ::std::max( sal_Int32( 0 ),
+ std::max( sal_Int32( 0 ),
static_cast< sal_Int32 >(rRequestedArea.getMinX()) ),
- ::std::max( sal_Int32( 0 ),
+ std::max( sal_Int32( 0 ),
static_cast< sal_Int32 >(rRequestedArea.getMinY()) ) );
// round output size towards +infty. Don't want to truncate a
// fraction of a sprite pixel... Limit size of VDev to output
// device's area.
const Size aOutputSize(
- ::std::min( rSize.getX(),
+ std::min( rSize.getX(),
::canvas::tools::roundUp( rRequestedArea.getMaxX() - aOutputPosition.X()) ),
- ::std::min( rSize.getY(),
+ std::min( rSize.getY(),
::canvas::tools::roundUp( rRequestedArea.getMaxY() - aOutputPosition.Y()) ) );
cairo_rectangle( pCompositingCairo.get(), aOutputPosition.X(), aOutputPosition.Y(), aOutputSize.Width(), aOutputSize.Height() );
diff --git a/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx
index 35cf73629653..1c71b4878a5a 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.hxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.hxx
@@ -111,10 +111,10 @@ namespace cairocanvas
const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea );
void opaqueUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
void genericUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
private:
::cairo::SurfaceSharedPtr const & getCompositingSurface( const ::basegfx::B2ISize& rNeededSize );
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index eaf439923992..3b6356c6cd51 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -306,7 +306,7 @@ namespace cairocanvas
setupLayoutMode( rOutDev, mnTextDirection );
// TODO(P2): cache that
- ::std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]);
+ std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]);
if( maLogicalAdvancements.getLength() )
{
@@ -553,7 +553,7 @@ namespace cairocanvas
renderState);
// fill integer offsets
- ::std::transform( inputOffsets.getConstArray(),
+ std::transform( inputOffsets.getConstArray(),
inputOffsets.getConstArray()+inputOffsets.getLength(),
outputOffsets,
OffsetTransformer( aMatrix ) );
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 4b41d302b54b..db4f151123dd 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -183,7 +183,7 @@ namespace dxcanvas
virtual void resize( const ::basegfx::B2IRange& rect ) override;
virtual ::basegfx::B2IVector getPageSize() override;
- virtual ::std::shared_ptr<canvas::ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) override;
+ virtual std::shared_ptr<canvas::ISurface> createSurface( const ::basegfx::B2IVector& surfaceSize ) override;
virtual void beginPrimitive( PrimitiveType eType ) override;
virtual void endPrimitive() override;
virtual void pushVertex( const ::canvas::Vertex& vertex ) override;
@@ -212,7 +212,7 @@ namespace dxcanvas
COMReference<IDirect3D9> mpDirect3D9;
COMReference<IDirect3DSwapChain9> mpSwapChain;
COMReference<IDirect3DVertexBuffer9> mpVertexBuffer;
- ::std::shared_ptr<canvas::ISurface> mpTexture;
+ std::shared_ptr<canvas::ISurface> mpTexture;
VclPtr<SystemChildWindow> mpWindow;
::basegfx::B2IVector maSize;
typedef std::vector<canvas::Vertex> vertexCache_t;
@@ -514,7 +514,7 @@ namespace dxcanvas
::basegfx::B2IVector aPageSize(maPageSize);
while(true)
{
- mpTexture = ::std::shared_ptr<canvas::ISurface>(
+ mpTexture = std::shared_ptr<canvas::ISurface>(
new DXSurface(*this,aPageSize));
if(mpTexture->isValid())
break;
@@ -980,13 +980,13 @@ namespace dxcanvas
// DXRenderModule::createSurface
- ::std::shared_ptr<canvas::ISurface> DXRenderModule::createSurface( const ::basegfx::B2IVector& surfaceSize )
+ std::shared_ptr<canvas::ISurface> DXRenderModule::createSurface( const ::basegfx::B2IVector& surfaceSize )
{
// TODO(P2): get rid of those fine-grained locking
::osl::MutexGuard aGuard( maMutex );
if(isDisposed())
- return ::std::shared_ptr<canvas::ISurface>();
+ return std::shared_ptr<canvas::ISurface>();
const ::basegfx::B2IVector& rPageSize( getPageSize() );
::basegfx::B2ISize aSize(surfaceSize);
@@ -998,7 +998,7 @@ namespace dxcanvas
if(mpTexture.use_count() == 1)
return mpTexture;
- return ::std::shared_ptr<canvas::ISurface>( new DXSurface(*this,aSize) );
+ return std::shared_ptr<canvas::ISurface>( new DXSurface(*this,aSize) );
}
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index b0e4b740ef67..4a87a66b04a8 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -40,7 +40,7 @@ namespace dxcanvas
CanvasCustomSprite::CanvasCustomSprite( const css::geometry::RealSize2D& rSpriteSize,
const SpriteCanvasRef& rRefDevice,
const IDXRenderModuleSharedPtr& rRenderModule,
- const ::std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
+ const std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
bool bShowSpriteBounds ) :
mpSpriteCanvas( rRefDevice ),
mpSurface()
diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index a3b57917ed7b..1772741a3fdf 100644
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.hxx
@@ -99,7 +99,7 @@ namespace dxcanvas
CanvasCustomSprite( const css::geometry::RealSize2D& rSpriteSize,
const SpriteCanvasRef& rRefDevice,
const IDXRenderModuleSharedPtr& rRenderModule,
- const ::std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
+ const std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
bool bShowSpriteBounds );
virtual void disposeThis() override;
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index 94b9c322b5ea..72c63ffc2816 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -358,8 +358,8 @@ namespace dxcanvas
if(bIsMiter)
aPen.SetMiterLimit( static_cast< Gdiplus::REAL >(strokeAttributes.MiterLimit) );
- const ::std::vector< Gdiplus::REAL >& rDashArray(
- ::comphelper::sequenceToContainer< ::std::vector< Gdiplus::REAL >, double >(
+ const std::vector< Gdiplus::REAL >& rDashArray(
+ ::comphelper::sequenceToContainer< std::vector< Gdiplus::REAL >, double >(
strokeAttributes.DashArray ) );
if( !rDashArray.empty() )
{
diff --git a/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index c9853cf4a36e..4bebeb8c30f2 100644
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.cxx
@@ -186,9 +186,9 @@ namespace dxcanvas
int numColorSteps( const Gdiplus::Color& rColor1, const Gdiplus::Color& rColor2 )
{
- return ::std::max(
+ return std::max(
labs( rColor1.GetRed() - rColor2.GetRed() ),
- ::std::max(
+ std::max(
labs( rColor1.GetGreen() - rColor2.GetGreen() ),
labs( rColor1.GetBlue() - rColor2.GetBlue() ) ) );
}
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index 60429f2a500d..a748b5d9729f 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -174,7 +174,7 @@ namespace dxcanvas
}
void graphicsPathFromB2DPolygon( GraphicsPathSharedPtr& rOutput,
- ::std::vector< Gdiplus::PointF >& rPoints,
+ std::vector< Gdiplus::PointF >& rPoints,
const ::basegfx::B2DPolygon& rPoly,
bool bNoLineJoin)
{
@@ -406,7 +406,7 @@ namespace dxcanvas
GraphicsPathSharedPtr graphicsPathFromRealPoint2DSequence( const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points )
{
GraphicsPathSharedPtr pRes( new Gdiplus::GraphicsPath() );
- ::std::vector< Gdiplus::PointF > aPoints;
+ std::vector< Gdiplus::PointF > aPoints;
sal_Int32 nCurrPoly;
for( nCurrPoly=0; nCurrPoly<points.getLength(); ++nCurrPoly )
@@ -419,7 +419,7 @@ namespace dxcanvas
// TODO(F1): Closed/open polygons
// convert from RealPoint2D array to Gdiplus::PointF array
- ::std::transform( points[nCurrPoly].getConstArray(),
+ std::transform( points[nCurrPoly].getConstArray(),
points[nCurrPoly].getConstArray()+nCurrSize,
aPoints.begin(),
implGdiPlusPointFromRealPoint2D );
@@ -434,7 +434,7 @@ namespace dxcanvas
GraphicsPathSharedPtr graphicsPathFromB2DPolygon( const ::basegfx::B2DPolygon& rPoly, bool bNoLineJoin )
{
GraphicsPathSharedPtr pRes( new Gdiplus::GraphicsPath() );
- ::std::vector< Gdiplus::PointF > aPoints;
+ std::vector< Gdiplus::PointF > aPoints;
graphicsPathFromB2DPolygon( pRes, aPoints, rPoly, bNoLineJoin );
@@ -444,7 +444,7 @@ namespace dxcanvas
GraphicsPathSharedPtr graphicsPathFromB2DPolyPolygon( const ::basegfx::B2DPolyPolygon& rPoly, bool bNoLineJoin )
{
GraphicsPathSharedPtr pRes( new Gdiplus::GraphicsPath() );
- ::std::vector< Gdiplus::PointF > aPoints;
+ std::vector< Gdiplus::PointF > aPoints;
const sal_uInt32 nPolies( rPoly.count() );
for( sal_uInt32 nCurrPoly=0; nCurrPoly<nPolies; ++nCurrPoly )
diff --git a/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
index f8661d82a0d3..d10a6fe66824 100644
--- a/canvas/source/directx/dx_spritecanvashelper.cxx
+++ b/canvas/source/directx/dx_spritecanvashelper.cxx
@@ -79,7 +79,7 @@ namespace dxcanvas
void SpriteCanvasHelper::init( SpriteCanvas& rParent,
::canvas::SpriteRedrawManager& rManager,
const IDXRenderModuleSharedPtr& rRenderModule,
- const ::std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
+ const std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
const DXSurfaceBitmapSharedPtr& rBackBuffer,
const ::basegfx::B2ISize& rOutputOffset )
{
@@ -265,7 +265,7 @@ namespace dxcanvas
// repaint uncovered areas from backbuffer - take the
// _rounded_ rectangles from above, to have the update
// consistent with the scroll above.
- ::std::vector< ::basegfx::B2DRange > aUncoveredAreas;
+ std::vector< ::basegfx::B2DRange > aUncoveredAreas;
::basegfx::computeSetDifference( aUncoveredAreas,
rUpdateArea.maTotalBounds,
::basegfx::B2DRange( rDestRect ) );
@@ -283,7 +283,7 @@ namespace dxcanvas
}
void SpriteCanvasHelper::opaqueUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
ENSURE_OR_THROW( mpRenderModule &&
mpBackBuffer,
@@ -313,7 +313,7 @@ namespace dxcanvas
}
void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
ENSURE_OR_THROW( mpRenderModule &&
mpBackBuffer,
diff --git a/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx
index d3f48ab0cfa9..5137d6f9f208 100644
--- a/canvas/source/directx/dx_spritecanvashelper.hxx
+++ b/canvas/source/directx/dx_spritecanvashelper.hxx
@@ -46,7 +46,7 @@ namespace dxcanvas
void init( SpriteCanvas& rParent,
::canvas::SpriteRedrawManager& rManager,
const IDXRenderModuleSharedPtr& rRenderModule,
- const ::std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
+ const std::shared_ptr<canvas::ISurfaceProxyManager>& rSurfaceProxy,
const DXSurfaceBitmapSharedPtr& rBackBuffer,
const ::basegfx::B2ISize& rOutputOffset );
@@ -119,10 +119,10 @@ namespace dxcanvas
const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea );
void opaqueUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
void genericUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
private:
/// For generating sprites
@@ -134,7 +134,7 @@ namespace dxcanvas
/// DX device, handling all low-level rendering
IDXRenderModuleSharedPtr mpRenderModule;
- ::std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceProxy;
+ std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceProxy;
/// Backbuffer, contains the static canvas render output
DXSurfaceBitmapSharedPtr mpBackBuffer;
diff --git a/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index ac8ce68d2c82..41f5b63ba655 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.cxx
@@ -56,8 +56,8 @@ namespace dxcanvas
bool /*bFullscreen*/ )
{
// #i60490# ensure backbuffer has sensible minimal size
- const sal_Int32 w( ::std::max(sal_Int32(1),sal_Int32(rRect.Width)));
- const sal_Int32 h( ::std::max(sal_Int32(1),sal_Int32(rRect.Height)));
+ const sal_Int32 w( std::max(sal_Int32(1),sal_Int32(rRect.Width)));
+ const sal_Int32 h( std::max(sal_Int32(1),sal_Int32(rRect.Height)));
rSpriteCanvas.setWindow(
uno::Reference<awt::XWindow2>(
@@ -185,8 +185,8 @@ namespace dxcanvas
// #i60490# ensure backbuffer has sensible minimal size
const sal_Int32 x(rBounds.X);
const sal_Int32 y(rBounds.Y);
- const sal_Int32 w(::std::max(sal_Int32(1),sal_Int32(rBounds.Width)));
- const sal_Int32 h(::std::max(sal_Int32(1),sal_Int32(rBounds.Height)));
+ const sal_Int32 w(std::max(sal_Int32(1),sal_Int32(rBounds.Width)));
+ const sal_Int32 h(std::max(sal_Int32(1),sal_Int32(rBounds.Height)));
if( mpRenderModule )
mpRenderModule->resize(::basegfx::B2IRange(x,y,x+w,y+h));
diff --git a/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index 9d5eed1b9789..88848d4bf0ce 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.hxx
@@ -68,7 +68,7 @@ namespace dxcanvas
const IDXRenderModuleSharedPtr& getRenderModule() const { return mpRenderModule; }
const DXSurfaceBitmapSharedPtr& getBackBuffer() const { return mpBackBuffer; }
- const ::std::shared_ptr<canvas::ISurfaceProxyManager> &getSurfaceProxy() const { return mpSurfaceProxyManager; }
+ const std::shared_ptr<canvas::ISurfaceProxyManager> &getSurfaceProxy() const { return mpSurfaceProxyManager; }
css::uno::Any isAccelerated() const;
@@ -89,7 +89,7 @@ namespace dxcanvas
DXSurfaceBitmapSharedPtr mpBackBuffer;
/// Instance passing out HW textures
- ::std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceProxyManager;
+ std::shared_ptr<canvas::ISurfaceProxyManager> mpSurfaceProxyManager;
/// Our encapsulation interface to DirectX
IDXRenderModuleSharedPtr mpRenderModule;
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index fb8e184f9cc6..6e279788a8c1 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -201,7 +201,7 @@ namespace dxcanvas
{
// create the DXArray
const sal_Int32 nLen( rLogicalAdvancements.getLength() );
- ::std::unique_ptr<sal_Int32[]> pDXArray( new sal_Int32[nLen] );
+ std::unique_ptr<sal_Int32[]> pDXArray( new sal_Int32[nLen] );
for( sal_Int32 i=0; i<nLen; ++i )
pDXArray[i] = basegfx::fround( rLogicalAdvancements[i] );
diff --git a/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index cb1840d4d42b..1214c99c71cd 100644
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.hxx
@@ -122,7 +122,7 @@ namespace dxcanvas
COMReference& operator=( const COMReference& rRHS )
{
COMReference aTmp(rRHS);
- ::std::swap( mp, aTmp.mp );
+ std::swap( mp, aTmp.mp );
return *this;
}
diff --git a/canvas/source/opengl/ogl_canvashelper.cxx b/canvas/source/opengl/ogl_canvashelper.cxx
index 67707bba4c59..d2edda651e4f 100644
--- a/canvas/source/opengl/ogl_canvashelper.cxx
+++ b/canvas/source/opengl/ogl_canvashelper.cxx
@@ -38,7 +38,7 @@
#include "ogl_canvashelper.hxx"
using namespace ::com::sun::star;
-using namespace ::std::placeholders;
+using namespace std::placeholders;
namespace oglcanvas
{
@@ -81,7 +81,7 @@ namespace oglcanvas
rendering::ARGBColor maARGBColor;
::basegfx::B2DPolyPolygonVector maPolyPolys;
- ::std::function< bool (
+ std::function< bool (
const CanvasHelper&,
const ::basegfx::B2DHomMatrix&,
GLenum,
@@ -409,7 +409,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState );
- rAct.maFunction = ::std::bind(&lcl_drawPoint,
+ rAct.maFunction = std::bind(&lcl_drawPoint,
_1,_2,_3,_4,_5,
aPoint);
}
@@ -427,7 +427,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState );
- rAct.maFunction = ::std::bind(&lcl_drawLine,
+ rAct.maFunction = std::bind(&lcl_drawLine,
_1, _2, _3, _4, _5,
aStartPoint, aEndPoint);
}
@@ -447,7 +447,7 @@ namespace oglcanvas
setupGraphicsState( rAct, viewState, renderState );
// TODO(F2): subdivide&render whole curve
- rAct.maFunction = ::std::bind(&lcl_drawLine,
+ rAct.maFunction = std::bind(&lcl_drawLine,
_1,_2,_3,_4,_5,
geometry::RealPoint2D(
aBezierSegment.Px,
@@ -600,7 +600,7 @@ namespace oglcanvas
const ::canvas::ParametricPolyPolygon::Values& rValues(
pGradient->getValues() );
- rAct.maFunction = ::std::bind(&lcl_fillGradientPolyPolygon,
+ rAct.maFunction = std::bind(&lcl_fillGradientPolyPolygon,
_1,_2,_3,_4,
rValues,
textures[0],
@@ -643,7 +643,7 @@ namespace oglcanvas
aPixelData,
canvas::tools::getStdColorSpace()));
- rAct.maFunction = ::std::bind(&lcl_fillTexturedPolyPolygon,
+ rAct.maFunction = std::bind(&lcl_fillTexturedPolyPolygon,
_1,_2,_3,_4,
textures[0],
aSize,
@@ -764,7 +764,7 @@ namespace oglcanvas
{
// create the DXArray
const sal_Int32 nLen( aLogicalAdvancements.getLength() );
- ::std::unique_ptr<long[]> pDXArray( new long[nLen] );
+ std::unique_ptr<long[]> pDXArray( new long[nLen] );
for( sal_Int32 i=0; i<nLen; ++i )
pDXArray[i] = basegfx::fround( aLogicalAdvancements[i] );
@@ -820,7 +820,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState );
- rAct.maFunction = ::std::bind(&lcl_drawOwnBitmap,
+ rAct.maFunction = std::bind(&lcl_drawOwnBitmap,
_1,_2,_3,_4,_5,
*pOwnBitmap);
}
@@ -849,7 +849,7 @@ namespace oglcanvas
Action& rAct=mpRecordedActions->back();
setupGraphicsState( rAct, viewState, renderState );
- rAct.maFunction = ::std::bind(&lcl_drawGenericBitmap,
+ rAct.maFunction = std::bind(&lcl_drawGenericBitmap,
_1,_2,_3,_4,_5,
aSize, aARGBBytes,
rtl_crc32(0,
diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx
index 0331c8c9d2ba..5857367938e5 100644
--- a/canvas/source/opengl/ogl_textlayout.cxx
+++ b/canvas/source/opengl/ogl_textlayout.cxx
@@ -85,7 +85,7 @@ namespace oglcanvas
// fake text bounds by either taking the advancement values,
// or assuming square glyph boxes (width similar to height)
const rendering::FontRequest& rFontRequest( mpFont->getFontRequest() );
- const double nFontSize( ::std::max( rFontRequest.CellSize,
+ const double nFontSize( std::max( rFontRequest.CellSize,
rFontRequest.ReferenceAdvancement ) );
if( maLogicalAdvancements.getLength() )
{
diff --git a/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx
index 37d010cd932c..0cbefbc5bf15 100644
--- a/canvas/source/tools/canvascustomspritehelper.cxx
+++ b/canvas/source/tools/canvascustomspritehelper.cxx
@@ -107,7 +107,7 @@ namespace canvas
{
// aClipBoundsB = maCurrClipBounds, i.e. last
// clip, intersected with sprite area
- typedef ::std::vector< ::basegfx::B2DRectangle > VectorOfRects;
+ typedef std::vector< ::basegfx::B2DRectangle > VectorOfRects;
VectorOfRects aClipDifferences;
// get all rectangles covered by exactly one
@@ -171,11 +171,11 @@ namespace canvas
"CanvasCustomSpriteHelper::init(): Invalid owning sprite canvas" );
mpSpriteCanvas = rOwningSpriteCanvas;
- maSize.setX( ::std::max( 1.0,
+ maSize.setX( std::max( 1.0,
ceil( rSpriteSize.Width ) ) ); // round up to nearest int,
// enforce sprite to have at
// least (1,1) pixel size
- maSize.setY( ::std::max( 1.0,
+ maSize.setY( std::max( 1.0,
ceil( rSpriteSize.Height ) ) );
}
diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 640c3a3e3b93..ee41f6732d2a 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.cxx
@@ -69,8 +69,8 @@ namespace canvas
geometry::RealSize2D createInfiniteSize2D()
{
return geometry::RealSize2D(
- ::std::numeric_limits<double>::infinity(),
- ::std::numeric_limits<double>::infinity() );
+ std::numeric_limits<double>::infinity(),
+ std::numeric_limits<double>::infinity() );
}
rendering::RenderState& initRenderState( rendering::RenderState& renderState )
@@ -1052,7 +1052,7 @@ namespace canvas
bool clipScrollArea( ::basegfx::B2IRange& io_rSourceArea,
::basegfx::B2IPoint& io_rDestPoint,
- ::std::vector< ::basegfx::B2IRange >& o_ClippedAreas,
+ std::vector< ::basegfx::B2IRange >& o_ClippedAreas,
const ::basegfx::B2IRange& rBounds )
{
::basegfx::B2IRange aResultingDestArea;
@@ -1228,7 +1228,7 @@ namespace canvas
// longest line in gradient bound rect
const int nGradientSize(
static_cast<int>(
- ::std::max(
+ std::max(
::basegfx::B2DVector(aRightBottom-aLeftTop).getLength(),
::basegfx::B2DVector(aRightTop-aLeftBottom).getLength() ) + 1.0 ) );
@@ -1237,8 +1237,8 @@ namespace canvas
// use at least three steps, and at utmost the number of color
// steps
- return ::std::max( 3,
- ::std::min(
+ return std::max( 3,
+ std::min(
nGradientSize / nStripSize,
nColorSteps ) );
}
diff --git a/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx
index aaf99c5eaea5..3cf44368c3f8 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.cxx
@@ -235,10 +235,10 @@ namespace canvas
// sort sprites after prio
VectorOfSprites aSortedSpriteVector;
- ::std::copy( maSprites.begin(),
+ std::copy( maSprites.begin(),
maSprites.end(),
- ::std::back_insert_iterator< VectorOfSprites >(aSortedSpriteVector) );
- ::std::sort( aSortedSpriteVector.begin(),
+ std::back_insert_iterator< VectorOfSprites >(aSortedSpriteVector) );
+ std::sort( aSortedSpriteVector.begin(),
aSortedSpriteVector.end(),
aSpriteComparator );
@@ -254,18 +254,18 @@ namespace canvas
aUpdatableSprites.push_back( rSprite );
}
- ::std::sort( aUpdatableSprites.begin(),
+ std::sort( aUpdatableSprites.begin(),
aUpdatableSprites.end(),
aSpriteComparator );
VectorOfSprites::iterator aEnd=
- ::std::unique( aUpdatableSprites.begin(),
+ std::unique( aUpdatableSprites.begin(),
aUpdatableSprites.end() );
// for each unique sprite, check the change event vector,
// calculate the update operation from that, and add the
// result to the aUpdateArea.
- ::std::for_each( aUpdatableSprites.begin(),
+ std::for_each( aUpdatableSprites.begin(),
aEnd,
SpriteUpdater( rUpdateAreas,
maChangeRecords) );
@@ -279,11 +279,11 @@ namespace canvas
// (i.e. the difference between aSortedSpriteVector and
// aUpdatableSprites).
VectorOfSprites aUnchangedSprites;
- ::std::set_difference( aSortedSpriteVector.begin(),
+ std::set_difference( aSortedSpriteVector.begin(),
aSortedSpriteVector.end(),
aUpdatableSprites.begin(),
aEnd,
- ::std::back_insert_iterator< VectorOfSprites >(aUnchangedSprites),
+ std::back_insert_iterator< VectorOfSprites >(aUnchangedSprites),
aSpriteComparator );
// add each remaining unchanged sprite to connected ranges,
@@ -318,7 +318,7 @@ namespace canvas
bool SpriteRedrawManager::isAreaUpdateScroll( ::basegfx::B2DRectangle& o_rMoveStart,
::basegfx::B2DRectangle& o_rMoveEnd,
const UpdateArea& rUpdateArea,
- ::std::size_t nNumSprites ) const
+ std::size_t nNumSprites ) const
{
// check for a solitary move, which consists of exactly two
// pure-move entries, the first with valid, the second with
@@ -378,7 +378,7 @@ namespace canvas
}
bool SpriteRedrawManager::isAreaUpdateOpaque( const UpdateArea& rUpdateArea,
- ::std::size_t nNumSprites ) const
+ std::size_t nNumSprites ) const
{
// check whether the sprites in the update area's list will
// fully cover the given area _and_ do that in an opaque way
@@ -406,9 +406,9 @@ namespace canvas
// and check whether _any_ of the sprites tells that its area
// update will not be opaque.
- return ::std::none_of( rUpdateArea.maComponentList.begin(),
+ return std::none_of( rUpdateArea.maComponentList.begin(),
aEnd,
- [&aTrueArea, this]( const ::std::pair< ::basegfx::B2DRange, SpriteInfo >& cp )
+ [&aTrueArea, this]( const std::pair< ::basegfx::B2DRange, SpriteInfo >& cp )
{ return this->isAreaUpdateNotOpaque(aTrueArea, cp); } );
}
@@ -421,9 +421,9 @@ namespace canvas
// component (return false)
const SpriteConnectedRanges::ComponentListType::const_iterator aEnd(
rUpdateArea.maComponentList.end() );
- return ::std::any_of( rUpdateArea.maComponentList.begin(),
+ return std::any_of( rUpdateArea.maComponentList.begin(),
aEnd,
- []( const ::std::pair< ::basegfx::B2DRange, SpriteInfo >& cp )
+ []( const std::pair< ::basegfx::B2DRange, SpriteInfo >& cp )
{ return cp.second.needsUpdate(); } );
}
diff --git a/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx
index e596ea535dae..adea0c2a983d 100644
--- a/canvas/source/tools/surface.cxx
+++ b/canvas/source/tools/surface.cxx
@@ -208,10 +208,10 @@ namespace canvas
::basegfx::fround(rArea.getMaximum().getY()) );
// clip the positions to the area this surface covers
- aPos1.setX(::std::max(aPos1.getX(),maSourceOffset.getX()));
- aPos1.setY(::std::max(aPos1.getY(),maSourceOffset.getY()));
- aPos2.setX(::std::min(aPos2.getX(),maSourceOffset.getX()+maSize.getX()));
- aPos2.setY(::std::min(aPos2.getY(),maSourceOffset.getY()+maSize.getY()));
+ aPos1.setX(std::max(aPos1.getX(),maSourceOffset.getX()));
+ aPos1.setY(std::max(aPos1.getY(),maSourceOffset.getY()));
+ aPos2.setX(std::min(aPos2.getX(),maSourceOffset.getX()+maSize.getX()));
+ aPos2.setY(std::min(aPos2.getY(),maSourceOffset.getY()+maSize.getY()));
// if the resulting area is empty, return immediately
::basegfx::B2IVector aSize(aPos2 - aPos1);
diff --git a/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx
index a9fb781fcb9a..2699820ccb1c 100644
--- a/canvas/source/tools/surfaceproxy.cxx
+++ b/canvas/source/tools/surfaceproxy.cxx
@@ -63,9 +63,9 @@ namespace canvas
// the current surface is located at the position [x,y]
// and has the size [min(restx,pagesizex),min(resty,pagesizey)
::basegfx::B2IPoint aOffset(x,y);
- ::basegfx::B2ISize aSize( ::std::min( aImageSize.getX()-x,
+ ::basegfx::B2ISize aSize( std::min( aImageSize.getX()-x,
aPageSize.getX() ),
- ::std::min( aImageSize.getY()-y,
+ std::min( aImageSize.getY()-y,
aPageSize.getY() ) );
maSurfaceList.push_back(
diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx
index e8ee7752cc0d..ab1d4c80cd72 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.cxx
@@ -60,11 +60,11 @@ namespace vclcanvas
const ::Size aSize(
- static_cast<sal_Int32>( ::std::max( 1.0,
+ static_cast<sal_Int32>( std::max( 1.0,
ceil( rSpriteSize.Width ))), // round up to nearest int,
// enforce sprite to have at
// least (1,1) pixel size
- static_cast<sal_Int32>( ::std::max( 1.0,
+ static_cast<sal_Int32>( std::max( 1.0,
ceil( rSpriteSize.Height ))) );
// create content backbuffer in screen depth
diff --git a/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 90c399b15e3f..f13780d143c6 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.cxx
@@ -357,8 +357,8 @@ namespace vclcanvas
// apply dashing, if any
if( strokeAttributes.DashArray.getLength() )
{
- const ::std::vector<double>& aDashArray(
- ::comphelper::sequenceToContainer< ::std::vector<double> >(strokeAttributes.DashArray) );
+ const std::vector<double>& aDashArray(
+ ::comphelper::sequenceToContainer< std::vector<double> >(strokeAttributes.DashArray) );
::basegfx::B2DPolyPolygon aDashedPolyPoly;
@@ -1010,7 +1010,7 @@ namespace vclcanvas
rOutDev.SetAntialiasing( AntialiasingFlags::EnableB2dDraw );
const Rectangle aRect( vcl::unotools::rectangleFromIntegerRectangle2D(rect) );
- const sal_uInt16 nBitCount( ::std::min( (sal_uInt16)24U,
+ const sal_uInt16 nBitCount( std::min( (sal_uInt16)24U,
(sal_uInt16)rOutDev.GetBitCount() ) );
const BitmapPalette* pPalette = nullptr;
diff --git a/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 462ae479fd41..8f76a08d80a2 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.cxx
@@ -523,9 +523,9 @@ namespace vclcanvas
int numColorSteps( const ::Color& rColor1, const ::Color& rColor2 )
{
- return ::std::max(
+ return std::max(
labs( rColor1.GetRed() - rColor2.GetRed() ),
- ::std::max(
+ std::max(
labs( rColor1.GetGreen() - rColor2.GetGreen() ),
labs( rColor1.GetBlue() - rColor2.GetBlue() ) ) );
}
diff --git a/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 775e53872990..b8ea28bad033 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.cxx
@@ -354,7 +354,7 @@ namespace vclcanvas
::canvas::tools::spritePixelAreaFromB2DRange( rMoveEnd ) );
::basegfx::B2IPoint aDestPos( rDestRect.getMinimum() );
- ::std::vector< ::basegfx::B2IRange > aUnscrollableAreas;
+ std::vector< ::basegfx::B2IRange > aUnscrollableAreas;
// Since strictly speaking, this scroll algorithm is plain
// buggy, the scrolled area might actually lie _below_ another
@@ -415,7 +415,7 @@ namespace vclcanvas
// repaint uncovered areas from backbuffer - take the
// _rounded_ rectangles from above, to have the update
// consistent with the scroll above.
- ::std::vector< ::basegfx::B2DRange > aUncoveredAreas;
+ std::vector< ::basegfx::B2DRange > aUncoveredAreas;
::basegfx::computeSetDifference( aUncoveredAreas,
rUpdateArea.maTotalBounds,
::basegfx::B2DRange( rDestRect ) );
@@ -425,7 +425,7 @@ namespace vclcanvas
}
void SpriteCanvasHelper::opaqueUpdate( SAL_UNUSED_PARAMETER const ::basegfx::B2DRange&,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
ENSURE_OR_THROW( mpOwningSpriteCanvas &&
mpOwningSpriteCanvas->getBackBuffer() &&
@@ -452,7 +452,7 @@ namespace vclcanvas
}
void SpriteCanvasHelper::genericUpdate( const ::basegfx::B2DRange& rRequestedArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites )
{
ENSURE_OR_THROW( mpOwningSpriteCanvas &&
mpOwningSpriteCanvas->getBackBuffer() &&
@@ -471,20 +471,20 @@ namespace vclcanvas
// otherwise, truncation of size below might leave visible
// areas uncovered by VDev.
const ::Point aOutputPosition(
- ::std::max( sal_Int32( 0 ),
+ std::max( sal_Int32( 0 ),
static_cast< sal_Int32 >(rRequestedArea.getMinX()) ),
- ::std::max( sal_Int32( 0 ),
+ std::max( sal_Int32( 0 ),
static_cast< sal_Int32 >(rRequestedArea.getMinY()) ) );
// round output size towards +infty. Don't want to truncate a
// fraction of a sprite pixel... Limit coverage of VDev to
// output device's area (i.e. not only to total size, but to
// cover _only_ the visible parts).
const ::Size aOutputSize(
- ::std::max( sal_Int32( 0 ),
- ::std::min( static_cast< sal_Int32 >(rTargetSizePixel.Width() - aOutputPosition.X()),
+ std::max( sal_Int32( 0 ),
+ std::min( static_cast< sal_Int32 >(rTargetSizePixel.Width() - aOutputPosition.X()),
::canvas::tools::roundUp( rRequestedArea.getMaxX() - aOutputPosition.X() ))),
- ::std::max( sal_Int32( 0 ),
- ::std::min( static_cast< sal_Int32 >(rTargetSizePixel.Height() - aOutputPosition.Y()),
+ std::max( sal_Int32( 0 ),
+ std::min( static_cast< sal_Int32 >(rTargetSizePixel.Height() - aOutputPosition.Y()),
::canvas::tools::roundUp( rRequestedArea.getMaxY() - aOutputPosition.Y() ))));
// early exit for empty output area.
diff --git a/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx
index 6c4631696113..d2186da26dda 100644
--- a/canvas/source/vcl/spritecanvashelper.hxx
+++ b/canvas/source/vcl/spritecanvashelper.hxx
@@ -113,10 +113,10 @@ namespace vclcanvas
const ::canvas::SpriteRedrawManager::UpdateArea& rUpdateArea );
void opaqueUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
void genericUpdate( const ::basegfx::B2DRange& rTotalArea,
- const ::std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
+ const std::vector< ::canvas::Sprite::Reference >& rSortedUpdateSprites );
css::uno::Any isUnsafeScrolling() const
{
diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index bdab9f9a6fab..98f5f43d7bf1 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.cxx
@@ -119,7 +119,7 @@ namespace vclcanvas
uno::Sequence<double>(4),
rendering::CompositeOperation::SOURCE);
- ::std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]);
+ std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]);
setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState, aRenderState);
std::vector< uno::Reference< rendering::XPolyPolygon2D> > aOutlineSequence;
@@ -171,7 +171,7 @@ namespace vclcanvas
uno::Sequence<double>(4),
rendering::CompositeOperation::SOURCE);
- ::std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]);
+ std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]);
setupTextOffsets(aOffsets.get(), maLogicalAdvancements, aViewState, aRenderState);
MetricVector aMetricVector;
@@ -365,7 +365,7 @@ namespace vclcanvas
if( maLogicalAdvancements.getLength() )
{
// TODO(P2): cache that
- ::std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]);
+ std::unique_ptr< long []> aOffsets(new long[maLogicalAdvancements.getLength()]);
setupTextOffsets( aOffsets.get(), maLogicalAdvancements, viewState, renderState );
// TODO(F3): ensure correct length and termination for DX
@@ -435,7 +435,7 @@ namespace vclcanvas
renderState);
// fill integer offsets
- ::std::transform( inputOffsets.getConstArray(),
+ std::transform( inputOffsets.getConstArray(),
inputOffsets.getConstArray()+inputOffsets.getLength(),
outputOffsets,
OffsetTransformer( aMatrix ) );
diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx
index 5225b80ea600..6af2660954fe 100644
--- a/chart2/inc/ChartModel.hxx
+++ b/chart2/inc/ChartModel.hxx
@@ -144,7 +144,7 @@ private:
css::uno::Reference< css::frame::XModel > m_xParent;
css::uno::Reference< css::chart2::data::XRangeHighlighter > m_xRangeHighlighter;
css::uno::Reference<css::chart2::data::XPopupRequest> m_xPopupRequest;
- ::std::vector< GraphicObject > m_aGraphicObjectVector;
+ std::vector< GraphicObject > m_aGraphicObjectVector;
css::uno::Reference< css::chart2::data::XDataProvider > m_xDataProvider;
/** is only valid if m_xDataProvider is set. If m_xDataProvider is set to an
diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx
index a7b545f49af0..b82a3086f45f 100644
--- a/chart2/inc/ChartView.hxx
+++ b/chart2/inc/ChartView.hxx
@@ -74,7 +74,7 @@ struct TimeBasedInfo
Timer maTimer;
// only valid when we are in the time based mode
- ::std::vector< std::vector< VDataSeries* > > m_aDataSeriesList;
+ std::vector< std::vector< VDataSeries* > > m_aDataSeriesList;
};
/**
diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx
index 4dd512a9d41f..d887fa67b734 100644
--- a/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -229,23 +229,23 @@ bool AccessibleBase::ImplUpdateChildren()
{
ObjectHierarchy::tChildContainer aModelChildren(
m_aAccInfo.m_spObjectHierarchy->getChildren( GetId() ));
- ::std::vector< ChildOIDMap::key_type > aAccChildren;
+ std::vector< ChildOIDMap::key_type > aAccChildren;
aAccChildren.reserve( aModelChildren.size());
- ::std::transform( m_aChildOIDMap.begin(), m_aChildOIDMap.end(),
- ::std::back_inserter( aAccChildren ),
+ std::transform( m_aChildOIDMap.begin(), m_aChildOIDMap.end(),
+ std::back_inserter( aAccChildren ),
::o3tl::select1st< ChildOIDMap::value_type >() );
- ::std::sort( aModelChildren.begin(), aModelChildren.end());
+ std::sort( aModelChildren.begin(), aModelChildren.end());
- ::std::vector< ObjectIdentifier > aChildrenToRemove, aChildrenToAdd;
- ::std::set_difference( aModelChildren.begin(), aModelChildren.end(),
+ std::vector< ObjectIdentifier > aChildrenToRemove, aChildrenToAdd;
+ std::set_difference( aModelChildren.begin(), aModelChildren.end(),
aAccChildren.begin(), aAccChildren.end(),
- ::std::back_inserter( aChildrenToAdd ));
- ::std::set_difference( aAccChildren.begin(), aAccChildren.end(),
+ std::back_inserter( aChildrenToAdd ));
+ std::set_difference( aAccChildren.begin(), aAccChildren.end(),
aModelChildren.begin(), aModelChildren.end(),
- ::std::back_inserter( aChildrenToRemove ));
+ std::back_inserter( aChildrenToRemove ));
- ::std::vector< ObjectIdentifier >::const_iterator aIt( aChildrenToRemove.begin());
+ std::vector< ObjectIdentifier >::const_iterator aIt( aChildrenToRemove.begin());
for( ; aIt != aChildrenToRemove.end(); ++aIt )
{
RemoveChildByOId( *aIt );
@@ -313,7 +313,7 @@ void AccessibleBase::RemoveChildByOId( const ObjectIdentifier& rOId )
// search child in vector
ChildListVectorType::iterator aVecIter =
- ::std::find( m_aChildList.begin(), m_aChildList.end(), xChild );
+ std::find( m_aChildList.begin(), m_aChildList.end(), xChild );
OSL_ENSURE( aVecIter != m_aChildList.end(),
"Inconsistent ChildMap" );
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index d18d405eadf0..7f93dc83ccd9 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -50,12 +50,12 @@ struct StaticAreaWrapperPropertyArray_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -148,7 +148,7 @@ const Sequence< beans::Property >& AreaWrapper::getPropertySequence()
const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties()
{
- ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
+ std::vector< ::chart::WrappedProperty* > aWrappedProperties;
aWrappedProperties.push_back( new WrappedDirectStateProperty("LineStyle","LineStyle") );
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index c5a993e4e470..3dcbd4210a9f 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -102,7 +102,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
//Properties for scaling:
rOutProperties.push_back(
@@ -374,14 +374,14 @@ struct StaticAxisWrapperPropertyArray_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -641,7 +641,7 @@ const Sequence< beans::Property >& AxisWrapper::getPropertySequence()
const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties()
{
- ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
+ std::vector< ::chart::WrappedProperty* > aWrappedProperties;
aWrappedProperties.push_back( new WrappedTextRotationProperty() );
aWrappedProperties.push_back( new WrappedProperty("Marks","MajorTickmarks") );
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 2a912ff51b77..abc07cf85942 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -104,7 +104,7 @@ enum eServiceType
SERVICE_NAME_IMPORT_GRAPHIC_RESOLVER
};
-typedef ::std::map< OUString, enum eServiceType > tServiceNameMap;
+typedef std::map< OUString, enum eServiceType > tServiceNameMap;
tServiceNameMap & lcl_getStaticServiceNameMap()
{
@@ -152,7 +152,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "HasMainTitle",
@@ -246,10 +246,10 @@ struct StaticChartDocumentWrapperPropertyArray_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -991,7 +991,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const
// iterate 'flat' over all top-level objects
// and determine all that are no chart objects
- ::std::vector< uno::Reference< drawing::XShape > > aShapeVector;
+ std::vector< uno::Reference< drawing::XShape > > aShapeVector;
sal_Int32 nSubCount = xDrawPageShapes->getCount();
uno::Reference< drawing::XShape > xShape;
for( sal_Int32 nS = 0; nS < nSubCount; nS++ )
@@ -1012,7 +1012,7 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const
OSL_ENSURE( xFoundShapes.is(), "Couldn't create a shape collection!" );
if( xFoundShapes.is())
{
- ::std::vector< uno::Reference< drawing::XShape > >::iterator aIter;
+ std::vector< uno::Reference< drawing::XShape > >::iterator aIter;
for( aIter = aShapeVector.begin(); aIter != aShapeVector.end(); ++aIter )
xFoundShapes->add( *aIter );
}
@@ -1433,7 +1433,7 @@ const Sequence< beans::Property >& ChartDocumentWrapper::getPropertySequence()
const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedProperties()
{
- ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
+ std::vector< ::chart::WrappedProperty* > aWrappedProperties;
aWrappedProperties.push_back( new WrappedDataSourceLabelsInFirstRowProperty( m_spChart2ModelContact ) );
aWrappedProperties.push_back( new WrappedDataSourceLabelsInFirstColumnProperty( m_spChart2ModelContact ) );
aWrappedProperties.push_back( new WrappedHasLegendProperty( m_spChart2ModelContact ) );
diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index a3769336501a..4eac71ec5864 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -89,7 +89,7 @@ enum
};
void lcl_AddPropertiesToVector_PointProperties(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
//service chart::Chart3DBarProperties
rOutProperties.push_back(
@@ -186,7 +186,7 @@ void lcl_AddPropertiesToVector_PointProperties(
}
void lcl_AddPropertiesToVector_SeriesOnly(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "Axis",
@@ -205,7 +205,7 @@ void lcl_AddPropertiesToVector_SeriesOnly(
uno::Sequence< Property > lcl_GetPropertySequence( DataSeriesPointWrapper::eType _eType )
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector_PointProperties( aProperties );
if( _eType == DataSeriesPointWrapper::DATA_SERIES )
@@ -222,7 +222,7 @@ uno::Sequence< Property > lcl_GetPropertySequence( DataSeriesPointWrapper::eType
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() );
+ std::sort( aProperties.begin(), aProperties.end(), ::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
}
@@ -551,7 +551,7 @@ Reference< chart2::XDataSeries > DataSeriesPointWrapper::getDataSeries()
if( !xSeries.is() )
{
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
- ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
+ std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
::chart::DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
if( m_nSeriesIndexInNewAPI >= 0 && m_nSeriesIndexInNewAPI < static_cast<sal_Int32>(aSeriesList.size()) )
@@ -719,7 +719,7 @@ const Sequence< beans::Property >& DataSeriesPointWrapper::getPropertySequence()
const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedProperties()
{
- ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
+ std::vector< ::chart::WrappedProperty* > aWrappedProperties;
WrappedCharacterHeightProperty::addWrappedProperties( aWrappedProperties, this );
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index d6a9885df789..e18882add0da 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -143,7 +143,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "AttributedDataPoints",
@@ -458,7 +458,7 @@ struct StaticDiagramWrapperPropertyArray_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
@@ -472,7 +472,7 @@ private:
WrappedAutomaticPositionProperties::addProperties( aProperties );
WrappedGL3DProperties::addProperties(aProperties);
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -508,7 +508,7 @@ sal_Int32 lcl_getNewAPIIndexForOldAPIIndex(
nNewAPIIndex -= 1;
}
- ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
+ std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
::chart::DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
if( nNewAPIIndex >= static_cast<sal_Int32>(aSeriesList.size()) )
nNewAPIIndex = -1;
@@ -1503,7 +1503,7 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con
uno::Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() );
if( xDiagram.is() && xChartDoc.is() )
{
- ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector(
+ std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
if( aSeriesVector.size() > 0 )
{
@@ -1649,9 +1649,9 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal
if( xDiagram.is() && xDiaProp.is())
{
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector(
::chart::DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
- ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
+ std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
aSeriesVector.begin();
sal_Int32 i = 0;
for( ; aIt != aSeriesVector.end(); ++aIt, ++i )
@@ -1681,12 +1681,12 @@ Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< bean
if( xDiagram.is() && xDiaProp.is())
{
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector(
::chart::DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
uno::Sequence< uno::Sequence< sal_Int32 > > aResult( aSeriesVector.size() );
- ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
+ std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
aSeriesVector.begin();
sal_Int32 i = 0;
for( ; aIt != aSeriesVector.end(); ++aIt, ++i )
@@ -1896,7 +1896,7 @@ const Sequence< beans::Property >& DiagramWrapper::getPropertySequence()
const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties()
{
- ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
+ std::vector< ::chart::WrappedProperty* > aWrappedProperties;
WrappedAxisAndGridExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
WrappedAxisTitleExistenceProperties::addWrappedProperties( aWrappedProperties, m_spChart2ModelContact );
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index e95a0c8f3147..10694a8533cb 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -53,11 +53,11 @@ struct StaticGridWrapperPropertyArray_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -159,7 +159,7 @@ const Sequence< beans::Property >& GridWrapper::getPropertySequence()
const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties()
{
- ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
+ std::vector< ::chart::WrappedProperty* > aWrappedProperties;
aWrappedProperties.push_back( new WrappedDefaultProperty( "LineColor", "LineColor", uno::Any( sal_Int32( 0x000000) ) ) ); // black
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 4d699c453584..36878f863fc3 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -209,7 +209,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "Alignment",
@@ -237,7 +237,7 @@ struct StaticLegendWrapperPropertyArray_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
@@ -246,7 +246,7 @@ private:
::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -387,7 +387,7 @@ const Sequence< beans::Property >& LegendWrapper::getPropertySequence()
const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties()
{
- ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
+ std::vector< ::chart::WrappedProperty* > aWrappedProperties;
aWrappedProperties.push_back( new WrappedLegendAlignmentProperty() );
aWrappedProperties.push_back( new WrappedProperty( "Expansion", "Expansion"));
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 4b9a84d24ce2..0e54a0096a65 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -67,12 +67,12 @@ struct StaticMinMaxLineWrapperPropertyArray_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index e56f203765a1..5c03301bb21c 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -121,7 +121,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "String",
@@ -155,7 +155,7 @@ struct StaticTitleWrapperPropertyArray_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< beans::Property > aProperties;
+ std::vector< beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
@@ -164,7 +164,7 @@ private:
::chart::wrapper::WrappedAutomaticPositionProperties::addProperties( aProperties );
::chart::wrapper::WrappedScaleTextProperties::addProperties( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -467,7 +467,7 @@ const Sequence< beans::Property >& TitleWrapper::getPropertySequence()
const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties()
{
- ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
+ std::vector< ::chart::WrappedProperty* > aWrappedProperties;
aWrappedProperties.push_back( new WrappedTitleStringProperty( m_spChart2ModelContact->m_xContext ) );
aWrappedProperties.push_back( new WrappedTextRotationProperty( true ) );
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 19bd0ba2ac1b..256eb8c29461 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -53,13 +53,13 @@ struct StaticUpDownBarWrapperPropertyArray_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index f179264767fe..ba9aa9978ec7 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -55,12 +55,12 @@ struct StaticWallFloorWrapperPropertyArray_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -137,7 +137,7 @@ const Sequence< beans::Property >& WallFloorWrapper::getPropertySequence()
const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties()
{
- ::std::vector< ::chart::WrappedProperty* > aWrappedProperties;
+ std::vector< ::chart::WrappedProperty* > aWrappedProperties;
// use direct state always, so that in XML the value is always
// exported. Because in the old chart the defaults is as follows:
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index 39bcb5140f41..663d9c8dd2c5 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -105,7 +105,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList )
}//anonymous namespace
-void WrappedAutomaticPositionProperties::addProperties( ::std::vector< Property > & rOutProperties )
+void WrappedAutomaticPositionProperties::addProperties( std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "AutomaticPosition",
diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
index 972ea658124e..389cefb683cb 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx
@@ -31,7 +31,7 @@ namespace wrapper
class WrappedAutomaticPositionProperties
{
public:
- static void addProperties( ::std::vector< css::beans::Property >& rOutProperties );
+ static void addProperties( std::vector< css::beans::Property >& rOutProperties );
static void addWrappedProperties( std::vector< WrappedProperty* >& rList );
};
diff --git a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
index acd7741c0f76..0793658e908d 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx
@@ -33,7 +33,7 @@ namespace wrapper
class WrappedDataCaptionProperties
{
public:
- static void addProperties( ::std::vector< css::beans::Property > & rOutProperties );
+ static void addProperties( std::vector< css::beans::Property > & rOutProperties );
static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 9f7cc28de789..1c3871ede3fd 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -112,7 +112,7 @@ enum
}//anonymous namespace
-void WrappedScaleTextProperties::addProperties( ::std::vector< Property > & rOutProperties )
+void WrappedScaleTextProperties::addProperties( std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "ScaleText",
diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
index b3e9ee9cd85e..f892fbbf5e83 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx
@@ -34,7 +34,7 @@ namespace wrapper
class WrappedScaleTextProperties
{
public:
- static void addProperties( ::std::vector< css::beans::Property >& rOutProperties );
+ static void addProperties( std::vector< css::beans::Property >& rOutProperties );
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
};
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
index e5ba28c44b45..47b2675cdcaa 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx
@@ -66,9 +66,9 @@ public:
if( m_ePropertyType == DIAGRAM &&
m_spChart2ModelContact.get() )
{
- ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector(
+ std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector(
::chart::DiagramHelper::getDataSeriesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) );
- ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter =
+ std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter =
aSeriesVector.begin();
for( ; aIter != aSeriesVector.end(); ++aIter )
{
@@ -95,9 +95,9 @@ public:
if( m_ePropertyType == DIAGRAM &&
m_spChart2ModelContact.get() )
{
- ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector(
+ std::vector< css::uno::Reference< css::chart2::XDataSeries > > aSeriesVector(
::chart::DiagramHelper::getDataSeriesFromDiagram( m_spChart2ModelContact->getChart2Diagram() ) );
- ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter =
+ std::vector< css::uno::Reference< css::chart2::XDataSeries > >::const_iterator aIter =
aSeriesVector.begin();
for( ; aIter != aSeriesVector.end(); ++aIter )
{
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index 2537b9ade1ce..f7ef66fbd572 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -175,7 +175,7 @@ enum
}//anonymous namespace
-void WrappedSplineProperties::addProperties( ::std::vector< Property > & rOutProperties )
+void WrappedSplineProperties::addProperties( std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( CHART_UNONAME_SPLINE_TYPE,
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
index 01cd3f034327..f47e3da4d70a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx
@@ -33,7 +33,7 @@ namespace wrapper
class WrappedSplineProperties
{
public:
- static void addProperties( ::std::vector< css::beans::Property > & rOutProperties );
+ static void addProperties( std::vector< css::beans::Property > & rOutProperties );
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
};
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 012ee391e349..72d2ca86dd45 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -120,7 +120,7 @@ sal_Int32 lcl_getErrorBarStyle( const uno::Reference< beans::XPropertySet >& xEr
}
uno::Reference< chart2::data::XDataProvider > lcl_getDataProviderFromContact(
- const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
+ const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
{
uno::Reference< chart2::data::XDataProvider > xResult;
if( spChart2ModelContact.get())
@@ -135,7 +135,7 @@ uno::Reference< chart2::data::XDataProvider > lcl_getDataProviderFromContact(
void lcl_ConvertRangeFromXML(
OUString & rInOutRange,
- const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
+ const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
{
if( !rInOutRange.isEmpty())
{
@@ -151,7 +151,7 @@ void lcl_ConvertRangeFromXML(
void lcl_ConvertRangeToXML(
OUString & rInOutRange,
- const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
+ const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
{
if( !rInOutRange.isEmpty())
{
@@ -172,7 +172,7 @@ class WrappedStatisticProperty : public WrappedSeriesOrDiagramProperty< PROPERTY
{
public:
explicit WrappedStatisticProperty( const OUString& rName, const Any& rDefaulValue
- , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
: WrappedSeriesOrDiagramProperty< PROPERTYTYPE >(rName,rDefaulValue,spChart2ModelContact,ePropertyType)
{}
@@ -205,7 +205,7 @@ public:
virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const override;
- explicit WrappedConstantErrorLowProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedConstantErrorLowProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
private:
@@ -213,7 +213,7 @@ private:
};
WrappedConstantErrorLowProperty::WrappedConstantErrorLowProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "ConstantErrorLow"
, uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType )
@@ -255,7 +255,7 @@ public:
virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const override;
- explicit WrappedConstantErrorHighProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedConstantErrorHighProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
private:
@@ -263,7 +263,7 @@ private:
};
WrappedConstantErrorHighProperty::WrappedConstantErrorHighProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "ConstantErrorHigh"
, uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType )
@@ -305,12 +305,12 @@ public:
virtual bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& aNewValue ) const override;
- explicit WrappedMeanValueProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedMeanValueProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
};
WrappedMeanValueProperty::WrappedMeanValueProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< bool >( "MeanValue", uno::Any( false ), spChart2ModelContact, ePropertyType )
{
@@ -345,12 +345,12 @@ public:
virtual css::chart::ChartErrorCategory getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartErrorCategory& aNewValue ) const override;
- explicit WrappedErrorCategoryProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorCategoryProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
};
WrappedErrorCategoryProperty::WrappedErrorCategoryProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< css::chart::ChartErrorCategory >( "ErrorCategory"
, uno::Any( css::chart::ChartErrorCategory_NONE ), spChart2ModelContact, ePropertyType )
@@ -439,7 +439,7 @@ public:
virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const override;
- explicit WrappedPercentageErrorProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedPercentageErrorProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
private:
@@ -447,7 +447,7 @@ private:
};
WrappedPercentageErrorProperty::WrappedPercentageErrorProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "PercentageError"
, uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType )
@@ -489,7 +489,7 @@ public:
virtual double getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const double& aNewValue ) const override;
- explicit WrappedErrorMarginProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorMarginProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
private:
@@ -497,7 +497,7 @@ private:
};
WrappedErrorMarginProperty::WrappedErrorMarginProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< double >( "ErrorMargin"
, uno::Any( double(0.0) ), spChart2ModelContact, ePropertyType )
@@ -539,12 +539,12 @@ public:
virtual css::chart::ChartErrorIndicatorType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartErrorIndicatorType& aNewValue ) const override;
- explicit WrappedErrorIndicatorProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorIndicatorProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
};
WrappedErrorIndicatorProperty::WrappedErrorIndicatorProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< css::chart::ChartErrorIndicatorType >( "ErrorIndicator"
, uno::Any( css::chart::ChartErrorIndicatorType_NONE ), spChart2ModelContact, ePropertyType )
@@ -608,12 +608,12 @@ public:
virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& nNewValue ) const override;
- explicit WrappedErrorBarStyleProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact1,
+ explicit WrappedErrorBarStyleProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact1,
tSeriesOrDiagramPropertyType ePropertyType );
};
WrappedErrorBarStyleProperty::WrappedErrorBarStyleProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< sal_Int32 >( "ErrorBarStyle"
, uno::Any( css::chart::ErrorBarStyle::NONE ), spChart2ModelContact, ePropertyType )
@@ -650,7 +650,7 @@ public:
virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const override;
- explicit WrappedErrorBarRangePositiveProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorBarRangePositiveProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
private:
@@ -658,7 +658,7 @@ private:
};
WrappedErrorBarRangePositiveProperty::WrappedErrorBarRangePositiveProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< OUString >( "ErrorBarRangePositive"
, uno::Any( OUString() ), spChart2ModelContact, ePropertyType )
@@ -713,7 +713,7 @@ public:
virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const OUString& aNewValue ) const override;
- explicit WrappedErrorBarRangeNegativeProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedErrorBarRangeNegativeProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
private:
@@ -721,7 +721,7 @@ private:
};
WrappedErrorBarRangeNegativeProperty::WrappedErrorBarRangeNegativeProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< OUString >( "ErrorBarRangeNegative"
, uno::Any( OUString() ), spChart2ModelContact, ePropertyType )
@@ -776,12 +776,12 @@ public:
virtual css::chart::ChartRegressionCurveType getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override;
virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const css::chart::ChartRegressionCurveType & aNewValue ) const override;
- explicit WrappedRegressionCurvesProperty( ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ explicit WrappedRegressionCurvesProperty( std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
};
WrappedRegressionCurvesProperty::WrappedRegressionCurvesProperty(
- ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< css::chart::ChartRegressionCurveType >( "RegressionCurves"
, lcl_getRegressionDefault(), spChart2ModelContact, ePropertyType )
@@ -835,7 +835,7 @@ public:
};
explicit WrappedStatisticPropertySetProperty(
- PropertySetType ePropertySetType, ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
+ PropertySetType ePropertySetType, std::shared_ptr< Chart2ModelContact > spChart2ModelContact,
tSeriesOrDiagramPropertyType ePropertyType );
private:
@@ -844,7 +844,7 @@ private:
WrappedStatisticPropertySetProperty::WrappedStatisticPropertySetProperty(
PropertySetType ePropertySetType
- , ::std::shared_ptr< Chart2ModelContact > spChart2ModelContact
+ , std::shared_ptr< Chart2ModelContact > spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
: WrappedStatisticProperty< Reference< beans::XPropertySet > >(
(ePropertySetType == PROPERTY_SET_TYPE_REGRESSION)
@@ -913,7 +913,7 @@ enum
series
*/
void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
- , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact
+ , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact
, tSeriesOrDiagramPropertyType ePropertyType )
{
rList.push_back( new WrappedConstantErrorLowProperty( spChart2ModelContact, ePropertyType ) );
@@ -937,7 +937,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
}//anonymous namespace
-void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOutProperties )
+void WrappedStatisticProperties::addProperties( std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "ConstantErrorLow",
@@ -1030,13 +1030,13 @@ void WrappedStatisticProperties::addProperties( ::std::vector< Property > & rOut
}
void WrappedStatisticProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
- , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
+ , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
{
lcl_addWrappedProperties( rList, spChart2ModelContact, DATA_SERIES );
}
void WrappedStatisticProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
- , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
+ , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact )
{
lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM );
}
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
index 2baba22cbbbb..6133e41f0c03 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx
@@ -33,11 +33,11 @@ namespace wrapper
class WrappedStatisticProperties
{
public:
- static void addProperties( ::std::vector< css::beans::Property > & rOutProperties );
+ static void addProperties( std::vector< css::beans::Property > & rOutProperties );
static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
- , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
+ , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
- , const ::std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
+ , const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
};
} //namespace wrapper
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 852fd0986d50..831ff67bcccc 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -126,7 +126,7 @@ css::uno::Any WrappedVolumeProperty::getPropertyValue( const css::uno::Reference
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
if( xDiagram.is() && xChartDoc.is() )
{
- ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector(
+ std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
if( aSeriesVector.size() > 0 )
{
@@ -191,7 +191,7 @@ css::uno::Any WrappedUpDownProperty::getPropertyValue( const css::uno::Reference
Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
if( xDiagram.is() && xChartDoc.is() )
{
- ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector(
+ std::vector< uno::Reference< chart2::XDataSeries > > aSeriesVector(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
if( aSeriesVector.size() > 0 )
{
@@ -241,7 +241,7 @@ enum
}//anonymous namespace
-void WrappedStockProperties::addProperties( ::std::vector< Property > & rOutProperties )
+void WrappedStockProperties::addProperties( std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "Volume",
diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
index faa1ba5211e0..3879eb8245d0 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx
@@ -33,7 +33,7 @@ namespace wrapper
class WrappedStockProperties
{
public:
- static void addProperties( ::std::vector< css::beans::Property > & rOutProperties );
+ static void addProperties( std::vector< css::beans::Property > & rOutProperties );
static void addWrappedProperties( std::vector< WrappedProperty* >& rList
, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
};
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index 830fbb692fd8..31b458abea71 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -162,7 +162,7 @@ void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
}//anonymous namespace
-void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutProperties )
+void WrappedSymbolProperties::addProperties( std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "SymbolType",
diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
index 44356dd348ad..c32249188ca6 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx
@@ -33,7 +33,7 @@ namespace wrapper
class WrappedSymbolProperties
{
public:
- static void addProperties( ::std::vector< css::beans::Property > & rOutProperties );
+ static void addProperties( std::vector< css::beans::Property > & rOutProperties );
static void addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact );
static void addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index b2ae9b21b90d..0d9b6d983afb 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -403,7 +403,7 @@ namespace
with focus is set at pIndex if pOutIndex is not 0.
*/
bool lcl_SeriesHeaderHasFocus(
- const ::std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader,
+ const std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader,
sal_Int32 * pOutIndex = nullptr )
{
sal_Int32 nIndex = 0;
@@ -420,7 +420,7 @@ bool lcl_SeriesHeaderHasFocus(
}
sal_Int32 lcl_getColumnInDataOrHeader(
- sal_uInt16 nCol, const ::std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader )
+ sal_uInt16 nCol, const std::vector< std::shared_ptr< ::chart::impl::SeriesHeader > > & rSeriesHeader )
{
sal_Int32 nColIdx = 0;
bool bHeaderHasFocus( lcl_SeriesHeaderHasFocus( rSeriesHeader, &nColIdx ));
@@ -590,8 +590,8 @@ void DataBrowser::RenewTable()
}
RowInserted( 1, nRowCountLocal );
- GoToRow( ::std::min( nOldRow, GetRowCount() - 1 ));
- GoToColumnId( ::std::min( nOldColId, static_cast< sal_uInt16 >( ColCount() - 1 )));
+ GoToRow( std::min( nOldRow, GetRowCount() - 1 ));
+ GoToColumnId( std::min( nOldColId, static_cast< sal_uInt16 >( ColCount() - 1 )));
Dialog* pDialog = GetParentDialog();
vcl::Window* pWin = pDialog->get<VclContainer>("columns");
diff --git a/chart2/source/controller/dialogs/DataBrowser.hxx b/chart2/source/controller/dialogs/DataBrowser.hxx
index 4c4135535c17..8eb8fbac53af 100644
--- a/chart2/source/controller/dialogs/DataBrowser.hxx
+++ b/chart2/source/controller/dialogs/DataBrowser.hxx
@@ -147,7 +147,7 @@ private:
css::uno::Reference< css::chart2::XChartDocument > m_xChartDoc;
std::unique_ptr< DataBrowserModel > m_apDataBrowserModel;
- typedef ::std::vector< std::shared_ptr< impl::SeriesHeader > > tSeriesHeaderContainer;
+ typedef std::vector< std::shared_ptr< impl::SeriesHeader > > tSeriesHeaderContainer;
tSeriesHeaderContainer m_aSeriesHeaders;
std::shared_ptr< NumberFormatterWrapper > m_spNumberFormatterWrapper;
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 55bbefecbeb4..91a332394cf0 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -125,7 +125,7 @@ bool lcl_SequenceOfSeriesIsShared(
return bResult;
}
-typedef ::std::vector< Reference< chart2::data::XLabeledDataSequence > > lcl_tSharedSeqVec;
+typedef std::vector< Reference< chart2::data::XLabeledDataSequence > > lcl_tSharedSeqVec;
lcl_tSharedSeqVec lcl_getSharedSequences( const Sequence< Reference< chart2::XDataSeries > > & rSeries )
{
@@ -171,7 +171,7 @@ sal_Int32 lcl_getValuesRepresentationIndex(
return nResult;
}
-struct lcl_RepresentationsOfLSeqMatch : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
+struct lcl_RepresentationsOfLSeqMatch : public std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
{
explicit lcl_RepresentationsOfLSeqMatch( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) :
m_aValuesRep( xLSeq.is() ?
@@ -189,7 +189,7 @@ private:
OUString m_aValuesRep;
};
-struct lcl_RolesOfLSeqMatch : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
+struct lcl_RolesOfLSeqMatch : public std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
{
explicit lcl_RolesOfLSeqMatch( const Reference< chart2::data::XLabeledDataSequence > & xLSeq ) :
m_aRole(DataSeriesHelper::getRole(xLSeq)) {}
@@ -234,7 +234,7 @@ struct DataBrowserModel::tDataColumn
{}
};
-struct DataBrowserModel::implColumnLess : public ::std::binary_function<
+struct DataBrowserModel::implColumnLess : public std::binary_function<
DataBrowserModel::tDataColumn, DataBrowserModel::tDataColumn, bool >
{
bool operator() ( const first_argument_type & rLeft, const second_argument_type & rRight )
@@ -262,7 +262,7 @@ DataBrowserModel::~DataBrowserModel()
namespace
{
-struct lcl_DataSeriesOfHeaderMatches : public ::std::unary_function< ::chart::DataBrowserModel::tDataHeader, bool >
+struct lcl_DataSeriesOfHeaderMatches : public std::unary_function< ::chart::DataBrowserModel::tDataHeader, bool >
{
explicit lcl_DataSeriesOfHeaderMatches(
const Reference< chart2::XDataSeries > & xSeriesToCompareWith ) :
@@ -307,7 +307,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
// Find the corresponding header and determine the last column of this
// data series.
tDataHeaderVector::const_iterator aIt(
- ::std::find_if( m_aHeaders.begin(), m_aHeaders.end(),
+ std::find_if( m_aHeaders.begin(), m_aHeaders.end(),
lcl_DataSeriesOfHeaderMatches( xSeries )));
if( aIt != m_aHeaders.end())
nStartCol = aIt->m_nEndColumn;
@@ -350,7 +350,7 @@ void DataBrowserModel::insertDataSeries( sal_Int32 nAfterColumnIndex )
for (sal_Int32 nIndex = nStartCol; nSeqIdx < nSeqSize; ++nSeqIdx)
{
lcl_tSharedSeqVec::const_iterator aSharedIt(
- ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(),
+ std::find_if( aSharedSequences.begin(), aSharedSequences.end(),
lcl_RolesOfLSeqMatch( aLSequences[nSeqIdx] )));
if( aSharedIt != aSharedSequences.end())
@@ -486,7 +486,7 @@ void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColu
for (sal_Int32 i = 0; i < aSequencesOfDeleted.getLength(); ++i)
{
std::vector<Reference<chart2::data::XLabeledDataSequence> >::const_iterator aHitIt(
- ::std::find_if( aAllDataSeqs.begin(), aAllDataSeqs.end(),
+ std::find_if( aAllDataSeqs.begin(), aAllDataSeqs.end(),
lcl_RepresentationsOfLSeqMatch( aSequencesOfDeleted[i] )));
// if not used by the remaining series this sequence can be deleted
if( aHitIt == aAllDataSeqs.end() )
@@ -496,8 +496,8 @@ void DataBrowserModel::removeDataSeriesOrComplexCategoryLevel( sal_Int32 nAtColu
// delete unnecessary sequences of the internal data
// iterate using greatest index first, so that deletion does not
// shift other sequences that will be deleted later
- ::std::sort( aSequenceIndexesToDelete.begin(), aSequenceIndexesToDelete.end());
- for( ::std::vector< sal_Int32 >::reverse_iterator aIt(
+ std::sort( aSequenceIndexesToDelete.begin(), aSequenceIndexesToDelete.end());
+ for( std::vector< sal_Int32 >::reverse_iterator aIt(
aSequenceIndexesToDelete.rbegin()); aIt != aSequenceIndexesToDelete.rend(); ++aIt )
{
if( *aIt != -1 )
@@ -878,7 +878,7 @@ void DataBrowserModel::updateFromModel()
else if( aRole == "values-x" )
nSequenceNumberFormatKey = nXAxisNumberFormat;
- if( ::std::find_if( aSharedSequences.begin(), aSharedSequences.end(),
+ if( std::find_if( aSharedSequences.begin(), aSharedSequences.end(),
lcl_RepresentationsOfLSeqMatch( aLSeqs[nSeqIdx] )) == aSharedSequences.end())
{
// no shared sequence
@@ -921,7 +921,7 @@ void DataBrowserModel::updateFromModel()
nHeaderStart = nHeaderEnd;
- ::std::sort( m_aColumns.begin() + nStartColIndex, m_aColumns.end(), implColumnLess() );
+ std::sort( m_aColumns.begin() + nStartColIndex, m_aColumns.end(), implColumnLess() );
}
}
}
@@ -937,7 +937,7 @@ void DataBrowserModel::addErrorBarRanges(
{
try
{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aSequences;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aSequences;
Reference< chart2::data::XDataSource > xErrorSource(
StatisticsHelper::getErrorBars( xDataSeries, bYError ), uno::UNO_QUERY );
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.hxx b/chart2/source/controller/dialogs/DataBrowserModel.hxx
index f191a607faee..589fe79086b9 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.hxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.hxx
@@ -122,7 +122,7 @@ public:
{}
};
- typedef ::std::vector< tDataHeader > tDataHeaderVector;
+ typedef std::vector< tDataHeader > tDataHeaderVector;
const tDataHeaderVector& getDataHeaders() const { return m_aHeaders;}
@@ -151,7 +151,7 @@ private:
struct tDataColumn;
struct implColumnLess;
- typedef ::std::vector< tDataColumn > tDataColumnVector;
+ typedef std::vector< tDataColumn > tDataColumnVector;
tDataColumnVector m_aColumns;
tDataHeaderVector m_aHeaders;
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index e6cdc9220170..e4e74416667a 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -59,7 +59,7 @@ namespace
{
const OUString lcl_aLabelRole( "label" );
-struct lcl_ChartTypeToSeriesCnt : ::std::unary_function<
+struct lcl_ChartTypeToSeriesCnt : std::unary_function<
Reference< XChartType >, Reference< XDataSeriesContainer > >
{
Reference< XDataSeriesContainer > operator() (
@@ -73,7 +73,7 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI )
{
OUString aResult( rRoleString );
- typedef ::std::map< OUString, OUString > tTranslationMap;
+ typedef std::map< OUString, OUString > tTranslationMap;
static tTranslationMap aTranslationMap;
if( aTranslationMap.empty() )
@@ -108,7 +108,7 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI )
else
{
tTranslationMap::const_iterator aIt(
- ::std::find_if( aTranslationMap.begin(), aTranslationMap.end(),
+ std::find_if( aTranslationMap.begin(), aTranslationMap.end(),
[&rRoleString]
( const tTranslationMap::value_type& cp )
{ return rRoleString == cp.second; } )
@@ -121,7 +121,7 @@ OUString lcl_ConvertRole( const OUString & rRoleString, bool bFromInternalToUI )
return aResult;
}
-typedef ::std::map< OUString, sal_Int32 > lcl_tRoleIndexMap;
+typedef std::map< OUString, sal_Int32 > lcl_tRoleIndexMap;
void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap )
{
@@ -146,9 +146,9 @@ void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap )
}
struct lcl_DataSeriesContainerAppend : public
- ::std::iterator< ::std::output_iterator_tag, Reference< XDataSeriesContainer > >
+ std::iterator< std::output_iterator_tag, Reference< XDataSeriesContainer > >
{
- typedef ::std::vector< ::chart::DialogModel::tSeriesWithChartTypeByName > tContainerType;
+ typedef std::vector< ::chart::DialogModel::tSeriesWithChartTypeByName > tContainerType;
explicit lcl_DataSeriesContainerAppend( tContainerType * rCnt )
: m_rDestCnt( rCnt )
@@ -170,7 +170,7 @@ struct lcl_DataSeriesContainerAppend : public
m_rDestCnt->push_back(
::chart::DialogModel::tSeriesWithChartTypeByName(
::chart::DataSeriesHelper::getDataSeriesLabel( aSeq[nI], aRole ),
- ::std::make_pair( aSeq[nI], xCT )));
+ std::make_pair( aSeq[nI], xCT )));
}
}
}
@@ -194,7 +194,7 @@ private:
};
struct lcl_RolesWithRangeAppend : public
- ::std::iterator< ::std::output_iterator_tag, Reference< data::XLabeledDataSequence > >
+ std::iterator< std::output_iterator_tag, Reference< data::XLabeledDataSequence > >
{
typedef ::chart::DialogModel::tRolesWithRanges tContainerType;
@@ -310,7 +310,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
Reference< data::XDataSink > xSink( xResult, uno::UNO_QUERY );
if( xChartType.is() && xSink.is())
{
- ::std::vector< Reference< data::XLabeledDataSequence > > aNewSequences;
+ std::vector< Reference< data::XLabeledDataSequence > > aNewSequences;
const OUString aRoleOfSeqForSeriesLabel = xChartType->getRoleOfSequenceForSeriesLabel();
const OUString aLabel(::chart::SchResId(STR_DATA_UNNAMED_SERIES).toString());
const Sequence< OUString > aRoles( xChartType->getSupportedMandatoryRoles());
@@ -350,7 +350,7 @@ Reference< XDataSeries > lcl_CreateNewSeries(
return xResult;
}
-struct lcl_addSeriesNumber : public ::std::binary_function<
+struct lcl_addSeriesNumber : public std::binary_function<
sal_Int32, Reference< XDataSeriesContainer >, sal_Int32 >
{
sal_Int32 operator() ( sal_Int32 nCurrentNumber, const Reference< XDataSeriesContainer > & xCnt ) const
@@ -396,7 +396,7 @@ void DialogModel::setTemplate(
m_xTemplate = xTemplate;
}
-::std::shared_ptr< RangeSelectionHelper > const &
+std::shared_ptr< RangeSelectionHelper > const &
DialogModel::getRangeSelectionHelper() const
{
if( ! m_spRangeSelectionHelper.get())
@@ -420,10 +420,10 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const
return xResult;
}
-::std::vector< Reference< XDataSeriesContainer > >
+std::vector< Reference< XDataSeriesContainer > >
DialogModel::getAllDataSeriesContainers() const
{
- ::std::vector< Reference< XDataSeriesContainer > > aResult;
+ std::vector< Reference< XDataSeriesContainer > > aResult;
try
{
@@ -440,9 +440,9 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const
{
Reference< XChartTypeContainer > xCTCnt( aCooSysSeq[i], uno::UNO_QUERY_THROW );
Sequence< Reference< XChartType > > aChartTypeSeq( xCTCnt->getChartTypes());
- ::std::transform(
+ std::transform(
aChartTypeSeq.getConstArray(), aChartTypeSeq.getConstArray() + aChartTypeSeq.getLength(),
- ::std::back_inserter( aResult ),
+ std::back_inserter( aResult ),
lcl_ChartTypeToSeriesCnt() );
}
}
@@ -455,14 +455,14 @@ Reference< data::XDataProvider > DialogModel::getDataProvider() const
return aResult;
}
-::std::vector< DialogModel::tSeriesWithChartTypeByName >
+std::vector< DialogModel::tSeriesWithChartTypeByName >
DialogModel::getAllDataSeriesWithLabel() const
{
- ::std::vector< tSeriesWithChartTypeByName > aResult;
- ::std::vector< Reference< XDataSeriesContainer > > aContainers(
+ std::vector< tSeriesWithChartTypeByName > aResult;
+ std::vector< Reference< XDataSeriesContainer > > aContainers(
getAllDataSeriesContainers());
- ::std::copy( aContainers.begin(), aContainers.end(),
+ std::copy( aContainers.begin(), aContainers.end(),
lcl_DataSeriesContainerAppend( &aResult ));
return aResult;
}
@@ -521,7 +521,7 @@ DialogModel::tRolesWithRanges DialogModel::getRolesWithRanges(
{
Reference< data::XDataSource > xSource( xSeries, uno::UNO_QUERY_THROW );
const Sequence< Reference< data::XLabeledDataSequence > > aSeq( xSource->getDataSequences());
- ::std::copy( aSeq.begin(), aSeq.end(),
+ std::copy( aSeq.begin(), aSeq.end(),
lcl_RolesWithRangeAppend( &aResult, aRoleOfSequenceForLabel ));
if( xChartType.is())
{
@@ -730,7 +730,7 @@ void DialogModel::setData(
Reference< chart2::XDiagram > xDiagram( m_xChartDocument->getFirstDiagram() );
ThreeDLookScheme e3DScheme = ThreeDHelper::detectScheme( xDiagram );
- ::std::vector< Reference< XDataSeries > > aSeriesToReUse(
+ std::vector< Reference< XDataSeries > > aSeriesToReUse(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
applyInterpretedData(
xInterpreter->interpretDataSource(
@@ -782,7 +782,7 @@ sal_Int32 DialogModel::GetRoleIndexForSorting( const OUString & rInternalRoleStr
void DialogModel::applyInterpretedData(
const InterpretedData & rNewData,
- const ::std::vector< Reference< XDataSeries > > & rSeriesToReUse )
+ const std::vector< Reference< XDataSeries > > & rSeriesToReUse )
{
if( ! m_xChartDocument.is())
return;
@@ -805,7 +805,7 @@ void DialogModel::applyInterpretedData(
const sal_Int32 nSeriesInGroup = aSeries.getLength();
for( sal_Int32 nSeries=0; nSeries<nSeriesInGroup; ++nSeries, ++nSeriesCounter )
{
- if( ::std::find( rSeriesToReUse.begin(), rSeriesToReUse.end(), aSeries[nSeries] )
+ if( std::find( rSeriesToReUse.begin(), rSeriesToReUse.end(), aSeries[nSeries] )
== rSeriesToReUse.end())
{
Reference< beans::XPropertySet > xSeriesProp( aSeries[nSeries], uno::UNO_QUERY );
@@ -825,14 +825,14 @@ void DialogModel::applyInterpretedData(
}
// data series
- ::std::vector< Reference< XDataSeriesContainer > > aSeriesCnt( getAllDataSeriesContainers());
- ::std::vector< Sequence< Reference< XDataSeries > > > aNewSeries(
+ std::vector< Reference< XDataSeriesContainer > > aSeriesCnt( getAllDataSeriesContainers());
+ std::vector< Sequence< Reference< XDataSeries > > > aNewSeries(
ContainerHelper::SequenceToVector( rNewData.Series ));
OSL_ASSERT( aSeriesCnt.size() == aNewSeries.size());
- ::std::vector< Sequence< Reference< XDataSeries > > >::const_iterator aSrcIt( aNewSeries.begin());
- ::std::vector< Reference< XDataSeriesContainer > >::iterator aDestIt( aSeriesCnt.begin());
+ std::vector< Sequence< Reference< XDataSeries > > >::const_iterator aSrcIt( aNewSeries.begin());
+ std::vector< Reference< XDataSeriesContainer > >::iterator aDestIt( aSeriesCnt.begin());
for(; aSrcIt != aNewSeries.end() && aDestIt != aSeriesCnt.end();
++aSrcIt, ++aDestIt )
{
@@ -853,8 +853,8 @@ void DialogModel::applyInterpretedData(
sal_Int32 DialogModel::countSeries() const
{
- ::std::vector< Reference< XDataSeriesContainer > > aCnt( getAllDataSeriesContainers());
- return ::std::accumulate( aCnt.begin(), aCnt.end(), 0, lcl_addSeriesNumber());
+ std::vector< Reference< XDataSeriesContainer > > aCnt( getAllDataSeriesContainers());
+ return std::accumulate( aCnt.begin(), aCnt.end(), 0, lcl_addSeriesNumber());
}
ChartModel& DialogModel::getModel() const
diff --git a/chart2/source/controller/dialogs/DialogModel.hxx b/chart2/source/controller/dialogs/DialogModel.hxx
index 73fe00a44efb..55251b1ad775 100644
--- a/chart2/source/controller/dialogs/DialogModel.hxx
+++ b/chart2/source/controller/dialogs/DialogModel.hxx
@@ -64,13 +64,13 @@ public:
const css::uno::Reference< css::uno::XComponentContext > & xContext );
~DialogModel();
- typedef ::std::pair<
+ typedef std::pair<
OUString,
- ::std::pair< css::uno::Reference< css::chart2::XDataSeries >,
+ std::pair< css::uno::Reference< css::chart2::XDataSeries >,
css::uno::Reference< css::chart2::XChartType > > >
tSeriesWithChartTypeByName;
- typedef ::std::map< OUString, OUString >
+ typedef std::map< OUString, OUString >
tRolesWithRanges;
void setTemplate(
@@ -85,10 +85,10 @@ public:
css::uno::Reference< css::chart2::data::XDataProvider >
getDataProvider() const;
- ::std::vector< css::uno::Reference< css::chart2::XDataSeriesContainer > >
+ std::vector< css::uno::Reference< css::chart2::XDataSeriesContainer > >
getAllDataSeriesContainers() const;
- ::std::vector< tSeriesWithChartTypeByName >
+ std::vector< tSeriesWithChartTypeByName >
getAllDataSeriesWithLabel() const;
static tRolesWithRanges getRolesWithRanges(
@@ -164,7 +164,7 @@ private:
private:
void applyInterpretedData(
const css::chart2::InterpretedData & rNewData,
- const ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > & rSeriesToReUse );
+ const std::vector< css::uno::Reference< css::chart2::XDataSeries > > & rSeriesToReUse );
sal_Int32 countSeries() const;
diff --git a/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index 157ca9106d3c..574de211aff5 100644
--- a/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -513,7 +513,7 @@ OUString ObjectNameProvider::getHelpText( const OUString& rObjectCID, const Refe
nIndex = aRet.indexOf( aWildcard );
if( nIndex != -1 )
{
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
sal_Int32 nSeriesIndex = -1;
for( nSeriesIndex=aSeriesVector.size();nSeriesIndex--;)
@@ -735,7 +735,7 @@ OUString ObjectNameProvider::getSelectedObjectText( const OUString & rObjectCID,
// replace data series index
{
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
sal_Int32 nSeriesIndex = -1;
for( nSeriesIndex=aSeriesVector.size();nSeriesIndex--;)
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index c4c00cd1fcf5..909760b3e932 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -122,7 +122,7 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes()
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
if( !aTypeList.getLength() )
{
- ::std::vector< uno::Type > aTypes;
+ std::vector< uno::Type > aTypes;
aTypes.push_back( cppu::UnoType<lang::XComponent>::get() );
aTypes.push_back( cppu::UnoType<lang::XTypeProvider>::get() );
aTypes.push_back( cppu::UnoType<uno::XAggregation>::get() );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index d1fda13149ca..a132ddf27e40 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -298,7 +298,7 @@ bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const
OUString aSep = our_aLBEntryMap[m_pLB_Separator->GetSelectEntryPos()];
rOutAttrs->Put( SfxStringItem( SCHATTR_DATADESCR_SEPARATOR, aSep) );
- ::std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectEntryPos()) );
+ std::map< sal_uInt16, sal_Int32 >::const_iterator aIt( m_aListBoxToPlacementMap.find(m_pLB_LabelPlacement->GetSelectEntryPos()) );
if(aIt!=m_aListBoxToPlacementMap.end())
{
sal_Int32 nValue = aIt->second;
@@ -344,7 +344,7 @@ void DataLabelResources::Reset(const SfxItemSet& rInAttrs)
if( rInAttrs.GetItemState(SCHATTR_DATADESCR_PLACEMENT, true, &pPoolItem) == SfxItemState::SET )
{
sal_Int32 nPlacement = static_cast<const SfxInt32Item*>(pPoolItem)->GetValue();
- ::std::map< sal_Int32, sal_uInt16 >::const_iterator aIt( m_aPlacementToListBoxMap.find(nPlacement) );
+ std::map< sal_Int32, sal_uInt16 >::const_iterator aIt( m_aPlacementToListBoxMap.find(nPlacement) );
if(aIt!=m_aPlacementToListBoxMap.end())
{
sal_uInt16 nPos = aIt->second;
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 4b86489a9fab..aefde02a7fec 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -66,8 +66,8 @@ private:
VclPtr<VclHBox> m_pBxTextDirection;
VclPtr<TextDirectionListBox> m_pLB_TextDirection;
- ::std::map< sal_Int32, sal_uInt16 > m_aPlacementToListBoxMap;
- ::std::map< sal_uInt16, sal_Int32 > m_aListBoxToPlacementMap;
+ std::map< sal_Int32, sal_uInt16 > m_aPlacementToListBoxMap;
+ std::map< sal_uInt16, sal_Int32 > m_aListBoxToPlacementMap;
SvNumberFormatter* m_pNumberFormatter;
bool m_bNumberFormatMixedState;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 5f36658e05c2..3e561045fc7d 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -742,8 +742,8 @@ ChartTypeTabPage::ChartTypeTabPage(vcl::Window* pParent
if ( aOpts.IsExperimentalMode() )
m_aChartTypeDialogControllerList.push_back(new GL3DBarChartDialogController());
- ::std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin();
- const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();
+ std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin();
+ const std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();
for( ; aIter != aEnd; ++aIter )
{
m_pMainTypeList->InsertEntry( (*aIter)->getName(), (*aIter)->getImage() );
@@ -766,8 +766,8 @@ ChartTypeTabPage::~ChartTypeTabPage()
void ChartTypeTabPage::dispose()
{
//delete all dialog controller
- ::std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin();
- const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();
+ std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin();
+ const std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();
for( ; aIter != aEnd; ++aIter )
{
delete *aIter;
@@ -850,7 +850,7 @@ void ChartTypeTabPage::stateChanged( ChangingResource* /*pResource*/ )
ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType()
{
ChartTypeDialogController* pTypeController = nullptr;
- ::std::vector< ChartTypeDialogController* >::size_type nM = static_cast< ::std::vector< ChartTypeDialogController* >::size_type >(
+ std::vector< ChartTypeDialogController* >::size_type nM = static_cast< std::vector< ChartTypeDialogController* >::size_type >(
m_pMainTypeList->GetSelectEntryPos() );
if( nM<m_aChartTypeDialogControllerList.size() )
pTypeController = m_aChartTypeDialogControllerList[nM];
@@ -962,8 +962,8 @@ void ChartTypeTabPage::initializePage()
bool bFound = false;
- ::std::vector< ChartTypeDialogController* >::iterator aIter = m_aChartTypeDialogControllerList.begin();
- const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();
+ std::vector< ChartTypeDialogController* >::iterator aIter = m_aChartTypeDialogControllerList.begin();
+ const std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();
for( sal_uInt16 nM=0; aIter != aEnd; ++aIter, ++nM )
{
if( (*aIter)->isSubType(aServiceName) )
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index a8eb3a31b53f..f330c208c81f 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -87,7 +87,7 @@ protected:
css::uno::Reference< css::chart2::XChartDocument > m_xChartModel;
- ::std::vector< ChartTypeDialogController* > m_aChartTypeDialogControllerList;
+ std::vector< ChartTypeDialogController* > m_aChartTypeDialogControllerList;
ChartTypeDialogController* m_pCurrentMainType;
sal_Int32 m_nChangingCalls;
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index 183073ca4fc4..65a97b3d554f 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -403,11 +403,11 @@ void DataSourceTabPage::fillSeriesListBox()
SvTreeListEntry * pSelectedEntry = nullptr;
m_pLB_SERIES->Clear();
- ::std::vector< DialogModel::tSeriesWithChartTypeByName > aSeries(
+ std::vector< DialogModel::tSeriesWithChartTypeByName > aSeries(
m_rDialogModel.getAllDataSeriesWithLabel() );
sal_Int32 nUnnamedSeriesIndex = 1;
- for( ::std::vector< DialogModel::tSeriesWithChartTypeByName >::const_iterator aIt = aSeries.begin();
+ for( std::vector< DialogModel::tSeriesWithChartTypeByName >::const_iterator aIt = aSeries.begin();
aIt != aSeries.end(); ++aIt )
{
OUString aLabel( (*aIt).first );
@@ -635,7 +635,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, AddButtonClickedHdl, Button*, void)
}
else
{
- ::std::vector< Reference< XDataSeriesContainer > > aCntVec(
+ std::vector< Reference< XDataSeriesContainer > > aCntVec(
m_rDialogModel.getAllDataSeriesContainers());
if( ! aCntVec.empty())
xChartTypeForNewSeries.set( aCntVec.front(), uno::UNO_QUERY );
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index c866eb6d07d2..50808b5825da 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -198,7 +198,7 @@ SdrObject* DrawViewWrapper::getHitObject( const Point& rPnt ) const
if( pScene )
{
// prepare result vector and call helper
- ::std::vector< const E3dCompoundObject* > aHitList;
+ std::vector< const E3dCompoundObject* > aHitList;
const basegfx::B2DPoint aHitPoint(rPnt.X(), rPnt.Y());
getAllHit3DObjectsSortedFrontToBack(aHitPoint, *pScene, aHitList);
diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx
index f20c14d3f71e..21da0b93180c 100644
--- a/chart2/source/controller/inc/AccessibleBase.hxx
+++ b/chart2/source/controller/inc/AccessibleBase.hxx
@@ -292,11 +292,11 @@ private:
private:
/** type of the vector containing the accessible children
*/
- typedef ::std::vector< css::uno::Reference< css::accessibility::XAccessible > > ChildListVectorType;
+ typedef std::vector< css::uno::Reference< css::accessibility::XAccessible > > ChildListVectorType;
/** type of the hash containing a vector index for every AccessibleUniqueId
of the object in the child list
*/
- typedef ::std::map< ObjectIdentifier, css::uno::Reference< css::accessibility::XAccessible > > ChildOIDMap;
+ typedef std::map< ObjectIdentifier, css::uno::Reference< css::accessibility::XAccessible > > ChildOIDMap;
bool m_bIsDisposed;
const bool m_bMayHaveChildren;
diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx
index 24a7e412ab87..0c1603a9eeca 100644
--- a/chart2/source/controller/inc/AxisItemConverter.hxx
+++ b/chart2/source/controller/inc/AxisItemConverter.hxx
@@ -56,7 +56,7 @@ protected:
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
- ::std::vector< ItemConverter * > m_aConverters;
+ std::vector< ItemConverter * > m_aConverters;
css::uno::Reference<
css::chart2::XAxis > m_xAxis;
diff --git a/chart2/source/controller/inc/CommandDispatchContainer.hxx b/chart2/source/controller/inc/CommandDispatchContainer.hxx
index 41adb4f19c7c..dfae2e41018a 100644
--- a/chart2/source/controller/inc/CommandDispatchContainer.hxx
+++ b/chart2/source/controller/inc/CommandDispatchContainer.hxx
@@ -81,7 +81,7 @@ public:
*/
void setChartDispatch(
const css::uno::Reference< css::frame::XDispatch >& rChartDispatch,
- const ::std::set< OUString > & rChartCommands );
+ const std::set< OUString > & rChartCommands );
/** Returns the dispatch that is able to do the command given in rURL, if
implemented here. If the URL is not implemented here, it should be
@@ -110,12 +110,12 @@ public:
private:
typedef
- ::std::map< OUString,
+ std::map< OUString,
css::uno::Reference< css::frame::XDispatch > >
tDispatchMap;
typedef
- ::std::vector< css::uno::Reference< css::frame::XDispatch > > tDisposeVector;
+ std::vector< css::uno::Reference< css::frame::XDispatch > > tDisposeVector;
mutable tDispatchMap m_aCachedDispatches;
mutable tDisposeVector m_aToBeDisposedDispatches;
@@ -124,7 +124,7 @@ private:
css::uno::WeakReference< css::frame::XModel > m_xModel;
css::uno::Reference< css::frame::XDispatch > m_xChartDispatcher;
- ::std::set< OUString > m_aChartCommands;
+ std::set< OUString > m_aChartCommands;
ChartController* m_pChartController;
DrawCommandDispatch* m_pDrawCommandDispatch;
diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx
index 030a42f65dde..0a96b3e47d6a 100644
--- a/chart2/source/controller/inc/DataPointItemConverter.hxx
+++ b/chart2/source/controller/inc/DataPointItemConverter.hxx
@@ -67,7 +67,7 @@ protected:
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
- ::std::vector< ItemConverter * > m_aConverters;
+ std::vector< ItemConverter * > m_aConverters;
bool m_bDataSeries;
bool m_bOverwriteLabelsForAttributedDataPointsAlso;
bool m_bUseSpecialFillColor;
diff --git a/chart2/source/controller/inc/DrawViewWrapper.hxx b/chart2/source/controller/inc/DrawViewWrapper.hxx
index fc92f9d050ad..fa5828f5110c 100644
--- a/chart2/source/controller/inc/DrawViewWrapper.hxx
+++ b/chart2/source/controller/inc/DrawViewWrapper.hxx
@@ -84,7 +84,7 @@ public:
private:
mutable MarkHandleProvider* m_pMarkHandleProvider;
- ::std::unique_ptr< SdrOutliner > m_apOutliner;
+ std::unique_ptr< SdrOutliner > m_apOutliner;
// #i79965# scroll back view when ending text edit
bool m_bRestoreMapMode;
diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx
index 2ddbab146bc2..53ddfb1c4aa9 100644
--- a/chart2/source/controller/inc/ItemConverter.hxx
+++ b/chart2/source/controller/inc/ItemConverter.hxx
@@ -81,7 +81,7 @@ public:
typedef OUString tPropertyNameType;
typedef sal_uInt8 tMemberIdType;
- typedef ::std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId;
+ typedef std::pair< tPropertyNameType, tMemberIdType > tPropertyNameWithMemberId;
/** applies all properties that can be mapped to items into the given item
set.
diff --git a/chart2/source/controller/inc/ItemPropertyMap.hxx b/chart2/source/controller/inc/ItemPropertyMap.hxx
index 2e940bee41bd..5577df790bd7 100644
--- a/chart2/source/controller/inc/ItemPropertyMap.hxx
+++ b/chart2/source/controller/inc/ItemPropertyMap.hxx
@@ -25,7 +25,7 @@
namespace chart { namespace wrapper {
-typedef ::std::map< ItemConverter::tWhichIdType, ::std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > >
+typedef std::map< ItemConverter::tWhichIdType, std::pair< ItemConverter::tPropertyNameType, ItemConverter::tMemberIdType > >
ItemPropertyMapType;
}}
diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx
index 794fd1733cd8..8d24a15718aa 100644
--- a/chart2/source/controller/inc/LegendItemConverter.hxx
+++ b/chart2/source/controller/inc/LegendItemConverter.hxx
@@ -55,7 +55,7 @@ protected:
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
- ::std::vector< ItemConverter * > m_aConverters;
+ std::vector< ItemConverter * > m_aConverters;
};
} // namespace wrapper
diff --git a/chart2/source/controller/inc/MultipleItemConverter.hxx b/chart2/source/controller/inc/MultipleItemConverter.hxx
index f16235129b35..9e05c4eef383 100644
--- a/chart2/source/controller/inc/MultipleItemConverter.hxx
+++ b/chart2/source/controller/inc/MultipleItemConverter.hxx
@@ -43,7 +43,7 @@ public:
protected:
MultipleItemConverter( SfxItemPool& rItemPool );
- ::std::vector< ItemConverter * > m_aConverters;
+ std::vector< ItemConverter * > m_aConverters;
};
}}
diff --git a/chart2/source/controller/inc/ObjectHierarchy.hxx b/chart2/source/controller/inc/ObjectHierarchy.hxx
index 017b7269544c..01d1a8bc2cda 100644
--- a/chart2/source/controller/inc/ObjectHierarchy.hxx
+++ b/chart2/source/controller/inc/ObjectHierarchy.hxx
@@ -41,7 +41,7 @@ class ImplObjectHierarchy;
class ObjectHierarchy
{
public:
- typedef ::std::vector< ObjectIdentifier > tChildContainer;
+ typedef std::vector< ObjectIdentifier > tChildContainer;
/** @param bFlattenDiagram
If <TRUE/>, the content of the diagram (data series, wall, floor,
@@ -72,7 +72,7 @@ public:
private:
- ::std::unique_ptr< impl::ImplObjectHierarchy > m_apImpl;
+ std::unique_ptr< impl::ImplObjectHierarchy > m_apImpl;
};
class ObjectKeyNavigation
diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
index 03eaadd967b9..22c49be4d6ec 100644
--- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
+++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx
@@ -55,7 +55,7 @@ protected:
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
- ::std::vector< ItemConverter * > m_aConverters;
+ std::vector< ItemConverter * > m_aConverters;
};
}}
diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx
index fde086ec12c9..8f2b9c746c47 100644
--- a/chart2/source/controller/inc/TitleItemConverter.hxx
+++ b/chart2/source/controller/inc/TitleItemConverter.hxx
@@ -51,7 +51,7 @@ protected:
virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override;
private:
- ::std::vector< ItemConverter * > m_aConverters;
+ std::vector< ItemConverter * > m_aConverters;
};
}}
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index c0ce414d21fb..c3be2086e7e4 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -58,8 +58,8 @@ public:
virtual void setValidPage( TabPage * pTabPage ) override;
protected:
- ::std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider;
- ::std::unique_ptr< DialogModel > m_apDialogModel;
+ std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider;
+ std::unique_ptr< DialogModel > m_apDialogModel;
private:
VclPtr<DataSourceTabControl> m_pTabControl;
diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 192fd3dec453..c7f328e6c991 100644
--- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -108,7 +108,7 @@ AxisItemConverter::~AxisItemConverter()
delete m_pExplicitScale;
delete m_pExplicitIncrement;
- ::std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
+ std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
}
void AxisItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 4d1575a7fa81..d252b7debdd7 100644
--- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -237,7 +237,7 @@ DataPointItemConverter::DataPointItemConverter(
DataPointItemConverter::~DataPointItemConverter()
{
- ::std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
+ std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
}
void DataPointItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index b3267044ad5e..c800a8c42bdd 100644
--- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -59,7 +59,7 @@ LegendItemConverter::LegendItemConverter(
LegendItemConverter::~LegendItemConverter()
{
- ::std::for_each( m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
+ std::for_each( m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
}
void LegendItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
diff --git a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index 02481f3b977e..bb122879ca2a 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -104,10 +104,10 @@ AllDataLabelItemConverter::AllDataLabelItemConverter(
const uno::Reference< lang::XMultiServiceFactory > & xNamedPropertyContainerFactory )
: MultipleItemConverter( rItemPool )
{
- ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
+ std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
::chart::ChartModelHelper::getDataSeries( xChartModel ));
- ::std::vector< uno::Reference< chart2::XDataSeries > >::const_iterator aIt;
+ std::vector< uno::Reference< chart2::XDataSeries > >::const_iterator aIt;
for( aIt = aSeriesList.begin(); aIt != aSeriesList.end(); ++aIt )
{
uno::Reference< beans::XPropertySet > xObjectProperties( *aIt, uno::UNO_QUERY);
@@ -169,10 +169,10 @@ AllSeriesStatisticsConverter::AllSeriesStatisticsConverter(
SfxItemPool& rItemPool )
: MultipleItemConverter( rItemPool )
{
- ::std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
+ std::vector< uno::Reference< chart2::XDataSeries > > aSeriesList(
::chart::ChartModelHelper::getDataSeries( xChartModel ));
- ::std::vector< uno::Reference< chart2::XDataSeries > >::const_iterator aIt;
+ std::vector< uno::Reference< chart2::XDataSeries > >::const_iterator aIt;
for( aIt = aSeriesList.begin(); aIt != aSeriesList.end(); ++aIt )
{
uno::Reference< beans::XPropertySet > xObjectProperties( *aIt, uno::UNO_QUERY);
diff --git a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
index 3570366d0936..9befc3810665 100644
--- a/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
@@ -33,13 +33,13 @@ MultipleItemConverter::MultipleItemConverter( SfxItemPool& rItemPool )
}
MultipleItemConverter::~MultipleItemConverter()
{
- ::std::for_each( m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
+ std::for_each( m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
}
void MultipleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
{
- ::std::vector< ItemConverter* >::const_iterator aIter = m_aConverters.begin();
- const ::std::vector< ItemConverter* >::const_iterator aEnd = m_aConverters.end();
+ std::vector< ItemConverter* >::const_iterator aIter = m_aConverters.begin();
+ const std::vector< ItemConverter* >::const_iterator aEnd = m_aConverters.end();
if( aIter != aEnd )
{
(*aIter)->FillItemSet( rOutItemSet );
diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index 1ba39b2ea907..0f62797e1eeb 100644
--- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -67,7 +67,7 @@ RegressionEquationItemConverter::RegressionEquationItemConverter(
RegressionEquationItemConverter::~RegressionEquationItemConverter()
{
- ::std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
+ std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
}
void RegressionEquationItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index e8d964dd8611..7a3c8f0c9c85 100644
--- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -118,7 +118,7 @@ TitleItemConverter::TitleItemConverter(
TitleItemConverter::~TitleItemConverter()
{
- ::std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
+ std::for_each(m_aConverters.begin(), m_aConverters.end(), std::default_delete<ItemConverter>());
}
void TitleItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const
diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx
index 06751063e540..0322808af53a 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1496,9 +1496,9 @@ void ChartController::impl_initializeAccessible( const uno::Reference< lang::XIn
}
}
-const ::std::set< OUString >& ChartController::impl_getAvailableCommands()
+const std::set< OUString >& ChartController::impl_getAvailableCommands()
{
- static ::std::set< OUString > s_AvailableCommands {
+ static std::set< OUString > s_AvailableCommands {
// commands for container forward
"AddDirect", "NewDoc", "Open",
"Save", "SaveAs", "SendMail",
diff --git a/chart2/source/controller/main/ChartController_Insert.cxx b/chart2/source/controller/main/ChartController_Insert.cxx
index 20b8f010a777..1fb09719d940 100644
--- a/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/chart2/source/controller/main/ChartController_Insert.cxx
@@ -328,7 +328,7 @@ void ChartController::executeDispatch_InsertMenu_MeanValues()
}
else
{
- ::std::vector< uno::Reference< chart2::XDataSeries > > aSeries(
+ std::vector< uno::Reference< chart2::XDataSeries > > aSeries(
DiagramHelper::getDataSeriesFromDiagram( ChartModelHelper::findDiagram( getModel() )));
for( const auto& xSrs : aSeries )
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index 7733e549f83c..bc62696dd2fa 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -214,7 +214,7 @@ void ChartController::executeDispatch_NewArrangement()
}
// regression curve equations
- ::std::vector< Reference< chart2::XRegressionCurve > > aRegressionCurves(
+ std::vector< Reference< chart2::XRegressionCurve > > aRegressionCurves(
RegressionCurveHelper::getAllRegressionCurvesNotMeanValueLine( xDiagram ));
// reset equation position
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index ad0248e0cc73..5aa588971400 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -999,8 +999,8 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
{
if( bIsPoint )
{
- ::std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
- ::std::vector< sal_Int32 >::iterator aIt = ::std::find( aIndices.begin(), aIndices.end(), nPointIndex );
+ std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
+ std::vector< sal_Int32 >::iterator aIt = std::find( aIndices.begin(), aIndices.end(), nPointIndex );
if( aIt != aIndices.end())
bSelectedPointIsFormatted = true;
else
diff --git a/chart2/source/controller/main/ChartDropTargetHelper.cxx b/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 097929533608..deb3c2db2b04 100644
--- a/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -36,10 +36,10 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-::std::vector< OUString > lcl_getStringsFromByteSequence(
+std::vector< OUString > lcl_getStringsFromByteSequence(
const Sequence< sal_Int8 > & aByteSequence )
{
- ::std::vector< OUString > aResult;
+ std::vector< OUString > aResult;
const sal_Int32 nLength = aByteSequence.getLength();
const sal_Char * pBytes( reinterpret_cast< const sal_Char* >( aByteSequence.getConstArray()));
sal_Int32 nStartPos = 0;
@@ -106,7 +106,7 @@ sal_Int8 ChartDropTargetHelper::ExecuteDrop( const ExecuteDropEvent& rEvt )
Sequence<sal_Int8> aBytes = aDataHelper.GetSequence(SotClipboardFormatId::LINK, OUString());
if (aBytes.getLength())
{
- ::std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes ));
+ std::vector< OUString > aStrings( lcl_getStringsFromByteSequence( aBytes ));
if( aStrings.size() >= 3 && aStrings[0] == "soffice" )
{
OUString aRangeString( aStrings[2] );
diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx
index 18235c3f8862..a9a76a1ab587 100644
--- a/chart2/source/controller/main/CommandDispatch.hxx
+++ b/chart2/source/controller/main/CommandDispatch.hxx
@@ -123,7 +123,7 @@ protected:
css::uno::Reference< css::util::XURLTransformer > m_xURLTransformer;
private:
- typedef ::std::map< OUString, ::comphelper::OInterfaceContainerHelper2* >
+ typedef std::map< OUString, ::comphelper::OInterfaceContainerHelper2* >
tListenerMap;
tListenerMap m_aListeners;
diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx
index e8b659895623..a03083a31342 100644
--- a/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -57,7 +57,7 @@ void CommandDispatchContainer::setModel(
void CommandDispatchContainer::setChartDispatch(
const Reference< frame::XDispatch >& rChartDispatch,
- const ::std::set< OUString > & rChartCommands )
+ const std::set< OUString > & rChartCommands )
{
OSL_ENSURE(rChartDispatch.is(),"Invalid fall back dispatcher!");
m_xChartDispatcher.set( rChartDispatch );
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx
index b32c5de1d01b..35fa134db732 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -503,7 +503,7 @@ void ControllerCommandDispatch::fireStatusEventForURLImpl(
const OUString & rURL,
const Reference< frame::XStatusListener > & xSingleListener )
{
- ::std::map< OUString, uno::Any >::const_iterator aArgIt( m_aCommandArguments.find( rURL ));
+ std::map< OUString, uno::Any >::const_iterator aArgIt( m_aCommandArguments.find( rURL ));
if( aArgIt != m_aCommandArguments.end())
fireStatusEventForURL( rURL, aArgIt->second, commandAvailable( rURL ), xSingleListener );
else
@@ -690,7 +690,7 @@ void ControllerCommandDispatch::updateCommandAvailability()
bool ControllerCommandDispatch::commandAvailable( const OUString & rCommand )
{
- ::std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.find( rCommand ));
+ std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.find( rCommand ));
if( aIt != m_aCommandAvailability.end())
return aIt->second;
OSL_FAIL( "commandAvailable: command not in availability map" );
@@ -726,7 +726,7 @@ void ControllerCommandDispatch::fireStatusEvent(
}
if( rURL.isEmpty() )
- for( ::std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.begin());
+ for( std::map< OUString, bool >::const_iterator aIt( m_aCommandAvailability.begin());
aIt != m_aCommandAvailability.end(); ++aIt )
fireStatusEventForURLImpl( aIt->first, xSingleListener );
else if( !bIsChartSelectorURL )
diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx
index 38d6a8c1e0ed..e338fdbacb92 100644
--- a/chart2/source/controller/main/ControllerCommandDispatch.hxx
+++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx
@@ -105,11 +105,11 @@ private:
css::uno::Reference< css::view::XSelectionSupplier > m_xSelectionSupplier;
css::uno::Reference< css::frame::XDispatch > m_xDispatch;
- ::std::unique_ptr< impl::ModelState > m_apModelState;
- ::std::unique_ptr< impl::ControllerState > m_apControllerState;
+ std::unique_ptr< impl::ModelState > m_apModelState;
+ std::unique_ptr< impl::ControllerState > m_apControllerState;
- mutable ::std::map< OUString, bool > m_aCommandAvailability;
- mutable ::std::map< OUString, css::uno::Any > m_aCommandArguments;
+ mutable std::map< OUString, bool > m_aCommandAvailability;
+ mutable std::map< OUString, css::uno::Any > m_aCommandArguments;
CommandDispatchContainer* m_pDispatchContainer;
};
diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 6fe052ea3db0..9072f31c99e4 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -55,7 +55,7 @@ namespace
{
// comparing two PropertyValue instances
- struct PropertyValueCompare : public ::std::binary_function< beans::PropertyValue, OUString, bool >
+ struct PropertyValueCompare : public std::binary_function< beans::PropertyValue, OUString, bool >
{
bool operator() ( const beans::PropertyValue& rPropValue, const OUString& rName ) const
{
@@ -119,7 +119,7 @@ void DrawCommandDispatch::setAttributes( SdrObject* pObj )
bool bAttributesAppliedFromGallery = false;
if ( GalleryExplorer::GetSdrObjCount( GALLERY_THEME_POWERPOINT ) )
{
- ::std::vector< OUString > aObjList;
+ std::vector< OUString > aObjList;
if ( GalleryExplorer::FillObjListTitle( GALLERY_THEME_POWERPOINT, aObjList ) )
{
for ( size_t i = 0; i < aObjList.size(); ++i )
@@ -372,8 +372,8 @@ void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< bea
const OUString sKeyModifier( "KeyModifier" );
const beans::PropertyValue* pIter = rArgs.getConstArray();
const beans::PropertyValue* pEnd = pIter + rArgs.getLength();
- const beans::PropertyValue* pKeyModifier = ::std::find_if(
- pIter, pEnd, ::std::bind2nd( PropertyValueCompare(), std::cref( sKeyModifier ) ) );
+ const beans::PropertyValue* pKeyModifier = std::find_if(
+ pIter, pEnd, std::bind2nd( PropertyValueCompare(), std::cref( sKeyModifier ) ) );
sal_Int16 nKeyModifier = 0;
if ( pKeyModifier != pEnd && pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 )
{
diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx
index 928b360bc84a..597ac2483f53 100644
--- a/chart2/source/controller/main/ElementSelector.hxx
+++ b/chart2/source/controller/main/ElementSelector.hxx
@@ -58,7 +58,7 @@ class SelectorListBox : public ListBox
private:
css::uno::WeakReference< css::frame::XController > m_xChartController;
- ::std::vector< ListBoxEntryData > m_aEntries;
+ std::vector< ListBoxEntryData > m_aEntries;
bool m_bReleaseFocus;
};
diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
index 8dca9c202dca..12db19ccdc75 100644
--- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
+++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx
@@ -33,7 +33,7 @@ struct ControllerFeature: public css::frame::DispatchInformation
sal_uInt16 nFeatureId;
};
-typedef ::std::map< OUString,
+typedef std::map< OUString,
ControllerFeature > SupportedFeatures;
struct FeatureState
diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx
index a8a29ceca11b..23db1d2d403e 100644
--- a/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -54,7 +54,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-struct lcl_ObjectToOID : public ::std::unary_function< Reference< uno::XInterface >, ::chart::ObjectIdentifier >
+struct lcl_ObjectToOID : public std::unary_function< Reference< uno::XInterface >, ::chart::ObjectIdentifier >
{
explicit lcl_ObjectToOID( const Reference< chart2::XChartDocument > & xChartDoc ) :
m_xModel( xChartDoc, uno::UNO_QUERY )
@@ -159,7 +159,7 @@ private:
const ObjectIdentifier& rParentOID,
const ObjectIdentifier& rOID );
- typedef ::std::map< ObjectIdentifier, ObjectHierarchy::tChildContainer >
+ typedef std::map< ObjectIdentifier, ObjectHierarchy::tChildContainer >
tChildMap;
tChildMap m_aChildMap;
ExplicitValueProvider* m_pExplicitValueProvider;
@@ -308,8 +308,8 @@ void ImplObjectHierarchy::createAxesTree(
{
Sequence< Reference< XAxis > > aAxes( AxisHelper::getAllAxesOfDiagram( xDiagram, /* bOnlyVisible = */ true ) );
if( !m_bOrderingForElementSelector )
- ::std::transform( aAxes.getConstArray(), aAxes.getConstArray() + aAxes.getLength(),
- ::std::back_inserter( rContainer ),
+ std::transform( aAxes.getConstArray(), aAxes.getConstArray() + aAxes.getLength(),
+ std::back_inserter( rContainer ),
lcl_ObjectToOID( xChartDoc ));
// get all axes, also invisible ones
@@ -578,7 +578,7 @@ ObjectHierarchy::tChildContainer ImplObjectHierarchy::getSiblings( const ObjectI
aIt != m_aChildMap.end(); ++aIt )
{
ObjectHierarchy::tChildContainer::const_iterator aElemIt(
- ::std::find( aIt->second.begin(), aIt->second.end(), rNode ));
+ std::find( aIt->second.begin(), aIt->second.end(), rNode ));
if( aElemIt != aIt->second.end())
return aIt->second;
}
@@ -593,7 +593,7 @@ ObjectIdentifier ImplObjectHierarchy::getParentImpl(
// search children
ObjectHierarchy::tChildContainer aChildren( getChildren( rParentOID ));
ObjectHierarchy::tChildContainer::const_iterator aIt(
- ::std::find( aChildren.begin(), aChildren.end(), rOID ));
+ std::find( aChildren.begin(), aChildren.end(), rOID ));
// recursion end
if( aIt != aChildren.end())
return rParentOID;
@@ -777,7 +777,7 @@ bool ObjectKeyNavigation::next()
if( bResult )
{
ObjectHierarchy::tChildContainer::const_iterator aIt(
- ::std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection()));
+ std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection()));
OSL_ASSERT( aIt != aSiblings.end());
if( ++aIt == aSiblings.end())
aIt = aSiblings.begin();
@@ -797,7 +797,7 @@ bool ObjectKeyNavigation::previous()
if( bResult )
{
ObjectHierarchy::tChildContainer::const_iterator aIt(
- ::std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection()));
+ std::find( aSiblings.begin(), aSiblings.end(), getCurrentSelection()));
OSL_ASSERT( aIt != aSiblings.end());
if( aIt == aSiblings.begin())
aIt = aSiblings.end();
diff --git a/chart2/source/inc/CharacterProperties.hxx b/chart2/source/inc/CharacterProperties.hxx
index 5435afe6dca7..f3cba60f723b 100644
--- a/chart2/source/inc/CharacterProperties.hxx
+++ b/chart2/source/inc/CharacterProperties.hxx
@@ -121,7 +121,7 @@ namespace CharacterProperties
};
OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
- ::std::vector< css::beans::Property > & rOutProperties );
+ std::vector< css::beans::Property > & rOutProperties );
OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
diff --git a/chart2/source/inc/ChartModelHelper.hxx b/chart2/source/inc/ChartModelHelper.hxx
index 3ddf4720027c..7dcce430fad4 100644
--- a/chart2/source/inc/ChartModelHelper.hxx
+++ b/chart2/source/inc/ChartModelHelper.hxx
@@ -62,12 +62,12 @@ public:
static css::uno::Reference< css::chart2::XCoordinateSystem >
getFirstCoordinateSystem( const css::uno::Reference< css::frame::XModel >& xModel );
- SAL_DLLPRIVATE static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >
+ SAL_DLLPRIVATE static std::vector< css::uno::Reference< css::chart2::XDataSeries > >
getDataSeries( ChartModel& rModel );
- SAL_DLLPRIVATE static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >
+ SAL_DLLPRIVATE static std::vector< css::uno::Reference< css::chart2::XDataSeries > >
getDataSeries( const css::uno::Reference< css::chart2::XChartDocument > & xChartDoc );
- static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >
+ static std::vector< css::uno::Reference< css::chart2::XDataSeries > >
getDataSeries( const css::uno::Reference< css::frame::XModel > & xModel );
static css::uno::Reference< css::chart2::XChartType >
diff --git a/chart2/source/inc/CloneHelper.hxx b/chart2/source/inc/CloneHelper.hxx
index dfe58235191f..ee625666ab9d 100644
--- a/chart2/source/inc/CloneHelper.hxx
+++ b/chart2/source/inc/CloneHelper.hxx
@@ -33,7 +33,7 @@ namespace CloneHelper
/// functor that clones a UNO-Reference
template< class Interface >
- struct CreateRefClone : public ::std::unary_function< Interface, Interface >
+ struct CreateRefClone : public std::unary_function< Interface, Interface >
{
css::uno::Reference<Interface> operator() ( const css::uno::Reference<Interface> & xOther )
{
@@ -50,11 +50,11 @@ template< class Interface >
/// clones a vector of UNO-References
template< class Interface >
void CloneRefVector(
- const ::std::vector< css::uno::Reference< Interface > > & rSource,
- ::std::vector< css::uno::Reference< Interface > > & rDestination )
+ const std::vector< css::uno::Reference< Interface > > & rSource,
+ std::vector< css::uno::Reference< Interface > > & rDestination )
{
- ::std::transform( rSource.begin(), rSource.end(),
- ::std::back_inserter( rDestination ),
+ std::transform( rSource.begin(), rSource.end(),
+ std::back_inserter( rDestination ),
CreateRefClone< Interface >());
}
@@ -65,7 +65,7 @@ template< class Interface >
css::uno::Sequence< css::uno::Reference<Interface> > & rDestination )
{
rDestination.realloc( rSource.getLength());
- ::std::transform( rSource.getConstArray(), rSource.getConstArray() + rSource.getLength(),
+ std::transform( rSource.getConstArray(), rSource.getConstArray() + rSource.getLength(),
rDestination.getArray(),
CreateRefClone< Interface >());
}
diff --git a/chart2/source/inc/CommonConverters.hxx b/chart2/source/inc/CommonConverters.hxx
index 789906e25f36..389c1ff553e0 100644
--- a/chart2/source/inc/CommonConverters.hxx
+++ b/chart2/source/inc/CommonConverters.hxx
@@ -200,16 +200,16 @@ css::uno::Sequence< T >
}
template< typename T >
- ::std::vector< T >
- FlattenVector( const ::std::vector< ::std::vector< T > > & rVecVec )
+ std::vector< T >
+ FlattenVector( const std::vector< std::vector< T > > & rVecVec )
{
- typedef ::std::vector< T > tFlatVec;
- typedef ::std::vector< tFlatVec > tVecVec;
+ typedef std::vector< T > tFlatVec;
+ typedef std::vector< tFlatVec > tVecVec;
tFlatVec aResult;
typename tVecVec::const_iterator aOuterEnd( rVecVec.end());
for( typename tVecVec::const_iterator aOuterIt( rVecVec.begin()); aOuterIt != aOuterEnd; ++aOuterIt )
- ::std::copy( aOuterIt->begin(), aOuterIt->end(), back_inserter( aResult ));
+ std::copy( aOuterIt->begin(), aOuterIt->end(), back_inserter( aResult ));
return aResult;
}
diff --git a/chart2/source/inc/CommonFunctors.hxx b/chart2/source/inc/CommonFunctors.hxx
index bbdc27a851c1..4e0eeb680631 100644
--- a/chart2/source/inc/CommonFunctors.hxx
+++ b/chart2/source/inc/CommonFunctors.hxx
@@ -38,7 +38,7 @@ namespace CommonFunctors
(via mem_fun_ptr)</p>
*/
template< typename T >
- struct makeAny : public ::std::unary_function< T, css::uno::Any >
+ struct makeAny : public std::unary_function< T, css::uno::Any >
{
css::uno::Any operator() ( const T & aVal )
{
@@ -51,7 +51,7 @@ template< typename T >
<p>In case no number can be generated from the Any, NaN (see
rtl::math::SetNAN()) is returned.</p>
*/
-struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< css::uno::Any, double >
+struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public std::unary_function< css::uno::Any, double >
{
double operator() ( const css::uno::Any & rAny )
{
@@ -65,7 +65,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToDouble : public ::std::unary_function< css:
/** unary function to convert css::uno::Any into an
OUString.
*/
-struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< css::uno::Any, OUString >
+struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public std::unary_function< css::uno::Any, OUString >
{
OUString operator() ( const css::uno::Any & rAny )
{
@@ -94,7 +94,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS AnyToString : public ::std::unary_function< css:
<p>For conversion rtl::math::StringToDouble is used.</p>
*/
-struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function< OUString, double >
+struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public std::unary_function< OUString, double >
{
double operator() ( const OUString & rStr )
{
@@ -112,7 +112,7 @@ struct OOO_DLLPUBLIC_CHARTTOOLS OUStringToDouble : public ::std::unary_function<
<p>For conversion rtl::math::DoubleToOUString is used.</p>
*/
-struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public ::std::unary_function< double, OUString >
+struct OOO_DLLPUBLIC_CHARTTOOLS DoubleToOUString : public std::unary_function< double, OUString >
{
OUString operator() ( double fNumber )
{
diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx
index 7fd695242bd4..1e6da809232f 100644
--- a/chart2/source/inc/ConfigColorScheme.hxx
+++ b/chart2/source/inc/ConfigColorScheme.hxx
@@ -65,7 +65,7 @@ private:
// member variables
css::uno::Reference< css::uno::XComponentContext > m_xContext;
- ::std::unique_ptr< impl::ChartConfigItem > m_apChartConfigItem;
+ std::unique_ptr< impl::ChartConfigItem > m_apChartConfigItem;
mutable css::uno::Sequence< sal_Int64 > m_aColorSequence;
mutable sal_Int32 m_nNumberOfColors;
bool m_bNeedsUpdate;
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
index 531e3bd00ae8..b2c0b448c30c 100644
--- a/chart2/source/inc/ContainerHelper.hxx
+++ b/chart2/source/inc/ContainerHelper.hxx
@@ -42,15 +42,15 @@ namespace ContainerHelper
example:
Sequence< sal_Int32 > aSequence;
- ::std::vector< sal_Int32 > aVector(
- ContainerToSequence::SequenceToSTLSequenceContainer< ::std::vector< sal_Int32 > >( aSequence );
+ std::vector< sal_Int32 > aVector(
+ ContainerToSequence::SequenceToSTLSequenceContainer< std::vector< sal_Int32 > >( aSequence );
*/
template< class Container >
Container
SequenceToSTLSequenceContainer( const css::uno::Sequence< typename Container::value_type > & rSeq )
{
Container aResult( rSeq.getLength());
- ::std::copy( rSeq.begin(), rSeq.end(), aResult.begin() );
+ std::copy( rSeq.begin(), rSeq.end(), aResult.begin() );
return aResult;
}
@@ -61,13 +61,13 @@ template< class Container >
example:
Sequence< sal_Int32 > aSequence;
- ::std::vector< sal_Int32 > aVector( ContainerHelper::SequenceToVector( aSequence ));
+ std::vector< sal_Int32 > aVector( ContainerHelper::SequenceToVector( aSequence ));
*/
template< typename T >
- ::std::vector< T >
+ std::vector< T >
SequenceToVector( const css::uno::Sequence< T > & rSeq )
{
- return SequenceToSTLSequenceContainer< ::std::vector< T > >( rSeq );
+ return SequenceToSTLSequenceContainer< std::vector< T > >( rSeq );
}
} // namespace ContainerHelper
diff --git a/chart2/source/inc/DataSeriesHelper.hxx b/chart2/source/inc/DataSeriesHelper.hxx
index 0566db7cec49..b031d4a54ae8 100644
--- a/chart2/source/inc/DataSeriesHelper.hxx
+++ b/chart2/source/inc/DataSeriesHelper.hxx
@@ -65,7 +65,7 @@ OOO_DLLPUBLIC_CHARTTOOLS css::uno::Reference< css::chart2::data::XLabeledDataSeq
@param aRole
The role that is to be filtered out.
*/
-OOO_DLLPUBLIC_CHARTTOOLS ::std::vector<
+OOO_DLLPUBLIC_CHARTTOOLS std::vector<
css::uno::Reference< css::chart2::data::XLabeledDataSequence > >
getAllDataSequencesByRole( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > & aDataSequences,
const OUString& aRole,
diff --git a/chart2/source/inc/DiagramHelper.hxx b/chart2/source/inc/DiagramHelper.hxx
index 29cc79d4af91..8555472ed85f 100644
--- a/chart2/source/inc/DiagramHelper.hxx
+++ b/chart2/source/inc/DiagramHelper.hxx
@@ -51,7 +51,7 @@ enum DiagramPositioningMode
class OOO_DLLPUBLIC_CHARTTOOLS DiagramHelper
{
public:
- typedef ::std::pair<
+ typedef std::pair<
css::uno::Reference< css::chart2::XChartTypeTemplate >,
OUString >
tTemplateWithServiceName;
@@ -159,7 +159,7 @@ public:
const css::uno::Reference< css::chart2::XDiagram >& xDiagram,
const css::uno::Reference< css::chart2::XDataSeries >& xSeries );
- static ::std::vector< css::uno::Reference< css::chart2::XDataSeries > >
+ static std::vector< css::uno::Reference< css::chart2::XDataSeries > >
getDataSeriesFromDiagram(
const css::uno::Reference< css::chart2::XDiagram > & xDiagram );
diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx
index 1436d436dd5f..93d3128fd2cd 100644
--- a/chart2/source/inc/ErrorBar.hxx
+++ b/chart2/source/inc/ErrorBar.hxx
@@ -131,7 +131,7 @@ protected:
virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override;
private:
- typedef ::std::vector< css::uno::Reference<
+ typedef std::vector< css::uno::Reference<
css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer;
tDataSequenceContainer m_aDataSequences;
diff --git a/chart2/source/inc/EventListenerHelper.hxx b/chart2/source/inc/EventListenerHelper.hxx
index 07de4ca91c43..7e951a3df3ab 100644
--- a/chart2/source/inc/EventListenerHelper.hxx
+++ b/chart2/source/inc/EventListenerHelper.hxx
@@ -36,7 +36,7 @@ namespace impl
{
template< class InterfaceRef >
-struct addListenerFunctor : public ::std::unary_function< InterfaceRef, void >
+struct addListenerFunctor : public std::unary_function< InterfaceRef, void >
{
explicit addListenerFunctor( const css::uno::Reference< css::lang::XEventListener > & xListener ) :
m_xListener( xListener )
@@ -54,7 +54,7 @@ private:
};
template< class InterfaceRef >
-struct removeListenerFunctor : public ::std::unary_function< InterfaceRef, void >
+struct removeListenerFunctor : public std::unary_function< InterfaceRef, void >
{
explicit removeListenerFunctor( const css::uno::Reference< css::lang::XEventListener > & xListener ) :
m_xListener( xListener )
@@ -91,7 +91,7 @@ void addListenerToAllElements(
const css::uno::Reference< css::lang::XEventListener > & xListener )
{
if( xListener.is())
- ::std::for_each( rContainer.begin(), rContainer.end(),
+ std::for_each( rContainer.begin(), rContainer.end(),
impl::addListenerFunctor< typename Container::value_type >( xListener ));
}
@@ -113,7 +113,7 @@ void removeListenerFromAllElements(
const css::uno::Reference< css::lang::XEventListener > & xListener )
{
if( xListener.is())
- ::std::for_each( rContainer.begin(), rContainer.end(),
+ std::for_each( rContainer.begin(), rContainer.end(),
impl::removeListenerFunctor< typename Container::value_type >( xListener ));
}
diff --git a/chart2/source/inc/ExplicitCategoriesProvider.hxx b/chart2/source/inc/ExplicitCategoriesProvider.hxx
index 7a39bf60ea5d..0195d24a31fd 100644
--- a/chart2/source/inc/ExplicitCategoriesProvider.hxx
+++ b/chart2/source/inc/ExplicitCategoriesProvider.hxx
@@ -91,7 +91,7 @@ private: //member
bool m_bIsExplicitCategoriesInited;
css::uno::Sequence< OUString > m_aExplicitCategories;
- ::std::vector< ::std::vector< ComplexCategory > > m_aComplexCats;
+ std::vector< std::vector< ComplexCategory > > m_aComplexCats;
css::uno::Sequence< css::uno::Reference<
css::chart2::data::XLabeledDataSequence> > m_aSplitCategoriesList;
diff --git a/chart2/source/inc/FillProperties.hxx b/chart2/source/inc/FillProperties.hxx
index f33d7207bb12..aba79c5fbd11 100644
--- a/chart2/source/inc/FillProperties.hxx
+++ b/chart2/source/inc/FillProperties.hxx
@@ -64,7 +64,7 @@ namespace FillProperties
};
OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
- ::std::vector< css::beans::Property > & rOutProperties );
+ std::vector< css::beans::Property > & rOutProperties );
OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
}
diff --git a/chart2/source/inc/InternalData.hxx b/chart2/source/inc/InternalData.hxx
index 9a7eb3587045..25ed60606d74 100644
--- a/chart2/source/inc/InternalData.hxx
+++ b/chart2/source/inc/InternalData.hxx
@@ -40,14 +40,14 @@ public:
css::uno::Sequence< double > getColumnValues( sal_Int32 nColumnIndex ) const;
css::uno::Sequence< double > getRowValues( sal_Int32 nRowIndex ) const;
- void setColumnValues( sal_Int32 nColumnIndex, const ::std::vector< double > & rNewData );
- void setRowValues( sal_Int32 nRowIndex, const ::std::vector< double > & rNewData );
+ void setColumnValues( sal_Int32 nColumnIndex, const std::vector< double > & rNewData );
+ void setRowValues( sal_Int32 nRowIndex, const std::vector< double > & rNewData );
- void setComplexColumnLabel( sal_Int32 nColumnIndex, const ::std::vector< css::uno::Any >& rComplexLabel );
- void setComplexRowLabel( sal_Int32 nRowIndex, const ::std::vector< css::uno::Any >& rComplexLabel );
+ void setComplexColumnLabel( sal_Int32 nColumnIndex, const std::vector< css::uno::Any >& rComplexLabel );
+ void setComplexRowLabel( sal_Int32 nRowIndex, const std::vector< css::uno::Any >& rComplexLabel );
- ::std::vector< css::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const;
- ::std::vector< css::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const;
+ std::vector< css::uno::Any > getComplexColumnLabel( sal_Int32 nColumnIndex ) const;
+ std::vector< css::uno::Any > getComplexRowLabel( sal_Int32 nRowIndex ) const;
void swapRowWithNext( sal_Int32 nRowIndex );
void swapColumnWithNext( sal_Int32 nColumnIndex );
@@ -65,7 +65,7 @@ public:
sal_Int32 getRowCount() const;
sal_Int32 getColumnCount() const;
- typedef ::std::vector< ::std::vector< css::uno::Any > > tVecVecAny; //inner index is hierarchical level
+ typedef std::vector< std::vector< css::uno::Any > > tVecVecAny; //inner index is hierarchical level
void setComplexRowLabels( const tVecVecAny& rNewRowLabels );
const tVecVecAny& getComplexRowLabels() const;
@@ -86,7 +86,7 @@ private:
sal_Int32 m_nColumnCount;
sal_Int32 m_nRowCount;
- typedef ::std::valarray< double > tDataType;
+ typedef std::valarray< double > tDataType;
tDataType m_aData;
tVecVecAny m_aRowLabels;//outer index is row index, inner index is category level
tVecVecAny m_aColumnLabels;//outer index is column index
diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx
index 183228250df4..d68e17f18ba8 100644
--- a/chart2/source/inc/InternalDataProvider.hxx
+++ b/chart2/source/inc/InternalDataProvider.hxx
@@ -197,11 +197,11 @@ private:
void increaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
void decreaseMapReferences( sal_Int32 nBegin, sal_Int32 nEnd );
- typedef ::std::multimap< OUString,
+ typedef std::multimap< OUString,
css::uno::WeakReference< css::chart2::data::XDataSequence > >
tSequenceMap;
- typedef ::std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange;
- typedef ::std::pair< tSequenceMap::const_iterator, tSequenceMap::const_iterator > tConstSequenceMapRange;
+ typedef std::pair< tSequenceMap::iterator, tSequenceMap::iterator > tSequenceMapRange;
+ typedef std::pair< tSequenceMap::const_iterator, tSequenceMap::const_iterator > tConstSequenceMapRange;
/** cache for all sequences that have been returned.
diff --git a/chart2/source/inc/LinePropertiesHelper.hxx b/chart2/source/inc/LinePropertiesHelper.hxx
index 45b086810346..81a5e5a1272f 100644
--- a/chart2/source/inc/LinePropertiesHelper.hxx
+++ b/chart2/source/inc/LinePropertiesHelper.hxx
@@ -46,7 +46,7 @@ namespace LinePropertiesHelper
};
OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
- ::std::vector< css::beans::Property > & rOutProperties );
+ std::vector< css::beans::Property > & rOutProperties );
OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx
index d26bb258839c..4fe9e178ff9e 100644
--- a/chart2/source/inc/ModifyListenerHelper.hxx
+++ b/chart2/source/inc/ModifyListenerHelper.hxx
@@ -90,8 +90,8 @@ private:
// ::osl::Mutex & m_rMutex;
::cppu::OBroadcastHelper m_aModifyListeners;
- typedef ::std::list<
- ::std::pair<
+ typedef std::list<
+ std::pair<
css::uno::WeakReference< css::util::XModifyListener >,
css::uno::Reference< css::util::XModifyListener > > >
tListenerMap;
@@ -103,7 +103,7 @@ namespace impl
{
template< class InterfaceRef >
-struct addListenerFunctor : public ::std::unary_function< InterfaceRef, void >
+struct addListenerFunctor : public std::unary_function< InterfaceRef, void >
{
explicit addListenerFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) :
m_xListener( xListener )
@@ -121,7 +121,7 @@ private:
};
template< class InterfaceRef >
-struct removeListenerFunctor : public ::std::unary_function< InterfaceRef, void >
+struct removeListenerFunctor : public std::unary_function< InterfaceRef, void >
{
explicit removeListenerFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) :
m_xListener( xListener )
@@ -139,7 +139,7 @@ private:
};
template< class Pair >
-struct addListenerToMappedElementFunctor : public ::std::unary_function< Pair, void >
+struct addListenerToMappedElementFunctor : public std::unary_function< Pair, void >
{
explicit addListenerToMappedElementFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) :
m_xListener( xListener )
@@ -157,7 +157,7 @@ private:
};
template< class Pair >
-struct removeListenerFromMappedElementFunctor : public ::std::unary_function< Pair, void >
+struct removeListenerFromMappedElementFunctor : public std::unary_function< Pair, void >
{
explicit removeListenerFromMappedElementFunctor( const css::uno::Reference< css::util::XModifyListener > & xListener ) :
m_xListener( xListener )
@@ -194,7 +194,7 @@ void addListenerToAllElements(
const css::uno::Reference< css::util::XModifyListener > & xListener )
{
if( xListener.is())
- ::std::for_each( rContainer.begin(), rContainer.end(),
+ std::for_each( rContainer.begin(), rContainer.end(),
impl::addListenerFunctor< typename Container::value_type >( xListener ));
}
@@ -204,7 +204,7 @@ void addListenerToAllMapElements(
const css::uno::Reference< css::util::XModifyListener > & xListener )
{
if( xListener.is())
- ::std::for_each( rContainer.begin(), rContainer.end(),
+ std::for_each( rContainer.begin(), rContainer.end(),
impl::addListenerToMappedElementFunctor< typename Container::value_type >( xListener ));
}
@@ -214,7 +214,7 @@ void addListenerToAllSequenceElements(
const css::uno::Reference< css::util::XModifyListener > & xListener )
{
if( xListener.is())
- ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(),
+ std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(),
impl::addListenerFunctor< T >( xListener ));
}
@@ -236,7 +236,7 @@ void removeListenerFromAllElements(
const css::uno::Reference< css::util::XModifyListener > & xListener )
{
if( xListener.is())
- ::std::for_each( rContainer.begin(), rContainer.end(),
+ std::for_each( rContainer.begin(), rContainer.end(),
impl::removeListenerFunctor< typename Container::value_type >( xListener ));
}
@@ -246,7 +246,7 @@ void removeListenerFromAllMapElements(
const css::uno::Reference< css::util::XModifyListener > & xListener )
{
if( xListener.is())
- ::std::for_each( rContainer.begin(), rContainer.end(),
+ std::for_each( rContainer.begin(), rContainer.end(),
impl::removeListenerFromMappedElementFunctor< typename Container::value_type >( xListener ));
}
@@ -256,7 +256,7 @@ void removeListenerFromAllSequenceElements(
const css::uno::Reference< css::util::XModifyListener > & xListener )
{
if( xListener.is())
- ::std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(),
+ std::for_each( rSequence.getConstArray(), rSequence.getConstArray() + rSequence.getLength(),
impl::removeListenerFunctor< T >( xListener ));
}
diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx
index 268255bfc7c0..33392a9c3903 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -81,7 +81,7 @@ private: //member
const OUString m_aServicename;
const OUString m_aImplementationName;
- typedef ::std::map< OUString, css::uno::Any > tContentMap;
+ typedef std::map< OUString, css::uno::Any > tContentMap;
tContentMap m_aMap;
};
diff --git a/chart2/source/inc/RegressionCalculationHelper.hxx b/chart2/source/inc/RegressionCalculationHelper.hxx
index 87dd524d3f17..e4b94818bfb5 100644
--- a/chart2/source/inc/RegressionCalculationHelper.hxx
+++ b/chart2/source/inc/RegressionCalculationHelper.hxx
@@ -31,7 +31,7 @@ namespace chart
namespace RegressionCalculationHelper
{
-typedef ::std::pair< ::std::vector< double >, ::std::vector< double > > tDoubleVectorPair;
+typedef std::pair< std::vector< double >, std::vector< double > > tDoubleVectorPair;
/** takes the given x- and y-values and copies them into the resulting pair,
which contains x-values in the first element and the y-values in the second
@@ -47,7 +47,7 @@ tDoubleVectorPair
Pred aPred )
{
tDoubleVectorPair aResult;
- sal_Int32 nSize = ::std::min( rXValues.getLength(), rYValues.getLength());
+ sal_Int32 nSize = std::min( rXValues.getLength(), rYValues.getLength());
for( sal_Int32 i=0; i<nSize; ++i )
{
if( aPred( rXValues[i], rYValues[i] ))
@@ -60,7 +60,7 @@ tDoubleVectorPair
return aResult;
}
-class isValid : public ::std::binary_function< double, double, bool >
+class isValid : public std::binary_function< double, double, bool >
{
public:
inline bool operator()( double x, double y )
@@ -71,7 +71,7 @@ public:
}
};
-class isValidAndXPositive : public ::std::binary_function< double, double, bool >
+class isValidAndXPositive : public std::binary_function< double, double, bool >
{
public:
inline bool operator()( double x, double y )
@@ -83,7 +83,7 @@ public:
}
};
-class isValidAndYPositive : public ::std::binary_function< double, double, bool >
+class isValidAndYPositive : public std::binary_function< double, double, bool >
{
public:
inline bool operator()( double x, double y )
@@ -95,7 +95,7 @@ public:
}
};
-class isValidAndYNegative : public ::std::binary_function< double, double, bool >
+class isValidAndYNegative : public std::binary_function< double, double, bool >
{
public:
inline bool operator()( double x, double y )
@@ -107,7 +107,7 @@ public:
}
};
-class isValidAndBothPositive : public ::std::binary_function< double, double, bool >
+class isValidAndBothPositive : public std::binary_function< double, double, bool >
{
public:
inline bool operator()( double x, double y )
@@ -120,7 +120,7 @@ public:
}
};
-class isValidAndXPositiveAndYNegative : public ::std::binary_function< double, double, bool >
+class isValidAndXPositiveAndYNegative : public std::binary_function< double, double, bool >
{
public:
inline bool operator()( double x, double y )
diff --git a/chart2/source/inc/SceneProperties.hxx b/chart2/source/inc/SceneProperties.hxx
index e1176720364a..bb2cc8b02001 100644
--- a/chart2/source/inc/SceneProperties.hxx
+++ b/chart2/source/inc/SceneProperties.hxx
@@ -72,7 +72,7 @@ namespace SceneProperties
};
OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
- ::std::vector< css::beans::Property > & rOutProperties );
+ std::vector< css::beans::Property > & rOutProperties );
OOO_DLLPUBLIC_CHARTTOOLS void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
}
diff --git a/chart2/source/inc/UserDefinedProperties.hxx b/chart2/source/inc/UserDefinedProperties.hxx
index cb671de2be9c..471126e32df5 100644
--- a/chart2/source/inc/UserDefinedProperties.hxx
+++ b/chart2/source/inc/UserDefinedProperties.hxx
@@ -47,7 +47,7 @@ namespace UserDefinedProperties
};
OOO_DLLPUBLIC_CHARTTOOLS void AddPropertiesToVector(
- ::std::vector< css::beans::Property > & rOutProperties );
+ std::vector< css::beans::Property > & rOutProperties );
}
} // namespace chart
diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx
index d28b83e7c8a2..cae7f323652e 100644
--- a/chart2/source/inc/WrappedProperty.hxx
+++ b/chart2/source/inc/WrappedProperty.hxx
@@ -74,7 +74,7 @@ protected:
OUString m_aInnerName;
};
-typedef ::std::map< sal_Int32, const WrappedProperty* > tWrappedPropertyMap;
+typedef std::map< sal_Int32, const WrappedProperty* > tWrappedPropertyMap;
} //namespace chart
diff --git a/chart2/source/inc/chartview/ExplicitScaleValues.hxx b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
index 9cf0e28dfd3d..14f474253644 100644
--- a/chart2/source/inc/chartview/ExplicitScaleValues.hxx
+++ b/chart2/source/inc/chartview/ExplicitScaleValues.hxx
@@ -144,7 +144,7 @@ struct OOO_DLLPUBLIC_CHARTVIEW ExplicitIncrementData
positions of subsequent tickmarks in relation to their parent tickmarks
given by the preceding SubIncrement.</p>
*/
- ::std::vector< ExplicitSubIncrement > SubIncrements;
+ std::vector< ExplicitSubIncrement > SubIncrements;
};
} //namespace chart
diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx
index 8ea6da924081..1aaef1f5b1c2 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -78,7 +78,7 @@ uno::Reference< embed::XStorage > lcl_getWriteStorage(
{
Reference< lang::XSingleServiceFactory > xStorageFact( embed::StorageFactory::create( xContext ) );
- ::std::vector< beans::PropertyValue > aPropertiesForStorage;
+ std::vector< beans::PropertyValue > aPropertiesForStorage;
for( sal_Int32 i=rMediaDescriptor.getLength(); i--; )
{
@@ -142,7 +142,7 @@ uno::Reference< embed::XStorage > lcl_getReadStorage(
{
// get XStream from MediaDescriptor
uno::Reference< io::XInputStream > xStream;
- ::std::vector< beans::PropertyValue > aPropertiesForStorage;
+ std::vector< beans::PropertyValue > aPropertiesForStorage;
for( sal_Int32 i=rMediaDescriptor.getLength(); i--; )
{
if( rMediaDescriptor[i].Name == "InputStream" )
diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx
index 73d7bf87a7a7..7b6edaf87c18 100644
--- a/chart2/source/model/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx
@@ -121,10 +121,10 @@ protected:
private:
sal_Int32 m_nDimensionCount;
- typedef ::std::vector< ::std::vector< css::uno::Reference< css::chart2::XAxis > > > tAxisVecVecType;
+ typedef std::vector< std::vector< css::uno::Reference< css::chart2::XAxis > > > tAxisVecVecType;
tAxisVecVecType m_aAllAxis; //outer sequence is the dimension; inner sequence is the axis index that indicates main or secondary axis
css::uno::Sequence< css::uno::Any > m_aOrigin;
- ::std::vector< css::uno::Reference< css::chart2::XChartType > > m_aChartTypes;
+ std::vector< css::uno::Reference< css::chart2::XChartType > > m_aChartTypes;
};
} // namespace chart
diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx
index 3c477e0afefe..e74da8a2baab 100644
--- a/chart2/source/model/inc/DataSeries.hxx
+++ b/chart2/source/model/inc/DataSeries.hxx
@@ -152,15 +152,15 @@ protected:
void fireModifyEvent();
private:
- typedef ::std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer;
+ typedef std::vector< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > tDataSequenceContainer;
tDataSequenceContainer m_aDataSequences;
- typedef ::std::map< sal_Int32,
+ typedef std::map< sal_Int32,
css::uno::Reference< css::beans::XPropertySet > > tDataPointAttributeContainer;
tDataPointAttributeContainer m_aAttributedDataPoints;
typedef
- ::std::vector< css::uno::Reference< css::chart2::XRegressionCurve > >
+ std::vector< css::uno::Reference< css::chart2::XRegressionCurve > >
tRegressionCurveContainerType;
tRegressionCurveContainerType m_aRegressionCurves;
diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx
index 88023bb1f0d6..da39d9ad8d4a 100644
--- a/chart2/source/model/inc/Diagram.hxx
+++ b/chart2/source/model/inc/Diagram.hxx
@@ -156,7 +156,7 @@ private:
css::uno::Reference< css::uno::XComponentContext > m_xContext;
typedef
- ::std::vector< css::uno::Reference< css::chart2::XCoordinateSystem > >
+ std::vector< css::uno::Reference< css::chart2::XCoordinateSystem > >
tCoordinateSystemContainerType;
tCoordinateSystemContainerType m_aCoordSystems;
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 140998b0057a..35b5c6df84f1 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -85,7 +85,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "Show",
@@ -273,13 +273,13 @@ struct StaticAxisInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 0204c59dab15..fcff9a60aad1 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -46,7 +46,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "SwapXAndYAxis",
@@ -81,11 +81,11 @@ struct StaticCooSysInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -253,7 +253,7 @@ sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int
// ____ XChartTypeContainer ____
void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChartType >& aChartType )
{
- if( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )
+ if( std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )
!= m_aChartTypes.end())
throw lang::IllegalArgumentException();
@@ -264,8 +264,8 @@ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChar
void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XChartType >& aChartType )
{
- ::std::vector< uno::Reference< chart2::XChartType > >::iterator
- aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ));
+ std::vector< uno::Reference< chart2::XChartType > >::iterator
+ aIt( std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ));
if( aIt == m_aChartTypes.end())
throw container::NoSuchElementException(
"The given chart type is no element of the container",
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index d502324dec2a..a3c26532907a 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -1149,7 +1149,7 @@ enum eServiceType
SERVICE_NAMESPACE_MAP
};
-typedef ::std::map< OUString, enum eServiceType > tServiceNameMap;
+typedef std::map< OUString, enum eServiceType > tServiceNameMap;
tServiceNameMap & lcl_getStaticServiceNameMap()
{
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index a88a1da027e9..c19aeaf7c4d6 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -63,7 +63,7 @@ using ::osl::MutexGuard;
namespace
{
-struct lcl_PropNameEquals : public ::std::unary_function< beans::PropertyValue, bool >
+struct lcl_PropNameEquals : public std::unary_function< beans::PropertyValue, bool >
{
explicit lcl_PropNameEquals( const OUString & rStrToCompareWith ) :
m_aStr( rStrToCompareWith )
@@ -86,7 +86,7 @@ T lcl_getProperty(
{
const beans::PropertyValue * pIt = rMediaDescriptor.getConstArray();
const beans::PropertyValue * pEndIt = pIt + + rMediaDescriptor.getLength();
- pIt = ::std::find_if( pIt, pEndIt, lcl_PropNameEquals( rPropName ));
+ pIt = std::find_if( pIt, pEndIt, lcl_PropNameEquals( rPropName ));
if( pIt != pEndIt )
(*pIt).Value >>= aResult;
}
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index ec5b6bc28d29..ec3e3cfe292d 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -51,12 +51,12 @@ struct StaticDataPointInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::DataPointProperties::AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/main/DataPointProperties.cxx b/chart2/source/model/main/DataPointProperties.cxx
index 2dd85a0e78b1..6d34a139fba1 100644
--- a/chart2/source/model/main/DataPointProperties.cxx
+++ b/chart2/source/model/main/DataPointProperties.cxx
@@ -44,7 +44,7 @@ namespace chart
{
void DataPointProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
// DataPointProperties
diff --git a/chart2/source/model/main/DataPointProperties.hxx b/chart2/source/model/main/DataPointProperties.hxx
index 39362498a52a..ad1169cdd6bc 100644
--- a/chart2/source/model/main/DataPointProperties.hxx
+++ b/chart2/source/model/main/DataPointProperties.hxx
@@ -86,7 +86,7 @@ namespace DataPointProperties
};
void AddPropertiesToVector(
- ::std::vector< css::beans::Property > & rOutProperties );
+ std::vector< css::beans::Property > & rOutProperties );
void AddDefaultsToMap( ::chart::tPropertyValueMap & rOutMap );
}
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 956a750d49d6..6eebded278cb 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -64,12 +64,12 @@ struct StaticDataSeriesInfoHelper : public rtl::StaticWithInit< ::cppu::OPropert
{
uno::Sequence< Property > operator()()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::DataSeriesProperties::AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -93,7 +93,7 @@ void lcl_SetParent(
xChild->setParent( xParentInterface );
}
-typedef ::std::map< sal_Int32, css::uno::Reference< css::beans::XPropertySet > >
+typedef std::map< sal_Int32, css::uno::Reference< css::beans::XPropertySet > >
lcl_tDataPointMap;
void lcl_CloneAttributedDataPoints(
@@ -307,7 +307,7 @@ Reference< beans::XPropertySet >
aSequences = comphelper::containerToSequence( m_aDataSequences );
}
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aValuesSeries(
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aValuesSeries(
DataSeriesHelper::getAllDataSequencesByRole( aSequences , "values", true ) );
if (aValuesSeries.empty())
@@ -420,7 +420,7 @@ void SAL_CALL DataSeries::addRegressionCurve(
{
MutexGuard aGuard( GetMutex() );
xModifyEventForwarder = m_xModifyEventForwarder;
- if( ::std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve )
+ if( std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve )
!= m_aRegressionCurves.end())
throw lang::IllegalArgumentException();
m_aRegressionCurves.push_back( xRegressionCurve );
@@ -440,7 +440,7 @@ void SAL_CALL DataSeries::removeRegressionCurve(
MutexGuard aGuard( GetMutex() );
xModifyEventForwarder = m_xModifyEventForwarder;
tRegressionCurveContainerType::iterator aIt(
- ::std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) );
+ std::find( m_aRegressionCurves.begin(), m_aRegressionCurves.end(), xRegressionCurve ) );
if( aIt == m_aRegressionCurves.end())
throw container::NoSuchElementException(
"The given regression curve is no element of this series",
@@ -513,7 +513,7 @@ void SAL_CALL DataSeries::disposing( const lang::EventObject& rEventObject )
{
// forget disposed data sequences
tDataSequenceContainer::iterator aIt(
- ::std::find( m_aDataSequences.begin(), m_aDataSequences.end(), rEventObject.Source ));
+ std::find( m_aDataSequences.begin(), m_aDataSequences.end(), rEventObject.Source ));
if( aIt != m_aDataSequences.end())
m_aDataSequences.erase( aIt );
}
diff --git a/chart2/source/model/main/DataSeriesProperties.cxx b/chart2/source/model/main/DataSeriesProperties.cxx
index 1912e99d2e61..91f24eb4cad6 100644
--- a/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/chart2/source/model/main/DataSeriesProperties.cxx
@@ -35,7 +35,7 @@ namespace chart
{
void DataSeriesProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "AttributedDataPoints",
diff --git a/chart2/source/model/main/DataSeriesProperties.hxx b/chart2/source/model/main/DataSeriesProperties.hxx
index a189b662a6cf..5742c99b8e95 100644
--- a/chart2/source/model/main/DataSeriesProperties.hxx
+++ b/chart2/source/model/main/DataSeriesProperties.hxx
@@ -39,7 +39,7 @@ namespace DataSeriesProperties
};
void AddPropertiesToVector(
- ::std::vector< css::beans::Property > & rOutProperties );
+ std::vector< css::beans::Property > & rOutProperties );
void AddDefaultsToMap( tPropertyValueMap & rOutMap );
}
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 12aea1fe3496..06ce4ac9cab6 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -81,7 +81,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "RelativePosition",
@@ -241,12 +241,12 @@ struct StaticDiagramInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::SceneProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -273,8 +273,8 @@ struct StaticDiagramInfo : public rtl::StaticAggregate< uno::Reference< beans::X
/// clones a UNO-sequence of UNO-References
typedef Reference< chart2::XCoordinateSystem > lcl_tCooSysRef;
-typedef ::std::map< lcl_tCooSysRef, lcl_tCooSysRef > lcl_tCooSysMapping;
-typedef ::std::vector< lcl_tCooSysRef > lcl_tCooSysVector;
+typedef std::map< lcl_tCooSysRef, lcl_tCooSysRef > lcl_tCooSysMapping;
+typedef std::vector< lcl_tCooSysRef > lcl_tCooSysVector;
lcl_tCooSysMapping lcl_CloneCoordinateSystems(
const lcl_tCooSysVector & rSource,
@@ -507,7 +507,7 @@ void SAL_CALL Diagram::addCoordinateSystem(
{
{
MutexGuard aGuard( GetMutex() );
- if( ::std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys )
+ if( std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys )
!= m_aCoordSystems.end())
throw lang::IllegalArgumentException();
@@ -527,8 +527,8 @@ void SAL_CALL Diagram::removeCoordinateSystem(
{
{
MutexGuard aGuard( GetMutex() );
- ::std::vector< uno::Reference< chart2::XCoordinateSystem > >::iterator
- aIt( ::std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys ));
+ std::vector< uno::Reference< chart2::XCoordinateSystem > >::iterator
+ aIt( std::find( m_aCoordSystems.begin(), m_aCoordSystems.end(), aCoordSys ));
if( aIt == m_aCoordSystems.end())
throw container::NoSuchElementException(
"The given coordinate-system is no element of the container",
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index bc0224d88b2e..846223462a01 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -59,10 +59,10 @@ struct StaticFormattedStringInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index 4014cbd1dda6..6d17c39c601c 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -43,7 +43,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "Show",
@@ -89,12 +89,12 @@ struct StaticGridInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< Property > aProperties;
+ std::vector< Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index a3a80d642875..e7b80dd4fd9d 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -58,7 +58,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "AnchorPosition",
@@ -144,14 +144,14 @@ struct StaticLegendInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 52308600f912..9587664faa3f 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -74,12 +74,12 @@ struct StaticPageBackgroundInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index a66243b847cd..200934b67d34 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -50,12 +50,12 @@ struct StaticStockBarInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index 042b8ad18ec5..92fc6a36fa80 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -66,7 +66,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "ParaAdjust",
@@ -204,12 +204,12 @@ struct StaticTitleInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index dae09c4ac598..78fd38ae5d4b 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -78,12 +78,12 @@ struct StaticWallInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index abe4f805d69d..188a7925928c 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -43,7 +43,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "Dimension",
@@ -78,10 +78,10 @@ struct StaticAreaChartTypeTemplateInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -185,10 +185,10 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle(
void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram )
{
ChartTypeTemplate::resetStyles( xDiagram );
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
uno::Any aLineStyleAny( drawing::LineStyle_NONE );
- for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
+ for( std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
aIt != aSeriesVec.end(); ++aIt )
{
Reference< beans::XPropertyState > xState( *aIt, uno::UNO_QUERY );
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx
index a2943f81a633..85eb2d5c7724 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -45,7 +45,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "Dimension",
@@ -92,10 +92,10 @@ struct StaticBarChartTypeTemplateInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -271,10 +271,10 @@ void SAL_CALL BarChartTypeTemplate::resetStyles(
const Reference< chart2::XDiagram >& xDiagram )
{
ChartTypeTemplate::resetStyles( xDiagram );
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
uno::Any aLineStyleAny( drawing::LineStyle_NONE );
- for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
+ for( std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
aIt != aSeriesVec.end(); ++aIt )
{
Reference< beans::XPropertyState > xState( *aIt, uno::UNO_QUERY );
diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx
index 4af09ba28611..2da52840c01b 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -62,9 +62,9 @@ struct StaticBubbleChartTypeInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 39a33f1a8908..1ee18079f5fb 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -64,9 +64,9 @@ struct StaticBubbleChartTypeTemplateInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx
index 4e0d14f3b540..32cae2fa556c 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -45,7 +45,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "Japanese",
@@ -114,10 +114,10 @@ struct StaticCandleStickChartTypeInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -223,7 +223,7 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo
getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
- ::std::vector< OUString > aMandRoles;
+ std::vector< OUString > aMandRoles;
aMandRoles.push_back( "label");
if( bShowFirst )
@@ -247,7 +247,7 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles()
getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_FIRST ) >>= bShowFirst;
getFastPropertyValue( PROP_CANDLESTICKCHARTTYPE_SHOW_HIGH_LOW ) >>= bShowHiLow;
- ::std::vector< OUString > aOptRoles;
+ std::vector< OUString > aOptRoles;
if( ! bShowFirst )
aOptRoles.push_back( "values-first");
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index e17a5344542d..a6b182c2497d 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -127,7 +127,7 @@ OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel()
void ChartType::impl_addDataSeriesWithoutNotification(
const Reference< chart2::XDataSeries >& xDataSeries )
{
- if( ::std::find( m_aDataSeries.begin(), m_aDataSeries.end(), xDataSeries )
+ if( std::find( m_aDataSeries.begin(), m_aDataSeries.end(), xDataSeries )
!= m_aDataSeries.end())
throw lang::IllegalArgumentException();
@@ -152,7 +152,7 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries
SolarMutexGuard g;
tDataSeriesContainerType::iterator aIt(
- ::std::find( m_aDataSeries.begin(), m_aDataSeries.end(), xDataSeries ) );
+ std::find( m_aDataSeries.begin(), m_aDataSeries.end(), xDataSeries ) );
if( aIt == m_aDataSeries.end())
throw container::NoSuchElementException(
diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx
index f239f7f38824..6d5a686e32fe 100644
--- a/chart2/source/model/template/ChartType.hxx
+++ b/chart2/source/model/template/ChartType.hxx
@@ -130,7 +130,7 @@ private:
const m_xContext;
typedef
- ::std::vector< css::uno::Reference< css::chart2::XDataSeries > > tDataSeriesContainerType;
+ std::vector< css::uno::Reference< css::chart2::XDataSeries > > tDataSeriesContainerType;
// --- mutable members: the following members need mutex guard ---
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index 08eba875e4b0..a746bf29fdd3 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -129,7 +129,7 @@ enum TemplateId
TEMPLATE_NOT_FOUND = 0xffff
};
-typedef ::std::map< OUString, TemplateId > tTemplateMapType;
+typedef std::map< OUString, TemplateId > tTemplateMapType;
const tTemplateMapType & lcl_DefaultChartTypeMap()
{
@@ -563,12 +563,12 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithA
uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames()
{
- ::std::vector< OUString > aServices;
+ std::vector< OUString > aServices;
const tTemplateMapType & rMap = lcl_DefaultChartTypeMap();
aServices.reserve( rMap.size());
// get own default templates
- ::std::transform( rMap.begin(), rMap.end(), ::std::back_inserter( aServices ),
+ std::transform( rMap.begin(), rMap.end(), std::back_inserter( aServices ),
::o3tl::select1st< tTemplateMapType::value_type >() );
// add components that were registered in the context's factory
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index d62068c9afac..76fc37d00564 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -293,7 +293,7 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData(
Sequence< Reference< XChartType > > aChartTypes(
DiagramHelper::getChartTypesFromDiagram( xDiagram ));
- sal_Int32 nMax = ::std::min( aChartTypes.getLength(), aSeriesSeq.getLength());
+ sal_Int32 nMax = std::min( aChartTypes.getLength(), aSeriesSeq.getLength());
for( i=0; i<nMax; ++i )
{
Reference< XDataSeriesContainer > xDSCnt( aChartTypes[i], uno::UNO_QUERY_THROW );
@@ -842,7 +842,7 @@ void ChartTypeTemplate::createChartTypes(
Sequence< Reference< XDataSeries > > aNewSeriesSeq( xDSCnt->getDataSeries());
sal_Int32 nNewStartIndex = aNewSeriesSeq.getLength();
aNewSeriesSeq.realloc( nNewStartIndex + aSeriesSeq[nSeriesIdx].getLength() );
- ::std::copy( aSeriesSeq[nSeriesIdx].begin(),
+ std::copy( aSeriesSeq[nSeriesIdx].begin(),
aSeriesSeq[nSeriesIdx].end(),
aNewSeriesSeq.getArray() + nNewStartIndex );
xDSCnt->setDataSeries( aNewSeriesSeq );
diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx
index 84c6054badbd..b04fd86b299f 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -38,7 +38,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "OverlapSequence",
@@ -91,10 +91,10 @@ struct StaticColumnChartTypeInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 4ca7024bd139..33bac477aaf7 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -48,7 +48,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "NumberOfLines",
@@ -83,10 +83,10 @@ struct StaticColumnLineChartTypeTemplateInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -204,7 +204,7 @@ void ColumnLineChartTypeTemplate::createChartTypes(
{
Reference< XDataSeriesContainer > xDSCnt( xCT, uno::UNO_QUERY_THROW );
Sequence< Reference< XDataSeries > > aColumnSeq( nNumberOfColumns );
- ::std::copy( aFlatSeriesSeq.begin(),
+ std::copy( aFlatSeriesSeq.begin(),
aFlatSeriesSeq.begin() + nNumberOfColumns,
aColumnSeq.getArray());
xDSCnt->setDataSeries( aColumnSeq );
@@ -220,7 +220,7 @@ void ColumnLineChartTypeTemplate::createChartTypes(
{
Reference< XDataSeriesContainer > xDSCnt( xCT, uno::UNO_QUERY_THROW );
Sequence< Reference< XDataSeries > > aLineSeq( nNumberOfLines );
- ::std::copy( aFlatSeriesSeq.begin() + nNumberOfColumns,
+ std::copy( aFlatSeriesSeq.begin() + nNumberOfColumns,
aFlatSeriesSeq.end(),
aLineSeq.getArray());
xDSCnt->setDataSeries( aLineSeq );
diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 735ca0ba976d..f3000954d5ca 100644
--- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -66,13 +66,13 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource(
// if we have more than one series put the last nNumOfLines ones into a new group
if( nNumberOfSeries > 1 && m_nNumberOfLines > 0 )
{
- sal_Int32 nNumOfLines = ::std::min( m_nNumberOfLines, nNumberOfSeries - 1 );
+ sal_Int32 nNumOfLines = std::min( m_nNumberOfLines, nNumberOfSeries - 1 );
aResult.Series.realloc(2);
Sequence< Reference< XDataSeries > > & rColumnDataSeries = aResult.Series[0];
Sequence< Reference< XDataSeries > > & rLineDataSeries = aResult.Series[1];
rLineDataSeries.realloc( nNumOfLines );
- ::std::copy( rColumnDataSeries.begin() + nNumberOfSeries - nNumOfLines,
+ std::copy( rColumnDataSeries.begin() + nNumberOfSeries - nNumOfLines,
rColumnDataSeries.begin() + nNumberOfSeries,
rLineDataSeries.getArray() );
rColumnDataSeries.realloc( nNumberOfSeries - nNumOfLines );
diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx
index c1af371763c5..58b3fb2686e3 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -43,7 +43,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_STYLE,
@@ -101,10 +101,10 @@ struct StaticLineChartTypeInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 759a5aa7fe86..a06f74466003 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -50,7 +50,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_STYLE,
@@ -107,10 +107,10 @@ struct StaticLineChartTypeTemplateInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -208,10 +208,10 @@ sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate(
bool bSymbolFound = false;
bool bLineFound = false;
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
+ for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
{
try
diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx
index a12dccf3a574..77eda20191a6 100644
--- a/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -101,10 +101,10 @@ sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate(
bool bSymbolFound = false;
bool bLineFound = false;
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
+ for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
{
try
diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx
index c758d67353ad..2645b2f0f285 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -44,7 +44,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "UseRings",
@@ -90,10 +90,10 @@ struct StaticPieChartTypeInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 15a27541bedb..1c61f0004347 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -55,7 +55,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "OffsetMode",
@@ -116,10 +116,10 @@ struct StaticPieChartTypeTemplateInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -320,7 +320,7 @@ sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate(
double fOffset=0.0;
bool bAllOffsetsEqual = true;
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
//check offset of outer series
@@ -572,10 +572,10 @@ void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagr
// vary colors by point,
// line style
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
uno::Any aLineStyleAny( drawing::LineStyle_NONE );
- for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
+ for( std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
aIt != aSeriesVec.end(); ++aIt )
{
Reference< beans::XPropertyState > xState( *aIt, uno::UNO_QUERY );
diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx
index be1f3ec99472..af78b959f7b4 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -48,7 +48,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_STYLE,
@@ -106,10 +106,10 @@ struct StaticScatterChartTypeInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index ea5c553637f5..e510280b215f 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -52,7 +52,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( CHART_UNONAME_CURVE_STYLE,
@@ -109,10 +109,10 @@ struct StaticScatterChartTypeTemplateInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -240,10 +240,10 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate(
bool bSymbolFound = false;
bool bLineFound = false;
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
+ for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
{
try
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx
index d453fec3cf51..bc29b89ac2b3 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -57,7 +57,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "Volume",
@@ -118,10 +118,10 @@ struct StaticStockChartTypeTemplateInfoHelper_Initializer
private:
static Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
@@ -266,9 +266,9 @@ void SAL_CALL StockChartTypeTemplate::resetStyles(
ChartTypeTemplate::resetStyles( xDiagram );
if( getDimension() == 3 )
{
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
+ for( std::vector< Reference< chart2::XDataSeries > >::iterator aIt( aSeriesVec.begin());
aIt != aSeriesVec.end(); ++aIt )
{
Reference< beans::XPropertySet > xProp( *aIt, uno::UNO_QUERY );
diff --git a/chart2/source/tools/AxisHelper.cxx b/chart2/source/tools/AxisHelper.cxx
index 6c7215269bd3..d3da454af5e2 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -197,7 +197,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
Reference< data::XDataSource > xSource( DataSourceHelper::getUsedData( xChartDoc ) );
if( xSource.is() )
{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aXValues(
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aXValues(
DataSeriesHelper::getAllDataSequencesByRole( xSource->getDataSequences(), "values-x", true ) );
if( aXValues.empty() )
{
@@ -232,7 +232,7 @@ sal_Int32 AxisHelper::getExplicitNumberFormatKeyForAxis(
if( !bFormatSet )
{
- typedef ::std::map< sal_Int32, sal_Int32 > tNumberformatFrequency;
+ typedef std::map< sal_Int32, sal_Int32 > tNumberformatFrequency;
tNumberformatFrequency aKeyMap;
bool bNumberFormatKeyFoundViaAttachedData = false;
@@ -512,8 +512,8 @@ void AxisHelper::hideAxisIfNoDataIsAttached( const Reference< XAxis >& xAxis, co
{
//axis is hidden if no data is attached anymore but data is available
bool bOtherSeriesAttachedToThisAxis = false;
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
- ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVector.begin();
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt = aSeriesVector.begin();
for( ; aIt != aSeriesVector.end(); ++aIt)
{
uno::Reference< chart2::XAxis > xCurrentAxis( DiagramHelper::getAttachedAxis( *aIt, xDiagram ), uno::UNO_QUERY );
@@ -1057,8 +1057,8 @@ Reference< XCoordinateSystem > AxisHelper::getCoordinateSystemOfAxis(
xCooSys = aCooSysList[nCooSysIndex];
std::vector< Reference< XAxis > > aAllAxis( AxisHelper::getAllAxesOfCoordinateSystem( xCooSys ) );
- ::std::vector< Reference< XAxis > >::iterator aFound =
- ::std::find( aAllAxis.begin(), aAllAxis.end(), xAxis );
+ std::vector< Reference< XAxis > >::iterator aFound =
+ std::find( aAllAxis.begin(), aAllAxis.end(), xAxis );
if( aFound != aAllAxis.end())
{
xRet.set( xCooSys );
@@ -1155,8 +1155,8 @@ void AxisHelper::setRTLAxisLayout( const Reference< XCoordinateSystem >& xCooSys
Reference< XChartType > AxisHelper::getFirstChartTypeWithSeriesAttachedToAxisIndex( const Reference< chart2::XDiagram >& xDiagram, const sal_Int32 nAttachedAxisIndex )
{
Reference< XChartType > xChartType;
- ::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
- ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
+ std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
for( ; aIter != aSeriesVector.end(); ++aIter )
{
sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx
index c702a1ab2489..1426a9803fdd 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -144,7 +144,7 @@ Sequence< double > CachedDataSequence::Impl_getNumericalData() const
if( m_eCurrentDataType == TEXTUAL )
{
const OUString * pTextArray = m_aTextualSequence.getConstArray();
- ::std::transform( pTextArray, pTextArray + nSize,
+ std::transform( pTextArray, pTextArray + nSize,
pResultArray,
CommonFunctors::OUStringToDouble() );
}
@@ -152,7 +152,7 @@ Sequence< double > CachedDataSequence::Impl_getNumericalData() const
{
OSL_ASSERT( m_eCurrentDataType == MIXED );
const Any * pMixedArray = m_aMixedSequence.getConstArray();
- ::std::transform( pMixedArray, pMixedArray + nSize,
+ std::transform( pMixedArray, pMixedArray + nSize,
pResultArray,
CommonFunctors::AnyToDouble() );
}
@@ -174,7 +174,7 @@ Sequence< OUString > CachedDataSequence::Impl_getTextualData() const
if( m_eCurrentDataType == NUMERICAL )
{
const double * pTextArray = m_aNumericalSequence.getConstArray();
- ::std::transform( pTextArray, pTextArray + nSize,
+ std::transform( pTextArray, pTextArray + nSize,
pResultArray,
CommonFunctors::DoubleToOUString() );
}
@@ -182,7 +182,7 @@ Sequence< OUString > CachedDataSequence::Impl_getTextualData() const
{
OSL_ASSERT( m_eCurrentDataType == MIXED );
const Any * pMixedArray = m_aMixedSequence.getConstArray();
- ::std::transform( pMixedArray, pMixedArray + nSize,
+ std::transform( pMixedArray, pMixedArray + nSize,
pResultArray,
CommonFunctors::AnyToString() );
}
@@ -205,7 +205,7 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const
if( m_eCurrentDataType == NUMERICAL )
{
const double * pTextArray = m_aNumericalSequence.getConstArray();
- ::std::transform( pTextArray, pTextArray + nSize,
+ std::transform( pTextArray, pTextArray + nSize,
pResultArray,
CommonFunctors::makeAny< double >() );
}
@@ -213,7 +213,7 @@ Sequence< Any > CachedDataSequence::Impl_getMixedData() const
{
OSL_ASSERT( m_eCurrentDataType == TEXTUAL );
const OUString * pMixedArray = m_aTextualSequence.getConstArray();
- ::std::transform( pMixedArray, pMixedArray + nSize,
+ std::transform( pMixedArray, pMixedArray + nSize,
pResultArray,
CommonFunctors::makeAny< OUString >() );
}
diff --git a/chart2/source/tools/CharacterProperties.cxx b/chart2/source/tools/CharacterProperties.cxx
index f0a953550e40..663f3b9c96a2 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -51,7 +51,7 @@ namespace chart
{
void CharacterProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
// CharacterProperties
rOutProperties.push_back(
diff --git a/chart2/source/tools/ChartModelHelper.cxx b/chart2/source/tools/ChartModelHelper.cxx
index a8314b62d801..9928f41e5d75 100644
--- a/chart2/source/tools/ChartModelHelper.cxx
+++ b/chart2/source/tools/ChartModelHelper.cxx
@@ -130,10 +130,10 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
return XCooSys;
}
-::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
+std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
ChartModel& rModel )
{
- ::std::vector< uno::Reference< XDataSeries > > aResult;
+ std::vector< uno::Reference< XDataSeries > > aResult;
uno::Reference< XDiagram > xDiagram = rModel.getFirstDiagram();
if( xDiagram.is())
@@ -142,10 +142,10 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
return aResult;
}
-::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
+std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
const uno::Reference< XChartDocument > & xChartDoc )
{
- ::std::vector< uno::Reference< XDataSeries > > aResult;
+ std::vector< uno::Reference< XDataSeries > > aResult;
uno::Reference< XDiagram > xDiagram = ChartModelHelper::findDiagram( xChartDoc );
if( xDiagram.is())
@@ -154,7 +154,7 @@ uno::Reference< XCoordinateSystem > ChartModelHelper::getFirstCoordinateSystem(
return aResult;
}
-::std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
+std::vector< uno::Reference< XDataSeries > > ChartModelHelper::getDataSeries(
const uno::Reference< frame::XModel > & xModel )
{
return getDataSeries( uno::Reference< chart2::XChartDocument >( xModel, uno::UNO_QUERY ));
diff --git a/chart2/source/tools/ColorPerPointHelper.cxx b/chart2/source/tools/ColorPerPointHelper.cxx
index 985f46035cbe..257c31b8a32b 100644
--- a/chart2/source/tools/ColorPerPointHelper.cxx
+++ b/chart2/source/tools/ColorPerPointHelper.cxx
@@ -67,7 +67,7 @@ bool ColorPerPointHelper::hasPointOwnProperties(
{
const sal_Int32 * pBegIt = aIndexList.getConstArray();
const sal_Int32 * pEndIt = pBegIt + aIndexList.getLength();
- return ( ::std::find( pBegIt, pEndIt, nPointIndex ) != pEndIt );
+ return ( std::find( pBegIt, pEndIt, nPointIndex ) != pEndIt );
}
}
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 2926cc0eabf2..e4792d415ecf 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -64,7 +64,7 @@ protected:
private:
ConfigColorScheme & m_rListener;
- ::std::set< OUString > m_aPropertiesToNotify;
+ std::set< OUString > m_aPropertiesToNotify;
};
ChartConfigItem::ChartConfigItem( ConfigColorScheme & rListener ) :
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index c3b2da5d64aa..2ca3a1d823b1 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -54,7 +54,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-class lcl_MatchesRole : public ::std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
+class lcl_MatchesRole : public std::unary_function< Reference< chart2::data::XLabeledDataSequence >, bool >
{
public:
explicit lcl_MatchesRole( const OUString & aRole, bool bMatchPrefix ) :
@@ -218,7 +218,7 @@ Reference< chart2::data::XLabeledDataSequence >
const Reference< chart2::data::XLabeledDataSequence > * pBegin = aLabeledSeq.getConstArray();
const Reference< chart2::data::XLabeledDataSequence > * pEnd = pBegin + aLabeledSeq.getLength();
const Reference< chart2::data::XLabeledDataSequence > * pMatch =
- ::std::find_if( pBegin, pEnd, lcl_MatchesRole( aRole, bMatchPrefix ));
+ std::find_if( pBegin, pEnd, lcl_MatchesRole( aRole, bMatchPrefix ));
if( pMatch != pEnd )
return *pMatch;
@@ -226,21 +226,21 @@ Reference< chart2::data::XLabeledDataSequence >
return aNoResult;
}
-::std::vector< Reference< chart2::data::XLabeledDataSequence > >
+std::vector< Reference< chart2::data::XLabeledDataSequence > >
getAllDataSequencesByRole( const Sequence< Reference< chart2::data::XLabeledDataSequence > > & aDataSequences,
const OUString& aRole, bool bMatchPrefix /* = false */ )
{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVec;
- ::std::remove_copy_if( aDataSequences.getConstArray(), aDataSequences.getConstArray() + aDataSequences.getLength(),
- ::std::back_inserter( aResultVec ),
- ::std::not1( lcl_MatchesRole( aRole, bMatchPrefix )));
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVec;
+ std::remove_copy_if( aDataSequences.getConstArray(), aDataSequences.getConstArray() + aDataSequences.getLength(),
+ std::back_inserter( aResultVec ),
+ std::not1( lcl_MatchesRole( aRole, bMatchPrefix )));
return aResultVec;
}
std::vector<Reference<css::chart2::data::XLabeledDataSequence> >
getAllDataSequences( const uno::Sequence<uno::Reference<chart2::XDataSeries> >& aSeries )
{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aSeqVec;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aSeqVec;
for( sal_Int32 i = 0; i < aSeries.getLength(); ++i )
{
@@ -248,8 +248,8 @@ getAllDataSequences( const uno::Sequence<uno::Reference<chart2::XDataSeries> >&
if( xSource.is())
{
Sequence< Reference< chart2::data::XLabeledDataSequence > > aSeq( xSource->getDataSequences());
- ::std::copy( aSeq.begin(), aSeq.end(),
- ::std::back_inserter( aSeqVec ));
+ std::copy( aSeq.begin(), aSeq.end(),
+ std::back_inserter( aSeqVec ));
}
}
@@ -427,7 +427,7 @@ void setStackModeAtSeries(
aAxisIndexSet.insert(0);
}
- for( ::std::set< sal_Int32 >::const_iterator aIt = aAxisIndexSet.begin();
+ for( std::set< sal_Int32 >::const_iterator aIt = aAxisIndexSet.begin();
aIt != aAxisIndexSet.end(); ++aIt )
{
sal_Int32 nAxisIndex = *aIt;
@@ -522,10 +522,10 @@ void deleteSeries(
try
{
Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY_THROW );
- ::std::vector< Reference< chart2::XDataSeries > > aSeries(
+ std::vector< Reference< chart2::XDataSeries > > aSeries(
ContainerHelper::SequenceToVector( xSeriesCnt->getDataSeries()));
- ::std::vector< Reference< chart2::XDataSeries > >::iterator aIt =
- ::std::find( aSeries.begin(), aSeries.end(), xSeries );
+ std::vector< Reference< chart2::XDataSeries > >::iterator aIt =
+ std::find( aSeries.begin(), aSeries.end(), xSeries );
if( aIt != aSeries.end())
{
aSeries.erase( aIt );
@@ -737,8 +737,8 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere
xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenIndicesSeq;
if( aHiddenIndicesSeq.getLength() )
{
- ::std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) );
- ::std::sort( aHiddenIndices.begin(), aHiddenIndices.end() );
+ std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) );
+ std::sort( aHiddenIndices.begin(), aHiddenIndices.end() );
sal_Int32 nHiddenCount = static_cast<sal_Int32>(aHiddenIndices.size());
for( sal_Int32 nN = 0; nN < nHiddenCount; ++nN)
@@ -822,8 +822,8 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I
uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList )
{
- ::std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
- ::std::vector< sal_Int32 >::iterator aIt = ::std::find( aIndices.begin(), aIndices.end(), nPointIndex );
+ std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
+ std::vector< sal_Int32 >::iterator aIt = std::find( aIndices.begin(), aIndices.end(), nPointIndex );
if( aIt != aIndices.end())
xProp = xSeries->getDataPointByIndex(nPointIndex);
else
diff --git a/chart2/source/tools/DataSourceHelper.cxx b/chart2/source/tools/DataSourceHelper.cxx
index 7ddfd660ec9b..7eff294e22ed 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -47,7 +47,7 @@ using ::com::sun::star::uno::Sequence;
namespace
{
-void lcl_addRanges( ::std::vector< OUString > & rOutResult,
+void lcl_addRanges( std::vector< OUString > & rOutResult,
const uno::Reference< data::XLabeledDataSequence > & xLabeledSeq )
{
if( ! xLabeledSeq.is())
@@ -61,7 +61,7 @@ void lcl_addRanges( ::std::vector< OUString > & rOutResult,
}
void lcl_addDataSourceRanges(
- ::std::vector< OUString > & rOutResult,
+ std::vector< OUString > & rOutResult,
const uno::Reference< data::XDataSource > & xDataSource )
{
if( xDataSource.is() )
@@ -73,7 +73,7 @@ void lcl_addDataSourceRanges(
}
void lcl_addErrorBarRanges(
- ::std::vector< OUString > & rOutResult,
+ std::vector< OUString > & rOutResult,
const uno::Reference< XDataSeries > & xDataSeries )
{
uno::Reference< beans::XPropertySet > xSeriesProp( xDataSeries, uno::UNO_QUERY );
@@ -229,7 +229,7 @@ void DataSourceHelper::readArguments( const uno::Sequence< beans::PropertyValue
uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoRectangularFormat(
const uno::Reference< chart2::XChartDocument >& xChartDoc )
{
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVector;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultVector;
//categories are always the first sequence
Reference< chart2::XDiagram > xDiagram( xChartDoc->getFirstDiagram());
@@ -238,7 +238,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR
if( xCategories.is() )
aResultVector.push_back( xCategories );
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
uno::Reference< chart2::data::XDataSource > xSeriesSource(
DataSeriesHelper::getDataSource( comphelper::containerToSequence(aSeriesVector) ) );
Sequence< Reference< chart2::data::XLabeledDataSequence > > aDataSeqences( xSeriesSource->getDataSequences() );
@@ -263,7 +263,7 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::pressUsedDataIntoR
uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges(
const uno::Reference< chart2::XDiagram > & xDiagram )
{
- ::std::vector< OUString > aResult;
+ std::vector< OUString > aResult;
if( xDiagram.is())
{
@@ -271,8 +271,8 @@ uno::Sequence< OUString > DataSourceHelper::getUsedDataRanges(
if( xCategories.is() )
lcl_addRanges( aResult, xCategories );
- ::std::vector< uno::Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
- for( ::std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
+ std::vector< uno::Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
; aSeriesIt != aSeriesVector.end(); ++aSeriesIt )
{
uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY );
@@ -299,23 +299,23 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
const uno::Reference< frame::XModel >& xChartModel )
{
- ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult;
uno::Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( xChartModel ) );
uno::Reference< data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) );
if( xCategories.is() )
aResult.push_back( xCategories );
- ::std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartModel ) );
- for( ::std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
+ std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartModel ) );
+ for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
; aSeriesIt != aSeriesVector.end(); ++aSeriesIt )
{
uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY );
if( !xDataSource.is() )
continue;
uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() );
- ::std::copy( aDataSequences.begin(), aDataSequences.end(),
- ::std::back_inserter( aResult ));
+ std::copy( aDataSequences.begin(), aDataSequences.end(),
+ std::back_inserter( aResult ));
}
return uno::Reference< chart2::data::XDataSource >(
@@ -325,23 +325,23 @@ uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
uno::Reference< chart2::data::XDataSource > DataSourceHelper::getUsedData(
ChartModel& rModel )
{
- ::std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult;
+ std::vector< uno::Reference< chart2::data::XLabeledDataSequence > > aResult;
uno::Reference< XDiagram > xDiagram( rModel.getFirstDiagram() );
uno::Reference< data::XLabeledDataSequence > xCategories( DiagramHelper::getCategoriesFromDiagram( xDiagram ) );
if( xCategories.is() )
aResult.push_back( xCategories );
- ::std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( rModel ) );
- for( ::std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
+ std::vector< uno::Reference< XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( rModel ) );
+ for( std::vector< uno::Reference< XDataSeries > >::const_iterator aSeriesIt( aSeriesVector.begin() )
; aSeriesIt != aSeriesVector.end(); ++aSeriesIt )
{
uno::Reference< data::XDataSource > xDataSource( *aSeriesIt, uno::UNO_QUERY );
if( !xDataSource.is() )
continue;
uno::Sequence< uno::Reference< data::XLabeledDataSequence > > aDataSequences( xDataSource->getDataSequences() );
- ::std::copy( aDataSequences.begin(), aDataSequences.end(),
- ::std::back_inserter( aResult ));
+ std::copy( aDataSequences.begin(), aDataSequences.end(),
+ std::back_inserter( aResult ));
}
return uno::Reference< chart2::data::XDataSource >(
@@ -516,7 +516,7 @@ OUString DataSourceHelper::getRangeFromValues(
Sequence< OUString > DataSourceHelper::getRangesFromDataSource( const Reference< data::XDataSource > & xSource )
{
- ::std::vector< OUString > aResult;
+ std::vector< OUString > aResult;
if( xSource.is())
{
Sequence< Reference< data::XLabeledDataSequence > > aLSeqSeq( xSource->getDataSequences());
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 54e1b52ecf93..c70f7e19c6f4 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -673,11 +673,11 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
return nullptr;
}
-::std::vector< Reference< XDataSeries > >
+std::vector< Reference< XDataSeries > >
DiagramHelper::getDataSeriesFromDiagram(
const Reference< XDiagram > & xDiagram )
{
- ::std::vector< Reference< XDataSeries > > aResult;
+ std::vector< Reference< XDataSeries > > aResult;
try
{
@@ -693,8 +693,8 @@ uno::Reference< XChartType > DiagramHelper::getChartTypeOfSeries(
{
Reference< XDataSeriesContainer > xDSCnt( aChartTypeSeq[j], uno::UNO_QUERY_THROW );
Sequence< Reference< XDataSeries > > aSeriesSeq( xDSCnt->getDataSeries() );
- ::std::copy( aSeriesSeq.begin(), aSeriesSeq.end(),
- ::std::back_inserter( aResult ));
+ std::copy( aSeriesSeq.begin(), aSeriesSeq.end(),
+ std::back_inserter( aResult ));
}
}
}
@@ -1221,7 +1221,7 @@ Sequence< Reference< XChartType > >
DiagramHelper::getChartTypesFromDiagram(
const Reference< XDiagram > & xDiagram )
{
- ::std::vector< Reference< XChartType > > aResult;
+ std::vector< Reference< XChartType > > aResult;
if(xDiagram.is())
{
@@ -1235,8 +1235,8 @@ Sequence< Reference< XChartType > >
{
Reference< XChartTypeContainer > xCTCnt( aCooSysSeq[i], uno::UNO_QUERY_THROW );
Sequence< Reference< XChartType > > aChartTypeSeq( xCTCnt->getChartTypes());
- ::std::copy( aChartTypeSeq.begin(), aChartTypeSeq.end(),
- ::std::back_inserter( aResult ));
+ std::copy( aChartTypeSeq.begin(), aChartTypeSeq.end(),
+ std::back_inserter( aResult ));
}
}
catch( const uno::Exception & ex )
@@ -1254,10 +1254,10 @@ bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartTy
if( !xFirstType.is() || !xSecondType.is() )
return false;
- ::std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) );
- ::std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) );
- ::std::sort( aFirstRoles.begin(), aFirstRoles.end() );
- ::std::sort( aSecondRoles.begin(), aSecondRoles.end() );
+ std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) );
+ std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) );
+ std::sort( aFirstRoles.begin(), aFirstRoles.end() );
+ std::sort( aSecondRoles.begin(), aSecondRoles.end() );
return ( aFirstRoles == aSecondRoles );
}
@@ -1508,13 +1508,13 @@ sal_Int32 DiagramHelper::getGeometry3D(
rbFound = false;
rbAmbiguous = false;
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
if( aSeriesVec.empty())
rbAmbiguous = true;
- for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
+ for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
{
try
@@ -1550,10 +1550,10 @@ void DiagramHelper::setGeometry3D(
const Reference< chart2::XDiagram > & xDiagram,
sal_Int32 nNewGeometry )
{
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVec(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
+ for( std::vector< Reference< chart2::XDataSeries > >::const_iterator aIt =
aSeriesVec.begin(); aIt != aSeriesVec.end(); ++aIt )
{
DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints(
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 2a7ae2d24f70..6b2c4edb00ca 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using ::std::vector;
+using std::vector;
ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2::XCoordinateSystem >& xCooSysModel
, ChartModel& rModel )
@@ -98,7 +98,7 @@ ExplicitCategoriesProvider::ExplicitCategoriesProvider( const Reference< chart2:
//->split them in the direction of the first series
//detect whether the first series is a row or a column
bool bSeriesUsesColumns = true;
- ::std::vector< Reference< XDataSeries > > aSeries( ChartModelHelper::getDataSeries( mrModel ) );
+ std::vector< Reference< XDataSeries > > aSeries( ChartModelHelper::getDataSeries( mrModel ) );
if( !aSeries.empty() )
{
uno::Reference< data::XDataSource > xSeriesSource( aSeries.front(), uno::UNO_QUERY );
@@ -266,7 +266,7 @@ std::vector< ComplexCategory > lcl_DataSequenceToComplexCategoryVector(
for( sal_Int32 nN=0; nN<nMaxCount; nN++ )
{
const OUString& aCurrent = rStrings[nN];
- if( bCreateSingleCategories || ::std::find( rLimitingBorders.begin(), rLimitingBorders.end(), nN ) != rLimitingBorders.end() )
+ if( bCreateSingleCategories || std::find( rLimitingBorders.begin(), rLimitingBorders.end(), nN ) != rLimitingBorders.end() )
{
aResult.push_back( ComplexCategory(aPrevious,nCurrentCount) );
nCurrentCount=1;
@@ -306,7 +306,7 @@ sal_Int32 lcl_getCategoryCount( std::vector< ComplexCategory >& rComplexCategori
Sequence< OUString > lcl_getExplicitSimpleCategories(
const SplitCategoriesProvider& rSplitCategoriesProvider,
- ::std::vector< ::std::vector< ComplexCategory > >& rComplexCats )
+ std::vector< std::vector< ComplexCategory > >& rComplexCats )
{
Sequence< OUString > aRet;
@@ -466,7 +466,7 @@ bool lcl_fillDateCategories( const uno::Reference< data::XDataSequence >& xDataS
rDateCategories.push_back( aDate );
}
}
- ::std::sort( rDateCategories.begin(), rDateCategories.end() );
+ std::sort( rDateCategories.begin(), rDateCategories.end() );
}
return bAnyDataFound && bOnlyDatesFound;
diff --git a/chart2/source/tools/FillProperties.cxx b/chart2/source/tools/FillProperties.cxx
index 064136093a9a..27ba6b63d314 100644
--- a/chart2/source/tools/FillProperties.cxx
+++ b/chart2/source/tools/FillProperties.cxx
@@ -34,7 +34,7 @@ namespace chart
namespace
{
-void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties )
+void lcl_AddPropertiesToVector_without_BitmapProperties( std::vector< css::beans::Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "FillStyle",
@@ -99,7 +99,7 @@ void lcl_AddPropertiesToVector_without_BitmapProperties( ::std::vector< css::bea
| beans::PropertyAttribute::MAYBEDEFAULT ));
}
-void lcl_AddPropertiesToVector_only_BitmapProperties( ::std::vector< css::beans::Property > & rOutProperties )
+void lcl_AddPropertiesToVector_only_BitmapProperties( std::vector< css::beans::Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "FillBitmapName",
@@ -200,7 +200,7 @@ void lcl_AddDefaultsToMap_only_BitmapProperties(
}//end anonymous namespace
void FillProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
// Fill Properties see service drawing::FillProperties
lcl_AddPropertiesToVector_without_BitmapProperties( rOutProperties );
diff --git a/chart2/source/tools/ImplOPropertySet.cxx b/chart2/source/tools/ImplOPropertySet.cxx
index 52c2c971ef5c..0c58e659cdaa 100644
--- a/chart2/source/tools/ImplOPropertySet.cxx
+++ b/chart2/source/tools/ImplOPropertySet.cxx
@@ -35,7 +35,7 @@ namespace
{
struct lcl_getPropertyStateByHandle :
- public ::std::unary_function< sal_Int32, beans::PropertyState >
+ public std::unary_function< sal_Int32, beans::PropertyState >
{
explicit lcl_getPropertyStateByHandle(
const ::property::impl::ImplOPropertySet::tPropertyMap & rMap )
@@ -55,9 +55,9 @@ private:
template< typename K, typename V >
struct lcl_eraseMapEntry :
- public ::std::unary_function< K, void >
+ public std::unary_function< K, void >
{
- explicit lcl_eraseMapEntry( ::std::map< K, V > & rMap )
+ explicit lcl_eraseMapEntry( std::map< K, V > & rMap )
: m_rMap( rMap )
{}
@@ -67,11 +67,11 @@ struct lcl_eraseMapEntry :
}
private:
- ::std::map< K, V > m_rMap;
+ std::map< K, V > m_rMap;
};
struct lcl_replaceInterfacePropertiesByClones :
- public ::std::unary_function< ::property::impl::ImplOPropertySet::tPropertyMap::value_type, void >
+ public std::unary_function< ::property::impl::ImplOPropertySet::tPropertyMap::value_type, void >
{
inline void operator() ( ::property::impl::ImplOPropertySet::tPropertyMap::value_type & rProp )
{
@@ -97,11 +97,11 @@ ImplOPropertySet::ImplOPropertySet()
ImplOPropertySet::ImplOPropertySet( const ImplOPropertySet & rOther )
{
- ::std::copy( rOther.m_aProperties.begin(), rOther.m_aProperties.end(),
- ::std::inserter( m_aProperties, m_aProperties.begin() ));
+ std::copy( rOther.m_aProperties.begin(), rOther.m_aProperties.end(),
+ std::inserter( m_aProperties, m_aProperties.begin() ));
// clone interface properties
- ::std::for_each( m_aProperties.begin(), m_aProperties.end(),
+ std::for_each( m_aProperties.begin(), m_aProperties.end(),
lcl_replaceInterfacePropertiesByClones());
m_xStyle.set( ::chart::CloneHelper::CreateRefClone< style::XStyle >()( rOther.m_xStyle ));
@@ -113,11 +113,11 @@ beans::PropertyState ImplOPropertySet::GetPropertyStateByHandle( sal_Int32 nHand
}
Sequence< beans::PropertyState > ImplOPropertySet::GetPropertyStatesByHandle(
- const ::std::vector< sal_Int32 > & aHandles ) const
+ const std::vector< sal_Int32 > & aHandles ) const
{
Sequence< beans::PropertyState > aResult( aHandles.size());
- ::std::transform( aHandles.begin(), aHandles.end(),
+ std::transform( aHandles.begin(), aHandles.end(),
aResult.getArray(),
lcl_getPropertyStateByHandle( m_aProperties ));
@@ -135,9 +135,9 @@ void ImplOPropertySet::SetPropertyToDefault( sal_Int32 nHandle )
}
void ImplOPropertySet::SetPropertiesToDefault(
- const ::std::vector< sal_Int32 > & aHandles )
+ const std::vector< sal_Int32 > & aHandles )
{
- ::std::for_each( aHandles.begin(), aHandles.end(),
+ std::for_each( aHandles.begin(), aHandles.end(),
lcl_eraseMapEntry< sal_Int32, Any >( m_aProperties ) );
}
diff --git a/chart2/source/tools/ImplOPropertySet.hxx b/chart2/source/tools/ImplOPropertySet.hxx
index 0881c89e4ac4..7b4f440c69fb 100644
--- a/chart2/source/tools/ImplOPropertySet.hxx
+++ b/chart2/source/tools/ImplOPropertySet.hxx
@@ -43,10 +43,10 @@ public:
GetPropertyStateByHandle( sal_Int32 nHandle ) const;
css::uno::Sequence< css::beans::PropertyState >
- GetPropertyStatesByHandle( const ::std::vector< sal_Int32 > & aHandles ) const;
+ GetPropertyStatesByHandle( const std::vector< sal_Int32 > & aHandles ) const;
void SetPropertyToDefault( sal_Int32 nHandle );
- void SetPropertiesToDefault( const ::std::vector< sal_Int32 > & aHandles );
+ void SetPropertiesToDefault( const std::vector< sal_Int32 > & aHandles );
void SetAllPropertiesToDefault();
/** @param rValue is set to the value for the property given in nHandle. If
@@ -69,7 +69,7 @@ public:
GetStyle() const { return m_xStyle;}
typedef
- ::std::map< sal_Int32, css::uno::Any >
+ std::map< sal_Int32, css::uno::Any >
tPropertyMap;
private:
diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx
index da87d33a430f..e24695621824 100644
--- a/chart2/source/tools/InternalData.cxx
+++ b/chart2/source/tools/InternalData.cxx
@@ -66,7 +66,7 @@ private:
};
template< typename T >
- Sequence< T > lcl_ValarrayToSequence( const ::std::valarray< T > & rValarray )
+ Sequence< T > lcl_ValarrayToSequence( const std::valarray< T > & rValarray )
{
// is there a more elegant way of conversion?
Sequence< T > aResult( rValarray.size());
@@ -137,7 +137,7 @@ void InternalData::setData( const Sequence< Sequence< double > >& rDataInRows )
for( sal_Int32 nRow=0; nRow<m_nRowCount; ++nRow )
{
int nDataIdx = nRow*m_nColumnCount;
- const sal_Int32 nMax = ::std::min( rDataInRows[nRow].getLength(), m_nColumnCount );
+ const sal_Int32 nMax = std::min( rDataInRows[nRow].getLength(), m_nColumnCount );
for( sal_Int32 nCol=0; nCol < nMax; ++nCol )
{
m_aData[nDataIdx] = rDataInRows[nRow][nCol];
@@ -152,7 +152,7 @@ Sequence< Sequence< double > > InternalData::getData() const
for( sal_Int32 i=0; i<m_nRowCount; ++i )
aResult[i] = lcl_ValarrayToSequence< tDataType::value_type >(
- m_aData[ ::std::slice( i*m_nColumnCount, m_nColumnCount, 1 ) ] );
+ m_aData[ std::slice( i*m_nColumnCount, m_nColumnCount, 1 ) ] );
return aResult;
}
@@ -161,14 +161,14 @@ Sequence< double > InternalData::getColumnValues( sal_Int32 nColumnIndex ) const
{
if( nColumnIndex >= 0 && nColumnIndex < m_nColumnCount )
return lcl_ValarrayToSequence< tDataType::value_type >(
- m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] );
return Sequence< double >();
}
Sequence< double > InternalData::getRowValues( sal_Int32 nRowIndex ) const
{
if( nRowIndex >= 0 && nRowIndex < m_nRowCount )
return lcl_ValarrayToSequence< tDataType::value_type >(
- m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ] );
+ m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ] );
return Sequence< double >();
}
@@ -178,10 +178,10 @@ void InternalData::setColumnValues( sal_Int32 nColumnIndex, const vector< double
return;
enlargeData( nColumnIndex + 1, rNewData.size() );
- tDataType aSlice = m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ];
+ tDataType aSlice = m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ];
for( vector< double >::size_type i = 0; i < rNewData.size(); ++i )
aSlice[i] = rNewData[i];
- m_aData[ ::std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] = aSlice;
+ m_aData[ std::slice( nColumnIndex, m_nRowCount, m_nColumnCount ) ] = aSlice;
}
void InternalData::setRowValues( sal_Int32 nRowIndex, const vector< double > & rNewData )
@@ -190,10 +190,10 @@ void InternalData::setRowValues( sal_Int32 nRowIndex, const vector< double > & r
return;
enlargeData( rNewData.size(), nRowIndex+1 );
- tDataType aSlice = m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ];
+ tDataType aSlice = m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ];
for( vector< double >::size_type i = 0; i < rNewData.size(); ++i )
aSlice[i] = rNewData[i];
- m_aData[ ::std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]= aSlice;
+ m_aData[ std::slice( nRowIndex*m_nColumnCount, m_nColumnCount, 1 ) ]= aSlice;
}
void InternalData::setComplexColumnLabel( sal_Int32 nColumnIndex, const vector< uno::Any >& rComplexLabel )
@@ -279,8 +279,8 @@ void InternalData::swapColumnWithNext( sal_Int32 nColumnIndex )
bool InternalData::enlargeData( sal_Int32 nColumnCount, sal_Int32 nRowCount )
{
- sal_Int32 nNewColumnCount( ::std::max<sal_Int32>( m_nColumnCount, nColumnCount ) );
- sal_Int32 nNewRowCount( ::std::max<sal_Int32>( m_nRowCount, nRowCount ) );
+ sal_Int32 nNewColumnCount( std::max<sal_Int32>( m_nColumnCount, nColumnCount ) );
+ sal_Int32 nNewRowCount( std::max<sal_Int32>( m_nRowCount, nRowCount ) );
sal_Int32 nNewSize( nNewColumnCount*nNewRowCount );
bool bGrow = (nNewSize > m_nColumnCount*m_nRowCount);
@@ -293,8 +293,8 @@ bool InternalData::enlargeData( sal_Int32 nColumnCount, sal_Int32 nRowCount )
// copy old data
for( int nCol=0; nCol<m_nColumnCount; ++nCol )
static_cast< tDataType >(
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] ) =
- m_aData[ ::std::slice( nCol, m_nRowCount, m_nColumnCount ) ];
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] ) =
+ m_aData[ std::slice( nCol, m_nRowCount, m_nColumnCount ) ];
m_aData.resize( nNewSize );
m_aData = aNewData;
@@ -320,13 +320,13 @@ void InternalData::insertColumn( sal_Int32 nAfterIndex )
// copy old data
int nCol=0;
for( ; nCol<=nAfterIndex; ++nCol )
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nCol, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nCol, m_nRowCount, m_nColumnCount ) ] );
for( ++nCol; nCol<nNewColumnCount; ++nCol )
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nCol - 1, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nCol - 1, m_nRowCount, m_nColumnCount ) ] );
m_nColumnCount = nNewColumnCount;
m_aData.resize( nNewSize );
@@ -376,16 +376,16 @@ void InternalData::insertRow( sal_Int32 nAfterIndex )
// copy old data
sal_Int32 nIndex = nAfterIndex + 1;
- aNewData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] =
+ aNewData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] );
+ m_aData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] );
if( nIndex < m_nRowCount )
{
sal_Int32 nRemainingCount = m_nColumnCount * (m_nRowCount - nIndex);
- aNewData[ ::std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] =
+ aNewData[ std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] );
+ m_aData[ std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] );
}
m_nRowCount = nNewRowCount;
@@ -414,13 +414,13 @@ void InternalData::deleteColumn( sal_Int32 nAtIndex )
// copy old data
int nCol=0;
for( ; nCol<nAtIndex; ++nCol )
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nCol, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nCol, m_nRowCount, m_nColumnCount ) ] );
for( ; nCol<nNewColumnCount; ++nCol )
- aNewData[ ::std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
+ aNewData[ std::slice( nCol, m_nRowCount, nNewColumnCount ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( nCol + 1, m_nRowCount, m_nColumnCount ) ] );
+ m_aData[ std::slice( nCol + 1, m_nRowCount, m_nColumnCount ) ] );
m_nColumnCount = nNewColumnCount;
m_aData.resize( nNewSize );
@@ -448,16 +448,16 @@ void InternalData::deleteRow( sal_Int32 nAtIndex )
// copy old data
sal_Int32 nIndex = nAtIndex;
if( nIndex )
- aNewData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] =
+ aNewData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( 0, nIndex * m_nColumnCount, 1 ) ] );
+ m_aData[ std::slice( 0, nIndex * m_nColumnCount, 1 ) ] );
if( nIndex < nNewRowCount )
{
sal_Int32 nRemainingCount = m_nColumnCount * (nNewRowCount - nIndex);
- aNewData[ ::std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] =
+ aNewData[ std::slice( nIndex * m_nColumnCount, nRemainingCount, 1 ) ] =
static_cast< tDataType >(
- m_aData[ ::std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] );
+ m_aData[ std::slice( (nIndex + 1) * m_nColumnCount, nRemainingCount, 1 ) ] );
}
m_nRowCount = nNewRowCount;
@@ -539,7 +539,7 @@ void InternalData::dump() const
for (sal_Int32 nRow = 0; nRow < m_nRowCount; ++nRow)
{
- tDataType aSlice( m_aData[ ::std::slice( nRow*m_nColumnCount, m_nColumnCount, 1 ) ] );
+ tDataType aSlice( m_aData[ std::slice( nRow*m_nColumnCount, m_nColumnCount, 1 ) ] );
for (sal_Int32 nCol = 0; nCol < m_nColumnCount; ++nCol)
aPrinter.set(nRow, nCol, OUString::number(aSlice[nCol]));
}
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 0101867ddbe3..7d3ff92bb828 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -66,7 +66,7 @@ static const char lcl_aCategoriesRoleName[] = "categories";
static const char lcl_aLabelRangePrefix[] = "label ";
static const char lcl_aCompleteRange[] = "all";
-typedef ::std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > >
+typedef std::multimap< OUString, uno::WeakReference< chart2::data::XDataSequence > >
lcl_tSequenceMap;
std::vector< OUString > lcl_AnyToStringSequence( const std::vector< uno::Any >& aAnySeq )
@@ -89,7 +89,7 @@ std::vector< uno::Any > lcl_StringToAnyVector( const css::uno::Sequence< OUStrin
return aResult;
}
-struct lcl_setModified : public ::std::unary_function< lcl_tSequenceMap, void >
+struct lcl_setModified : public std::unary_function< lcl_tSequenceMap, void >
{
void operator() ( const lcl_tSequenceMap::value_type & rMapEntry )
{
@@ -104,7 +104,7 @@ struct lcl_setModified : public ::std::unary_function< lcl_tSequenceMap, void >
}
};
-struct lcl_internalizeSeries : public ::std::unary_function< Reference< chart2::XDataSeries >, void >
+struct lcl_internalizeSeries : public std::unary_function< Reference< chart2::XDataSeries >, void >
{
lcl_internalizeSeries( InternalData & rInternalData,
InternalDataProvider & rProvider,
@@ -133,7 +133,7 @@ struct lcl_internalizeSeries : public ::std::unary_function< Reference< chart2::
if( xValues.is() )
{
- ::std::vector< double > aValues( ContainerHelper::SequenceToVector( xValues->getNumericalData()));
+ std::vector< double > aValues( ContainerHelper::SequenceToVector( xValues->getNumericalData()));
if( m_bDataInColumns )
m_rInternalData.setColumnValues( nNewIndex, aValues );
else
@@ -181,7 +181,7 @@ private:
bool m_bDataInColumns;
};
-struct lcl_copyFromLevel : public ::std::unary_function< vector< uno::Any >, uno::Any >
+struct lcl_copyFromLevel : public std::unary_function< vector< uno::Any >, uno::Any >
{
public:
@@ -200,7 +200,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_getStringFromLevelVector : public ::std::unary_function< vector< uno::Any >, OUString >
+struct lcl_getStringFromLevelVector : public std::unary_function< vector< uno::Any >, OUString >
{
public:
@@ -219,7 +219,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_setAnyAtLevel : public ::std::binary_function< vector< uno::Any >, uno::Any, vector< uno::Any > >
+struct lcl_setAnyAtLevel : public std::binary_function< vector< uno::Any >, uno::Any, vector< uno::Any > >
{
public:
@@ -239,7 +239,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_setAnyAtLevelFromStringSequence : public ::std::binary_function< vector< uno::Any >, OUString, vector< uno::Any > >
+struct lcl_setAnyAtLevelFromStringSequence : public std::binary_function< vector< uno::Any >, OUString, vector< uno::Any > >
{
public:
@@ -259,7 +259,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_insertAnyAtLevel : public ::std::unary_function< vector< uno::Any >, void >
+struct lcl_insertAnyAtLevel : public std::unary_function< vector< uno::Any >, void >
{
public:
@@ -282,7 +282,7 @@ private:
sal_Int32 m_nLevel;
};
-struct lcl_removeAnyAtLevel : public ::std::unary_function< vector< uno::Any >, void >
+struct lcl_removeAnyAtLevel : public std::unary_function< vector< uno::Any >, void >
{
public:
@@ -388,7 +388,7 @@ InternalDataProvider::InternalDataProvider(
}
// data series
- ::std::vector< Reference< chart2::XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartDoc ));
+ std::vector< Reference< chart2::XDataSeries > > aSeriesVector( ChartModelHelper::getDataSeries( xChartDoc ));
lcl_internalizeSeries ftor( m_aInternalData, *this, bConnectToModel, m_bDataInColumns );
for( const auto& rxScreen : aSeriesVector )
ftor( rxScreen );
@@ -459,8 +459,8 @@ void InternalDataProvider::adaptMapReferences(
// erase map values for old index
m_aSequenceMap.erase( aRange.first, aRange.second );
// add new entries for values with new index
- ::std::copy( aNewElements.begin(), aNewElements.end(),
- ::std::inserter( m_aSequenceMap,
+ std::copy( aNewElements.begin(), aNewElements.end(),
+ std::inserter( m_aSequenceMap,
m_aSequenceMap.upper_bound( rNewRangeRepresentation )));
}
@@ -688,7 +688,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
if( aRangeRepresentation == lcl_aCategoriesRangeName )
{
//return split complex categories if we have any:
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aComplexCategories;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aComplexCategories;
vector< vector< uno::Any > > aCategories( m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels());
if( bUseColumns==m_bDataInColumns )
{
@@ -714,7 +714,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
OSL_ASSERT( aRangeRepresentation == lcl_aCompleteRange );
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aResultLSeqVec;
// categories
if( bHasCategories )
@@ -722,7 +722,7 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
new LabeledDataSequence( createDataSequenceAndAddToMap( lcl_aCategoriesRangeName, lcl_aCategoriesRoleName ) ) );
// data with labels
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > > aDataVec;
+ std::vector< Reference< chart2::data::XLabeledDataSequence > > aDataVec;
const sal_Int32 nCount = (bUseColumns ? m_aInternalData.getColumnCount() : m_aInternalData.getRowCount());
for( sal_Int32 nIdx=0; nIdx<nCount; ++nIdx )
{
@@ -753,8 +753,8 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData
}
//add left over data sequences to result
- ::std::vector< Reference< chart2::data::XLabeledDataSequence > >::iterator aIt(aDataVec.begin());
- const ::std::vector< Reference< chart2::data::XLabeledDataSequence > >::const_iterator aEndIt(aDataVec.end());
+ std::vector< Reference< chart2::data::XLabeledDataSequence > >::iterator aIt(aDataVec.begin());
+ const std::vector< Reference< chart2::data::XLabeledDataSequence > >::const_iterator aEndIt(aDataVec.end());
for( ;aIt!=aEndIt; ++aIt)
{
if( aIt->is() )
@@ -1045,14 +1045,14 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel
if( nLevel>0 )
{
vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
- ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_insertAnyAtLevel(nLevel) );
+ std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_insertAnyAtLevel(nLevel) );
if( m_bDataInColumns )
m_aInternalData.setComplexRowLabels( aComplexCategories );
else
m_aInternalData.setComplexColumnLabels( aComplexCategories );
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
}
void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel )
@@ -1061,14 +1061,14 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel
if( nLevel>0 )
{
vector< vector< uno::Any > > aComplexCategories = m_bDataInColumns ? m_aInternalData.getComplexRowLabels() : m_aInternalData.getComplexColumnLabels();
- ::std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_removeAnyAtLevel(nLevel) );
+ std::for_each( aComplexCategories.begin(), aComplexCategories.end(), lcl_removeAnyAtLevel(nLevel) );
if( m_bDataInColumns )
m_aInternalData.setComplexRowLabels( aComplexCategories );
else
m_aInternalData.setComplexColumnLabels( aComplexCategories );
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
}
@@ -1089,10 +1089,10 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32
// notify change to all affected ranges
tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
- ::std::for_each( aBegin, aEnd, lcl_setModified());
+ std::for_each( aBegin, aEnd, lcl_setModified());
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex )
@@ -1112,10 +1112,10 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32
// notify change to all affected ranges
tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
- ::std::for_each( aBegin, aEnd, lcl_setModified());
+ std::for_each( aBegin, aEnd, lcl_setModified());
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex )
@@ -1131,10 +1131,10 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s
// notify change to all affected ranges
tSequenceMap::const_iterator aBegin( m_aSequenceMap.lower_bound( "0"));
tSequenceMap::const_iterator aEnd( m_aSequenceMap.upper_bound( OUString::number( nMaxRep )));
- ::std::for_each( aBegin, aEnd, lcl_setModified());
+ std::for_each( aBegin, aEnd, lcl_setModified());
tSequenceMapRange aRange( m_aSequenceMap.equal_range( lcl_aCategoriesRangeName ));
- ::std::for_each( aRange.first, aRange.second, lcl_setModified());
+ std::for_each( aRange.first, aRange.second, lcl_setModified());
}
void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq )
@@ -1317,7 +1317,7 @@ class SplitCategoriesProvider_ForComplexDescriptions : public SplitCategoriesPro
{
public:
- explicit SplitCategoriesProvider_ForComplexDescriptions( const ::std::vector< ::std::vector< uno::Any > >& rComplexDescriptions )
+ explicit SplitCategoriesProvider_ForComplexDescriptions( const std::vector< std::vector< uno::Any > >& rComplexDescriptions )
: m_rComplexDescriptions( rComplexDescriptions )
{}
@@ -1325,7 +1325,7 @@ public:
virtual uno::Sequence< OUString > getStringsForLevel( sal_Int32 nIndex ) const override;
private:
- const ::std::vector< ::std::vector< uno::Any > >& m_rComplexDescriptions;
+ const std::vector< std::vector< uno::Any > >& m_rComplexDescriptions;
};
sal_Int32 SplitCategoriesProvider_ForComplexDescriptions::getLevelCount() const
diff --git a/chart2/source/tools/LinePropertiesHelper.cxx b/chart2/source/tools/LinePropertiesHelper.cxx
index 6f53e7ead77d..e857d2d9a6ae 100644
--- a/chart2/source/tools/LinePropertiesHelper.cxx
+++ b/chart2/source/tools/LinePropertiesHelper.cxx
@@ -32,7 +32,7 @@ namespace chart
{
void LinePropertiesHelper::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
// Line Properties see service drawing::LineProperties
rOutProperties.push_back(
diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx
index 44fd89e248e8..2aa55ef38d73 100644
--- a/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/chart2/source/tools/ModifyListenerHelper.cxx
@@ -59,8 +59,8 @@ void lcl_fireModifyEvent(
}
}
-struct lcl_weakReferenceToSame : public ::std::unary_function<
- ::std::pair<
+struct lcl_weakReferenceToSame : public std::unary_function<
+ std::pair<
css::uno::WeakReference< css::util::XModifyListener >,
css::uno::Reference< css::util::XModifyListener > >,
bool >
@@ -131,7 +131,7 @@ void ModifyEventForwarder::RemoveListener( const Reference< util::XModifyListene
// look up fitting helper class that has been added
Reference< util::XModifyListener > xListenerToRemove( aListener );
tListenerMap::iterator aIt(
- ::std::find_if( m_aListenerMap.begin(), m_aListenerMap.end(), lcl_weakReferenceToSame( aListener )));
+ std::find_if( m_aListenerMap.begin(), m_aListenerMap.end(), lcl_weakReferenceToSame( aListener )));
if( aIt != m_aListenerMap.end())
{
xListenerToRemove.set( (*aIt).second );
diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx
index dbf192bd6690..5acadad16bee 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -122,7 +122,7 @@ Sequence< beans::PropertyState > SAL_CALL
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ aPropertyName.getLength() ]);
rPH.fillHandles( pHandles.get(), aPropertyName );
- ::std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyName.getLength());
+ std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyName.getLength());
pHandles.reset();
return m_pImplProperties->GetPropertyStatesByHandle( aHandles );
@@ -165,7 +165,7 @@ void SAL_CALL
std::unique_ptr<sal_Int32[]> pHandles(new sal_Int32[ aPropertyNames.getLength() ]);
rPH.fillHandles( pHandles.get(), aPropertyNames );
- ::std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyNames.getLength());
+ std::vector< sal_Int32 > aHandles( pHandles.get(), pHandles.get() + aPropertyNames.getLength());
pHandles.reset();
m_pImplProperties->SetPropertiesToDefault( aHandles );
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 1887477fd418..8741037b6014 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -36,7 +36,7 @@ using ::com::sun::star::uno::Reference;
namespace
{
-struct lcl_EqualsElement : public ::std::unary_function< OUString, bool >
+struct lcl_EqualsElement : public std::unary_function< OUString, bool >
{
explicit lcl_EqualsElement( const Any & rValue, const Reference< container::XNameAccess > & xAccess )
: m_aValue( rValue ), m_xAccess( xAccess )
@@ -62,7 +62,7 @@ private:
Reference< container::XNameAccess > m_xAccess;
};
-struct lcl_StringMatches : public ::std::unary_function< OUString ,bool >
+struct lcl_StringMatches : public std::unary_function< OUString ,bool >
{
explicit lcl_StringMatches( const OUString & rCmpStr ) :
m_aCmpStr( rCmpStr )
@@ -77,7 +77,7 @@ private:
OUString m_aCmpStr;
};
-struct lcl_OUStringRestToInt32 : public ::std::unary_function< OUString, sal_Int32 >
+struct lcl_OUStringRestToInt32 : public std::unary_function< OUString, sal_Int32 >
{
explicit lcl_OUStringRestToInt32( sal_Int32 nPrefixLength ) :
m_nPrefixLength( nPrefixLength )
@@ -119,9 +119,9 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
try
{
Reference< container::XNameAccess > xNameAccess( xNameContainer, uno::UNO_QUERY_THROW );
- ::std::vector< OUString > aNames( ::chart::ContainerHelper::SequenceToVector( xNameAccess->getElementNames()));
- ::std::vector< OUString >::const_iterator aIt(
- ::std::find_if( aNames.begin(), aNames.end(), lcl_EqualsElement( rValue, xNameAccess )));
+ std::vector< OUString > aNames( ::chart::ContainerHelper::SequenceToVector( xNameAccess->getElementNames()));
+ std::vector< OUString >::const_iterator aIt(
+ std::find_if( aNames.begin(), aNames.end(), lcl_EqualsElement( rValue, xNameAccess )));
// element not found in container
if( aIt == aNames.end())
@@ -131,7 +131,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
// check if preferred name is already used
if( !rPreferredName.isEmpty())
{
- aIt = ::std::find( aNames.begin(), aNames.end(), rPreferredName );
+ aIt = std::find( aNames.begin(), aNames.end(), rPreferredName );
if( aIt == aNames.end())
aUniqueName = rPreferredName;
}
@@ -139,14 +139,14 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
if( aUniqueName.isEmpty())
{
// create a unique id using the prefix plus a number
- ::std::vector< sal_Int32 > aNumbers;
- ::std::vector< OUString >::iterator aNonConstIt(
- ::std::partition( aNames.begin(), aNames.end(), lcl_StringMatches( rPrefix )));
- ::std::transform( aNames.begin(), aNonConstIt,
+ std::vector< sal_Int32 > aNumbers;
+ std::vector< OUString >::iterator aNonConstIt(
+ std::partition( aNames.begin(), aNames.end(), lcl_StringMatches( rPrefix )));
+ std::transform( aNames.begin(), aNonConstIt,
back_inserter( aNumbers ),
lcl_OUStringRestToInt32( rPrefix.getLength() ));
- ::std::vector< sal_Int32 >::const_iterator aMaxIt(
- ::std::max_element( aNumbers.begin(), aNumbers.end()));
+ std::vector< sal_Int32 >::const_iterator aMaxIt(
+ std::max_element( aNumbers.begin(), aNumbers.end()));
sal_Int32 nIndex = 1;
if( aMaxIt != aNumbers.end())
diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx
index 13c107a6d2b2..6c7a5d5ae156 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -268,7 +268,7 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface
if( xSource.is() )
{
sal_Int32 nPreferredColor = defaultPreferredColor;
- ::std::vector< chart2::data::HighlightedRange > aHilightedRanges;
+ std::vector< chart2::data::HighlightedRange > aHilightedRanges;
Sequence< Reference< chart2::data::XLabeledDataSequence > > aLSeqSeq( xSource->getDataSequences());
for( sal_Int32 i=0; i<aLSeqSeq.getLength(); ++i )
{
diff --git a/chart2/source/tools/ReferenceSizeProvider.cxx b/chart2/source/tools/ReferenceSizeProvider.cxx
index 036699648163..0510f278762a 100644
--- a/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -95,10 +95,10 @@ void ReferenceSizeProvider::setValuesAtAllDataSeries()
Reference< XDiagram > xDiagram( ChartModelHelper::findDiagram( m_xChartDoc ));
// DataSeries/Points
- ::std::vector< Reference< XDataSeries > > aSeries(
+ std::vector< Reference< XDataSeries > > aSeries(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin());
+ for( std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin());
aIt != aSeries.end(); ++aIt )
{
Reference< beans::XPropertySet > xSeriesProp( *aIt, uno::UNO_QUERY );
@@ -266,10 +266,10 @@ ReferenceSizeProvider::AutoResizeState ReferenceSizeProvider::getAutoResizeState
}
// DataSeries/Points
- ::std::vector< Reference< XDataSeries > > aSeries(
+ std::vector< Reference< XDataSeries > > aSeries(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ));
- for( ::std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin());
+ for( std::vector< Reference< XDataSeries > >::const_iterator aIt( aSeries.begin());
aIt != aSeries.end(); ++aIt )
{
Reference< beans::XPropertySet > xSeriesProp( *aIt, uno::UNO_QUERY );
diff --git a/chart2/source/tools/RegressionCurveHelper.cxx b/chart2/source/tools/RegressionCurveHelper.cxx
index 96b55ec76063..10c6edf7e35f 100644
--- a/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/chart2/source/tools/RegressionCurveHelper.cxx
@@ -407,7 +407,7 @@ bool RegressionCurveHelper::removeAllExceptMeanValueLine(
{
uno::Sequence< uno::Reference< chart2::XRegressionCurve > > aCurves(
xRegCnt->getRegressionCurves());
- ::std::vector< uno::Reference< chart2::XRegressionCurve > > aCurvesToDelete;
+ std::vector< uno::Reference< chart2::XRegressionCurve > > aCurvesToDelete;
for( sal_Int32 i = 0; i < aCurves.getLength(); ++i )
{
if( ! isMeanValueLine( aCurves[i] ))
@@ -416,7 +416,7 @@ bool RegressionCurveHelper::removeAllExceptMeanValueLine(
}
}
- for( ::std::vector< uno::Reference< chart2::XRegressionCurve > >::const_iterator aIt = aCurvesToDelete.begin();
+ for( std::vector< uno::Reference< chart2::XRegressionCurve > >::const_iterator aIt = aCurvesToDelete.begin();
aIt != aCurvesToDelete.end(); ++aIt )
{
xRegCnt->removeRegressionCurve( *aIt );
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 136c687e8174..e90296fc4227 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -66,7 +66,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "PolynomialDegree",
@@ -142,11 +142,11 @@ struct StaticRegressionCurveInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index ab13afc027a1..d72298fee60e 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -58,7 +58,7 @@ enum
};
void lcl_AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "ShowEquation",
@@ -157,14 +157,14 @@ struct StaticRegressionEquationInfoHelper_Initializer
private:
static uno::Sequence< Property > lcl_GetPropertySequence()
{
- ::std::vector< css::beans::Property > aProperties;
+ std::vector< css::beans::Property > aProperties;
lcl_AddPropertiesToVector( aProperties );
::chart::LinePropertiesHelper::AddPropertiesToVector( aProperties );
::chart::FillProperties::AddPropertiesToVector( aProperties );
::chart::CharacterProperties::AddPropertiesToVector( aProperties );
::chart::UserDefinedProperties::AddPropertiesToVector( aProperties );
- ::std::sort( aProperties.begin(), aProperties.end(),
+ std::sort( aProperties.begin(), aProperties.end(),
::chart::PropertyNameLess() );
return comphelper::containerToSequence( aProperties );
diff --git a/chart2/source/tools/SceneProperties.cxx b/chart2/source/tools/SceneProperties.cxx
index a654b8dc01ea..dfe44a0bbc69 100644
--- a/chart2/source/tools/SceneProperties.cxx
+++ b/chart2/source/tools/SceneProperties.cxx
@@ -36,7 +36,7 @@ namespace chart
{
void SceneProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
// transformation matrix
rOutProperties.push_back(
diff --git a/chart2/source/tools/ThreeDHelper.cxx b/chart2/source/tools/ThreeDHelper.cxx
index e9e7c45e7702..b7c448eb7124 100644
--- a/chart2/source/tools/ThreeDHelper.cxx
+++ b/chart2/source/tools/ThreeDHelper.cxx
@@ -1310,7 +1310,7 @@ void ThreeDHelper::getRoundedEdgesAndObjectLines(
drawing::LineStyle aLineStyle( drawing::LineStyle_SOLID );
- ::std::vector< uno::Reference< XDataSeries > > aSeriesList(
+ std::vector< uno::Reference< XDataSeries > > aSeriesList(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() );
@@ -1410,7 +1410,7 @@ void ThreeDHelper::setRoundedEdgesAndObjectLines(
uno::Any aALineStyle( aLineStyle);
uno::Any aARoundedEdges( static_cast< sal_Int16 >( nRoundedEdges ));
- ::std::vector< uno::Reference< XDataSeries > > aSeriesList(
+ std::vector< uno::Reference< XDataSeries > > aSeriesList(
DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
sal_Int32 nSeriesCount = static_cast<sal_Int32>( aSeriesList.size() );
for( sal_Int32 nS = 0; nS < nSeriesCount; ++nS )
diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx
index 3ec0ff23343e..e942b6eaeb5b 100644
--- a/chart2/source/tools/UncachedDataSequence.cxx
+++ b/chart2/source/tools/UncachedDataSequence.cxx
@@ -174,7 +174,7 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData()
{
Sequence< uno::Any > aValues( m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation ));
aResult.realloc( aValues.getLength());
- ::std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(),
+ std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(),
aResult.getArray(), CommonFunctors::AnyToDouble());
}
return aResult;
@@ -189,7 +189,7 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData()
{
Sequence< uno::Any > aValues( m_xDataProvider->getDataByRangeRepresentation( m_aSourceRepresentation ));
aResult.realloc( aValues.getLength());
- ::std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(),
+ std::transform( aValues.getConstArray(), aValues.getConstArray() + aValues.getLength(),
aResult.getArray(), CommonFunctors::AnyToString());
}
return aResult;
diff --git a/chart2/source/tools/UserDefinedProperties.cxx b/chart2/source/tools/UserDefinedProperties.cxx
index 37ce9727e4a6..730b4fc46298 100644
--- a/chart2/source/tools/UserDefinedProperties.cxx
+++ b/chart2/source/tools/UserDefinedProperties.cxx
@@ -30,7 +30,7 @@ namespace chart
{
void UserDefinedProperties::AddPropertiesToVector(
- ::std::vector< Property > & rOutProperties )
+ std::vector< Property > & rOutProperties )
{
rOutProperties.push_back(
Property( "ChartUserDefinedAttributes",
diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx
index 84195460e1a0..f90bc4f248ae 100644
--- a/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -88,7 +88,7 @@ void WrappedIgnoreProperties::addIgnoreFillProperties( std::vector< WrappedPrope
addIgnoreFillProperties_only_BitmapProperties( rList );
}
-void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
+void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties( std::vector< WrappedProperty* >& rList )
{
rList.push_back( new WrappedIgnoreProperty( "FillStyle", uno::Any( drawing::FillStyle_SOLID ) ) );
rList.push_back( new WrappedIgnoreProperty( "FillColor", uno::Any( sal_Int32(-1) ) ) );
@@ -102,7 +102,7 @@ void WrappedIgnoreProperties::addIgnoreFillProperties_without_BitmapProperties(
rList.push_back( new WrappedIgnoreProperty( "FillBackground", uno::Any( false ) ) );
}
-void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( ::std::vector< WrappedProperty* >& rList )
+void WrappedIgnoreProperties::addIgnoreFillProperties_only_BitmapProperties( std::vector< WrappedProperty* >& rList )
{
// rList.push_back( new WrappedIgnoreProperty( "FillBitmapName", uno::Any( OUString() ) ) );
// rList.push_back( new WrappedIgnoreProperty( "FillBitmap", uno::Any( uno::Reference< awt::XBitmap > (0) ) ) );
diff --git a/chart2/source/tools/XMLRangeHelper.cxx b/chart2/source/tools/XMLRangeHelper.cxx
index 3fade3573ece..e537054abd64 100644
--- a/chart2/source/tools/XMLRangeHelper.cxx
+++ b/chart2/source/tools/XMLRangeHelper.cxx
@@ -31,7 +31,7 @@ namespace
array (which you can get from an OUString with getStr()) and puts the result
into the OUStringBuffer given in the CTOR
*/
-class lcl_Escape : public ::std::unary_function< sal_Unicode, void >
+class lcl_Escape : public std::unary_function< sal_Unicode, void >
{
public:
explicit lcl_Escape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
@@ -54,7 +54,7 @@ private:
you can get from an OUString with getStr()) and puts the result into the
OUStringBuffer given in the CTOR
*/
-class lcl_UnEscape : public ::std::unary_function< sal_Unicode, void >
+class lcl_UnEscape : public std::unary_function< sal_Unicode, void >
{
public:
explicit lcl_UnEscape( OUStringBuffer & aResultBuffer ) : m_aResultBuffer( aResultBuffer ) {}
@@ -186,7 +186,7 @@ bool lcl_getCellAddressFromXMLString(
const sal_Unicode * pTableName = rXMLString.getStr();
// remove escapes from table name
- ::std::for_each( pTableName + nStartPos,
+ std::for_each( pTableName + nStartPos,
pTableName + nDelimiterPos,
lcl_UnEscape( aTableNameBuffer ));
@@ -367,7 +367,7 @@ OUString getXMLStringFromCellRange( const CellRange & rRange )
const sal_Unicode * pTableNameBeg = rRange.aTableName.getStr();
// append the quoted string at the buffer
- ::std::for_each( pTableNameBeg,
+ std::for_each( pTableNameBeg,
pTableNameBeg + rRange.aTableName.getLength(),
lcl_Escape( aBuffer ) );
}
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 022025ba8751..1c7016e0e94a 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -353,7 +353,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
double fTempValue = fSourceMinimum;
fSourceMinimum = -fSourceMaximum;
fSourceMaximum = -fTempValue;
- ::std::swap( bAutoMinimum, bAutoMaximum );
+ std::swap( bAutoMinimum, bAutoMaximum );
}
// *** STEP 2: find temporary (unrounded) axis minimum and maximum ***
@@ -518,7 +518,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
rExplicitScale.Maximum = 10.0;
}
if( rExplicitScale.Maximum < rExplicitScale.Minimum )
- ::std::swap( rExplicitScale.Maximum, rExplicitScale.Minimum );
+ std::swap( rExplicitScale.Maximum, rExplicitScale.Minimum );
}
//fill explicit sub increment
@@ -773,7 +773,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
double fTempValue = fSourceMinimum;
fSourceMinimum = -fSourceMaximum;
fSourceMaximum = -fTempValue;
- ::std::swap( bAutoMinimum, bAutoMaximum );
+ std::swap( bAutoMinimum, bAutoMaximum );
}
// *** STEP 2: find temporary (unrounded) axis minimum and maximum ***
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 53770dc9b6b2..8178ab8c6edf 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -129,7 +129,7 @@ struct AxisProperties final
*/
sal_Int32 m_nMajorTickmarks;
sal_Int32 m_nMinorTickmarks;
- ::std::vector<TickmarkProperties> m_aTickmarkPropertiesList;
+ std::vector<TickmarkProperties> m_aTickmarkPropertiesList;
VLineProperties m_aLineProperties;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 5dcb9a89bd1a..8a38c8cb1597 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -295,9 +295,9 @@ B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTick
{
awt::Size aSize = AbstractShapeFactory::getSizeAfterRotation( xShape2DText, fRotationAngleDegree );
if(fabs(aStaggerDirection.getX())>fabs(aStaggerDirection.getY()))
- nDistance = ::std::max(nDistance,aSize.Width);
+ nDistance = std::max(nDistance,aSize.Width);
else
- nDistance = ::std::max(nDistance,aSize.Height);
+ nDistance = std::max(nDistance,aSize.Height);
}
}
@@ -1092,8 +1092,8 @@ VCartesianAxis::ScreenPosAndLogicPos VCartesianAxis::getScreenPosAndLogicPos( do
return aRet;
}
-typedef ::std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList;
-struct lcl_LessXPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
+typedef std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList;
+struct lcl_LessXPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
{
inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
{
@@ -1101,7 +1101,7 @@ struct lcl_LessXPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLogicP
}
};
-struct lcl_GreaterYPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
+struct lcl_GreaterYPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
{
inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
{
@@ -1201,14 +1201,14 @@ void VCartesianAxis::get2DAxisMainLine(
{
rAlignment.meAlignment = LABEL_ALIGN_LEFT;
//choose most left positions
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
rAlignment.mfLabelDirection = (fDeltaY < 0) ? -1.0 : 1.0;
}
else
{
rAlignment.meAlignment = LABEL_ALIGN_BOTTOM;
//choose most bottom positions
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
rAlignment.mfLabelDirection = (fDeltaX < 0) ? -1.0 : 1.0;
}
ScreenPosAndLogicPos aBestPos( aPosList[0] );
@@ -1255,14 +1255,14 @@ void VCartesianAxis::get2DAxisMainLine(
{
rAlignment.meAlignment = LABEL_ALIGN_LEFT;
//choose most left positions
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
rAlignment.mfLabelDirection = (fDeltaY < 0) ? -1.0 : 1.0;
}
else
{
rAlignment.meAlignment = LABEL_ALIGN_BOTTOM;
//choose most bottom positions
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
rAlignment.mfLabelDirection = (fDeltaX < 0) ? -1.0 : 1.0;
}
ScreenPosAndLogicPos aBestPos( aPosList[0] );
@@ -1330,7 +1330,7 @@ void VCartesianAxis::get2DAxisMainLine(
aPosList.push_back( getScreenPosAndLogicPos( fXOther, fYOnYPlane, fMinZ ) );
aPosList.push_back( getScreenPosAndLogicPos( fXOnXPlane, fYOther, fMinZ ) );
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
ScreenPosAndLogicPos aBestPos( aPosList[0] );
ScreenPosAndLogicPos aNotSoGoodPos( aPosList[1] );
@@ -1768,7 +1768,7 @@ void VCartesianAxis::createShapes()
pTickFactory2D->updateScreenValues( aComplexTickInfos );
hideIdenticalScreenValues( aComplexTickInfos );
- ::std::vector<TickmarkProperties> aTickmarkPropertiesList;
+ std::vector<TickmarkProperties> aTickmarkPropertiesList;
static bool bIncludeSpaceBetweenTickAndText = false;
sal_Int32 nOffset = static_cast<sal_Int32>(pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties, false, bIncludeSpaceBetweenTickAndText ).getLength());
sal_Int32 nTextLevelCount = getTextLevelCount();
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 02b23221c50a..8da909ffef3f 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -174,7 +174,7 @@ VCartesianGrid::~VCartesianGrid()
m_pPosHelper = nullptr;
}
-void VCartesianGrid::fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList
+void VCartesianGrid::fillLinePropertiesFromGridModel( std::vector<VLineProperties>& rLinePropertiesList
, const Sequence< Reference< beans::XPropertySet > > & rGridPropertiesList )
{
rLinePropertiesList.clear();
@@ -205,7 +205,7 @@ void VCartesianGrid::createShapes()
if(!xGroupShape_Shapes.is())
return;
- ::std::vector<VLineProperties> aLinePropertiesList;
+ std::vector<VLineProperties> aLinePropertiesList;
fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList );
//create all scaled tickmark values
diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx
index dddb629bd6dd..31b6fb878775 100644
--- a/chart2/source/view/axes/VCartesianGrid.hxx
+++ b/chart2/source/view/axes/VCartesianGrid.hxx
@@ -40,7 +40,7 @@ public:
virtual void createShapes() override;
- static void fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList
+ static void fillLinePropertiesFromGridModel( std::vector<VLineProperties>& rLinePropertiesList
, const css::uno::Sequence<
css::uno::Reference< css::beans::XPropertySet > >& rGridPropertiesList );
diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx
index 6eaed3385128..997663b6e325 100644
--- a/chart2/source/view/axes/VPolarAxis.hxx
+++ b/chart2/source/view/axes/VPolarAxis.hxx
@@ -49,7 +49,7 @@ protected:
protected: //member
PolarPlottingPositionHelper* m_pPosHelper;
- ::std::vector< ExplicitIncrementData > m_aIncrements;
+ std::vector< ExplicitIncrementData > m_aIncrements;
};
} //namespace chart
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 9dbc47df44cd..c20f1a68730e 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -105,7 +105,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis(
void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicTarget
, TickInfoArraysType& /* rRadiusTickInfos */
, TickInfoArraysType& rAngleTickInfos
- , const ::std::vector<VLineProperties>& rLinePropertiesList )
+ , const std::vector<VLineProperties>& rLinePropertiesList )
{
Reference< drawing::XShapes > xMainTarget(
this->createGroupShape( xLogicTarget, m_aCID ) );
@@ -159,7 +159,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogicTarget
, TickInfoArraysType& rRadiusTickInfos
, TickInfoArraysType& rAngleTickInfos
- , const ::std::vector<VLineProperties>& rLinePropertiesList )
+ , const std::vector<VLineProperties>& rLinePropertiesList )
{
Reference< drawing::XShapes > xMainTarget(
this->createGroupShape( xLogicTarget, m_aCID ) );
@@ -233,7 +233,7 @@ void VPolarGrid::createShapes()
getAllTickInfos( 0, aAngleTickInfos );
getAllTickInfos( 1, aRadiusTickInfos );
- ::std::vector<VLineProperties> aLinePropertiesList;
+ std::vector<VLineProperties> aLinePropertiesList;
VCartesianGrid::fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList );
//create tick mark line shapes
diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx
index 6d8a128b3210..645c341bf4fc 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -57,14 +57,14 @@ private: //member
css::uno::Sequence<
css::uno::Reference< css::beans::XPropertySet > > m_aGridPropertiesList;//main grid, subgrid, subsubgrid etc
PolarPlottingPositionHelper* m_pPosHelper;
- ::std::vector< ExplicitIncrementData > m_aIncrements;
+ std::vector< ExplicitIncrementData > m_aIncrements;
void getAllTickInfos( sal_Int32 nDimensionIndex, TickInfoArraysType& rAllTickInfos ) const;
void create2DRadiusGrid( const css::uno::Reference<css::drawing::XShapes>& xLogicTarget
, TickInfoArraysType& rRadiusTickInfos
, TickInfoArraysType& rAngleTickInfos
- , const ::std::vector<VLineProperties>& rLinePropertiesList );
+ , const std::vector<VLineProperties>& rLinePropertiesList );
};
} //namespace chart
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx
index e4f2d85da738..bdf23f29751b 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.hxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx
@@ -47,7 +47,7 @@ public:
virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ) override;
- virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override;
+ virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override;
virtual void setExplicitScaleAndIncrement(
const ExplicitScaleData& rScale
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index b0f3fdb63d86..da8a20f3e117 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -531,19 +531,19 @@ void AreaChart::impl_createSeriesShapes()
//the polygon shapes for each series need to be created before
//iterate through all series again to create the series shapes
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex
drawing::PolyPolygonShape3D* pSeriesPoly = nullptr;
@@ -580,20 +580,20 @@ void AreaChart::impl_createSeriesShapes()
namespace
{
-void lcl_reorderSeries( ::std::vector< ::std::vector< VDataSeriesGroup > >& rZSlots )
+void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >& rZSlots )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > > aRet;
+ std::vector< std::vector< VDataSeriesGroup > > aRet;
aRet.reserve( rZSlots.size() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() );
+ std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() );
+ std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() );
for( ; aZIt != aZEnd; ++aZIt )
{
- ::std::vector< VDataSeriesGroup > aXSlot;
+ std::vector< VDataSeriesGroup > aXSlot;
aXSlot.reserve( aZIt->size() );
- ::std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() );
- ::std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() );
+ std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() );
+ std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() );
for( ; aXIt != aXEnd; ++aXIt )
aXSlot.push_back(*aXIt);
@@ -667,14 +667,14 @@ void AreaChart::createShapes()
bool bDateCategory = (m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis());
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
std::vector<std::map< sal_Int32, double > > aLogicYSumMapByX(nEndIndex);//one for each different nAttachedAxisIndex
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end();
//iterate through all x slots in this category to get 100percent sum
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
@@ -715,8 +715,8 @@ void AreaChart::createShapes()
aZSlotIter = m_aZSlots.begin();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
//for the area chart there should be at most one x slot (no side by side stacking available)
//attention different: xSlots are always interpreted as independent areas one behind the other: @todo this doesn't work why not???
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 764dae06a6eb..df796f73e04e 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -451,15 +451,15 @@ void BarChart::createShapes()
//iterate through all x values per indices
for( sal_Int32 nPointIndex = nStartIndex; nPointIndex < nEndIndex; nPointIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
//sum up the values for all series in a complete z zlot per attached axis
- ::std::map< sal_Int32, double > aLogicYSumMap;
+ std::map< sal_Int32, double > aLogicYSumMap;
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
@@ -485,8 +485,8 @@ void BarChart::createShapes()
aZSlotIter = m_aZSlots.begin();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
//iterate through all x slots in this category
double fSlotX=0;
@@ -508,7 +508,7 @@ void BarChart::createShapes()
pPosHelper->updateSeriesCount( aZSlotIter->size() );
double fLogicBaseWidth = pPosHelper->getScaledSlotWidth();
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
// get distance from base value to maximum and minimum
@@ -553,8 +553,8 @@ void BarChart::createShapes()
double fPositiveLogicYForNextSeries = fBaseValue;
double fNegativeLogicYForNextSeries = fBaseValue;
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
@@ -862,12 +862,12 @@ void BarChart::createShapes()
}//next category
if( bDrawConnectionLines )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
BarPositionHelper* pPosHelper = m_pMainPosHelper.get();
if( aXSlotIter != aXSlotEnd )
@@ -883,10 +883,10 @@ void BarChart::createShapes()
//iterate through all x slots in this category
for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index a435ceed43d6..5bb940aa7dc4 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -72,17 +72,17 @@ void BubbleChart::calculateMaximumLogicBubbleSize()
sal_Int32 nEndIndex = VSeriesPlotter::getPointCount();
for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
VDataSeries* pSeries( *aSeriesIter );
@@ -215,19 +215,19 @@ void BubbleChart::createShapes()
//iterate through all x values per indices
for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series
for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex )
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 439ed56ea1ce..58e0f3aac533 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -139,12 +139,12 @@ void CandleStickChart::createShapes()
//iterate through all x values per indices
for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=0; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
sal_Int32 nAttachedAxisIndex = 0;
BarPositionHelper* pPosHelper = m_pMainPosHelper.get();
@@ -163,10 +163,10 @@ void CandleStickChart::createShapes()
//iterate through all x slots in this category
for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 591e4c98969e..c1cebdcc97bd 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -244,19 +244,19 @@ void NetChart::impl_createSeriesShapes()
//the polygon shapes for each series need to be created before
//iterate through all series again to create the series shapes
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex
drawing::PolyPolygonShape3D* pSeriesPoly = nullptr;
@@ -290,20 +290,20 @@ void NetChart::impl_createSeriesShapes()
namespace
{
-void lcl_reorderSeries( ::std::vector< ::std::vector< VDataSeriesGroup > >& rZSlots )
+void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >& rZSlots )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > > aRet;
+ std::vector< std::vector< VDataSeriesGroup > > aRet;
aRet.reserve( rZSlots.size() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() );
+ std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() );
+ std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() );
for( ; aZIt != aZEnd; ++aZIt )
{
- ::std::vector< VDataSeriesGroup > aXSlot;
+ std::vector< VDataSeriesGroup > aXSlot;
aXSlot.reserve( aZIt->size() );
- ::std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() );
- ::std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() );
+ std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() );
+ std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() );
for( ; aXIt != aXEnd; ++aXIt )
aXSlot.push_back(*aXIt);
@@ -375,14 +375,14 @@ void NetChart::createShapes()
//iterate through all x values per indices
for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
std::map< sal_Int32, double > aLogicYSumMap;//one for each different nAttachedAxisIndex
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end();
//iterate through all x slots in this category to get 100percent sum
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
@@ -419,8 +419,8 @@ void NetChart::createShapes()
aZSlotIter = m_aZSlots.begin();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
//for the area chart there should be at most one x slot (no side by side stacking available)
//attention different: xSlots are always interpreted as independent areas one behind the other: @todo this doesn't work why not???
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index a510604d44fc..34001ef1f9f0 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -394,7 +394,7 @@ double PieChart::getMaxOffset()
if( m_aZSlots[0].size()<=0 )
return m_fMaxOffset;
- const ::std::vector< VDataSeries* >& rSeriesList( m_aZSlots[0][0].m_aSeriesVector );
+ const std::vector< VDataSeries* >& rSeriesList( m_aZSlots[0][0].m_aSeriesVector );
if( rSeriesList.size()<=0 )
return m_fMaxOffset;
@@ -511,8 +511,8 @@ void PieChart::createShapes()
///that the radius axis scale is the one with index 0 and the angle axis
///scale is the one with index 1.
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = m_aZSlots[0].begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = m_aZSlots[0].end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = m_aZSlots[0].begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = m_aZSlots[0].end();
///m_bUseRings == true if chart type is `donut`, == false if chart type is
///`pie`; if the chart is of `donut` type we have as many rings as many data
@@ -527,7 +527,7 @@ void PieChart::createShapes()
///the `explodeable` ring is the first one except when the radius axis
///orientation is reversed (always!?) and we are dealing with a donut: in
///such a case the `explodeable` ring is the last one.
- ::std::vector< VDataSeriesGroup >::size_type nExplodeableSlot = 0;
+ std::vector< VDataSeriesGroup >::size_type nExplodeableSlot = 0;
if( m_pPosHelper->isMathematicalOrientationRadius() && m_bUseRings )
nExplodeableSlot = m_aZSlots[0].size()-1;
@@ -552,7 +552,7 @@ void PieChart::createShapes()
{
ShapeParam aParam;
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
if( pSeriesList->size()<=0 )//there should be only one series in each x slot
continue;
VDataSeries* pSeries = (*pSeriesList)[0];
@@ -628,7 +628,7 @@ void PieChart::createShapes()
///property of the current data series entry only for slices
///belonging to the outer ring
aParam.mfExplodePercentage = 0.0;
- bool bDoExplode = ( nExplodeableSlot == static_cast< ::std::vector< VDataSeriesGroup >::size_type >(fSlotX) );
+ bool bDoExplode = ( nExplodeableSlot == static_cast< std::vector< VDataSeriesGroup >::size_type >(fSlotX) );
if(bDoExplode) try
{
xPointProperties->getPropertyValue( "Offset") >>= aParam.mfExplodePercentage;
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index 6ec5356a6eeb..8743bc0d2af8 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -44,7 +44,7 @@ public:
virtual void createShapes() override;
virtual void rearrangeLabelToAvoidOverlapIfRequested( const css::awt::Size& rPageSize ) override;
- virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override;
+ virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override;
virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override;
virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override;
@@ -134,7 +134,7 @@ private: //member
css::awt::Point aPreviousPosition;
};
- ::std::vector< PieLabelInfo > m_aLabelInfoList;
+ std::vector< PieLabelInfo > m_aLabelInfoList;
double m_fMaxOffset; /// cached max offset value (init'ed to NaN)
};
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index a06a76a2be8f..ca8051155164 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -33,8 +33,8 @@ using namespace ::com::sun::star;
namespace
{
-typedef ::std::pair< double, double > tPointType;
-typedef ::std::vector< tPointType > tPointVecType;
+typedef std::pair< double, double > tPointType;
+typedef std::vector< tPointType > tPointVecType;
typedef tPointVecType::size_type lcl_tSizeType;
class lcl_SplineCalculation
@@ -76,7 +76,7 @@ private:
tPointVecType m_aPoints;
/// the result of the Calculate() method
- ::std::vector< double > m_aSecDerivY;
+ std::vector< double > m_aSecDerivY;
double m_fYp1;
double m_fYpN;
@@ -146,7 +146,7 @@ void lcl_SplineCalculation::Calculate()
// n is the last valid index to m_aPoints
const lcl_tSizeType n = m_aPoints.size() - 1;
- ::std::vector< double > u( n );
+ std::vector< double > u( n );
m_aSecDerivY.resize( n + 1, 0.0 );
if( ::rtl::math::isInf( m_fYp1 ) )
@@ -219,25 +219,25 @@ void lcl_SplineCalculation::CalculatePeriodic()
// u is used for vector f in A*c=f in [3], vector a in Ax=a in [2],
// vector z in Rtranspose z = a and Dr=z in [2]
- ::std::vector< double > u( n + 1, 0.0 );
+ std::vector< double > u( n + 1, 0.0 );
// used for vector c in A*c=f and vector x in Ax=a in [2]
m_aSecDerivY.resize( n + 1, 0.0 );
// diagonal of matrix A, used index 1 to n
- ::std::vector< double > Adiag( n + 1, 0.0 );
+ std::vector< double > Adiag( n + 1, 0.0 );
// secondary diagonal of matrix A with index 1 to n-1 and upper right element in A[n]
- ::std::vector< double > Aupper( n + 1, 0.0 );
+ std::vector< double > Aupper( n + 1, 0.0 );
// diagonal of matrix D in A=(R transpose)*D*R in [2], used index 1 to n
- ::std::vector< double > Ddiag( n+1, 0.0 );
+ std::vector< double > Ddiag( n+1, 0.0 );
// right column of matrix R, used index 1 to n-2
- ::std::vector< double > Rright( n-1, 0.0 );
+ std::vector< double > Rright( n-1, 0.0 );
// secondary diagonal of matrix R, used index 1 to n-1
- ::std::vector< double > Rupper( n, 0.0 );
+ std::vector< double > Rupper( n, 0.0 );
if (n<4)
{
@@ -557,7 +557,7 @@ void SplineCalculater::CalculateCubicSplines(
const double* pOldY = rInput.SequenceY[nOuter].getConstArray();
const double* pOldZ = rInput.SequenceZ[nOuter].getConstArray();
- ::std::vector < double > aParameter(nMaxIndexPoints+1);
+ std::vector < double > aParameter(nMaxIndexPoints+1);
aParameter[0]=0.0;
for( sal_uInt32 nIndex=1; nIndex<=nMaxIndexPoints; nIndex++ )
{
@@ -703,7 +703,7 @@ void SplineCalculater::CalculateBSplines(
aPointsIn[ i ].first = pOldX[i];
aPointsIn[ i ].second = pOldY[i];
}
- aPointsIn.erase( ::std::unique( aPointsIn.begin(), aPointsIn.end()),
+ aPointsIn.erase( std::unique( aPointsIn.begin(), aPointsIn.end()),
aPointsIn.end() );
// n is the last valid index to the reduced aPointsIn
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index ebdb4f82755c..134a9898e6d4 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -118,8 +118,8 @@ VDataSeriesGroup::~VDataSeriesGroup()
void VDataSeriesGroup::deleteSeries()
{
//delete all data series help objects:
- ::std::vector< VDataSeries* >::const_iterator aIter = m_aSeriesVector.begin();
- const ::std::vector< VDataSeries* >::const_iterator aEnd = m_aSeriesVector.end();
+ std::vector< VDataSeries* >::const_iterator aIter = m_aSeriesVector.begin();
+ const std::vector< VDataSeries* >::const_iterator aEnd = m_aSeriesVector.end();
for( ; aIter != aEnd; ++aIter )
{
delete *aIter;
@@ -158,12 +158,12 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode
VSeriesPlotter::~VSeriesPlotter()
{
//delete all data series help objects:
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
aXSlotIter->deleteSeries();
@@ -209,14 +209,14 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
if(zSlot<0 || zSlot>=static_cast<sal_Int32>(m_aZSlots.size()))
{
//new z slot
- ::std::vector< VDataSeriesGroup > aZSlot;
+ std::vector< VDataSeriesGroup > aZSlot;
aZSlot.push_back( VDataSeriesGroup(pSeries) );
m_aZSlots.push_back( aZSlot );
}
else
{
//existing zslot
- ::std::vector< VDataSeriesGroup >& rXSlots = m_aZSlots[zSlot];
+ std::vector< VDataSeriesGroup >& rXSlots = m_aZSlots[zSlot];
if(xSlot<0 || xSlot>=static_cast<sal_Int32>(rXSlots.size()))
{
@@ -271,18 +271,18 @@ drawing::Direction3D VSeriesPlotter::getPreferredDiagramAspectRatio() const
void VSeriesPlotter::releaseShapes()
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
@@ -1558,12 +1558,12 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu
::rtl::math::setInf(&rfMinimum, false);
::rtl::math::setInf(&rfMaximum, true);
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
double fLocalMinimum, fLocalMaximum;
@@ -1585,12 +1585,12 @@ void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, d
::rtl::math::setInf(&rfMinY, false);
::rtl::math::setInf(&rfMaxY, true);
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
double fLocalMinimum, fLocalMaximum;
@@ -1611,13 +1611,13 @@ sal_Int32 VSeriesPlotter::getPointCount() const
{
sal_Int32 nRet = 0;
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
@@ -1651,8 +1651,8 @@ sal_Int32 VDataSeriesGroup::getPointCount() const
return m_nMaxPointCount;
sal_Int32 nRet = 0;
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter)
{
@@ -1670,8 +1670,8 @@ sal_Int32 VDataSeriesGroup::getPointCount() const
sal_Int32 VDataSeriesGroup::getAttachedAxisIndexForFirstSeries() const
{
sal_Int32 nRet = 0;
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
if( aSeriesIter != aSeriesEnd )
nRet = (*aSeriesIter)->getAttachedAxisIndex();
@@ -1681,10 +1681,10 @@ sal_Int32 VDataSeriesGroup::getAttachedAxisIndexForFirstSeries() const
void VDataSeriesGroup::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const
{
- const ::std::vector< VDataSeries* >* pSeriesList = &this->m_aSeriesVector;
+ const std::vector< VDataSeries* >* pSeriesList = &this->m_aSeriesVector;
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
::rtl::math::setInf(&rfMinimum, false);
::rtl::math::setInf(&rfMaximum, true);
@@ -1916,8 +1916,8 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
::rtl::math::setNan( &fFirstPositiveY );
::rtl::math::setNan( &fFirstNegativeY );
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
- ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
+ std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
if( bSeparateStackingForDifferentSigns )
{
@@ -2063,12 +2063,12 @@ void VSeriesPlotter::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& /
VDataSeries* VSeriesPlotter::getFirstSeries() const
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() );
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() );
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() );
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
if( aXSlotIter != aXSlotEnd )
{
@@ -2086,18 +2086,18 @@ VDataSeries* VSeriesPlotter::getFirstSeries() const
uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const
{
- ::std::vector< OUString > aRetVector;
+ std::vector< OUString > aRetVector;
OUString aRole;
if( m_xChartTypeModel.is() )
aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel();
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() );
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() );
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() );
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
if( aXSlotIter != aXSlotEnd )
{
@@ -2119,13 +2119,13 @@ uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const
namespace
{
-struct lcl_setRefSizeAtSeriesGroup : public ::std::unary_function< VDataSeriesGroup, void >
+struct lcl_setRefSizeAtSeriesGroup : public std::unary_function< VDataSeriesGroup, void >
{
explicit lcl_setRefSizeAtSeriesGroup( awt::Size aRefSize ) : m_aRefSize( aRefSize ) {}
void operator()( VDataSeriesGroup & rGroup )
{
- ::std::vector< VDataSeries* >::iterator aIt( rGroup.m_aSeriesVector.begin());
- const ::std::vector< VDataSeries* >::iterator aEndIt( rGroup.m_aSeriesVector.end());
+ std::vector< VDataSeries* >::iterator aIt( rGroup.m_aSeriesVector.begin());
+ const std::vector< VDataSeries* >::iterator aEndIt( rGroup.m_aSeriesVector.end());
for( ; aIt != aEndIt; ++aIt )
(*aIt)->setPageReferenceSize( m_aRefSize );
}
@@ -2141,8 +2141,8 @@ void VSeriesPlotter::setPageReferenceSize( const css::awt::Size & rPageRefSize )
// set reference size also at all data series
- ::std::vector< VDataSeriesGroup > aSeriesGroups( FlattenVector( m_aZSlots ));
- ::std::for_each( aSeriesGroups.begin(), aSeriesGroups.end(),
+ std::vector< VDataSeriesGroup > aSeriesGroups( FlattenVector( m_aZSlots ));
+ std::for_each( aSeriesGroups.begin(), aSeriesGroups.end(),
lcl_setRefSizeAtSeriesGroup( m_aPageReferenceSize ));
}
@@ -2180,17 +2180,17 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
//iterate through all series
bool bBreak = false;
bool bFirstSeries = true;
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter!=aZSlotEnd && !bBreak; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter!=aXSlotEnd && !bBreak; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter!=aSeriesEnd && !bBreak; ++aSeriesIter )
{
@@ -2232,18 +2232,18 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
return aResult;
}
-::std::vector< VDataSeries* > VSeriesPlotter::getAllSeries()
+std::vector< VDataSeries* > VSeriesPlotter::getAllSeries()
{
- ::std::vector< VDataSeries* > aAllSeries;
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< VDataSeries* > aAllSeries;
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* > aSeriesList = aXSlotIter->m_aSeriesVector;
+ std::vector< VDataSeries* > aSeriesList = aXSlotIter->m_aSeriesVector;
aAllSeries.insert( aAllSeries.end(), aSeriesList.begin(), aSeriesList.end() );
}
}
@@ -2301,9 +2301,9 @@ awt::Size VSeriesPlotter::getPreferredLegendKeyAspectRatio()
bool bSeriesAllowsLines = (getLegendSymbolStyle() == LegendSymbolStyle_LINE);
bool bHasLines = false;
bool bHasDashedLines = false;
- ::std::vector< VDataSeries* > aAllSeries( getAllSeries() );
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = aAllSeries.begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = aAllSeries.end();
+ std::vector< VDataSeries* > aAllSeries( getAllSeries() );
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = aAllSeries.begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = aAllSeries.end();
//iterate through all series
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
diff --git a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
index 3c2baf9b0ed5..303c1c5c8ac9 100644
--- a/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
+++ b/chart2/source/view/inc/MinimumAndMaximumSupplier.hxx
@@ -86,7 +86,7 @@ public:
virtual void setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate ) override;
private:
- typedef ::std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet;
+ typedef std::set< MinimumAndMaximumSupplier* > MinimumAndMaximumSupplierSet;
MinimumAndMaximumSupplierSet m_aMinimumAndMaximumSupplierList;
inline MinimumAndMaximumSupplierSet::iterator begin() { return m_aMinimumAndMaximumSupplierList.begin(); }
diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx
index 8c408328f419..9544cf3b7343 100644
--- a/chart2/source/view/inc/PlotterBase.hxx
+++ b/chart2/source/view/inc/PlotterBase.hxx
@@ -56,7 +56,7 @@ public:
, const OUString& rCID
);
- virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
+ virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix );
diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx
index 99ed5c864492..19c341b061ce 100644
--- a/chart2/source/view/inc/PlottingPositionHelper.hxx
+++ b/chart2/source/view/inc/PlottingPositionHelper.hxx
@@ -49,8 +49,8 @@ public:
virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix);
- virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
- const ::std::vector< ExplicitScaleData >& getScales() const { return m_aScales;}
+ virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis );
+ const std::vector< ExplicitScaleData >& getScales() const { return m_aScales;}
//better performance for big data
inline void setCoordinateSystemResolution( const css::uno::Sequence< sal_Int32 >& rCoordinateSystemResolution );
@@ -111,7 +111,7 @@ public:
void AllowShiftZAxisPos( bool bAllowShift );
protected: //member
- ::std::vector< ExplicitScaleData > m_aScales;
+ std::vector< ExplicitScaleData > m_aScales;
::basegfx::B3DHomMatrix m_aMatrixScreenToScene;
//this is calculated based on m_aScales and m_aMatrixScreenToScene
diff --git a/chart2/source/view/inc/PropertyMapper.hxx b/chart2/source/view/inc/PropertyMapper.hxx
index fbdd90a27be6..5af3b7fdf27b 100644
--- a/chart2/source/view/inc/PropertyMapper.hxx
+++ b/chart2/source/view/inc/PropertyMapper.hxx
@@ -31,8 +31,8 @@
namespace chart
{
-typedef ::std::map< OUString, OUString > tPropertyNameMap;
-typedef ::std::map< OUString, css::uno::Any > tPropertyNameValueMap;
+typedef std::map< OUString, OUString > tPropertyNameMap;
+typedef std::map< OUString, css::uno::Any > tPropertyNameValueMap;
typedef css::uno::Sequence< OUString > tNameSequence;
typedef css::uno::Sequence< css::uno::Any > tAnySequence;
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index 97ceebd16050..b5a404ff2bb3 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -73,9 +73,9 @@ public:
ExplicitCategoriesProvider* getExplicitCategoriesProvider();
// returns a complete scale set for a given dimension and index; for example if nDimensionIndex==1 and nAxisIndex==2 you get returned the secondary x axis, main y axis and main z axis
- ::std::vector< ExplicitScaleData > getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
+ std::vector< ExplicitScaleData > getExplicitScales( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
// returns a complete increment set for a given dimension and index; for example if nDimensionIndex==1 and nAxisIndex==2 you get returned the secondary x axis, main y axis and main z axis
- ::std::vector< ExplicitIncrementData > getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
+ std::vector< ExplicitIncrementData > getExplicitIncrements( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const;
void addMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier );
bool hasMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier );
diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx
index 571d903843dd..de1a3fdd1aa2 100644
--- a/chart2/source/view/inc/VSeriesPlotter.hxx
+++ b/chart2/source/view/inc/VSeriesPlotter.hxx
@@ -97,7 +97,7 @@ public:
, bool bSeparateStackingForDifferentSigns
, double& rfMinimumY, double& rfMaximumY, sal_Int32 nAxisIndex );
- ::std::vector< VDataSeries* > m_aSeriesVector;
+ std::vector< VDataSeries* > m_aSeriesVector;
private:
//cached values
@@ -113,7 +113,7 @@ private:
mutable bool m_bMaxPointCountDirty;
mutable sal_Int32 m_nMaxPointCount;
typedef std::map< sal_Int32, CachedYValues > tCachedYValuesPerAxisIndexMap;
- mutable ::std::vector< tCachedYValuesPerAxisIndexMap > m_aListOfCachedYValues;
+ mutable std::vector< tCachedYValuesPerAxisIndexMap > m_aListOfCachedYValues;
};
class VSeriesPlotter : public PlotterBase, public MinimumAndMaximumSupplier, public LegendEntryProvider
@@ -220,7 +220,7 @@ public:
const css::uno::Reference< css::uno::XComponentContext >& xContext
);
- ::std::vector< VDataSeries* > getAllSeries();
+ std::vector< VDataSeries* > getAllSeries();
// This method creates a series plotter of the requested type; e.g. : return new PieChart ....
static VSeriesPlotter* createSeriesPlotter( const css::uno::Reference< css::chart2::XChartType >& xChartTypeModel
@@ -394,7 +394,7 @@ protected:
css::uno::Reference< css::chart2::XChartType > m_xChartTypeModel;
css::uno::Reference< css::beans::XPropertySet > m_xChartTypeModelProps;
- ::std::vector< ::std::vector< VDataSeriesGroup > > m_aZSlots;
+ std::vector< std::vector< VDataSeriesGroup > > m_aZSlots;
bool m_bCategoryXAxis;//true->xvalues are indices (this would not be necessary if series for category chart wouldn't have x-values)
long m_nTimeResolution;
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 4909b1223239..213d12fec963 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -52,7 +52,7 @@ ChartItemPool::ChartItemPool():
rPoolDefaults[SCHATTR_DATADESCR_WRAP_TEXT - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_WRAP_TEXT);
rPoolDefaults[SCHATTR_DATADESCR_SEPARATOR - SCHATTR_START] = new SfxStringItem(SCHATTR_DATADESCR_SEPARATOR," ");
rPoolDefaults[SCHATTR_DATADESCR_PLACEMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_DATADESCR_PLACEMENT,0);
- rPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, ::std::vector < sal_Int32 >() );
+ rPoolDefaults[SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_DATADESCR_AVAILABLE_PLACEMENTS, std::vector < sal_Int32 >() );
rPoolDefaults[SCHATTR_DATADESCR_NO_PERCENTVALUE - SCHATTR_START] = new SfxBoolItem(SCHATTR_DATADESCR_NO_PERCENTVALUE);
rPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_VALUE - SCHATTR_START] = new SfxUInt32Item(SCHATTR_PERCENT_NUMBERFORMAT_VALUE, 0);
rPoolDefaults[SCHATTR_PERCENT_NUMBERFORMAT_SOURCE - SCHATTR_START] = new SfxBoolItem(SCHATTR_PERCENT_NUMBERFORMAT_SOURCE);
@@ -143,7 +143,7 @@ ChartItemPool::ChartItemPool():
rPoolDefaults[SCHATTR_CLOCKWISE - SCHATTR_START] = new SfxBoolItem( SCHATTR_CLOCKWISE, false );
rPoolDefaults[SCHATTR_MISSING_VALUE_TREATMENT - SCHATTR_START] = new SfxInt32Item(SCHATTR_MISSING_VALUE_TREATMENT, 0);
- rPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, ::std::vector < sal_Int32 >() );
+ rPoolDefaults[SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS - SCHATTR_START] = new SfxIntegerListItem(SCHATTR_AVAILABLE_MISSING_VALUE_TREATMENTS, std::vector < sal_Int32 >() );
rPoolDefaults[SCHATTR_INCLUDE_HIDDEN_CELLS - SCHATTR_START] = new SfxBoolItem(SCHATTR_INCLUDE_HIDDEN_CELLS, true);
rPoolDefaults[SCHATTR_AXIS_FOR_ALL_SERIES - SCHATTR_START] = new SfxInt32Item(SCHATTR_AXIS_FOR_ALL_SERIES, 0);
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index f509436e2092..fce14c83e5b2 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -152,7 +152,7 @@ struct AxisUsage
~AxisUsage();
void addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
- ::std::vector< VCoordinateSystem* > getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
+ std::vector< VCoordinateSystem* > getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex );
sal_Int32 getMaxAxisIndexForDimension( sal_Int32 nDimensionIndex );
void prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex );
@@ -211,9 +211,9 @@ void AxisUsage::addCoordinateSystem( VCoordinateSystem* pCooSys, sal_Int32 nDime
aMaxIndexPerDimension[nDimensionIndex]=nAxisIndex;
}
-::std::vector< VCoordinateSystem* > AxisUsage::getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
+std::vector< VCoordinateSystem* > AxisUsage::getCoordinateSystems( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex )
{
- ::std::vector< VCoordinateSystem* > aRet;
+ std::vector< VCoordinateSystem* > aRet;
tCoordinateSystemMap::const_iterator aIter;
for( aIter = aCoordinateSystems.begin(); aIter!=aCoordinateSystems.end();++aIter )
@@ -357,7 +357,7 @@ private:
/** A map whose key is a `XAxis` interface and the related value is
* an object of `AxisUsage` type.
*/
- ::std::map< uno::Reference< XAxis >, AxisUsage > m_aAxisUsageList;
+ std::map< uno::Reference< XAxis >, AxisUsage > m_aAxisUsageList;
/**
* Max axis index of all dimensions. Currently this can be either 0 or 1
@@ -703,8 +703,8 @@ void SeriesPlotterContainer::initAxisUsageList(const Date& rNullDate)
}
// Determine the highest axis index of all dimensions.
- ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin();
- const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end();
+ std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin();
+ const std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end();
m_nMaxAxisIndex = 0;
for (VCoordinateSystem* pVCooSys : m_rVCooSysList)
{
@@ -797,8 +797,8 @@ void SeriesPlotterContainer::doAutoScaling( ChartModel& rChartModel )
// We need these two containers populated to do auto-scaling. Bail out.
return;
- ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin();
- const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end();
+ std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin();
+ const std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end();
//iterate over the main scales first than secondary axis
for (sal_Int32 nAxisIndex = 0; nAxisIndex <= m_nMaxAxisIndex; ++nAxisIndex)
@@ -842,15 +842,15 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel&
{
//issue #i80518#
- ::std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin();
- const ::std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end();
+ std::map< uno::Reference< XAxis >, AxisUsage >::iterator aAxisIter = m_aAxisUsageList.begin();
+ const std::map< uno::Reference< XAxis >, AxisUsage >::const_iterator aAxisEndIter = m_aAxisUsageList.end();
for( sal_Int32 nAxisIndex=0; nAxisIndex<=m_nMaxAxisIndex; nAxisIndex++ )
{
for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
{
AxisUsage& rAxisUsage = (*aAxisIter).second;
- ::std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex );
+ std::vector< VCoordinateSystem* > aVCooSysList_Y = rAxisUsage.getCoordinateSystems( 1, nAxisIndex );
if( aVCooSysList_Y.empty() )
continue;
@@ -861,8 +861,8 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel&
bool bSeriesAttachedToThisAxis = false;
sal_Int32 nAttachedAxisIndex = -1;
{
- ::std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
- ::std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
+ std::vector< Reference< XDataSeries > > aSeriesVector( DiagramHelper::getDataSeriesFromDiagram( xDiagram ) );
+ std::vector< Reference< XDataSeries > >::const_iterator aIter = aSeriesVector.begin();
for( ; aIter != aSeriesVector.end(); ++aIter )
{
sal_Int32 nCurrentIndex = DataSeriesHelper::getAttachedAxisIndex( *aIter );
@@ -946,7 +946,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel&
for( aAxisIter = m_aAxisUsageList.begin(); aAxisIter != aAxisEndIter; ++aAxisIter )
{
AxisUsage& rAxisUsage = (*aAxisIter).second;
- ::std::vector< VCoordinateSystem* > aVCooSysList = rAxisUsage.getCoordinateSystems(nDimensionIndex,nAxisIndex);
+ std::vector< VCoordinateSystem* > aVCooSysList = rAxisUsage.getCoordinateSystems(nDimensionIndex,nAxisIndex);
size_t nC;
for( nC=0; nC < aVCooSysList.size(); nC++)
{
@@ -1243,10 +1243,10 @@ ChartView::~ChartView()
void ChartView::impl_deleteCoordinateSystems()
{
//delete all coordinate systems
- ::std::vector< VCoordinateSystem* > aVectorToDeleteObjects;
- ::std::swap( aVectorToDeleteObjects, m_aVCooSysList );//#i109770#
- ::std::vector< VCoordinateSystem* >::const_iterator aIter = aVectorToDeleteObjects.begin();
- const ::std::vector< VCoordinateSystem* >::const_iterator aEnd = aVectorToDeleteObjects.end();
+ std::vector< VCoordinateSystem* > aVectorToDeleteObjects;
+ std::swap( aVectorToDeleteObjects, m_aVCooSysList );//#i109770#
+ std::vector< VCoordinateSystem* >::const_iterator aIter = aVectorToDeleteObjects.begin();
+ const std::vector< VCoordinateSystem* >::const_iterator aEnd = aVectorToDeleteObjects.end();
for( ; aIter != aEnd; ++aIter )
{
delete *aIter;
diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx
index 2b4e85555dc7..4a8489425063 100644
--- a/chart2/source/view/main/ShapeFactory.cxx
+++ b/chart2/source/view/main/ShapeFactory.cxx
@@ -209,7 +209,7 @@ uno::Any createPolyPolygon_Cylinder(
double fY2 = fHeight;
if( fHeight<0.0 )
- ::std::swap(fY1,fY2);
+ std::swap(fY1,fY2);
for(sal_Int32 nN = 2; nN--;)
*pInnerSequenceZ++ = 0.0;
@@ -302,8 +302,8 @@ uno::Any createPolyPolygon_Cone( double fHeight, double fRadius, double fTopHeig
if( fHeight<0.0 )
{
- ::std::swap(fX1,fX3);
- ::std::swap(fY1,fY3);
+ std::swap(fX1,fX3);
+ std::swap(fY1,fY3);
}
for(sal_Int32 nN = 2; nN--;)
diff --git a/chart2/source/view/main/VDataSeries.cxx b/chart2/source/view/main/VDataSeries.cxx
index 81e7bd2a2ce1..e9a16e7dbf3a 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -285,7 +285,7 @@ void VDataSeries::doSortByXValues()
if( m_aValues_X.is() && m_aValues_X.Doubles.getLength() )
{
//prepare a vector for sorting
- std::vector< ::std::vector< double > > aTmp;//outer vector are points, inner vector are the different values of the point
+ std::vector< std::vector< double > > aTmp;//outer vector are points, inner vector are the different values of the point
double fNan;
::rtl::math::setNan( & fNan );
sal_Int32 nPointIndex = 0;
@@ -780,7 +780,7 @@ double VDataSeries::getYMeanValue() const
std::unique_ptr<Symbol> getSymbolPropertiesFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
{
- ::std::unique_ptr< Symbol > apSymbolProps( new Symbol() );
+ std::unique_ptr< Symbol > apSymbolProps( new Symbol() );
try
{
if( xProp->getPropertyValue("Symbol") >>= *apSymbolProps )
@@ -926,7 +926,7 @@ uno::Reference<beans::XPropertySet> VDataSeries::getPropertiesOfSeries() const
std::unique_ptr<DataPointLabel> getDataPointLabelFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp )
{
- ::std::unique_ptr< DataPointLabel > apLabel( new DataPointLabel() );
+ std::unique_ptr< DataPointLabel > apLabel( new DataPointLabel() );
try
{
if( !(xProp->getPropertyValue(CHART_UNONAME_LABEL) >>= *apLabel) )
diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx
index 9506b250bda2..5cddb573af95 100644
--- a/chart2/source/view/main/VLegend.cxx
+++ b/chart2/source/view/main/VLegend.cxx
@@ -55,7 +55,7 @@ namespace chart
namespace
{
-typedef ::std::pair< ::chart::tNameSequence, ::chart::tAnySequence > tPropertyValues;
+typedef std::pair< ::chart::tNameSequence, ::chart::tAnySequence > tPropertyValues;
double lcl_CalcViewFontSize(
const Reference< beans::XPropertySet > & xProp,
@@ -148,7 +148,7 @@ awt::Size lcl_createTextShapes(
const std::vector<ViewLegendEntry> & rEntries,
const Reference< lang::XMultiServiceFactory > & xShapeFactory,
const Reference< drawing::XShapes > & xTarget,
- ::std::vector< Reference< drawing::XShape > > & rOutTextShapes,
+ std::vector< Reference< drawing::XShape > > & rOutTextShapes,
const tPropertyValues & rTextProperties )
{
awt::Size aResult;
@@ -178,8 +178,8 @@ awt::Size lcl_createTextShapes(
// adapt max-extent
awt::Size aCurrSize( xEntry->getSize());
- aResult.Width = ::std::max( aResult.Width, aCurrSize.Width );
- aResult.Height = ::std::max( aResult.Height, aCurrSize.Height );
+ aResult.Width = std::max( aResult.Width, aCurrSize.Width );
+ aResult.Height = std::max( aResult.Height, aCurrSize.Height );
rOutTextShapes.push_back( xEntry );
}
@@ -193,7 +193,7 @@ awt::Size lcl_createTextShapes(
}
void lcl_collectColumnWidths( std::vector< sal_Int32 >& rColumnWidths, const sal_Int32 nNumberOfRows, const sal_Int32 nNumberOfColumns,
- const ::std::vector< Reference< drawing::XShape > >& rTextShapes, sal_Int32 nSymbolPlusDistanceWidth )
+ const std::vector< Reference< drawing::XShape > >& rTextShapes, sal_Int32 nSymbolPlusDistanceWidth )
{
rColumnWidths.clear();
sal_Int32 nNumberOfEntries = rTextShapes.size();
@@ -209,14 +209,14 @@ void lcl_collectColumnWidths( std::vector< sal_Int32 >& rColumnWidths, const sal
if( nRow==0 )
rColumnWidths.push_back( nWidth );
else
- rColumnWidths[nColumn] = ::std::max( nWidth, rColumnWidths[nColumn] );
+ rColumnWidths[nColumn] = std::max( nWidth, rColumnWidths[nColumn] );
}
}
}
}
void lcl_collectRowHeighs( std::vector< sal_Int32 >& rRowHeights, const sal_Int32 nNumberOfRows, const sal_Int32 nNumberOfColumns,
- const ::std::vector< Reference< drawing::XShape > >& rTextShapes )
+ const std::vector< Reference< drawing::XShape > >& rTextShapes )
{
// calculate maximum height for each row
// and collect column widths
@@ -231,7 +231,7 @@ void lcl_collectRowHeighs( std::vector< sal_Int32 >& rRowHeights, const sal_Int3
if( nEntry < nNumberOfEntries )
{
awt::Size aTextSize( rTextShapes[ nEntry ]->getSize() );
- nCurrentRowHeight = ::std::max( nCurrentRowHeight, aTextSize.Height );
+ nCurrentRowHeight = std::max( nCurrentRowHeight, aTextSize.Height );
}
}
rRowHeights.push_back( nCurrentRowHeight );
@@ -292,7 +292,7 @@ awt::Size lcl_placeLegendEntries(
*pFrameWidthAny <<= nMaxTextWidth;
}
- ::std::vector< Reference< drawing::XShape > > aTextShapes;
+ std::vector< Reference< drawing::XShape > > aTextShapes;
awt::Size aMaxEntryExtent = lcl_createTextShapes( rEntries, xShapeFactory, xTarget, aTextShapes, rTextProperties );
OSL_ASSERT( aTextShapes.size() == rEntries.size());
@@ -547,7 +547,7 @@ awt::Size lcl_placeLegendEntries(
nCurrentYPos += aRowHeights[ nRow ];
if( nRow+1 < nNumberOfRows )
nCurrentYPos += nYOffset;
- nMaxYPos = ::std::max( nMaxYPos, nCurrentYPos );
+ nMaxYPos = std::max( nMaxYPos, nCurrentYPos );
}
if( bSymbolsLeftSide )
{
diff --git a/cli_ure/source/uno_bridge/cli_base.h b/cli_ure/source/uno_bridge/cli_base.h
index ea07ff0767da..13f1dc7bff36 100644
--- a/cli_ure/source/uno_bridge/cli_base.h
+++ b/cli_ure/source/uno_bridge/cli_base.h
@@ -124,15 +124,15 @@ struct rtl_mem
inline static void operator delete ( void *, void * )
{}
- static inline ::std::unique_ptr< rtl_mem > allocate( ::std::size_t bytes );
+ static inline std::unique_ptr< rtl_mem > allocate( std::size_t bytes );
};
-inline ::std::unique_ptr< rtl_mem > rtl_mem::allocate( ::std::size_t bytes )
+inline std::unique_ptr< rtl_mem > rtl_mem::allocate( std::size_t bytes )
{
void * p = rtl_allocateMemory( bytes );
if (0 == p)
throw BridgeRuntimeError("out of memory!" );
- return ::std::unique_ptr< rtl_mem >( (rtl_mem *)p );
+ return std::unique_ptr< rtl_mem >( (rtl_mem *)p );
}
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index c05d143729de..ea8459596957 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -389,7 +389,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CreateEmbedde
aObjDescr[1].Name = "DefaultParentBaseURL";
aObjDescr[1].Value <<= *pBaseURL;
}
- ::std::copy( rArgs.begin(), rArgs.end(), aObjDescr.getArray() + nExtraArgs );
+ std::copy( rArgs.begin(), rArgs.end(), aObjDescr.getArray() + nExtraArgs );
xObj.set( xFactory->createInstanceInitNew(
rClassId, OUString(), pImpl->mxStorage, rNewName,
aObjDescr ), uno::UNO_QUERY );
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index fcd42c341912..530d799cec5f 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.cxx
@@ -82,15 +82,15 @@ namespace comphelper
class MapEnumerator;
- typedef ::std::map< Any, Any, LessPredicateAdapter > KeyedValues;
+ typedef std::map< Any, Any, LessPredicateAdapter > KeyedValues;
struct MapData
{
Type m_aKeyType;
Type m_aValueType;
- ::std::unique_ptr< KeyedValues > m_pValues;
- ::std::shared_ptr< IKeyPredicateLess > m_pKeyCompare;
+ std::unique_ptr< KeyedValues > m_pValues;
+ std::shared_ptr< IKeyPredicateLess > m_pKeyCompare;
bool m_bMutable;
- ::std::vector< MapEnumerator* > m_aModListeners;
+ std::vector< MapEnumerator* > m_aModListeners;
MapData()
:m_bMutable( true )
@@ -125,7 +125,7 @@ namespace comphelper
static void lcl_revokeMapModificationListener( MapData& _mapData, MapEnumerator& _listener )
{
- for ( ::std::vector< MapEnumerator* >::iterator lookup = _mapData.m_aModListeners.begin();
+ for ( std::vector< MapEnumerator* >::iterator lookup = _mapData.m_aModListeners.begin();
lookup != _mapData.m_aModListeners.end();
++lookup
)
@@ -297,7 +297,7 @@ namespace comphelper
private:
// since we share our mutex with the main map, we need to keep it alive as long as we live
Reference< XInterface > m_xKeepMapAlive;
- ::std::unique_ptr< MapData > m_pMapDataCopy;
+ std::unique_ptr< MapData > m_pMapDataCopy;
MapEnumerator m_aEnumerator;
};
@@ -349,7 +349,7 @@ namespace comphelper
throw IllegalTypeException("Unsupported value type.", *this );
// create the comparator for the KeyType, and throw if the type is not supported
- ::std::unique_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, nullptr ) );
+ std::unique_ptr< IKeyPredicateLess > pComparator( getStandardLessPredicate( aKeyType, nullptr ) );
if ( !pComparator.get() )
throw IllegalTypeException("Unsupported key type.", *this );
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index faf6915f3323..46be1454c8ef 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -75,8 +75,8 @@ struct AttachedObject_Impl
struct AttacherIndex_Impl
{
- ::std::deque< ScriptEventDescriptor > aEventList;
- ::std::deque< AttachedObject_Impl > aObjList;
+ std::deque< ScriptEventDescriptor > aEventList;
+ std::deque< AttachedObject_Impl > aObjList;
};
@@ -84,7 +84,7 @@ class ImplEventAttacherManager
: public WeakImplHelper< XEventAttacherManager, XPersistObject >
{
friend class AttacherAllListener_Impl;
- ::std::deque< AttacherIndex_Impl > aIndex;
+ std::deque< AttacherIndex_Impl > aIndex;
Mutex aLock;
// Container for the ScriptListener
OInterfaceContainerHelper2 aScriptListeners;
@@ -126,7 +126,7 @@ private:
@return
the iterator pointing to the position indicated by the index
*/
- ::std::deque<AttacherIndex_Impl>::iterator implCheckIndex( sal_Int32 _nIndex );
+ std::deque<AttacherIndex_Impl>::iterator implCheckIndex( sal_Int32 _nIndex );
};
@@ -376,12 +376,12 @@ Reference< XIdlReflection > ImplEventAttacherManager::getReflection()
}
-::std::deque< AttacherIndex_Impl >::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex )
+std::deque< AttacherIndex_Impl >::iterator ImplEventAttacherManager::implCheckIndex( sal_Int32 _nIndex )
{
if ( (_nIndex < 0) || (static_cast<sal_uInt32>(_nIndex) >= aIndex.size()) )
throw IllegalArgumentException();
- ::std::deque<AttacherIndex_Impl>::iterator aIt = aIndex.begin() + _nIndex;
+ std::deque<AttacherIndex_Impl>::iterator aIt = aIndex.begin() + _nIndex;
return aIt;
}
@@ -395,9 +395,9 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvent
Guard< Mutex > aGuard( aLock );
// Examine the index and apply the array
- ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
+ std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
- ::std::deque< AttachedObject_Impl > aList = (*aIt).aObjList;
+ std::deque< AttachedObject_Impl > aList = (*aIt).aObjList;
ScriptEventDescriptor aEvt = ScriptEvent;
sal_Int32 nLastDot = aEvt.ListenerType.lastIndexOf('.');
@@ -432,7 +432,7 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents
Guard< Mutex > aGuard( aLock );
// Examine the index and apply the array
- ::std::deque< AttachedObject_Impl > aList = implCheckIndex( nIndex )->aObjList;
+ std::deque< AttachedObject_Impl > aList = implCheckIndex( nIndex )->aObjList;
for( const auto& rObj : aList )
this->detach( nIndex, rObj.xTarget );
@@ -456,9 +456,9 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
{
Guard< Mutex > aGuard( aLock );
- ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
+ std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
- ::std::deque< AttachedObject_Impl > aList = aIt->aObjList;
+ std::deque< AttachedObject_Impl > aList = aIt->aObjList;
for( const auto& rObj : aList )
this->detach( nIndex, rObj.xTarget );
@@ -467,7 +467,7 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
if (nLastDot != -1)
aLstType = aLstType.copy(nLastDot+1);
- ::std::deque< ScriptEventDescriptor >::const_iterator aEvtEnd = aIt->aEventList.end();
+ std::deque< ScriptEventDescriptor >::const_iterator aEvtEnd = aIt->aEventList.end();
for( std::deque< ScriptEventDescriptor >::iterator aEvtIt = aIt->aEventList.begin();
aEvtIt != aEvtEnd;
++aEvtIt )
@@ -489,9 +489,9 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent
void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex )
{
Guard< Mutex > aGuard( aLock );
- ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
+ std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
- ::std::deque< AttachedObject_Impl > aList = aIt->aObjList;
+ std::deque< AttachedObject_Impl > aList = aIt->aObjList;
for( const auto& rObj : aList )
this->detach( nIndex, rObj.xTarget );
aIt->aEventList.clear();
@@ -506,7 +506,7 @@ void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex)
if( nIndex < 0 )
throw IllegalArgumentException();
- if ( static_cast< ::std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() )
+ if ( static_cast< std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() )
aIndex.resize(nIndex+1);
AttacherIndex_Impl aTmp;
@@ -517,9 +517,9 @@ void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex)
void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex)
{
Guard< Mutex > aGuard( aLock );
- ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
+ std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
- ::std::deque< AttachedObject_Impl > aList = aIt->aObjList;
+ std::deque< AttachedObject_Impl > aList = aIt->aObjList;
for( const auto& rObj : aList )
this->detach( nIndex, rObj.xTarget );
@@ -530,7 +530,7 @@ void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex)
Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEvents(sal_Int32 nIndex)
{
Guard< Mutex > aGuard( aLock );
- ::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
+ std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
return comphelper::containerToSequence(aIt->aEventList);
}
@@ -541,7 +541,7 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference
if( nIndex < 0 || !xObject.is() )
throw IllegalArgumentException();
- if( static_cast< ::std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() )
+ if( static_cast< std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() )
{
// read older files
if( nVersion == 1 )
@@ -554,7 +554,7 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference
throw IllegalArgumentException();
}
- ::std::deque< AttacherIndex_Impl >::iterator aCurrentPosition = aIndex.begin() + nIndex;
+ std::deque< AttacherIndex_Impl >::iterator aCurrentPosition = aIndex.begin() + nIndex;
AttachedObject_Impl aTmp;
aTmp.xTarget = xObject;
@@ -600,12 +600,12 @@ void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference
{
Guard< Mutex > aGuard( aLock );
//return;
- if( nIndex < 0 || static_cast< ::std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() || !xObject.is() )
+ if( nIndex < 0 || static_cast< std::deque< AttacherIndex_Impl >::size_type>(nIndex) >= aIndex.size() || !xObject.is() )
throw IllegalArgumentException();
- ::std::deque< AttacherIndex_Impl >::iterator aCurrentPosition = aIndex.begin() + nIndex;
- ::std::deque< AttachedObject_Impl >::iterator aObjEnd = aCurrentPosition->aObjList.end();
- for( ::std::deque< AttachedObject_Impl >::iterator aObjIt = aCurrentPosition->aObjList.begin();
+ std::deque< AttacherIndex_Impl >::iterator aCurrentPosition = aIndex.begin() + nIndex;
+ std::deque< AttachedObject_Impl >::iterator aObjEnd = aCurrentPosition->aObjList.end();
+ for( std::deque< AttachedObject_Impl >::iterator aObjIt = aCurrentPosition->aObjList.begin();
aObjIt != aObjEnd;
++aObjIt )
{
diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx
index 742de12ff6cb..9eeeafc45b29 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/comphelper/source/misc/accessibleeventnotifier.cxx
@@ -33,14 +33,14 @@ using namespace ::comphelper;
namespace
{
- typedef ::std::pair< AccessibleEventNotifier::TClientId,
+ typedef std::pair< AccessibleEventNotifier::TClientId,
AccessibleEventObject > ClientEvent;
- typedef ::std::map< AccessibleEventNotifier::TClientId,
+ typedef std::map< AccessibleEventNotifier::TClientId,
::comphelper::OInterfaceContainerHelper2* > ClientMap;
/// key is the end of the interval, value is the start of the interval
- typedef ::std::map<AccessibleEventNotifier::TClientId,
+ typedef std::map<AccessibleEventNotifier::TClientId,
AccessibleEventNotifier::TClientId> IntervalMap;
struct lclMutex
@@ -51,8 +51,8 @@ namespace
: public rtl::StaticWithInit<IntervalMap, FreeIntervals> {
IntervalMap operator() () {
IntervalMap map;
- map.insert(::std::make_pair(
- ::std::numeric_limits<AccessibleEventNotifier::TClientId>::max(), 1));
+ map.insert(std::make_pair(
+ std::numeric_limits<AccessibleEventNotifier::TClientId>::max(), 1));
return map;
}
};
@@ -73,12 +73,12 @@ namespace
if (lower != rFreeIntervals.end() && lower->first == nId - 1)
{
// add nId by replacing lower with new merged entry
- rFreeIntervals.insert(::std::make_pair(nId, lower->second));
+ rFreeIntervals.insert(std::make_pair(nId, lower->second));
rFreeIntervals.erase(lower);
}
else // otherwise just add new 1-element interval
{
- rFreeIntervals.insert(::std::make_pair(nId, nId));
+ rFreeIntervals.insert(std::make_pair(nId, nId));
}
}
// currently it's not checked whether intervals can be merged now
diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx
index 87a01f21282c..49d6d9326442 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.cxx
@@ -295,8 +295,8 @@ namespace comphelper
if ( !implIsValidRange( nStartIndex, nEndIndex, sText.getLength() ) )
throw IndexOutOfBoundsException();
- sal_Int32 nMinIndex = ::std::min( nStartIndex, nEndIndex );
- sal_Int32 nMaxIndex = ::std::max( nStartIndex, nEndIndex );
+ sal_Int32 nMinIndex = std::min( nStartIndex, nEndIndex );
+ sal_Int32 nMaxIndex = std::max( nStartIndex, nEndIndex );
return sText.copy( nMinIndex, nMaxIndex - nMinIndex );
}
diff --git a/comphelper/source/misc/anycompare.cxx b/comphelper/source/misc/anycompare.cxx
index 5704888a98ef..aa92b70f5309 100644
--- a/comphelper/source/misc/anycompare.cxx
+++ b/comphelper/source/misc/anycompare.cxx
@@ -158,9 +158,9 @@ namespace comphelper
};
- ::std::unique_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
+ std::unique_ptr< IKeyPredicateLess > getStandardLessPredicate( Type const & i_type, Reference< XCollator > const & i_collator )
{
- ::std::unique_ptr< IKeyPredicateLess > pComparator;
+ std::unique_ptr< IKeyPredicateLess > pComparator;
switch ( i_type.getTypeClass() )
{
case TypeClass_CHAR:
diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index ba28772cd194..fe509536ff73 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.cxx
@@ -57,10 +57,10 @@ namespace comphelper
};
- typedef ::std::deque< ProcessableEvent > EventQueue;
+ typedef std::deque< ProcessableEvent > EventQueue;
- struct EqualProcessor : public ::std::unary_function< ProcessableEvent, bool >
+ struct EqualProcessor : public std::unary_function< ProcessableEvent, bool >
{
const ::rtl::Reference< IEventProcessor >& rProcessor;
explicit EqualProcessor( const ::rtl::Reference< IEventProcessor >& _rProcessor ) :rProcessor( _rProcessor ) { }
@@ -104,7 +104,7 @@ namespace comphelper
::osl::MutexGuard aGuard( m_xImpl->aMutex );
// remove all events for this processor
- m_xImpl->aEvents.erase(::std::remove_if( m_xImpl->aEvents.begin(), m_xImpl->aEvents.end(), EqualProcessor( _xProcessor ) ), m_xImpl->aEvents.end());
+ m_xImpl->aEvents.erase(std::remove_if( m_xImpl->aEvents.begin(), m_xImpl->aEvents.end(), EqualProcessor( _xProcessor ) ), m_xImpl->aEvents.end());
}
diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx
index fff86ffff791..face14f70060 100644
--- a/comphelper/source/misc/backupfilehelper.cxx
+++ b/comphelper/source/misc/backupfilehelper.cxx
@@ -554,7 +554,7 @@ namespace
}
};
- typedef ::std::vector< ExtensionInfoEntry > ExtensionInfoEntryVector;
+ typedef std::vector< ExtensionInfoEntry > ExtensionInfoEntryVector;
class ExtensionInfo
{
@@ -1354,7 +1354,7 @@ namespace
namespace
{
- typedef ::std::deque< PackedFileEntry > PackedFileEntryVector;
+ typedef std::deque< PackedFileEntry > PackedFileEntryVector;
class PackedFile
{
@@ -1775,7 +1775,7 @@ namespace comphelper
const sal_uInt16 nConfigNumCopies(static_cast<sal_uInt16>(sTokenOut.toUInt32()));
// limit to range [1..mnMaxAllowedBackups]
- mnNumBackups = ::std::min(::std::max(nConfigNumCopies, mnNumBackups), mnMaxAllowedBackups);
+ mnNumBackups = std::min(std::max(nConfigNumCopies, mnNumBackups), mnMaxAllowedBackups);
}
if (mbActive && rtl::Bootstrap::get("SecureUserConfigMode", sTokenOut))
@@ -1783,7 +1783,7 @@ namespace comphelper
const sal_uInt16 nMode(static_cast<sal_uInt16>(sTokenOut.toUInt32()));
// limit to range [0..2]
- mnMode = ::std::min(nMode, sal_uInt16(2));
+ mnMode = std::min(nMode, sal_uInt16(2));
}
if (mbActive && rtl::Bootstrap::get("SecureUserConfigExtensions", sTokenOut))
diff --git a/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index 3ff9e4a72639..7a66a771b030 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.cxx
@@ -33,7 +33,7 @@ namespace comphelper
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::XInterface;
- typedef ::std::vector< ComponentDescription > ComponentDescriptions;
+ typedef std::vector< ComponentDescription > ComponentDescriptions;
/** implementation for <type>OModule</type>. not threadsafe, has to be guarded by its owner
*/
diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index 241899b9014e..7e8dbb52e24b 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.cxx
@@ -37,7 +37,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons
css::uno::Reference< css::lang::XMultiServiceFactory > xConfigProvider(
css::configuration::theDefaultProvider::get( rxContext ) );
- ::std::vector< css::uno::Any > lParams;
+ std::vector< css::uno::Any > lParams;
css::beans::PropertyValue aParam ;
// set root path
diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 49fc0c3b5807..0ca3c01a55ab 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.cxx
@@ -268,7 +268,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
sal_uInt16 pPassData[16];
memset( pPassData, 0, sizeof(pPassData) );
- sal_Int32 nPassLen = ::std::min< sal_Int32 >( aPassword.getLength(), 15 );
+ sal_Int32 nPassLen = std::min< sal_Int32 >( aPassword.getLength(), 15 );
memcpy( pPassData, aPassword.getStr(), nPassLen * sizeof(pPassData[0]) );
aResultKey = GenerateStd97Key( pPassData, aDocId );
@@ -350,7 +350,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
const Reference< XInteractionHandler >& rxInteractHandler,
const OUString& rDocumentUrl,
DocPasswordRequestType eRequestType,
- const ::std::vector< OUString >* pDefaultPasswords,
+ const std::vector< OUString >* pDefaultPasswords,
bool* pbIsDefaultPassword )
{
css::uno::Sequence< css::beans::NamedValue > aEncData;
@@ -361,7 +361,7 @@ Sequence< sal_Int8 > DocPasswordHelper::GetXLHashAsSequence(
*pbIsDefaultPassword = false;
if( pDefaultPasswords )
{
- for( ::std::vector< OUString >::const_iterator aIt = pDefaultPasswords->begin(), aEnd = pDefaultPasswords->end(); (eResult == DocPasswordVerifierResult::WrongPassword) && (aIt != aEnd); ++aIt )
+ for( std::vector< OUString >::const_iterator aIt = pDefaultPasswords->begin(), aEnd = pDefaultPasswords->end(); (eResult == DocPasswordVerifierResult::WrongPassword) && (aIt != aEnd); ++aIt )
{
OSL_ENSURE( !aIt->isEmpty(), "DocPasswordHelper::requestAndVerifyDocPassword - unexpected empty default password" );
if( !aIt->isEmpty() )
diff --git a/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index ff47011808a3..4e1471186d6e 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.cxx
@@ -155,9 +155,9 @@ namespace comphelper
}
- ::std::vector< OUString > NamedValueCollection::getNames() const
+ std::vector< OUString > NamedValueCollection::getNames() const
{
- ::std::vector< OUString > aNames;
+ std::vector< OUString > aNames;
for ( NamedValueRepository::const_iterator it = m_pImpl->aValues.begin(), end = m_pImpl->aValues.end(); it != end; ++it )
{
aNames.push_back( it->first );
@@ -314,7 +314,7 @@ namespace comphelper
namespace
{
- struct Value2PropertyValue : public ::std::unary_function< NamedValueRepository::value_type, PropertyValue >
+ struct Value2PropertyValue : public std::unary_function< NamedValueRepository::value_type, PropertyValue >
{
PropertyValue operator()( const NamedValueRepository::value_type& _rValue )
{
@@ -323,7 +323,7 @@ namespace comphelper
}
};
- struct Value2NamedValue : public ::std::unary_function< NamedValueRepository::value_type, NamedValue >
+ struct Value2NamedValue : public std::unary_function< NamedValueRepository::value_type, NamedValue >
{
NamedValue operator()( const NamedValueRepository::value_type& _rValue )
{
@@ -336,7 +336,7 @@ namespace comphelper
sal_Int32 NamedValueCollection::operator >>= ( Sequence< PropertyValue >& _out_rValues ) const
{
_out_rValues.realloc( m_pImpl->aValues.size() );
- ::std::transform( m_pImpl->aValues.begin(), m_pImpl->aValues.end(), _out_rValues.getArray(), Value2PropertyValue() );
+ std::transform( m_pImpl->aValues.begin(), m_pImpl->aValues.end(), _out_rValues.getArray(), Value2PropertyValue() );
return _out_rValues.getLength();
}
@@ -344,7 +344,7 @@ namespace comphelper
sal_Int32 NamedValueCollection::operator >>= ( Sequence< NamedValue >& _out_rValues ) const
{
_out_rValues.realloc( m_pImpl->aValues.size() );
- ::std::transform( m_pImpl->aValues.begin(), m_pImpl->aValues.end(), _out_rValues.getArray(), Value2NamedValue() );
+ std::transform( m_pImpl->aValues.begin(), m_pImpl->aValues.end(), _out_rValues.getArray(), Value2NamedValue() );
return _out_rValues.getLength();
}
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index 45afaa32e4ae..6ebfe0c11e39 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.cxx
@@ -182,7 +182,7 @@ OUString SAL_CALL NumberedCollection::getUntitledPrefix()
::sal_Int32 NumberedCollection::impl_searchFreeNumber ()
{
// create ordered list of all possible numbers.
- ::std::vector< ::sal_Int32 > lPossibleNumbers;
+ std::vector< ::sal_Int32 > lPossibleNumbers;
::sal_Int32 c = (::sal_Int32)m_lComponents.size ();
::sal_Int32 i = 1;
@@ -212,7 +212,7 @@ OUString SAL_CALL NumberedCollection::getUntitledPrefix()
continue;
}
- ::std::vector< ::sal_Int32 >::iterator pPossible = ::std::find(lPossibleNumbers.begin (), lPossibleNumbers.end (), rItem.nNumber);
+ std::vector< ::sal_Int32 >::iterator pPossible = std::find(lPossibleNumbers.begin (), lPossibleNumbers.end (), rItem.nNumber);
if (pPossible != lPossibleNumbers.end ())
lPossibleNumbers.erase (pPossible);
}
diff --git a/comphelper/source/misc/simplefileaccessinteraction.cxx b/comphelper/source/misc/simplefileaccessinteraction.cxx
index 5f59921ae7de..2d0cf5de5ca1 100644
--- a/comphelper/source/misc/simplefileaccessinteraction.cxx
+++ b/comphelper/source/misc/simplefileaccessinteraction.cxx
@@ -32,7 +32,7 @@ static const sal_Int32 HANDLE_AUTHENTICATIONREQUEST = 4;
SimpleFileAccessInteraction::SimpleFileAccessInteraction(
const css::uno::Reference< css::task::XInteractionHandler >& xHandler )
{
- ::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions;
+ std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions;
::ucbhelper::InterceptedInteraction::InterceptedRequest aInterceptedRequest;
//intercept standard IO error exception (local file and WebDAV)
diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx
index f4fdf76c3ae5..a211229baad0 100644
--- a/comphelper/source/misc/stillreadwriteinteraction.cxx
+++ b/comphelper/source/misc/stillreadwriteinteraction.cxx
@@ -40,7 +40,7 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference<
, m_bHandledByInternalHandler(false)
, m_xAuxiliaryHandler(xAuxiliaryHandler)
{
- ::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions;
+ std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions;
::ucbhelper::InterceptedInteraction::InterceptedRequest aInterceptedRequest;
aInterceptedRequest.Handle = HANDLE_INTERACTIVEIOEXCEPTION;
@@ -69,7 +69,7 @@ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference<
void StillReadWriteInteraction::resetInterceptions()
{
- setInterceptions(::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest >());
+ setInterceptions(std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest >());
}
void StillReadWriteInteraction::resetErrorStates()
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index c07e8c56b2c0..a2e4abdc7a14 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.cxx
@@ -86,10 +86,10 @@ namespace comphelper
&& (_rArguments[1] >>= AllowEmptyPropertyName)
&& (_rArguments[2] >>= AutomaticAddition))
{
- ::std::copy(
+ std::copy(
aTypes.getConstArray(),
aTypes.getConstArray() + aTypes.getLength(),
- ::std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() )
+ std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() )
);
m_bAutoAddProperties = AutomaticAddition;
@@ -97,10 +97,10 @@ namespace comphelper
::comphelper::NamedValueCollection aArguments( _rArguments );
if ( aArguments.get_ensureType( "AllowedTypes", aTypes ) )
- ::std::copy(
+ std::copy(
aTypes.getConstArray(),
aTypes.getConstArray() + aTypes.getLength(),
- ::std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() )
+ std::insert_iterator< TypeBag >( m_aAllowedTypes, m_aAllowedTypes.begin() )
);
aArguments.get_ensureType( "AutomaticAddition", m_bAutoAddProperties );
@@ -350,7 +350,7 @@ namespace comphelper
namespace
{
- struct ComparePropertyValueByName : public ::std::binary_function< PropertyValue, PropertyValue, bool >
+ struct ComparePropertyValueByName : public std::binary_function< PropertyValue, PropertyValue, bool >
{
bool operator()( const PropertyValue& _rLHS, const PropertyValue& _rRHS )
{
@@ -359,7 +359,7 @@ namespace comphelper
};
template< typename CLASS >
- struct TransformPropertyToName : public ::std::unary_function< CLASS, OUString >
+ struct TransformPropertyToName : public std::unary_function< CLASS, OUString >
{
const OUString& operator()( const CLASS& _rProp )
{
@@ -367,7 +367,7 @@ namespace comphelper
}
};
- struct ExtractPropertyValue : public ::std::unary_function< PropertyValue, Any >
+ struct ExtractPropertyValue : public std::unary_function< PropertyValue, Any >
{
const Any& operator()( const PropertyValue& _rProp )
{
@@ -387,7 +387,7 @@ namespace comphelper
// their names
Sequence< OUString > aNames( aProperties.getLength() );
- ::std::transform(
+ std::transform(
aProperties.getConstArray(),
aProperties.getConstArray() + aProperties.getLength(),
aNames.getArray(),
@@ -436,7 +436,7 @@ namespace comphelper
{
// sort (the XMultiPropertySet interface requires this)
Sequence< PropertyValue > aProperties( _rProps );
- ::std::sort(
+ std::sort(
aProperties.getArray(),
aProperties.getArray() + aProperties.getLength(),
ComparePropertyValueByName()
@@ -444,7 +444,7 @@ namespace comphelper
// a sequence of names
Sequence< OUString > aNames( aProperties.getLength() );
- ::std::transform(
+ std::transform(
aProperties.getConstArray(),
aProperties.getConstArray() + aProperties.getLength(),
aNames.getArray(),
@@ -489,7 +489,7 @@ namespace comphelper
// a sequence of values
Sequence< Any > aValues( aProperties.getLength() );
- ::std::transform(
+ std::transform(
aProperties.getConstArray(),
aProperties.getConstArray() + aProperties.getLength(),
aValues.getArray(),
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 678c457b563f..df08b946d349 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.hxx
@@ -44,7 +44,7 @@ namespace comphelper
{
- struct UnoTypeLess : public ::std::unary_function< css::uno::Type, bool >
+ struct UnoTypeLess : public std::unary_function< css::uno::Type, bool >
{
inline bool operator()( const css::uno::Type& _rLHS, const css::uno::Type& _rRHS ) const
{
@@ -55,8 +55,8 @@ namespace comphelper
}
};
- typedef ::std::map< sal_Int32, css::uno::Any > MapInt2Any;
- typedef ::std::set< css::uno::Type, UnoTypeLess > TypeBag;
+ typedef std::map< sal_Int32, css::uno::Any > MapInt2Any;
+ typedef std::set< css::uno::Type, UnoTypeLess > TypeBag;
typedef ::cppu::WeakAggImplHelper5 < css::beans::XPropertyBag
, css::util::XModifiable
@@ -73,7 +73,7 @@ namespace comphelper
{
private:
/// our IPropertyArrayHelper implementation
- ::std::unique_ptr< ::cppu::OPropertyArrayHelper >
+ std::unique_ptr< ::cppu::OPropertyArrayHelper >
m_pArrayHelper;
::comphelper::PropertyBag
m_aDynamicProperties;
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index 2a7dd2d52537..987fd2e1e323 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.cxx
@@ -51,7 +51,7 @@ namespace comphelper
const Property* lcl_findPropertyByName( const std::vector< Property >& _rProps, const OUString& _rName )
{
Property aNameProp(_rName, 0, Type(), 0);
- auto pResult = ::std::lower_bound(_rProps.begin(), _rProps.end(), aNameProp, PropertyCompareByName());
+ auto pResult = std::lower_bound(_rProps.begin(), _rProps.end(), aNameProp, PropertyCompareByName());
if ( pResult == _rProps.end() || pResult->Name != _rName )
return nullptr;
@@ -67,15 +67,15 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
// merge and sort properties by name, delete duplicates (stable sort ensures delegator properties win)
m_aProperties.insert( m_aProperties.end(), _rProperties.begin(), _rProperties.end() );
m_aProperties.insert( m_aProperties.end(), _rAggProperties.begin(), _rAggProperties.end() );
- ::std::stable_sort( m_aProperties.begin(), m_aProperties.end(), PropertyCompareByName() );
- m_aProperties.erase( ::std::unique(m_aProperties.begin(), m_aProperties.end(),
+ std::stable_sort( m_aProperties.begin(), m_aProperties.end(), PropertyCompareByName() );
+ m_aProperties.erase( std::unique(m_aProperties.begin(), m_aProperties.end(),
[]( const css::beans::Property& x, const css::beans::Property& y ) -> bool { return x.Name == y.Name; } ),
m_aProperties.end() );
m_aProperties.shrink_to_fit();
// fill aDelegatorProps with names from _rProperties for a fast existence check
// different kinds of properties are processed differently
- ::std::unordered_set< OUString, OUStringHash > aDelegatorProps;
+ std::unordered_set< OUString, OUStringHash > aDelegatorProps;
aDelegatorProps.reserve( _rProperties.getLength() );
for( auto &delegateProp: _rProperties )
{
@@ -84,7 +84,7 @@ OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper(
"OPropertyArrayAggregationHelper::OPropertyArrayAggregationHelper: duplicate delegatee property!" );
}
- ::std::unordered_set< sal_Int32 > existingHandles;
+ std::unordered_set< sal_Int32 > existingHandles;
existingHandles.reserve( m_aProperties.size() );
sal_Int32 nAggregateHandle = _nFirstAggregateId;
for ( sal_Int32 nMPLoop = 0; nMPLoop < static_cast< sal_Int32 >( m_aProperties.size() ); ++nMPLoop )
@@ -237,7 +237,7 @@ sal_Int32 OPropertyArrayAggregationHelper::fillHandles(
for( sal_Int32 i = 0; i < nReqLen; ++i )
{
aNameProp.Name = pReqProps[i];
- auto findIter = ::std::lower_bound(m_aProperties.begin(), m_aProperties.end(), aNameProp, PropertyCompareByName());
+ auto findIter = std::lower_bound(m_aProperties.begin(), m_aProperties.end(), aNameProp, PropertyCompareByName());
if ( findIter != m_aProperties.end() )
{
_pHandles[i] = findIter->Handle;
@@ -253,7 +253,7 @@ namespace internal
{
private:
OPropertySetAggregationHelper& m_rAggregationHelper;
- ::std::set< sal_Int32 > m_aProperties;
+ std::set< sal_Int32 > m_aProperties;
sal_Int32 m_nCurrentlyForwarding;
public:
diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index c89804d8bba2..a7533bc9f2bf 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.cxx
@@ -147,7 +147,7 @@ void RemoveProperty(Sequence<Property>& _rProps, const OUString& _rPropName)
// binaere Suche
const Property* pProperties = _rProps.getConstArray();
Property aNameProp(_rPropName, 0, Type(), 0);
- const Property* pResult = ::std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName());
+ const Property* pResult = std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName());
// gefunden ?
if ( pResult && (pResult != pProperties + nLen) && (pResult->Name == _rPropName) )
@@ -165,7 +165,7 @@ void ModifyPropertyAttributes(Sequence<Property>& seqProps, const OUString& sPro
// binaere Suche
Property* pProperties = seqProps.getArray();
Property aNameProp(sPropName, 0, Type(), 0);
- Property* pResult = ::std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName());
+ Property* pResult = std::lower_bound(pProperties, pProperties + nLen, aNameProp, PropertyCompareByName());
// gefunden ?
if ( pResult && (pResult != pProperties + nLen) && (pResult->Name == sPropName) )
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index 019c2b9d5723..b3be3ddbf5ac 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.cxx
@@ -46,7 +46,7 @@ namespace comphelper
namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
- typedef ::std::map< sal_Int32, Any > MapInt2Any;
+ typedef std::map< sal_Int32, Any > MapInt2Any;
struct PropertyBag_Impl
{
PropertyBag_Impl() : m_bAllowEmptyPropertyName(false) { }
diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index adaa6557a860..dcde4190d495 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.cxx
@@ -41,7 +41,7 @@ using namespace ::com::sun::star::beans;
namespace
{
// comparing two property descriptions
- struct PropertyDescriptionHandleCompare : public ::std::binary_function< PropertyDescription, PropertyDescription, bool >
+ struct PropertyDescriptionHandleCompare : public std::binary_function< PropertyDescription, PropertyDescription, bool >
{
bool operator() (const PropertyDescription& x, const PropertyDescription& y) const
{
@@ -49,7 +49,7 @@ namespace
}
};
// comparing two property descriptions (by name)
- struct PropertyDescriptionNameMatch : public ::std::unary_function< PropertyDescription, bool >
+ struct PropertyDescriptionNameMatch : public std::unary_function< PropertyDescription, bool >
{
OUString m_rCompare;
explicit PropertyDescriptionNameMatch( const OUString& _rCompare ) : m_rCompare( _rCompare ) { }
@@ -154,7 +154,7 @@ bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) co
// i.e. registered and revoked even though the XPropertySet has already been
// accessed, a vector is not really the best data structure anymore ...
- ConstPropertiesIterator pos = ::std::find_if(
+ ConstPropertiesIterator pos = std::find_if(
m_aProperties.begin(),
m_aProperties.end(),
PropertyDescriptionNameMatch( _rName )
@@ -188,7 +188,7 @@ void OPropertyContainerHelper::implPushBackProperty(const PropertyDescription& _
}
#endif
- PropertiesIterator pos = ::std::lower_bound(
+ PropertiesIterator pos = std::lower_bound(
m_aProperties.begin(), m_aProperties.end(),
_rProp, ComparePropertyHandles() );
@@ -433,7 +433,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan
PropertyDescription aHandlePropDesc;
aHandlePropDesc.aProperty.Handle = _nHandle;
// search a lower bound
- PropertiesIterator aLowerBound = ::std::lower_bound(
+ PropertiesIterator aLowerBound = std::lower_bound(
m_aProperties.begin(),
m_aProperties.end(),
aHandlePropDesc,
@@ -449,7 +449,7 @@ OPropertyContainerHelper::PropertiesIterator OPropertyContainerHelper::searchHan
const Property& OPropertyContainerHelper::getProperty( const OUString& _rName ) const
{
- ConstPropertiesIterator pos = ::std::find_if(
+ ConstPropertiesIterator pos = std::find_if(
m_aProperties.begin(),
m_aProperties.end(),
PropertyDescriptionNameMatch( _rName )
@@ -478,14 +478,14 @@ void OPropertyContainerHelper::describeProperties(Sequence< Property >& _rProps)
}
// as our property vector is sorted by handles, not by name, we have to sort aOwnProps
- ::std::sort(aOwnProps.getArray(), aOwnProps.getArray() + aOwnProps.getLength(), PropertyCompareByName());
+ std::sort(aOwnProps.getArray(), aOwnProps.getArray() + aOwnProps.getLength(), PropertyCompareByName());
// unfortunately the STL merge function does not allow the output range to overlap one of the input ranges,
// so we need an extra sequence
Sequence< Property > aOutput;
aOutput.realloc(_rProps.getLength() + aOwnProps.getLength());
// do the merge
- ::std::merge( _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(), // input 1
+ std::merge( _rProps.getConstArray(), _rProps.getConstArray() + _rProps.getLength(), // input 1
aOwnProps.getConstArray(), aOwnProps.getConstArray() + aOwnProps.getLength(), // input 2
aOutput.getArray(), // output
PropertyCompareByName() // compare operator
diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx
index 64daa2a14320..7ce9cf2d4752 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.cxx
@@ -50,7 +50,7 @@ struct AttributeList_Impl
// performance improvement during adding
vecAttribute.reserve(20);
}
- ::std::vector<struct TagAttribute_Impl> vecAttribute;
+ std::vector<struct TagAttribute_Impl> vecAttribute;
};
sal_Int16 SAL_CALL AttributeList::getLength()
@@ -78,7 +78,7 @@ OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i)
OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName )
{
- ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
+ std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) {
if( (*ii).sName == sName ) {
@@ -90,7 +90,7 @@ OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName )
OUString SAL_CALL AttributeList::getValueByName(const OUString& sName)
{
- ::std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
+ std::vector<struct TagAttribute_Impl>::iterator ii = m_pImpl->vecAttribute.begin();
for( ; ii != m_pImpl->vecAttribute.end() ; ++ii ) {
if( (*ii).sName == sName ) {
diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx
index 2e8be47952bf..9cf55cb1a351 100644
--- a/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -181,7 +181,7 @@ Sequence< sal_Int8 > OConnectionWrapper::getUnoTunnelImplementationId()
namespace
{
- class TPropertyValueLessFunctor : public ::std::binary_function< css::beans::PropertyValue,css::beans::PropertyValue,bool>
+ class TPropertyValueLessFunctor : public std::binary_function< css::beans::PropertyValue,css::beans::PropertyValue,bool>
{
public:
TPropertyValueLessFunctor()
@@ -212,7 +212,7 @@ void OConnectionWrapper::createUniqueId( const OUString& _rURL
// now we need to sort the properties
PropertyValue* pBegin = _rInfo.getArray();
PropertyValue* pEnd = pBegin + _rInfo.getLength();
- ::std::sort(pBegin,pEnd,TPropertyValueLessFunctor());
+ std::sort(pBegin,pEnd,TPropertyValueLessFunctor());
pBegin = _rInfo.getArray();
pEnd = pBegin + _rInfo.getLength();
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index cada6eeb03e2..30ccbd971eed 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -129,7 +129,7 @@ typedef const sal_Char* StringIteratorT;
struct ParserContext
{
- typedef ::std::stack< std::shared_ptr<ExpressionNode> > OperandStack;
+ typedef std::stack< std::shared_ptr<ExpressionNode> > OperandStack;
// stores a stack of not-yet-evaluated operands. This is used
// by the operators (i.e. '+', '*', 'sin' etc.) to pop their
@@ -426,7 +426,7 @@ std::shared_ptr<ExpressionNode> FunctionParser::parseFunction( const OUString& _
::boost::spirit::space_p ) );
#if (OSL_DEBUG_LEVEL > 0)
- ::std::cout.flush(); // needed to keep stdout and cout in sync
+ std::cout.flush(); // needed to keep stdout and cout in sync
#endif
// input fully congested by the parser?
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index d8d426b1182d..92728dfc1406 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -114,7 +114,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( )
,DataType::INTEGER
,DataType::INTEGER
};
- ::std::vector<std::shared_ptr<ExpressionNode>> aConditions;
+ std::vector<std::shared_ptr<ExpressionNode>> aConditions;
if ( aTypeInfoSettings.getLength() > 1 && ((aTypeInfoSettings.getLength() % 2) == 0) )
{
const Any* pIter = aTypeInfoSettings.getConstArray();
@@ -145,8 +145,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( )
aRow.push_back(new ORowSetValueDecorator(aValue));
}
- ::std::vector<std::shared_ptr<ExpressionNode>>::iterator aIter = aConditions.begin();
- ::std::vector<std::shared_ptr<ExpressionNode>>::const_iterator aEnd = aConditions.end();
+ std::vector<std::shared_ptr<ExpressionNode>>::iterator aIter = aConditions.begin();
+ std::vector<std::shared_ptr<ExpressionNode>>::const_iterator aEnd = aConditions.end();
for (; aIter != aEnd; ++aIter)
{
if ( (*aIter)->evaluate(aRow)->getValue().getBool() )
@@ -258,67 +258,67 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( )
OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( )
{
- return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
+ return callImplMethod(m_sIdentifierQuoteString,std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( )
{
- return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
+ return callImplMethod(m_isCatalogAtStart,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw));
}
OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( )
{
- return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
+ return callImplMethod(m_sCatalogSeparator,std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( )
{
- return callImplMethod(m_supportsCatalogsInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw));
+ return callImplMethod(m_supportsCatalogsInTableDefinitions,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions( )
{
- return callImplMethod(m_supportsSchemasInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw));
+ return callImplMethod(m_supportsSchemasInTableDefinitions,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation( )
{
- return callImplMethod(m_supportsCatalogsInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw));
+ return callImplMethod(m_supportsCatalogsInDataManipulation,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation( )
{
- return callImplMethod(m_supportsSchemasInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw));
+ return callImplMethod(m_supportsSchemasInDataManipulation,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers( )
{
- return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw));
+ return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn( )
{
- return callImplMethod(m_supportsAlterTableWithAddColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw));
+ return callImplMethod(m_supportsAlterTableWithAddColumn,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn( )
{
- return callImplMethod(m_supportsAlterTableWithDropColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw));
+ return callImplMethod(m_supportsAlterTableWithDropColumn,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw));
}
sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements( )
{
- return callImplMethod(m_MaxStatements,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw));
+ return callImplMethod(m_MaxStatements,std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw));
}
sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect( )
{
- return callImplMethod(m_MaxTablesInSelect,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw));
+ return callImplMethod(m_MaxTablesInSelect,std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw));
}
sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers( )
{
- return callImplMethod(m_storesMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw));
+ return callImplMethod(m_storesMixedCaseQuotedIdentifiers,std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw));
}
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index 0adbc7031a48..28c1827075eb 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -36,7 +36,7 @@ OIndexHelper::OIndexHelper( OTableHelper* _pTable) : connectivity::sdbcx::OIndex
, m_pTable(_pTable)
{
construct();
- ::std::vector< OUString> aVector;
+ std::vector< OUString> aVector;
m_pColumns.reset( new OIndexColumns(this,m_aMutex,aVector) );
}
@@ -63,7 +63,7 @@ void OIndexHelper::refreshColumns()
if ( !m_pTable )
return;
- ::std::vector< OUString> aVector;
+ std::vector< OUString> aVector;
if ( !isNew() )
{
::dbtools::OPropertyMap& rPropMap = OMetaConnection::getPropMap();
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 3d19c026ec1d..fcddb7f4caec 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::lang;
OIndexColumns::OIndexColumns( OIndexHelper* _pIndex,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector)
+ const std::vector< OUString> &_rVector)
: connectivity::sdbcx::OCollection(*_pIndex,true,_rMutex,_rVector)
,m_pIndex(_pIndex)
{
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 66a7ccb6078d..0c950b919e24 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -40,7 +40,7 @@ using namespace cppu;
OIndexesHelper::OIndexesHelper(OTableHelper* _pTable,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector
+ const std::vector< OUString> &_rVector
)
: OCollection(*_pTable,true,_rMutex,_rVector)
,m_pTable(_pTable)
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index 783aa533ad92..89d5bf44b3f1 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -52,7 +52,7 @@ void OTableKeyHelper::refreshColumns()
if ( !m_pTable )
return;
- ::std::vector< OUString> aVector;
+ std::vector< OUString> aVector;
if ( !isNew() )
{
aVector = m_aProps->m_aKeyColumnNames;
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 01cdab458112..5e6dca1c3f5d 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -40,7 +40,7 @@ using namespace ::com::sun::star::lang;
OKeyColumnsHelper::OKeyColumnsHelper( OTableKeyHelper* _pKey,
::osl::Mutex& _rMutex,
- const ::std::vector< OUString> &_rVector)
+ const std::vector< OUString> &_rVector)
: connectivity::sdbcx::OCollection(*_pKey,true,_rMutex,_rVector)
,m_pKey(_pKey)
{
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index 829dfd1beb8e..5778e219d121 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -151,7 +151,7 @@ bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, s
if ( nDriverPos > (sal_Int32)m_aBookmarksPositions.size() )
m_aBookmarksPositions.push_back(nDriverPos);
}
- else if ( ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
+ else if ( std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),nDriverPos) == m_aBookmarksPositions.end() )
m_aBookmarksPositions.push_back(nDriverPos);
/*sal_Int32 nDriverPos = m_pHelper->getDriverPos();
if(m_aBookmarks.find(nDriverPos) == m_aBookmarks.end())
@@ -225,13 +225,13 @@ bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,bool _bRetrieveData)
void OSkipDeletedSet::clear()
{
- ::std::vector<sal_Int32>().swap(m_aBookmarksPositions);
+ std::vector<sal_Int32>().swap(m_aBookmarksPositions);
//TInt2IntMap().swap(m_aBookmarks);
}
sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const
{
- ::std::vector<sal_Int32>::const_iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos);
+ std::vector<sal_Int32>::const_iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos);
if ( aFind != m_aBookmarksPositions.end() )
return (aFind - m_aBookmarksPositions.begin()) + 1;
/*TInt2IntMap::const_iterator aFind = m_aBookmarks.find(_nPos);
@@ -245,13 +245,13 @@ void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos)
{
//OSL_ENSURE(m_aBookmarks.find(_nPos) == m_aBookmarks.end(),"OSkipDeletedSet::insertNewPosition: Invalid position");
//m_aBookmarksPositions.push_back(m_aBookmarks.insert(TInt2IntMap::value_type(_nPos,m_aBookmarksPositions.size()+1)).first);
- //OSL_ENSURE(::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos");
+ //OSL_ENSURE(std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos");
m_aBookmarksPositions.push_back(_nPos);
}
void OSkipDeletedSet::deletePosition(sal_Int32 _nBookmark)
{
- ::std::vector<sal_Int32>::iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark);
+ std::vector<sal_Int32>::iterator aFind = std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark);
if ( aFind != m_aBookmarksPositions.end() )
{
//TInt2IntMap::iterator aFind = m_aBookmarks.find(_nPos);
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 2bb5541d0d6d..d1c72e01a921 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -25,7 +25,7 @@
using namespace connectivity;
/// binary_function Functor object for class OSortIndex::TIntValuePairVector::value_type returntype is bool
-struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::value_type,OSortIndex::TIntValuePairVector::value_type,bool>
+struct TKeyValueFunc : std::binary_function<OSortIndex::TIntValuePairVector::value_type,OSortIndex::TIntValuePairVector::value_type,bool>
{
OSortIndex* pIndex;
@@ -35,9 +35,9 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
// return false if compared values are equal otherwise true
inline bool operator()(const OSortIndex::TIntValuePairVector::value_type& lhs,const OSortIndex::TIntValuePairVector::value_type& rhs) const
{
- const ::std::vector<OKeyType>& aKeyType = pIndex->getKeyType();
- ::std::vector<OKeyType>::const_iterator aIter = aKeyType.begin();
- for (::std::vector<sal_Int16>::size_type i=0;aIter != aKeyType.end(); ++aIter,++i)
+ const std::vector<OKeyType>& aKeyType = pIndex->getKeyType();
+ std::vector<OKeyType>::const_iterator aIter = aKeyType.begin();
+ for (std::vector<sal_Int16>::size_type i=0;aIter != aKeyType.end(); ++aIter,++i)
{
const bool bGreater = pIndex->getAscending(i) != TAscendingOrder::ASC;
const bool bLess = !bGreater;
@@ -82,16 +82,16 @@ struct TKeyValueFunc : ::std::binary_function<OSortIndex::TIntValuePairVector::v
::rtl::Reference<OKeySet> pKeySet = new OKeySet();
pKeySet->get().reserve(m_aKeyValues.size());
- ::std::transform(m_aKeyValues.begin()
+ std::transform(m_aKeyValues.begin()
,m_aKeyValues.end()
- ,::std::back_inserter(pKeySet->get())
+ ,std::back_inserter(pKeySet->get())
,::o3tl::select1st<TIntValuePairVector::value_type>());
pKeySet->setFrozen();
return pKeySet;
}
-OSortIndex::OSortIndex( const ::std::vector<OKeyType>& _aKeyType,
- const ::std::vector<TAscendingOrder>& _aAscending)
+OSortIndex::OSortIndex( const std::vector<OKeyType>& _aKeyType,
+ const std::vector<TAscendingOrder>& _aAscending)
:m_aKeyType(_aKeyType)
,m_aAscending(_aAscending)
,m_bFrozen(false)
@@ -120,7 +120,7 @@ void OSortIndex::Freeze()
// Sortierung:
if (m_aKeyType[0] != OKeyType::NONE)
// we will sort ourself when the first keyType say so
- ::std::sort(m_aKeyValues.begin(),m_aKeyValues.end(),TKeyValueFunc(this));
+ std::sort(m_aKeyValues.begin(),m_aKeyValues.end(),TKeyValueFunc(this));
TIntValuePairVector::iterator aIter = m_aKeyValues.begin();
for(;aIter != m_aKeyValues.end();++aIter)
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 7d20c75e7573..3f851a6afd1f 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -57,7 +57,7 @@ class OTableContainerListener:
public ::cppu::WeakImplHelper< XContainerListener >
{
OTableHelper* m_pComponent;
- ::std::map< OUString,bool> m_aRefNames;
+ std::map< OUString,bool> m_aRefNames;
protected:
virtual ~OTableContainerListener() override {}
@@ -89,7 +89,7 @@ public:
{
}
void clear() { m_pComponent = nullptr; }
- inline void add(const OUString& _sRefName) { m_aRefNames.insert(::std::map< OUString,bool>::value_type(_sRefName,true)); }
+ inline void add(const OUString& _sRefName) { m_aRefNames.insert(std::map< OUString,bool>::value_type(_sRefName,true)); }
};
}
namespace connectivity
@@ -116,7 +116,7 @@ namespace connectivity
Reference< css::sdbc::XDatabaseMetaData > m_xMetaData;
Reference< css::sdbc::XConnection > m_xConnection;
rtl::Reference<OTableContainerListener> m_xTablePropertyListener;
- ::std::vector< ColumnDesc > m_aColumnDesc;
+ std::vector< ColumnDesc > m_aColumnDesc;
explicit OTableHelperImpl(const Reference< css::sdbc::XConnection >& _xConnection)
: m_xConnection(_xConnection)
{
@@ -191,7 +191,7 @@ namespace
{
/** collects ColumnDesc's from a resultset produced by XDatabaseMetaData::getColumns
*/
- void lcl_collectColumnDescs_throw( const Reference< XResultSet >& _rxResult, ::std::vector< ColumnDesc >& _out_rColumns )
+ void lcl_collectColumnDescs_throw( const Reference< XResultSet >& _rxResult, std::vector< ColumnDesc >& _out_rColumns )
{
Reference< XRow > xRow( _rxResult, UNO_QUERY_THROW );
OUString sName;
@@ -214,14 +214,14 @@ namespace
/** checks a given array of ColumnDesc's whether it has reasonable ordinal positions. If not,
they will be normalized to be the array index.
*/
- void lcl_sanitizeColumnDescs( ::std::vector< ColumnDesc >& _rColumns )
+ void lcl_sanitizeColumnDescs( std::vector< ColumnDesc >& _rColumns )
{
if ( _rColumns.empty() )
return;
// collect all used ordinals
- ::std::set< OrdinalPosition > aUsedOrdinals;
- for ( ::std::vector< ColumnDesc >::const_iterator collect = _rColumns.begin();
+ std::set< OrdinalPosition > aUsedOrdinals;
+ for ( std::vector< ColumnDesc >::const_iterator collect = _rColumns.begin();
collect != _rColumns.end();
++collect
)
@@ -239,7 +239,7 @@ namespace
OSL_FAIL( "lcl_sanitizeColumnDescs: database did provide invalid ORDINAL_POSITION values!" );
OrdinalPosition nNormalizedPosition = 1;
- for ( ::std::vector< ColumnDesc >::iterator normalize = _rColumns.begin();
+ for ( std::vector< ColumnDesc >::iterator normalize = _rColumns.begin();
normalize != _rColumns.end();
++normalize
)
@@ -250,7 +250,7 @@ namespace
// what's left is that the range might not be from 1 to <column count>, but for instance
// 0 to <column count>-1.
size_t nOffset = *aUsedOrdinals.begin() - 1;
- for ( ::std::vector< ColumnDesc >::iterator offset = _rColumns.begin();
+ for ( std::vector< ColumnDesc >::iterator offset = _rColumns.begin();
offset != _rColumns.end();
++offset
)
@@ -283,19 +283,19 @@ void OTableHelper::refreshColumns()
lcl_sanitizeColumnDescs( m_pImpl->m_aColumnDesc );
// sort by ordinal position
- ::std::map< OrdinalPosition, OUString > aSortedColumns;
- for ( ::std::vector< ColumnDesc >::const_iterator copy = m_pImpl->m_aColumnDesc.begin();
+ std::map< OrdinalPosition, OUString > aSortedColumns;
+ for ( std::vector< ColumnDesc >::const_iterator copy = m_pImpl->m_aColumnDesc.begin();
copy != m_pImpl->m_aColumnDesc.end();
++copy
)
aSortedColumns[ copy->nOrdinalPosition ] = copy->sName;
// copy them to aVector, now that we have the proper ordering
- ::std::transform(
+ std::transform(
aSortedColumns.begin(),
aSortedColumns.end(),
- ::std::insert_iterator< TStringVector >( aVector, aVector.begin() ),
- ::o3tl::select2nd< ::std::map< OrdinalPosition, OUString >::value_type >()
+ std::insert_iterator< TStringVector >( aVector, aVector.begin() ),
+ ::o3tl::select2nd< std::map< OrdinalPosition, OUString >::value_type >()
);
}
@@ -308,15 +308,15 @@ void OTableHelper::refreshColumns()
const ColumnDesc* OTableHelper::getColumnDescription(const OUString& _sName) const
{
const ColumnDesc* pRet = nullptr;
- ::std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end();
- for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
+ std::vector< ColumnDesc >::const_iterator aEnd = m_pImpl->m_aColumnDesc.end();
+ for (std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
{
if ( aIter->sName == _sName )
{
pRet = &*aIter;
break;
}
- } // for (::std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
+ } // for (std::vector< ColumnDesc >::const_iterator aIter = m_pImpl->m_aColumnDesc.begin();aIter != aEnd;++aIter)
return pRet;
}
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index dc3440f66b9d..f883b576ee4d 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -965,7 +965,7 @@ try
if ( pOldProps[i].Name != "DefaultControl" && pOldProps[i].Name != "LabelControl" )
{
// binary search
- Property* pResult = ::std::lower_bound(
+ Property* pResult = std::lower_bound(
pNewProps, pNewProps + nNewLen, pOldProps[i], ::comphelper::PropertyCompareByName());
if ( pResult
@@ -1383,11 +1383,11 @@ sal_Int32 getSearchColumnFlag( const Reference< XConnection>& _rxConn,sal_Int32
OUString createUniqueName( const Sequence< OUString >& _rNames, const OUString& _rBaseName, bool _bStartWithNumber )
{
- ::std::set< OUString > aUsedNames;
- ::std::copy(
+ std::set< OUString > aUsedNames;
+ std::copy(
_rNames.getConstArray(),
_rNames.getConstArray() + _rNames.getLength(),
- ::std::insert_iterator< ::std::set< OUString > >( aUsedNames, aUsedNames.end() )
+ std::insert_iterator< std::set< OUString > >( aUsedNames, aUsedNames.end() )
);
OUString sName( _rBaseName );
@@ -1630,10 +1630,10 @@ namespace
{
class OParameterWrapper : public ::cppu::WeakImplHelper< XIndexAccess >
{
- ::std::vector<bool, std::allocator<bool> > m_aSet;
+ std::vector<bool, std::allocator<bool> > m_aSet;
Reference<XIndexAccess> m_xSource;
public:
- OParameterWrapper(const ::std::vector<bool, std::allocator<bool> >& _aSet,const Reference<XIndexAccess>& _xSource) : m_aSet(_aSet),m_xSource(_xSource){}
+ OParameterWrapper(const std::vector<bool, std::allocator<bool> >& _aSet,const Reference<XIndexAccess>& _xSource) : m_aSet(_aSet),m_xSource(_xSource){}
private:
// css::container::XElementAccess
virtual Type SAL_CALL getElementType() override
@@ -1644,14 +1644,14 @@ namespace
{
if ( m_aSet.empty() )
return m_xSource->hasElements();
- return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0;
+ return std::count(m_aSet.begin(),m_aSet.end(),false) != 0;
}
// css::container::XIndexAccess
virtual sal_Int32 SAL_CALL getCount( ) override
{
if ( m_aSet.empty() )
return m_xSource->getCount();
- return ::std::count(m_aSet.begin(),m_aSet.end(),false);
+ return std::count(m_aSet.begin(),m_aSet.end(),false);
}
virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override
{
@@ -1660,8 +1660,8 @@ namespace
if ( m_aSet.size() < (size_t)Index )
throw IndexOutOfBoundsException();
- ::std::vector<bool, std::allocator<bool> >::const_iterator aIter = m_aSet.begin();
- ::std::vector<bool, std::allocator<bool> >::const_iterator aEnd = m_aSet.end();
+ std::vector<bool, std::allocator<bool> >::const_iterator aIter = m_aSet.begin();
+ std::vector<bool, std::allocator<bool> >::const_iterator aEnd = m_aSet.end();
sal_Int32 i = 0;
sal_Int32 nParamPos = -1;
for(; aIter != aEnd && i <= Index; ++aIter)
@@ -1681,7 +1681,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
const Reference<XParameters>& _xParameters,
const Reference< XConnection>& _xConnection,
const Reference< XInteractionHandler >& _rxHandler,
- const ::std::vector<bool, std::allocator<bool> >& _aParametersSet)
+ const std::vector<bool, std::allocator<bool> >& _aParametersSet)
{
OSL_ENSURE(_xComposer.is(),"dbtools::askForParameters XSQLQueryComposer is null!");
OSL_ENSURE(_xParameters.is(),"dbtools::askForParameters XParameters is null!");
@@ -1693,12 +1693,12 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
Reference<XIndexAccess> xParamsAsIndicies = xParameters.is() ? xParameters->getParameters() : Reference<XIndexAccess>();
sal_Int32 nParamCount = xParamsAsIndicies.is() ? xParamsAsIndicies->getCount() : 0;
- ::std::vector<bool, std::allocator<bool> > aNewParameterSet( _aParametersSet );
- if ( nParamCount && ::std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
+ std::vector<bool, std::allocator<bool> > aNewParameterSet( _aParametersSet );
+ if ( nParamCount && std::count(aNewParameterSet.begin(),aNewParameterSet.end(),true) != nParamCount )
{
static const OUString PROPERTY_NAME(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME));
aNewParameterSet.resize(nParamCount ,false);
- typedef ::std::map< OUString, ::std::vector<sal_Int32> > TParameterPositions;
+ typedef std::map< OUString, std::vector<sal_Int32> > TParameterPositions;
TParameterPositions aParameterNames;
for(sal_Int32 i = 0; i < nParamCount; ++i)
{
@@ -1758,8 +1758,8 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer,
xParamColumn->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE)) >>= nScale;
// (the index of the parameters is one-based)
TParameterPositions::const_iterator aFind = aParameterNames.find(pFinalValues->Name);
- ::std::vector<sal_Int32>::const_iterator aIterPos = aFind->second.begin();
- ::std::vector<sal_Int32>::const_iterator aEndPos = aFind->second.end();
+ std::vector<sal_Int32>::const_iterator aIterPos = aFind->second.begin();
+ std::vector<sal_Int32>::const_iterator aEndPos = aFind->second.end();
for(;aIterPos != aEndPos;++aIterPos)
{
if ( _aParametersSet.empty() || !_aParametersSet[(*aIterPos)-1] )
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index ba73d0dddf03..43c0b424200e 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -638,9 +638,9 @@ bool isDataSourcePropertyEnabled(const Reference<XInterface>& _xProp, const OUSt
{
Sequence< PropertyValue > aInfo;
xProp->getPropertyValue("Info") >>= aInfo;
- const PropertyValue* pValue =::std::find_if(aInfo.getConstArray(),
+ const PropertyValue* pValue =std::find_if(aInfo.getConstArray(),
aInfo.getConstArray() + aInfo.getLength(),
- ::std::bind2nd(TPropertyValueEqualFunctor(),_sProperty));
+ std::bind2nd(TPropertyValueEqualFunctor(),_sProperty));
if ( pValue && pValue != (aInfo.getConstArray() + aInfo.getLength()) )
pValue->Value >>= bEnabled;
}
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index ad3bf0338f15..2db8bb4e12a0 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -107,7 +107,7 @@ namespace dbtools
m_sIdentifierQuoteString.clear();
m_sSpecialCharacters.clear();
m_xConnectionMetadata.clear();
- ::std::vector< bool > aEmptyArray;
+ std::vector< bool > aEmptyArray;
m_aParametersVisited.swap( aEmptyArray );
m_bUpToDate = false;
}
@@ -240,7 +240,7 @@ namespace dbtools
void ParameterManager::classifyLinks( const Reference< XNameAccess >& _rxParentColumns,
- const Reference< XNameAccess >& _rxColumns, ::std::vector< OUString >& _out_rAdditionalFilterComponents )
+ const Reference< XNameAccess >& _rxColumns, std::vector< OUString >& _out_rAdditionalFilterComponents )
{
OSL_PRECOND( m_aMasterFields.size() == m_aDetailFields.size(),
"ParameterManager::classifyLinks: master and detail fields should have the same length!" );
@@ -251,8 +251,8 @@ namespace dbtools
// we may need to strip any links which are invalid, so here go the containers
// for temporarirly holding the new pairs
- ::std::vector< OUString > aStrippedMasterFields;
- ::std::vector< OUString > aStrippedDetailFields;
+ std::vector< OUString > aStrippedMasterFields;
+ std::vector< OUString > aStrippedDetailFields;
bool bNeedExchangeLinks = false;
@@ -297,7 +297,7 @@ namespace dbtools
OSL_PRECOND( !sNewParamName.isEmpty(), "ParameterManager::classifyLinks: createFilterConditionFromColumnLink returned nonsense!" );
// remember meta information about this new parameter
- ::std::pair< ParameterInformation::iterator, bool > aInsertionPos =
+ std::pair< ParameterInformation::iterator, bool > aInsertionPos =
m_aParameterInformation.insert(
ParameterInformation::value_type( sNewParamName, ParameterMetaData( nullptr ) )
);
@@ -376,7 +376,7 @@ namespace dbtools
return;
// classify the links - depending on what the detail fields in each link pair denotes
- ::std::vector< OUString > aAdditionalFilterComponents;
+ std::vector< OUString > aAdditionalFilterComponents;
classifyLinks( xParentColumns, xColumns, aAdditionalFilterComponents );
// did we find links where the detail field refers to a detail column (instead of a parameter name)?
@@ -384,7 +384,7 @@ namespace dbtools
{
// build a conjunction of all the filter components
OUStringBuffer sAdditionalFilter;
- for ( ::std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin();
+ for ( std::vector< OUString >::const_iterator aComponent = aAdditionalFilterComponents.begin();
aComponent != aAdditionalFilterComponents.end();
++aComponent
)
@@ -447,7 +447,7 @@ namespace dbtools
// check which of the parameters have already been visited (e.g. filled via XParameters)
size_t nAlreadyVisited = 0;
- for ( ::std::vector< sal_Int32 >::iterator aIndex = aParam->second.aInnerIndexes.begin();
+ for ( std::vector< sal_Int32 >::iterator aIndex = aParam->second.aInnerIndexes.begin();
aIndex != aParam->second.aInnerIndexes.end();
++aIndex
)
@@ -580,7 +580,7 @@ namespace dbtools
Reference< XPropertySet > xMasterField(_rxParentColumns->getByName( *pMasterFields ),UNO_QUERY);
// the positions where we have to fill in values for the current parameter name
- for ( ::std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin();
+ for ( std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin();
aPosition != aParamInfo->second.aInnerIndexes.end();
++aPosition
)
@@ -908,7 +908,7 @@ namespace dbtools
if ( !xMasterField.is() )
continue;
- for ( ::std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin();
+ for ( std::vector< sal_Int32 >::const_iterator aPosition = aParamInfo->second.aInnerIndexes.begin();
aPosition != aParamInfo->second.aInnerIndexes.end();
++aPosition
)
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx
index 1db52ce640c3..817de72d9365 100644
--- a/connectivity/source/commontools/paramwrapper.cxx
+++ b/connectivity/source/commontools/paramwrapper.cxx
@@ -76,7 +76,7 @@ namespace param
ParameterWrapper::ParameterWrapper( const Reference< XPropertySet >& _rxColumn,
- const Reference< XParameters >& _rxAllParameters, const ::std::vector< sal_Int32 >& _rIndexes )
+ const Reference< XParameters >& _rxAllParameters, const std::vector< sal_Int32 >& _rIndexes )
:PropertyBase( m_aBHelper )
,m_aIndexes( _rIndexes )
,m_xDelegator( _rxColumn )
@@ -206,7 +206,7 @@ namespace param
if ( m_xValueDestination.is() )
{
- for ( ::std::vector< sal_Int32 >::const_iterator aIter = m_aIndexes.begin(); aIter != m_aIndexes.end(); ++aIter )
+ for ( std::vector< sal_Int32 >::const_iterator aIter = m_aIndexes.begin(); aIter != m_aIndexes.end(); ++aIter )
{
m_xValueDestination->setObjectWithInfo( *aIter + 1, rValue, nParamType, nScale );
// (the index of the parameters is one-based)
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index b653d0f8eb4a..e88fb5098def 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -94,7 +94,7 @@ namespace dbtools
const OUString& OPropertyMap::getNameByIndex(sal_Int32 _nIndex) const
{
- ::std::map<sal_Int32, OUString>::const_iterator aIter = m_aPropertyMap.find(_nIndex);
+ std::map<sal_Int32, OUString>::const_iterator aIter = m_aPropertyMap.find(_nIndex);
return aIter->second;
}
}
diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx
index c261aeca4d24..9a6d5d657456 100644
--- a/connectivity/source/commontools/sqlerror.cxx
+++ b/connectivity/source/commontools/sqlerror.cxx
@@ -82,7 +82,7 @@ namespace connectivity
private:
::osl::Mutex m_aMutex;
Reference<XComponentContext> m_aContext;
- ::std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources;
+ std::unique_ptr< ::comphelper::OfficeResourceBundle > m_pResources;
bool m_bAttemptedInit;
};
@@ -177,7 +177,7 @@ namespace connectivity
const Type& _rExceptionType, const ParamValue& _rParamValue1, const ParamValue& _rParamValue2, const ParamValue& _rParamValue3 )
{
if ( !::cppu::UnoType< SQLException >::get().isAssignableFrom( _rExceptionType ) )
- throw ::std::bad_cast();
+ throw std::bad_cast();
// default-construct an exception of the desired type
Any aException( nullptr, _rExceptionType );
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx
index a350993bd0e0..0e6be4f36039 100644
--- a/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/connectivity/source/cpool/ZConnectionPool.cxx
@@ -77,8 +77,8 @@ OConnectionPool::~OConnectionPool()
clear(false);
}
-struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::value_type,void>
- ,::std::unary_function<TActiveConnectionMap::value_type,void>
+struct TRemoveEventListenerFunctor : std::unary_function<TPooledConnections::value_type,void>
+ ,std::unary_function<TActiveConnectionMap::value_type,void>
{
OConnectionPool* m_pConnectionPool;
bool m_bDispose;
@@ -113,7 +113,7 @@ struct TRemoveEventListenerFunctor : ::std::unary_function<TPooledConnections::v
}
};
-struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type,void>
+struct TConnectionPoolFunctor : std::unary_function<TConnectionMap::value_type,void>
{
OConnectionPool* m_pConnectionPool;
@@ -124,7 +124,7 @@ struct TConnectionPoolFunctor : ::std::unary_function<TConnectionMap::value_type
}
void operator()(const TConnectionMap::value_type& _aValue)
{
- ::std::for_each(_aValue.second.aConnections.begin(),_aValue.second.aConnections.end(),TRemoveEventListenerFunctor(m_pConnectionPool,true));
+ std::for_each(_aValue.second.aConnections.begin(),_aValue.second.aConnections.end(),TRemoveEventListenerFunctor(m_pConnectionPool,true));
}
};
@@ -135,10 +135,10 @@ void OConnectionPool::clear(bool _bDispose)
if(m_xInvalidator->isTicking())
m_xInvalidator->stop();
- ::std::for_each(m_aPool.begin(),m_aPool.end(),TConnectionPoolFunctor(this));
+ std::for_each(m_aPool.begin(),m_aPool.end(),TConnectionPoolFunctor(this));
m_aPool.clear();
- ::std::for_each(m_aActiveConnections.begin(),m_aActiveConnections.end(),TRemoveEventListenerFunctor(this,_bDispose));
+ std::for_each(m_aActiveConnections.begin(),m_aActiveConnections.end(),TRemoveEventListenerFunctor(this,_bDispose));
m_aActiveConnections.clear();
Reference< XComponent > xComponent(m_xDriverNode, UNO_QUERY);
@@ -235,7 +235,7 @@ void OConnectionPool::invalidatePooledConnections()
{
if(!(--(aIter->second.nALiveCount))) // connections are invalid
{
- ::std::for_each(aIter->second.aConnections.begin(),aIter->second.aConnections.end(),TRemoveEventListenerFunctor(this,true));
+ std::for_each(aIter->second.aConnections.begin(),aIter->second.aConnections.end(),TRemoveEventListenerFunctor(this,true));
aIter->second.aConnections.clear();
diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx
index 3430ee23c76c..890732848c90 100644
--- a/connectivity/source/cpool/ZConnectionPool.hxx
+++ b/connectivity/source/cpool/ZConnectionPool.hxx
@@ -62,7 +62,7 @@ namespace connectivity
typedef ::cppu::WeakImplHelper< css::beans::XPropertyChangeListener> OConnectionPool_Base;
// typedef for the internal structure
- typedef ::std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections;
+ typedef std::vector< css::uno::Reference< css::sdbc::XPooledConnection> > TPooledConnections;
// contains the currently pooled connections
typedef struct
@@ -83,7 +83,7 @@ namespace connectivity
// typedef TDigestHolder
- struct TDigestLess : public ::std::binary_function< TDigestHolder, TDigestHolder, bool>
+ struct TDigestLess : public std::binary_function< TDigestHolder, TDigestHolder, bool>
{
bool operator() (const TDigestHolder& x, const TDigestHolder& y) const
{
@@ -94,7 +94,7 @@ namespace connectivity
}
};
- typedef ::std::map< TDigestHolder,TConnectionPool,TDigestLess> TConnectionMap;
+ typedef std::map< TDigestHolder,TConnectionPool,TDigestLess> TConnectionMap;
// contains additional information about a activeconnection which is needed to put it back to the pool
typedef struct
@@ -103,7 +103,7 @@ namespace connectivity
css::uno::Reference< css::sdbc::XPooledConnection> xPooledConnection;
} TActiveConnectionInfo;
- typedef ::std::map< css::uno::Reference< css::sdbc::XConnection>,
+ typedef std::map< css::uno::Reference< css::sdbc::XConnection>,
TActiveConnectionInfo> TActiveConnectionMap;
class OConnectionPool : public OConnectionPool_Base
diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx
index 1683f0d9dcfb..144a6f16b0b5 100644
--- a/connectivity/source/drivers/ado/AColumn.cxx
+++ b/connectivity/source/drivers/ado/AColumn.cxx
@@ -213,7 +213,7 @@ void OAdoColumn::fillPropertyValues()
else if ( eType == adVarBinary && ADOS::isJetEngine(m_pConnection->getEngineType()) )
{
::comphelper::UStringMixEqual aCase(false);
- OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(),
+ OTypeInfoMap::const_iterator aFind = std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(),
[&aCase] (const OTypeInfoMap::value_type& typeInfo) {
return aCase(typeInfo.second->getDBName(), OUString("VarBinary"));
});
diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx
index b1395122343e..9f5e819f022f 100644
--- a/connectivity/source/drivers/ado/AColumns.cxx
+++ b/connectivity/source/drivers/ado/AColumns.cxx
@@ -86,7 +86,7 @@ sdbcx::ObjectType OColumns::appendObject( const OUString&, const Reference< XPro
const OTypeInfoMap* pTypeInfoMap = m_pConnection->getTypeInfo();
::comphelper::UStringMixEqual aCase(false);
// search for typeinfo where the typename is equal sTypeName
- OTypeInfoMap::const_iterator aFind = ::std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(),
+ OTypeInfoMap::const_iterator aFind = std::find_if(pTypeInfoMap->begin(), pTypeInfoMap->end(),
[&aCase, &sTypeName] (const OTypeInfoMap::value_type& typeInfo) {
return aCase(typeInfo.second->getDBName(), sTypeName);
});
diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx
index 77daa121cac0..c83d85d8c385 100644
--- a/connectivity/source/drivers/ado/AConnection.cxx
+++ b/connectivity/source/drivers/ado/AConnection.cxx
@@ -529,7 +529,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r
const OExtendedTypeInfo* pTypeInfo = nullptr;
_brForceToType = false;
// search for type
- ::std::pair<OTypeInfoMap::const_iterator, OTypeInfoMap::const_iterator> aPair = _rTypeInfo.equal_range(_nType);
+ std::pair<OTypeInfoMap::const_iterator, OTypeInfoMap::const_iterator> aPair = _rTypeInfo.equal_range(_nType);
OTypeInfoMap::const_iterator aIter = aPair.first;
if(aIter != _rTypeInfo.end()) // compare with end is correct here
{
@@ -586,7 +586,7 @@ const OExtendedTypeInfo* OConnection::getTypeInfoFromType(const OTypeInfoMap& _r
{
::comphelper::UStringMixEqual aCase(false);
// search for typeinfo where the typename is equal _sTypeName
- OTypeInfoMap::const_iterator aFind = ::std::find_if(_rTypeInfo.begin(), _rTypeInfo.end(),
+ OTypeInfoMap::const_iterator aFind = std::find_if(_rTypeInfo.begin(), _rTypeInfo.end(),
[&aCase, &_sTypeName] (const OTypeInfoMap::value_type& typeInfo) {
return aCase(typeInfo.second->getDBName(), _sTypeName);
});
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index 5be23aa03ead..e159863abb64 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -85,7 +85,7 @@ sal_Int32 ODatabaseMetaData::getMaxSize(sal_uInt32 _nId)
fillLiterals();
sal_Int32 nSize = 0;
- ::std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId);
+ std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId);
if(aIter != m_aLiteralInfo.end() && (*aIter).second.fSupported)
nSize = (static_cast<sal_Int32>((*aIter).second.cchMaxLen) == (-1)) ? 0 : (*aIter).second.cchMaxLen;
return nSize;
@@ -96,7 +96,7 @@ bool ODatabaseMetaData::isCapable(sal_uInt32 _nId)
if(m_aLiteralInfo.empty())
fillLiterals();
bool bSupported = false;
- ::std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId);
+ std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId);
if(aIter != m_aLiteralInfo.end())
bSupported = (*aIter).second.fSupported;
return bSupported;
@@ -108,7 +108,7 @@ OUString ODatabaseMetaData::getLiteral(sal_uInt32 _nId)
if(m_aLiteralInfo.empty())
fillLiterals();
OUString sStr;
- ::std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId);
+ std::map<sal_uInt32,LiteralInfo>::const_iterator aIter = m_aLiteralInfo.find(_nId);
if(aIter != m_aLiteralInfo.end() && (*aIter).second.fSupported)
sStr = (*aIter).second.pwszLiteralValue;
return sStr;
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index 09ee0797e09c..a411f9363c0f 100644
--- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -898,7 +898,7 @@ void ODatabaseMetaDataResultSet::setColumnsMap()
m_aValueRange[12] = aMap;
- ::std::map< sal_Int32,OUString> aMap2;
+ std::map< sal_Int32,OUString> aMap2;
aMap2[0] = "YES";
aMap2[1] = "NO";
m_aIntValueRange[18] = aMap2;
@@ -1031,7 +1031,7 @@ void ODatabaseMetaDataResultSet::setIndexInfoMap()
aMap[1] = 0;
m_aValueRange[8] = aMap2;
- ::std::map< sal_Int32,OUString> aMap3;
+ std::map< sal_Int32,OUString> aMap3;
aMap3[0] = "";
aMap3[DB_COLLATION_ASC] = "A";
aMap3[DB_COLLATION_DESC] = "D";
@@ -1054,7 +1054,7 @@ void ODatabaseMetaDataResultSet::setTablePrivilegesMap()
m_aColMapping.push_back(6);
m_aColMapping.push_back(7);
- ::std::map< sal_Int32,OUString> aMap;
+ std::map< sal_Int32,OUString> aMap;
aMap[0] = "YES";
aMap[1] = "NO";
m_aIntValueRange[7] = aMap;
@@ -1081,7 +1081,7 @@ void ODatabaseMetaDataResultSet::setCrossReferenceMap()
m_aColMapping.push_back(16);
m_aColMapping.push_back(18);
- ::std::map< OUString,sal_Int32> aMap;
+ std::map< OUString,sal_Int32> aMap;
aMap[ OUString("CASCADE")] = KeyRule::CASCADE;
aMap[ OUString("RESTRICT")] = KeyRule::RESTRICT;
aMap[ OUString("SET NULL")] = KeyRule::SET_NULL;
@@ -1102,7 +1102,7 @@ void ODatabaseMetaDataResultSet::setTypeInfoMap(bool _bJetEngine)
for(;i<19;i++)
m_aColMapping.push_back(i);
- ::std::map< OUString,sal_Int32> aMap1;
+ std::map< OUString,sal_Int32> aMap1;
aMap1[ OUString()] = 10;
m_aStrValueRange[18] = aMap1;
diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx
index c6a22e761dbd..efda9a97820d 100644
--- a/connectivity/source/drivers/ado/ADriver.cxx
+++ b/connectivity/source/drivers/ado/ADriver.cxx
@@ -149,7 +149,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
impl_checkURL_throw(url);
if ( acceptsURL(url) )
{
- ::std::vector< DriverPropertyInfo > aDriverInfo;
+ std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< OUString > aBooleanValues(2);
aBooleanValues[0] = "false";
diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx
index 136c3a90b377..8f4ef082aed4 100644
--- a/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -238,7 +238,7 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn
void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x )
{
- setParameter( parameterIndex, adLongVarWChar, ::std::numeric_limits< sal_Int32 >::max(), x );
+ setParameter( parameterIndex, adLongVarWChar, std::numeric_limits< sal_Int32 >::max(), x );
}
Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( )
diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx
index 025be1b95b37..3e8d0f5d2e3b 100644
--- a/connectivity/source/drivers/ado/AStatement.cxx
+++ b/connectivity/source/drivers/ado/AStatement.cxx
@@ -214,10 +214,10 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType)
aInfo.nType = (sal_Int16)sqlType;
if (!m_aTypeInfo.empty())
{
- ::std::vector<OTypeInfo>::const_iterator aIter = ::std::find(m_aTypeInfo.begin(),m_aTypeInfo.end(),aInfo);
+ std::vector<OTypeInfo>::const_iterator aIter = std::find(m_aTypeInfo.begin(),m_aTypeInfo.end(),aInfo);
for(;aIter != m_aTypeInfo.end();++aIter)
{
- prec = ::std::max(prec,(*aIter).nPrecision);
+ prec = std::max(prec,(*aIter).nPrecision);
}
}
@@ -352,7 +352,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( )
OUString aBatchSql;
sal_Int32 nLen = 0;
- for(::std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen)
+ for(std::list< OUString>::const_iterator i=m_aBatchList.begin();i != m_aBatchList.end();++i,++nLen)
aBatchSql = aBatchSql + *i + ";";
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 97cf3fa98fcf..7777318cb1ae 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -645,7 +645,7 @@ void SAL_CALL OCalcTable::disposing()
Sequence< Type > SAL_CALL OCalcTable::getTypes( )
{
Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
- ::std::vector<Type> aOwnTypes;
+ std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength());
const Type* pBegin = aTypes.getConstArray();
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index 6e920abdf729..39a672f35840 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -78,7 +78,7 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString
{
if ( acceptsURL(url) )
{
- ::std::vector< DriverPropertyInfo > aDriverInfo;
+ std::vector< DriverPropertyInfo > aDriverInfo;
Sequence< OUString > aBoolean(2);
aBoolean[0] = "0";
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 65ec2d36bc41..fba7c5f62d70 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -732,7 +732,7 @@ void SAL_CALL ODbaseTable::disposing()
Sequence< Type > SAL_CALL ODbaseTable::getTypes( )
{
Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
- ::std::vector<Type> aOwnTypes;
+ std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength());
const Type* pBegin = aTypes.getConstArray();
@@ -1321,7 +1321,7 @@ bool ODbaseTable::CreateFile(const INetURLObject& aFile, bool& bCreateMemo)
throwInvalidColumnType(STR_INVALID_COLUMN_PRECISION, aName);
}
(*m_pFileStream).WriteUChar( std::min((unsigned)nPrecision, 255U) ); // field length
- nRecLength = nRecLength + (sal_uInt16)::std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL);
+ nRecLength = nRecLength + (sal_uInt16)std::min((sal_uInt16)nPrecision, (sal_uInt16)255UL);
(*m_pFileStream).WriteUChar( 0 ); // decimals
break;
case 'F':
@@ -1682,7 +1682,7 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
sal_uInt16 i;
OUString aColName;
const sal_Int32 nColumnCount = m_pColumns->getCount();
- ::std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount);
+ std::vector< Reference<XPropertySet> > aIndexedCols(nColumnCount);
::comphelper::UStringMixEqual aCase(isCaseSensitive());
@@ -1934,11 +1934,11 @@ bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, const OValueRefRow& pOrgRo
m_pColumns->getByIndex(i) >>= xCol;
OSL_ENSURE(xCol.is(),"ODbaseTable::UpdateBuffer column is null!");
xCol->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME)) >>= aColName;
- ::std::list< ::std::pair<const sal_Char* , OUString > > aStringToSubstitutes;
- aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$columnname$", aColName));
- aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$precision$", OUString::number(nLen)));
- aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$scale$", OUString::number(nScale)));
- aStringToSubstitutes.push_back(::std::pair<const sal_Char* , OUString >("$value$", OStringToOUString(aDefaultValue,RTL_TEXTENCODING_UTF8)));
+ std::list< std::pair<const sal_Char* , OUSt