chart2/source/controller/chartapiwrapper/AreaWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/AxisWrapper.cxx | 2 --
chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/GridWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/LegendWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/TitleWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 1 -
chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx | 1 -
chart2/source/controller/dialogs/DataBrowser.cxx | 1 -
chart2/source/controller/dialogs/DataBrowserModel.cxx | 1 -
chart2/source/controller/dialogs/DialogModel.cxx | 5
++---
chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx | 1 -
chart2/source/model/filter/XMLFilter.cxx | 1 -
chart2/source/model/main/Axis.cxx | 1 -
chart2/source/model/main/DataPoint.cxx | 1 -
chart2/source/model/main/Diagram.cxx | 1 -
chart2/source/model/main/FormattedString.cxx | 1 -
chart2/source/model/main/GridProperties.cxx | 1 -
chart2/source/model/main/Legend.cxx | 1 -
chart2/source/model/main/PageBackground.cxx | 1 -
chart2/source/model/main/StockBar.cxx | 1 -
chart2/source/model/main/Wall.cxx | 1 -
chart2/source/model/template/AreaChartTypeTemplate.cxx | 1 -
chart2/source/model/template/BarChartTypeTemplate.cxx | 1 -
chart2/source/model/template/BubbleChartType.cxx | 1 -
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 1 -
chart2/source/model/template/BubbleDataInterpreter.cxx | 1 -
chart2/source/model/template/CandleStickChartType.cxx | 1 -
chart2/source/model/template/ChartType.cxx | 1 -
chart2/source/model/template/ChartTypeManager.cxx | 2 +-
chart2/source/model/template/ChartTypeTemplate.cxx | 1 -
chart2/source/model/template/ColumnChartType.cxx | 1 -
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 1 -
chart2/source/model/template/DataInterpreter.cxx | 2 --
chart2/source/model/template/FilledNetChartType.cxx | 1 -
chart2/source/model/template/LineChartType.cxx | 1 -
chart2/source/model/template/LineChartTypeTemplate.cxx | 1 -
chart2/source/model/template/NetChartType.cxx | 1 -
chart2/source/model/template/PieChartType.cxx | 1 -
chart2/source/model/template/PieChartTypeTemplate.cxx | 1 -
chart2/source/model/template/ScatterChartType.cxx | 1 -
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 1 -
chart2/source/model/template/StockChartTypeTemplate.cxx | 1 -
chart2/source/model/template/StockDataInterpreter.cxx | 2 --
chart2/source/model/template/XYDataInterpreter.cxx | 1 -
chart2/source/tools/AxisHelper.cxx | 1 -
chart2/source/tools/CachedDataSequence.cxx | 2 --
chart2/source/tools/CharacterProperties.cxx | 1 -
chart2/source/tools/ConfigColorScheme.cxx | 1 -
chart2/source/tools/DataSourceHelper.cxx | 1 -
chart2/source/tools/ExplicitCategoriesProvider.cxx | 1 -
chart2/source/tools/RangeHighlighter.cxx | 1 -
chart2/source/tools/RegressionCurveModel.cxx | 1 -
chart2/source/view/charttypes/VSeriesPlotter.cxx | 1 -
chart2/source/view/main/PropertyMapper.cxx | 1 -
chart2/source/view/main/VDataSeries.cxx | 1 -
60 files changed, 3 insertions(+), 66 deletions(-)
New commits:
commit 194d4a02b9117064106fba0bde6b9494831d6475
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Wed Jul 13 13:27:01 2016 +0200
chart2: remove unused ContainerHelper.hxx includes
remove using namespace ::chart::ContainerHelper;
to match other uses
Change-Id: I343086a6b7d70c84499b209680973431c7317219
Reviewed-on: https://gerrit.libreoffice.org/27184
Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 58b0eb2..4cc40be 100644
--- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -19,7 +19,6 @@
#include "AreaWrapper.hxx"
#include "macros.hxx"
-#include "ContainerHelper.hxx"
#include "Chart2ModelContact.hxx"
#include "WrappedDirectStateProperty.hxx"
#include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 5ed3cce..177c7d9 100644
--- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -21,7 +21,6 @@
#include "AxisHelper.hxx"
#include "TitleHelper.hxx"
#include "Chart2ModelContact.hxx"
-#include "ContainerHelper.hxx"
#include "macros.hxx"
#include "WrappedDirectStateProperty.hxx"
#include "GridWrapper.hxx"
@@ -53,7 +52,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using namespace ::chart::ContainerHelper;
using ::com::sun::star::beans::Property;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 353bb0f..5d5bfa5 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -22,7 +22,6 @@
#include "DiagramHelper.hxx"
#include "DataSourceHelper.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "CommonFunctors.hxx"
#include "ChartModelHelper.hxx"
#include "DataSeriesHelper.hxx"
diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index 3ad6522..b0749d6 100644
--- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -36,7 +36,6 @@
#include "DiagramHelper.hxx"
#include "DataSourceHelper.hxx"
#include "ChartModelHelper.hxx"
-#include "ContainerHelper.hxx"
#include "AxisHelper.hxx"
#include "ThreeDHelper.hxx"
diff --git
a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 21e54a5..72b4e9a 100644
--- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -23,7 +23,6 @@
#include "Chart2ModelContact.hxx"
#include "ChartTypeHelper.hxx"
#include "DiagramHelper.hxx"
-#include "ContainerHelper.hxx"
#include "ChartModelHelper.hxx"
#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 7bee58d..61eb885 100644
--- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -41,7 +41,6 @@
#include "WrappedSceneProperty.hxx"
#include "WrappedGL3DProperties.hxx"
#include "RelativePositionHelper.hxx"
-#include "ContainerHelper.hxx"
#include "ControllerLockGuard.hxx"
#include "ModifyListenerHelper.hxx"
#include "DisposeHelper.hxx"
diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index c72d95f..3865cfa 100644
--- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -21,7 +21,6 @@
#include "macros.hxx"
#include "AxisHelper.hxx"
#include "Chart2ModelContact.hxx"
-#include "ContainerHelper.hxx"
#include "AxisIndexDefines.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index eebcf9b..696f600 100644
--- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -21,7 +21,6 @@
#include "macros.hxx"
#include "Chart2ModelContact.hxx"
#include "LegendHelper.hxx"
-#include "ContainerHelper.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/XTitled.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 2a0780a..c047939 100644
--- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -22,7 +22,6 @@
#include "Chart2ModelContact.hxx"
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/chart2/XChartType.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index a06080d..532291e 100644
--- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -19,7 +19,6 @@
#include "TitleWrapper.hxx"
#include "macros.hxx"
-#include "ContainerHelper.hxx"
#include "ControllerLockGuard.hxx"
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 7d345de..1e87a55 100644
--- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -22,7 +22,6 @@
#include "Chart2ModelContact.hxx"
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/chart2/XChartType.hpp>
#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 69b60b9..b52ca66 100644
--- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -20,7 +20,6 @@
#include "WallFloorWrapper.hxx"
#include "macros.hxx"
#include "Chart2ModelContact.hxx"
-#include "ContainerHelper.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx
b/chart2/source/controller/dialogs/DataBrowser.cxx
index e1b8e94..6187109 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -23,7 +23,6 @@
#include "DataBrowser.hxx"
#include "DataBrowserModel.hxx"
#include "Strings.hrc"
-#include "ContainerHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "DiagramHelper.hxx"
#include "ChartModelHelper.hxx"
diff --git a/chart2/source/controller/dialogs/DataBrowserModel.cxx
b/chart2/source/controller/dialogs/DataBrowserModel.cxx
index 8ec2ca3..e90d36a 100644
--- a/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -26,7 +26,6 @@
#include "ControllerLockGuard.hxx"
#include "macros.hxx"
#include "StatisticsHelper.hxx"
-#include "ContainerHelper.hxx"
#include "ChartTypeHelper.hxx"
#include "chartview/ExplicitValueProvider.hxx"
#include "ExplicitCategoriesProvider.hxx"
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx
b/chart2/source/controller/dialogs/DialogModel.cxx
index 4cb14c4..2503d85 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -51,7 +51,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-using namespace ::chart::ContainerHelper;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
@@ -494,7 +493,7 @@ void addNewSeriesToContainer(
const Reference<XDataSeries>& xNewSeries )
{
Reference<XDataSeriesContainer> xSeriesCnt(xChartType,
uno::UNO_QUERY_THROW);
- std::vector<Reference<XDataSeries> > aSeries =
SequenceToVector(xSeriesCnt->getDataSeries());
+ std::vector<Reference<XDataSeries> > aSeries =
ContainerHelper::SequenceToVector(xSeriesCnt->getDataSeries());
std::vector<Reference<XDataSeries> >::iterator aIt =
std::find( aSeries.begin(), aSeries.end(), xSeries);
@@ -828,7 +827,7 @@ void DialogModel::applyInterpretedData(
// data series
::std::vector< Reference< XDataSeriesContainer > > aSeriesCnt(
getAllDataSeriesContainers());
::std::vector< Sequence< Reference< XDataSeries > > > aNewSeries(
- SequenceToVector( rNewData.Series ));
+ ContainerHelper::SequenceToVector( rNewData.Series ));
OSL_ASSERT( aSeriesCnt.size() == aNewSeries.size());
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index 0795c31..21b9a2d 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -21,7 +21,6 @@
#include "dlg_CreationWizard.hxx"
#include "macros.hxx"
#include "servicenames.hxx"
-#include "ContainerHelper.hxx"
#include "TimerTriggeredControllerLock.hxx"
#include <osl/mutex.hxx>
#include <vcl/svapp.hxx>
diff --git a/chart2/source/model/filter/XMLFilter.cxx
b/chart2/source/model/filter/XMLFilter.cxx
index 8cac9e2..cc74c3e 100644
--- a/chart2/source/model/filter/XMLFilter.cxx
+++ b/chart2/source/model/filter/XMLFilter.cxx
@@ -20,7 +20,6 @@
#include "XMLFilter.hxx"
#include "macros.hxx"
#include "MediaDescriptorHelper.hxx"
-#include "ContainerHelper.hxx"
#include <svtools/sfxecode.hxx>
#include <unotools/saveopt.hxx>
diff --git a/chart2/source/model/main/Axis.cxx
b/chart2/source/model/main/Axis.cxx
index 5f97ee4..eec6bbe 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -24,7 +24,6 @@
#include "LinePropertiesHelper.hxx"
#include "UserDefinedProperties.hxx"
#include "PropertyHelper.hxx"
-#include "ContainerHelper.hxx"
#include "CloneHelper.hxx"
#include "AxisHelper.hxx"
#include "EventListenerHelper.hxx"
diff --git a/chart2/source/model/main/DataPoint.cxx
b/chart2/source/model/main/DataPoint.cxx
index 274bb4e..19a54e0 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -23,7 +23,6 @@
#include "UserDefinedProperties.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
-#include "ContainerHelper.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/model/main/Diagram.cxx
b/chart2/source/model/main/Diagram.cxx
index f1ef40f..8ab8c66 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -24,7 +24,6 @@
#include "UserDefinedProperties.hxx"
#include "ConfigColorScheme.hxx"
#include "DiagramHelper.hxx"
-#include "ContainerHelper.hxx"
#include "ThreeDHelper.hxx"
#include "CloneHelper.hxx"
#include "AxisHelper.hxx"
diff --git a/chart2/source/model/main/FormattedString.cxx
b/chart2/source/model/main/FormattedString.cxx
index caaff12..d34dfa5 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -18,7 +18,6 @@
*/
#include "FormattedString.hxx"
-#include "ContainerHelper.hxx"
#include "CharacterProperties.hxx"
#include "PropertyHelper.hxx"
diff --git a/chart2/source/model/main/GridProperties.cxx
b/chart2/source/model/main/GridProperties.cxx
index 70aa84e..e145a70 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -22,7 +22,6 @@
#include "UserDefinedProperties.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
-#include "ContainerHelper.hxx"
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/chart2/source/model/main/Legend.cxx
b/chart2/source/model/main/Legend.cxx
index 69250fc..d7eabc9 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -24,7 +24,6 @@
#include "CharacterProperties.hxx"
#include "UserDefinedProperties.hxx"
#include "LegendHelper.hxx"
-#include "ContainerHelper.hxx"
#include "CloneHelper.hxx"
#include "PropertyHelper.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/model/main/PageBackground.cxx
b/chart2/source/model/main/PageBackground.cxx
index f5fe633..c73f58c 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -22,7 +22,6 @@
#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
-#include "ContainerHelper.hxx"
#include "PropertyHelper.hxx"
#include <com/sun/star/drawing/LineStyle.hpp>
diff --git a/chart2/source/model/main/StockBar.cxx
b/chart2/source/model/main/StockBar.cxx
index 9eafe97..4b922bb 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -23,7 +23,6 @@
#include "UserDefinedProperties.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
-#include "ContainerHelper.hxx"
#include "ModifyListenerHelper.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/style/XStyle.hpp>
diff --git a/chart2/source/model/main/Wall.cxx
b/chart2/source/model/main/Wall.cxx
index 3fa5b18..40e7e43 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -22,7 +22,6 @@
#include "LinePropertiesHelper.hxx"
#include "FillProperties.hxx"
#include "UserDefinedProperties.hxx"
-#include "ContainerHelper.hxx"
#include "PropertyHelper.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx
b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 42b2f9f..0128bb0 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -22,7 +22,6 @@
#include "servicenames_charttypes.hxx"
#include "DiagramHelper.hxx"
#include "DataSeriesHelper.hxx"
-#include "ContainerHelper.hxx"
#include "PropertyHelper.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx
b/chart2/source/model/template/BarChartTypeTemplate.cxx
index a4db718..1296b52 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -21,7 +21,6 @@
#include "macros.hxx"
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "PropertyHelper.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/model/template/BubbleChartType.cxx
b/chart2/source/model/template/BubbleChartType.cxx
index df1731c..d274060 100644
--- a/chart2/source/model/template/BubbleChartType.cxx
+++ b/chart2/source/model/template/BubbleChartType.cxx
@@ -21,7 +21,6 @@
#include "PropertyHelper.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "CartesianCoordinateSystem.hxx"
#include "AxisHelper.hxx"
#include "AxisIndexDefines.hxx"
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index fc8fe86..1d03e50 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -24,7 +24,6 @@
#include "Scaling.hxx"
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "DataSeriesHelper.hxx"
#include <com/sun/star/drawing/LineStyle.hpp>
#include "PropertyHelper.hxx"
diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx
b/chart2/source/model/template/BubbleDataInterpreter.cxx
index eef20b1..b2abf8e 100644
--- a/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -22,7 +22,6 @@
#include "macros.hxx"
#include "DataSeriesHelper.hxx"
#include "CommonConverters.hxx"
-#include "ContainerHelper.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
#include <com/sun/star/util/XCloneable.hpp>
diff --git a/chart2/source/model/template/CandleStickChartType.cxx
b/chart2/source/model/template/CandleStickChartType.cxx
index e9d2b32..fb9d702 100644
--- a/chart2/source/model/template/CandleStickChartType.cxx
+++ b/chart2/source/model/template/CandleStickChartType.cxx
@@ -22,7 +22,6 @@
#include "macros.hxx"
#include "StockBar.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/model/template/ChartType.cxx
b/chart2/source/model/template/ChartType.cxx
index 663abaa..479e6c1 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -25,7 +25,6 @@
#include "AxisHelper.hxx"
#include "CloneHelper.hxx"
#include "AxisIndexDefines.hxx"
-#include "ContainerHelper.hxx"
#include <vcl/svapp.hxx>
#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/model/template/ChartTypeManager.cxx
b/chart2/source/model/template/ChartTypeManager.cxx
index a4bdb98..9871b1c 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -20,7 +20,6 @@
#include "ChartTypeManager.hxx"
#include "macros.hxx"
#include "StackMode.hxx"
-#include "ContainerHelper.hxx"
#include "CartesianCoordinateSystem.hxx"
@@ -48,6 +47,7 @@
#include <iterator>
#include <functional>
#include <o3tl/functional.hxx>
+#include <map>
using namespace ::com::sun::star;
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx
b/chart2/source/model/template/ChartTypeTemplate.cxx
index 313343e..1b62e7a 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -23,7 +23,6 @@
#include "DataSeriesHelper.hxx"
#include "DataInterpreter.hxx"
#include "CommonConverters.hxx"
-#include "ContainerHelper.hxx"
#include "ChartTypeHelper.hxx"
#include "CartesianCoordinateSystem.hxx"
diff --git a/chart2/source/model/template/ColumnChartType.cxx
b/chart2/source/model/template/ColumnChartType.cxx
index dc0429b..c2b0146 100644
--- a/chart2/source/model/template/ColumnChartType.cxx
+++ b/chart2/source/model/template/ColumnChartType.cxx
@@ -21,7 +21,6 @@
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
#include "PropertyHelper.hxx"
-#include "ContainerHelper.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 4d81f4e..55a8f1e 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -24,7 +24,6 @@
#include "DataSeriesHelper.hxx"
#include "servicenames_charttypes.hxx"
#include "ColumnLineDataInterpreter.hxx"
-#include "ContainerHelper.hxx"
#include "PropertyHelper.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
diff --git a/chart2/source/model/template/DataInterpreter.cxx
b/chart2/source/model/template/DataInterpreter.cxx
index a7c0d34..163ac44 100644
--- a/chart2/source/model/template/DataInterpreter.cxx
+++ b/chart2/source/model/template/DataInterpreter.cxx
@@ -23,7 +23,6 @@
#include "DataSeriesHelper.hxx"
#include "macros.hxx"
#include "CommonConverters.hxx"
-#include "ContainerHelper.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
#include <cppuhelper/supportsservice.hxx>
@@ -35,7 +34,6 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
using namespace ::std;
-using namespace ::chart::ContainerHelper;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
diff --git a/chart2/source/model/template/FilledNetChartType.cxx
b/chart2/source/model/template/FilledNetChartType.cxx
index 5a04305..6831eaa9 100644
--- a/chart2/source/model/template/FilledNetChartType.cxx
+++ b/chart2/source/model/template/FilledNetChartType.cxx
@@ -23,7 +23,6 @@
#include "PolarCoordinateSystem.hxx"
#include "Scaling.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "AxisIndexDefines.hxx"
#include <com/sun/star/chart2/AxisType.hpp>
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/model/template/LineChartType.cxx
b/chart2/source/model/template/LineChartType.cxx
index 1b77e28..f2e2b5a 100644
--- a/chart2/source/model/template/LineChartType.cxx
+++ b/chart2/source/model/template/LineChartType.cxx
@@ -21,7 +21,6 @@
#include "PropertyHelper.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include <unonames.hxx>
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx
b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 9796f4e..8c988c5 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -21,7 +21,6 @@
#include "macros.hxx"
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "PropertyHelper.hxx"
#include <unonames.hxx>
diff --git a/chart2/source/model/template/NetChartType.cxx
b/chart2/source/model/template/NetChartType.cxx
index 42ede75..b04892f 100644
--- a/chart2/source/model/template/NetChartType.cxx
+++ b/chart2/source/model/template/NetChartType.cxx
@@ -22,7 +22,6 @@
#include "macros.hxx"
#include "PolarCoordinateSystem.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "AxisIndexDefines.hxx"
#include "AxisHelper.hxx"
diff --git a/chart2/source/model/template/PieChartType.cxx
b/chart2/source/model/template/PieChartType.cxx
index e20a341..1f7adf7 100644
--- a/chart2/source/model/template/PieChartType.cxx
+++ b/chart2/source/model/template/PieChartType.cxx
@@ -23,7 +23,6 @@
#include "PolarCoordinateSystem.hxx"
#include "AxisHelper.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "AxisIndexDefines.hxx"
#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx
b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 78e113e..cd296aff 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -23,7 +23,6 @@
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
#include "DataSeriesHelper.hxx"
-#include "ContainerHelper.hxx"
#include "BaseGFXHelper.hxx"
#include "AxisHelper.hxx"
#include "ThreeDHelper.hxx"
diff --git a/chart2/source/model/template/ScatterChartType.cxx
b/chart2/source/model/template/ScatterChartType.cxx
index c7db754..9caf5a0 100644
--- a/chart2/source/model/template/ScatterChartType.cxx
+++ b/chart2/source/model/template/ScatterChartType.cxx
@@ -21,7 +21,6 @@
#include "PropertyHelper.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "CartesianCoordinateSystem.hxx"
#include "AxisHelper.hxx"
#include "AxisIndexDefines.hxx"
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index aecac2e..44703f6 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -23,7 +23,6 @@
#include "CartesianCoordinateSystem.hxx"
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
-#include "ContainerHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "PropertyHelper.hxx"
#include <unonames.hxx>
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx
b/chart2/source/model/template/StockChartTypeTemplate.cxx
index d58bcb4..8d580b6 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -26,7 +26,6 @@
#include "DiagramHelper.hxx"
#include "servicenames_charttypes.hxx"
#include "servicenames_coosystems.hxx"
-#include "ContainerHelper.hxx"
#include "AxisIndexDefines.hxx"
#include <com/sun/star/chart2/AxisType.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
diff --git a/chart2/source/model/template/StockDataInterpreter.cxx
b/chart2/source/model/template/StockDataInterpreter.cxx
index e806ab1..d92ee28 100644
--- a/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/chart2/source/model/template/StockDataInterpreter.cxx
@@ -22,7 +22,6 @@
#include "macros.hxx"
#include "DataSeriesHelper.hxx"
#include "CommonConverters.hxx"
-#include "ContainerHelper.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
@@ -36,7 +35,6 @@ using namespace ::std;
using ::com::sun::star::uno::Reference;
using ::com::sun::star::uno::Sequence;
-using namespace ::chart::ContainerHelper;
namespace chart
{
diff --git a/chart2/source/model/template/XYDataInterpreter.cxx
b/chart2/source/model/template/XYDataInterpreter.cxx
index 4eaab59..c64f54b 100644
--- a/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/chart2/source/model/template/XYDataInterpreter.cxx
@@ -22,7 +22,6 @@
#include "macros.hxx"
#include "DataSeriesHelper.hxx"
#include "CommonConverters.hxx"
-#include "ContainerHelper.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/chart2/data/XDataSink.hpp>
#include <com/sun/star/util/XCloneable.hpp>
diff --git a/chart2/source/tools/AxisHelper.cxx
b/chart2/source/tools/AxisHelper.cxx
index cdc2629..1fb25ad 100644
--- a/chart2/source/tools/AxisHelper.cxx
+++ b/chart2/source/tools/AxisHelper.cxx
@@ -23,7 +23,6 @@
#include "macros.hxx"
#include "AxisIndexDefines.hxx"
#include "LinePropertiesHelper.hxx"
-#include "ContainerHelper.hxx"
#include "servicenames_coosystems.hxx"
#include "DataSeriesHelper.hxx"
#include "Scaling.hxx"
diff --git a/chart2/source/tools/CachedDataSequence.cxx
b/chart2/source/tools/CachedDataSequence.cxx
index 68afef5..0a4c634 100644
--- a/chart2/source/tools/CachedDataSequence.cxx
+++ b/chart2/source/tools/CachedDataSequence.cxx
@@ -20,7 +20,6 @@
#include "CachedDataSequence.hxx"
#include "macros.hxx"
#include "PropertyHelper.hxx"
-#include "ContainerHelper.hxx"
#include "CommonFunctors.hxx"
#include "ModifyListenerHelper.hxx"
@@ -32,7 +31,6 @@
#include <rtl/math.hxx>
using namespace ::com::sun::star;
-using namespace ::chart::ContainerHelper;
using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Reference;
diff --git a/chart2/source/tools/CharacterProperties.cxx
b/chart2/source/tools/CharacterProperties.cxx
index fe3d287..f0a9535 100644
--- a/chart2/source/tools/CharacterProperties.cxx
+++ b/chart2/source/tools/CharacterProperties.cxx
@@ -18,7 +18,6 @@
*/
#include "CharacterProperties.hxx"
-#include "ContainerHelper.hxx"
#include "macros.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/chart2/source/tools/ConfigColorScheme.cxx
b/chart2/source/tools/ConfigColorScheme.cxx
index 69ddf39..5d474dd 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -18,7 +18,6 @@
*/
#include "ConfigColorScheme.hxx"
-#include "ContainerHelper.hxx"
#include "macros.hxx"
#include <unotools/configitem.hxx>
diff --git a/chart2/source/tools/DataSourceHelper.cxx
b/chart2/source/tools/DataSourceHelper.cxx
index 11a6c76..d75ad20 100644
--- a/chart2/source/tools/DataSourceHelper.cxx
+++ b/chart2/source/tools/DataSourceHelper.cxx
@@ -23,7 +23,6 @@
#include "DiagramHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "DataSource.hxx"
-#include "ContainerHelper.hxx"
#include "ControllerLockGuard.hxx"
#include "PropertyHelper.hxx"
#include "CachedDataSequence.hxx"
diff --git a/chart2/source/tools/ExplicitCategoriesProvider.cxx
b/chart2/source/tools/ExplicitCategoriesProvider.cxx
index ca9475b..fc45f1f 100644
--- a/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -24,7 +24,6 @@
#include "CommonConverters.hxx"
#include "DataSourceHelper.hxx"
#include "ChartModelHelper.hxx"
-#include "ContainerHelper.hxx"
#include "macros.hxx"
#include "NumberFormatterWrapper.hxx"
#include <unonames.hxx>
diff --git a/chart2/source/tools/RangeHighlighter.cxx
b/chart2/source/tools/RangeHighlighter.cxx
index 55b90e1..be12ffd 100644
--- a/chart2/source/tools/RangeHighlighter.cxx
+++ b/chart2/source/tools/RangeHighlighter.cxx
@@ -21,7 +21,6 @@
#include "WeakListenerAdapter.hxx"
#include "ChartModelHelper.hxx"
#include "DataSourceHelper.hxx"
-#include "ContainerHelper.hxx"
#include "macros.hxx"
#include "ObjectIdentifier.hxx"
#include "DataSeriesHelper.hxx"
diff --git a/chart2/source/tools/RegressionCurveModel.cxx
b/chart2/source/tools/RegressionCurveModel.cxx
index 0133ff0..d09e46e 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -23,7 +23,6 @@
#include "RegressionCurveHelper.hxx"
#include "RegressionCalculationHelper.hxx"
#include "RegressionEquation.hxx"
-#include "ContainerHelper.hxx"
#include "CloneHelper.hxx"
#include "PropertyHelper.hxx"
#include <cppuhelper/supportsservice.hxx>
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx
b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 4d17b16..ea6d341 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -33,7 +33,6 @@
#include "Clipping.hxx"
#include "servicenames_charttypes.hxx"
#include "NumberFormatterWrapper.hxx"
-#include "ContainerHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "RegressionCurveHelper.hxx"
#include "VLegendSymbolFactory.hxx"
diff --git a/chart2/source/view/main/PropertyMapper.cxx
b/chart2/source/view/main/PropertyMapper.cxx
index 41bd757..420ac93 100644
--- a/chart2/source/view/main/PropertyMapper.cxx
+++ b/chart2/source/view/main/PropertyMapper.cxx
@@ -18,7 +18,6 @@
*/
#include "PropertyMapper.hxx"
-#include "ContainerHelper.hxx"
#include "macros.hxx"
#include <unonames.hxx>
diff --git a/chart2/source/view/main/VDataSeries.cxx
b/chart2/source/view/main/VDataSeries.cxx
index 83c58e4..6b98b7a 100644
--- a/chart2/source/view/main/VDataSeries.cxx
+++ b/chart2/source/view/main/VDataSeries.cxx
@@ -23,7 +23,6 @@
#include "CommonConverters.hxx"
#include "LabelPositionHelper.hxx"
#include "ChartTypeHelper.hxx"
-#include "ContainerHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "RegressionCurveHelper.hxx"
#include <unonames.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
