[Libreoffice-commits] core.git: canvas/source chart2/inc chart2/source cli_ure/source comphelper/source connectivity/source connectivity/workben cppcanvas/source cppuhelper/source cppu/source cui/source
Tor Lillqvist
tml at collabora.com
Wed Feb 15 23:01:49 UTC 2017
canvas/source/cairo/cairo_canvashelper.cxx | 4
canvas/source/cairo/cairo_spritecanvashelper.cxx | 16 -
canvas/source/cairo/cairo_spritecanvashelper.hxx | 4
canvas/source/cairo/cairo_textlayout.cxx | 4
canvas/source/directx/dx_9rm.cxx | 12
canvas/source/directx/dx_canvascustomsprite.cxx | 2
canvas/source/directx/dx_canvascustomsprite.hxx | 2
canvas/source/directx/dx_canvashelper.cxx | 4
canvas/source/directx/dx_canvashelper_texturefill.cxx | 4
canvas/source/directx/dx_impltools.cxx | 10
canvas/source/directx/dx_spritecanvashelper.cxx | 8
canvas/source/directx/dx_spritecanvashelper.hxx | 8
canvas/source/directx/dx_spritedevicehelper.cxx | 8
canvas/source/directx/dx_spritedevicehelper.hxx | 4
canvas/source/directx/dx_textlayout_drawhelper.cxx | 2
canvas/source/directx/dx_winstuff.hxx | 2
canvas/source/opengl/ogl_canvashelper.cxx | 20 -
canvas/source/opengl/ogl_textlayout.cxx | 2
canvas/source/tools/canvascustomspritehelper.cxx | 6
canvas/source/tools/canvastools.cxx | 12
canvas/source/tools/spriteredrawmanager.cxx | 28 +-
canvas/source/tools/surface.cxx | 8
canvas/source/tools/surfaceproxy.cxx | 4
canvas/source/vcl/canvascustomsprite.cxx | 4
canvas/source/vcl/canvashelper.cxx | 6
canvas/source/vcl/canvashelper_texturefill.cxx | 4
canvas/source/vcl/spritecanvashelper.cxx | 20 -
canvas/source/vcl/spritecanvashelper.hxx | 4
canvas/source/vcl/textlayout.cxx | 8
chart2/inc/ChartModel.hxx | 2
chart2/inc/ChartView.hxx | 2
chart2/source/controller/accessibility/AccessibleBase.cxx | 22 -
chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 6
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 8
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 14 -
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 12
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 20 -
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 6
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 8
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 8
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 4
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 6
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.hxx | 2
chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.hxx | 2
chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.hxx | 2
chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx | 8
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSplineProperties.hxx | 2
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx | 64 ++--
chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.hxx | 6
chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 6
chart2/source/controller/chartapiwrapper/WrappedStockProperties.hxx | 2
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx | 2
chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.hxx | 2
chart2/source/controller/dialogs/DataBrowser.cxx | 8
chart2/source/controller/dialogs/DataBrowser.hxx | 2
chart2/source/controller/dialogs/DataBrowserModel.cxx | 26 -
chart2/source/controller/dialogs/DataBrowserModel.hxx | 4
chart2/source/controller/dialogs/DialogModel.cxx | 58 ++--
chart2/source/controller/dialogs/DialogModel.hxx | 12
chart2/source/controller/dialogs/ObjectNameProvider.cxx | 4
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 2
chart2/source/controller/dialogs/res_DataLabel.cxx | 4
chart2/source/controller/dialogs/res_DataLabel.hxx | 4
chart2/source/controller/dialogs/tp_ChartType.cxx | 14 -
chart2/source/controller/dialogs/tp_ChartType.hxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 6
chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 2
chart2/source/controller/inc/AccessibleBase.hxx | 4
chart2/source/controller/inc/AxisItemConverter.hxx | 2
chart2/source/controller/inc/CommandDispatchContainer.hxx | 8
chart2/source/controller/inc/DataPointItemConverter.hxx | 2
chart2/source/controller/inc/DrawViewWrapper.hxx | 2
chart2/source/controller/inc/ItemConverter.hxx | 2
chart2/source/controller/inc/ItemPropertyMap.hxx | 2
chart2/source/controller/inc/LegendItemConverter.hxx | 2
chart2/source/controller/inc/MultipleItemConverter.hxx | 2
chart2/source/controller/inc/ObjectHierarchy.hxx | 4
chart2/source/controller/inc/RegressionEquationItemConverter.hxx | 2
chart2/source/controller/inc/TitleItemConverter.hxx | 2
chart2/source/controller/inc/dlg_DataSource.hxx | 4
chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 8
chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx | 6
chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx | 2
chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx | 2
chart2/source/controller/main/ChartController.cxx | 4
chart2/source/controller/main/ChartController_Insert.cxx | 2
chart2/source/controller/main/ChartController_Tools.cxx | 2
chart2/source/controller/main/ChartController_Window.cxx | 4
chart2/source/controller/main/ChartDropTargetHelper.cxx | 6
chart2/source/controller/main/CommandDispatch.hxx | 2
chart2/source/controller/main/CommandDispatchContainer.cxx | 2
chart2/source/controller/main/ControllerCommandDispatch.cxx | 6
chart2/source/controller/main/ControllerCommandDispatch.hxx | 8
chart2/source/controller/main/DrawCommandDispatch.cxx | 8
chart2/source/controller/main/ElementSelector.hxx | 2
chart2/source/controller/main/FeatureCommandDispatchBase.hxx | 2
chart2/source/controller/main/ObjectHierarchy.cxx | 16 -
chart2/source/inc/CharacterProperties.hxx | 2
chart2/source/inc/ChartModelHelper.hxx | 6
chart2/source/inc/CloneHelper.hxx | 12
chart2/source/inc/CommonConverters.hxx | 10
chart2/source/inc/CommonFunctors.hxx | 10
chart2/source/inc/ConfigColorScheme.hxx | 2
chart2/source/inc/ContainerHelper.hxx | 12
chart2/source/inc/DataSeriesHelper.hxx | 2
chart2/source/inc/DiagramHelper.hxx | 4
chart2/source/inc/ErrorBar.hxx | 2
chart2/source/inc/EventListenerHelper.hxx | 8
chart2/source/inc/ExplicitCategoriesProvider.hxx | 2
chart2/source/inc/FillProperties.hxx | 2
chart2/source/inc/InternalData.hxx | 16 -
chart2/source/inc/InternalDataProvider.hxx | 6
chart2/source/inc/LinePropertiesHelper.hxx | 2
chart2/source/inc/ModifyListenerHelper.hxx | 24 -
chart2/source/inc/NameContainer.hxx | 2
chart2/source/inc/RegressionCalculationHelper.hxx | 16 -
chart2/source/inc/SceneProperties.hxx | 2
chart2/source/inc/UserDefinedProperties.hxx | 2
chart2/source/inc/WrappedProperty.hxx | 2
chart2/source/inc/chartview/ExplicitScaleValues.hxx | 2
chart2/source/model/filter/XMLFilter.cxx | 4
chart2/source/model/inc/BaseCoordinateSystem.hxx | 4
chart2/source/model/inc/DataSeries.hxx | 6
chart2/source/model/inc/Diagram.hxx | 2
chart2/source/model/main/Axis.cxx | 6
chart2/source/model/main/BaseCoordinateSystem.cxx | 12
chart2/source/model/main/ChartModel.cxx | 2
chart2/source/model/main/ChartModel_Persistence.cxx | 4
chart2/source/model/main/DataPoint.cxx | 4
chart2/source/model/main/DataPointProperties.cxx | 2
chart2/source/model/main/DataPointProperties.hxx | 2
chart2/source/model/main/DataSeries.cxx | 14 -
chart2/source/model/main/DataSeriesProperties.cxx | 2
chart2/source/model/main/DataSeriesProperties.hxx | 2
chart2/source/model/main/Diagram.cxx | 16 -
chart2/source/model/main/FormattedString.cxx | 4
chart2/source/model/main/GridProperties.cxx | 6
chart2/source/model/main/Legend.cxx | 6
chart2/source/model/main/PageBackground.cxx | 4
chart2/source/model/main/StockBar.cxx | 4
chart2/source/model/main/Title.cxx | 6
chart2/source/model/main/Wall.cxx | 4
chart2/source/model/template/AreaChartTypeTemplate.cxx | 10
chart2/source/model/template/BarChartTypeTemplate.cxx | 10
chart2/source/model/template/BubbleChartType.cxx | 4
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 4
chart2/source/model/template/CandleStickChartType.cxx | 10
chart2/source/model/template/ChartType.cxx | 4
chart2/source/model/template/ChartType.hxx | 2
chart2/source/model/template/ChartTypeManager.cxx | 6
chart2/source/model/template/ChartTypeTemplate.cxx | 4
chart2/source/model/template/ColumnChartType.cxx | 6
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 10
chart2/source/model/template/ColumnLineDataInterpreter.cxx | 4
chart2/source/model/template/LineChartType.cxx | 6
chart2/source/model/template/LineChartTypeTemplate.cxx | 10
chart2/source/model/template/NetChartTypeTemplate.cxx | 4
chart2/source/model/template/PieChartType.cxx | 6
chart2/source/model/template/PieChartTypeTemplate.cxx | 12
chart2/source/model/template/ScatterChartType.cxx | 6
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 10
chart2/source/model/template/StockChartTypeTemplate.cxx | 10
chart2/source/tools/AxisHelper.cxx | 16 -
chart2/source/tools/CachedDataSequence.cxx | 12
chart2/source/tools/CharacterProperties.cxx | 2
chart2/source/tools/ChartModelHelper.cxx | 10
chart2/source/tools/ColorPerPointHelper.cxx | 2
chart2/source/tools/ConfigColorScheme.cxx | 2
chart2/source/tools/DataSeriesHelper.cxx | 36 +-
chart2/source/tools/DataSourceHelper.cxx | 38 +-
chart2/source/tools/DiagramHelper.cxx | 30 +-
chart2/source/tools/ExplicitCategoriesProvider.cxx | 10
chart2/source/tools/FillProperties.cxx | 6
chart2/source/tools/ImplOPropertySet.cxx | 24 -
chart2/source/tools/ImplOPropertySet.hxx | 6
chart2/source/tools/InternalData.cxx | 60 ++--
chart2/source/tools/InternalDataProvider.cxx | 60 ++--
chart2/source/tools/LinePropertiesHelper.cxx | 2
chart2/source/tools/ModifyListenerHelper.cxx | 6
chart2/source/tools/OPropertySet.cxx | 4
chart2/source/tools/PropertyHelper.cxx | 26 -
chart2/source/tools/RangeHighlighter.cxx | 2
chart2/source/tools/ReferenceSizeProvider.cxx | 8
chart2/source/tools/RegressionCurveHelper.cxx | 4
chart2/source/tools/RegressionCurveModel.cxx | 6
chart2/source/tools/RegressionEquation.cxx | 6
chart2/source/tools/SceneProperties.cxx | 2
chart2/source/tools/ThreeDHelper.cxx | 4
chart2/source/tools/UncachedDataSequence.cxx | 4
chart2/source/tools/UserDefinedProperties.cxx | 2
chart2/source/tools/WrappedIgnoreProperty.cxx | 4
chart2/source/tools/XMLRangeHelper.cxx | 8
chart2/source/view/axes/ScaleAutomatism.cxx | 6
chart2/source/view/axes/VAxisProperties.hxx | 2
chart2/source/view/axes/VCartesianAxis.cxx | 22 -
chart2/source/view/axes/VCartesianGrid.cxx | 4
chart2/source/view/axes/VCartesianGrid.hxx | 2
chart2/source/view/axes/VPolarAxis.hxx | 2
chart2/source/view/axes/VPolarGrid.cxx | 6
chart2/source/view/axes/VPolarGrid.hxx | 4
chart2/source/view/axes/VPolarRadiusAxis.hxx | 2
chart2/source/view/charttypes/AreaChart.cxx | 40 +-
chart2/source/view/charttypes/BarChart.cxx | 34 +-
chart2/source/view/charttypes/BubbleChart.cxx | 28 +-
chart2/source/view/charttypes/CandleStickChart.cxx | 14 -
chart2/source/view/charttypes/NetChart.cxx | 40 +-
chart2/source/view/charttypes/PieChart.cxx | 12
chart2/source/view/charttypes/PieChart.hxx | 4
chart2/source/view/charttypes/Splines.cxx | 24 -
chart2/source/view/charttypes/VSeriesPlotter.cxx | 134 +++++-----
chart2/source/view/inc/MinimumAndMaximumSupplier.hxx | 2
chart2/source/view/inc/PlotterBase.hxx | 2
chart2/source/view/inc/PlottingPositionHelper.hxx | 6
chart2/source/view/inc/PropertyMapper.hxx | 4
chart2/source/view/inc/VCoordinateSystem.hxx | 4
chart2/source/view/inc/VSeriesPlotter.hxx | 8
chart2/source/view/main/ChartItemPool.cxx | 4
chart2/source/view/main/ChartView.cxx | 36 +-
chart2/source/view/main/ShapeFactory.cxx | 6
chart2/source/view/main/VDataSeries.cxx | 6
chart2/source/view/main/VLegend.cxx | 20 -
cli_ure/source/uno_bridge/cli_base.h | 6
comphelper/source/container/embeddedobjectcontainer.cxx | 2
comphelper/source/container/enumerablemap.cxx | 14 -
comphelper/source/eventattachermgr/eventattachermgr.cxx | 48 +--
comphelper/source/misc/accessibleeventnotifier.cxx | 14 -
comphelper/source/misc/accessibletexthelper.cxx | 4
comphelper/source/misc/anycompare.cxx | 4
comphelper/source/misc/asyncnotification.cxx | 6
comphelper/source/misc/backupfilehelper.cxx | 8
comphelper/source/misc/componentmodule.cxx | 2
comphelper/source/misc/configurationhelper.cxx | 2
comphelper/source/misc/docpasswordhelper.cxx | 6
comphelper/source/misc/namedvaluecollection.cxx | 12
comphelper/source/misc/numberedcollection.cxx | 4
comphelper/source/misc/simplefileaccessinteraction.cxx | 2
comphelper/source/misc/stillreadwriteinteraction.cxx | 4
comphelper/source/property/opropertybag.cxx | 22 -
comphelper/source/property/opropertybag.hxx | 8
comphelper/source/property/propagg.cxx | 14 -
comphelper/source/property/property.cxx | 4
comphelper/source/property/propertybag.cxx | 2
comphelper/source/property/propertycontainerhelper.cxx | 16 -
comphelper/source/xml/attributelist.cxx | 6
connectivity/source/commontools/ConnectionWrapper.cxx | 4
connectivity/source/commontools/RowFunctionParser.cxx | 4
connectivity/source/commontools/TDatabaseMetaDataBase.cxx | 32 +-
connectivity/source/commontools/TIndex.cxx | 4
connectivity/source/commontools/TIndexColumns.cxx | 2
connectivity/source/commontools/TIndexes.cxx | 2
connectivity/source/commontools/TKey.cxx | 2
connectivity/source/commontools/TKeyColumns.cxx | 2
connectivity/source/commontools/TSkipDeletedSet.cxx | 10
connectivity/source/commontools/TSortIndex.cxx | 18 -
connectivity/source/commontools/TTableHelper.cxx | 34 +-
connectivity/source/commontools/dbtools.cxx | 32 +-
connectivity/source/commontools/dbtools2.cxx | 4
connectivity/source/commontools/parameters.cxx | 20 -
connectivity/source/commontools/paramwrapper.cxx | 4
connectivity/source/commontools/propertyids.cxx | 2
connectivity/source/commontools/sqlerror.cxx | 4
connectivity/source/cpool/ZConnectionPool.cxx | 14 -
connectivity/source/cpool/ZConnectionPool.hxx | 8
connectivity/source/drivers/ado/AColumn.cxx | 2
connectivity/source/drivers/ado/AColumns.cxx | 2
connectivity/source/drivers/ado/AConnection.cxx | 4
connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx | 6
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 10
connectivity/source/drivers/ado/ADriver.cxx | 2
connectivity/source/drivers/ado/APreparedStatement.cxx | 2
connectivity/source/drivers/ado/AStatement.cxx | 6
connectivity/source/drivers/calc/CTable.cxx | 2
connectivity/source/drivers/dbase/DDriver.cxx | 2
connectivity/source/drivers/dbase/DTable.cxx | 20 -
connectivity/source/drivers/dbase/dindexnode.cxx | 2
connectivity/source/drivers/evoab2/NPreparedStatement.hxx | 2
connectivity/source/drivers/evoab2/NResultSetMetaData.hxx | 2
connectivity/source/drivers/evoab2/NStatement.hxx | 2
connectivity/source/drivers/file/FCatalog.cxx | 2
connectivity/source/drivers/file/FDateFunctions.cxx | 8
connectivity/source/drivers/file/FDriver.cxx | 2
connectivity/source/drivers/file/FNoException.cxx | 4
connectivity/source/drivers/file/FNumericFunctions.cxx | 6
connectivity/source/drivers/file/FPreparedStatement.cxx | 4
connectivity/source/drivers/file/FResultSet.cxx | 16 -
connectivity/source/drivers/file/FStatement.cxx | 16 -
connectivity/source/drivers/file/FStringFunctions.cxx | 28 +-
connectivity/source/drivers/file/fanalyzer.cxx | 12
connectivity/source/drivers/file/fcode.cxx | 8
connectivity/source/drivers/firebird/Connection.hxx | 2
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 2
connectivity/source/drivers/firebird/Indexes.hxx | 2
connectivity/source/drivers/firebird/Util.hxx | 2
connectivity/source/drivers/flat/EDriver.cxx | 2
connectivity/source/drivers/flat/EResultSet.cxx | 2
connectivity/source/drivers/hsqldb/HCatalog.cxx | 2
connectivity/source/drivers/hsqldb/HDriver.cxx | 6
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 4
connectivity/source/drivers/hsqldb/HTable.cxx | 2
connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx | 4
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 8
connectivity/source/drivers/jdbc/JDriver.cxx | 2
connectivity/source/drivers/jdbc/JStatement.cxx | 2
connectivity/source/drivers/kab/KResultSetMetaData.hxx | 2
connectivity/source/drivers/kab/KStatement.hxx | 2
connectivity/source/drivers/kab/korder.hxx | 2
connectivity/source/drivers/macab/MacabAddressBook.cxx | 10
connectivity/source/drivers/macab/MacabAddressBook.hxx | 4
connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx | 2
connectivity/source/drivers/macab/MacabResultSetMetaData.hxx | 2
connectivity/source/drivers/macab/MacabStatement.hxx | 2
connectivity/source/drivers/macab/macaborder.hxx | 2
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 4
connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx | 8
connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx | 2
connectivity/source/drivers/mork/MPreparedStatement.cxx | 6
connectivity/source/drivers/mork/MPreparedStatement.hxx | 2
connectivity/source/drivers/mork/MQueryHelper.cxx | 16 -
connectivity/source/drivers/mork/MQueryHelper.hxx | 2
connectivity/source/drivers/mork/MResultSet.cxx | 22 -
connectivity/source/drivers/mork/MResultSet.hxx | 20 -
connectivity/source/drivers/mork/MStatement.cxx | 2
connectivity/source/drivers/mork/MStatement.hxx | 6
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 2
connectivity/source/drivers/mysql/YCatalog.cxx | 2
connectivity/source/drivers/mysql/YDriver.cxx | 4
connectivity/source/drivers/odbc/OConnection.cxx | 14 -
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 6
connectivity/source/drivers/odbc/ODriver.cxx | 2
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 2
connectivity/source/drivers/odbc/OResultSet.cxx | 6
connectivity/source/drivers/odbc/OResultSetMetaData.cxx | 4
connectivity/source/drivers/odbc/OStatement.cxx | 4
connectivity/source/drivers/postgresql/pq_connection.cxx | 4
connectivity/source/drivers/postgresql/pq_connection.hxx | 2
connectivity/source/drivers/postgresql/pq_updateableresultset.hxx | 2
connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx | 4
connectivity/source/inc/TDatabaseMetaDataBase.hxx | 28 +-
connectivity/source/inc/TKeyValue.hxx | 6
connectivity/source/inc/TSkipDeletedSet.hxx | 2
connectivity/source/inc/TSortIndex.hxx | 16 -
connectivity/source/inc/ado/AConnection.hxx | 2
connectivity/source/inc/ado/ADatabaseMetaData.hxx | 2
connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx | 16 -
connectivity/source/inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 6
connectivity/source/inc/ado/AResultSet.hxx | 2
connectivity/source/inc/ado/AStatement.hxx | 4
connectivity/source/inc/calc/CTable.hxx | 6
connectivity/source/inc/dbase/DTable.hxx | 8
connectivity/source/inc/dbase/dindexnode.hxx | 2
connectivity/source/inc/file/FDateFunctions.hxx | 8
connectivity/source/inc/file/FNumericFunctions.hxx | 6
connectivity/source/inc/file/FPreparedStatement.hxx | 2
connectivity/source/inc/file/FResultSet.hxx | 14 -
connectivity/source/inc/file/FStatement.hxx | 10
connectivity/source/inc/file/FStringFunctions.hxx | 12
connectivity/source/inc/file/fanalyzer.hxx | 6
connectivity/source/inc/file/fcode.hxx | 4
connectivity/source/inc/file/fcomp.hxx | 2
connectivity/source/inc/flat/ETable.hxx | 12
connectivity/source/inc/hsqldb/HDriver.hxx | 8
connectivity/source/inc/mysql/YDriver.hxx | 6
connectivity/source/inc/odbc/OConnection.hxx | 4
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 4
connectivity/source/inc/odbc/OResultSet.hxx | 16 -
connectivity/source/inc/odbc/OResultSetMetaData.hxx | 6
connectivity/source/inc/odbc/OStatement.hxx | 2
connectivity/source/inc/propertyids.hxx | 2
connectivity/source/inc/resource/sharedresources.hxx | 2
connectivity/source/manager/mdrivermanager.cxx | 38 +-
connectivity/source/parse/sqliterator.cxx | 8
connectivity/source/parse/sqlnode.cxx | 12
connectivity/source/resource/sharedresources.cxx | 8
connectivity/source/sdbcx/VCollection.cxx | 18 -
connectivity/source/sdbcx/VDescriptor.cxx | 8
connectivity/workben/skeleton/SResultSet.hxx | 10
cppcanvas/source/inc/implrenderer.hxx | 6
cppcanvas/source/mtfrenderer/implrenderer.cxx | 26 -
cppcanvas/source/mtfrenderer/mtftools.cxx | 2
cppcanvas/source/mtfrenderer/textaction.cxx | 16 -
cppcanvas/source/mtfrenderer/transparencygroupaction.hxx | 4
cppu/source/threadpool/jobqueue.hxx | 2
cppu/source/threadpool/thread.cxx | 2
cppu/source/threadpool/threadpool.hxx | 8
cppuhelper/source/component_context.cxx | 2
cppuhelper/source/factory.cxx | 2
cppuhelper/source/interfacecontainer.cxx | 4
cppuhelper/source/propshlp.cxx | 24 -
cui/source/customize/cfgutil.cxx | 22 -
cui/source/customize/macropg.cxx | 12
cui/source/dialogs/cuifmsearch.cxx | 4
cui/source/dialogs/cuigaldlg.cxx | 12
cui/source/dialogs/hangulhanjadlg.cxx | 2
cui/source/dialogs/iconcdlg.cxx | 2
cui/source/dialogs/pastedlg.cxx | 4
cui/source/dialogs/screenshotannotationdlg.cxx | 4
cui/source/factory/dlgfact.cxx | 2
cui/source/factory/dlgfact.hxx | 2
cui/source/inc/cfgutil.hxx | 4
cui/source/inc/cuifmsearch.hxx | 4
cui/source/inc/cuigaldlg.hxx | 8
cui/source/inc/cuitabline.hxx | 2
cui/source/inc/hangulhanjadlg.hxx | 2
cui/source/inc/iconcdlg.hxx | 2
cui/source/inc/macropg.hxx | 4
cui/source/inc/pastedlg.hxx | 2
cui/source/inc/treeopt.hxx | 6
cui/source/options/cfgchart.hxx | 2
cui/source/options/dbregistersettings.hxx | 2
cui/source/options/optasian.cxx | 4
cui/source/options/optchart.cxx | 2
cui/source/options/optjava.hxx | 2
cui/source/options/sdbcdriverenum.cxx | 4
cui/source/options/sdbcdriverenum.hxx | 2
cui/source/tabpages/border.cxx | 6
cui/source/tabpages/page.cxx | 2
423 files changed, 1678 insertions(+), 1678 deletions(-)
New commits:
commit 6de3688cc6bd52ce08ff8a4327e59dbbc8a5c7d4
Author: Tor Lillqvist <tml at collabora.com>
Date: Wed Feb 15 23:55:18 2017 +0200
Drop :: prefix from std in c*/
Change-Id: If078cda95fa6ccd37270a5e9d81cfa0b84e71155
Reviewed-on: https://gerrit.libreoffice.org/34324
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Tor Lillqvist <tml at collabora.com>
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index c733a25..2bfd634 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 8ffa34e..7f419e0 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 35cf736..1c71b48 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 eaf4399..3b6356c 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 4b41d30..db4f151 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 b0e4b74..4a87a66 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 a3b5791..1772741 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 94b9c32..72c63ff 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 c9853cf..4bebeb8 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 60429f2..a748b5d 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 f8661d8..d10a6fe 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 d3f48ab..5137d6f 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 ac8ce68..41f5b63 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 9d5eed1..88848d4 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 fb8e184..6e27978 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 cb1840d..1214c99 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 67707bb..d2edda6 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 0331c8c..5857367 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 37d010c..0cbefbc 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 640c3a3..ee41f67 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 aaf99c5..3cf4436 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 e596ea5..adea0c2 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 a9fb781..2699820 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 e8ee775..ab1d4c8 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 90c399b..f13780d 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 462ae47..8f76a08 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 775e538..b8ea28b 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 6c46316..d2186da 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 bdab9f9..98f5f43 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 5225b80..6af2660 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 a7b545f..b82a308 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 4dd512a..d887fa6 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 d18d405..7f93dc8 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 c5a993e..3dcbd42 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 2a912ff..abc07cf 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 a376933..4eac71e 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 d6a9885..e18882a 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 e95a0c8..10694a8 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 4d699c4..36878f8 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 4b9a84d..0e54a00 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 e56f203..5c03301 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 19bd0ba..256eb8c 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 f179264..ba9aa99 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 39bcb51..663d9c8 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 972ea65..389cefb 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 acd7741..0793658 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 9f7cc28..1c3871e 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 b3e9ee9..f892fbb 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 e5ba28c..47b2675 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 2537b9a..f7ef66f 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 01cd3f0..f47e3da 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 012ee39..72d2ca8 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 2baba22..6133e41 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 );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list