summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/controller/dialogs/DialogModel.cxx7
-rw-r--r--chart2/source/controller/main/ChartController_Window.cxx4
-rw-r--r--chart2/source/inc/ContainerHelper.hxx73
-rw-r--r--chart2/source/model/main/BaseCoordinateSystem.cxx3
-rw-r--r--chart2/source/model/main/DataSeries.cxx5
-rw-r--r--chart2/source/model/main/Title.cxx13
-rw-r--r--chart2/source/tools/DataSeriesHelper.cxx9
-rw-r--r--chart2/source/tools/DiagramHelper.cxx5
-rw-r--r--chart2/source/tools/ErrorBar.cxx3
-rw-r--r--chart2/source/tools/InternalDataProvider.cxx7
-rw-r--r--chart2/source/tools/PropertyHelper.cxx4
-rw-r--r--chart2/source/tools/RegressionEquation.cxx7
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx3
13 files changed, 33 insertions, 110 deletions
diff --git a/chart2/source/controller/dialogs/DialogModel.cxx b/chart2/source/controller/dialogs/DialogModel.cxx
index 11a616a34f8e..a363c6cc6fc8 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -24,7 +24,6 @@
#include <DiagramHelper.hxx>
#include <strings.hrc>
#include <ResId.hxx>
-#include <ContainerHelper.hxx>
#include <ControllerLockGuard.hxx>
#include <ChartTypeHelper.hxx>
#include <ThreeDHelper.hxx>
@@ -489,7 +488,7 @@ void addNewSeriesToContainer(
const Reference<XDataSeries>& xNewSeries )
{
Reference<XDataSeriesContainer> xSeriesCnt(xChartType, uno::UNO_QUERY_THROW);
- std::vector<Reference<XDataSeries> > aSeries = ContainerHelper::SequenceToVector(xSeriesCnt->getDataSeries());
+ auto aSeries = comphelper::sequenceToContainer<std::vector<Reference<XDataSeries> >>(xSeriesCnt->getDataSeries());
std::vector<Reference<XDataSeries> >::iterator aIt =
std::find( aSeries.begin(), aSeries.end(), xSeries);
@@ -819,8 +818,8 @@ void DialogModel::applyInterpretedData(
// data series
std::vector< Reference< XDataSeriesContainer > > aSeriesCnt( getAllDataSeriesContainers());
- std::vector< Sequence< Reference< XDataSeries > > > aNewSeries(
- ContainerHelper::SequenceToVector( rNewData.Series ));
+ auto aNewSeries(
+ comphelper::sequenceToContainer<std::vector< Sequence< Reference< XDataSeries > > >>( rNewData.Series ));
OSL_ASSERT( aSeriesCnt.size() == aNewSeries.size());
diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx
index f63126747058..c928be0e3a17 100644
--- a/chart2/source/controller/main/ChartController_Window.cxx
+++ b/chart2/source/controller/main/ChartController_Window.cxx
@@ -39,7 +39,6 @@
#include <RegressionCurveHelper.hxx>
#include <StatisticsHelper.hxx>
#include <DataSeriesHelper.hxx>
-#include <ContainerHelper.hxx>
#include <AxisHelper.hxx>
#include <LegendHelper.hxx>
#include <servicenames_charttypes.hxx>
@@ -63,6 +62,7 @@
#include <comphelper/lok.hxx>
#include <comphelper/propertysequence.hxx>
#include <comphelper/propertyvalue.hxx>
+#include <comphelper/sequence.hxx>
#include <toolkit/awt/vclxmenu.hxx>
@@ -1054,7 +1054,7 @@ void ChartController::execute_Command( const CommandEvent& rCEvt )
{
if( bIsPoint )
{
- std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
+ auto aIndices( comphelper::sequenceToContainer<std::vector< sal_Int32 >>( aAttributedDataPointIndexList ) );
std::vector< sal_Int32 >::iterator aIt = std::find( aIndices.begin(), aIndices.end(), nPointIndex );
if( aIt != aIndices.end())
bSelectedPointIsFormatted = true;
diff --git a/chart2/source/inc/ContainerHelper.hxx b/chart2/source/inc/ContainerHelper.hxx
deleted file mode 100644
index 014d3c1033d5..000000000000
--- a/chart2/source/inc/ContainerHelper.hxx
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CHART2_SOURCE_INC_CONTAINERHELPER_HXX
-#define INCLUDED_CHART2_SOURCE_INC_CONTAINERHELPER_HXX
-
-#include <vector>
-
-namespace chart
-{
-namespace ContainerHelper
-{
-
-/** converts a UNO sequence into a standard "Sequence" container. For
- convenience see the methods SequenceToVector, etc. below.
-
- input: uno::Sequence
- output: a standard container of the same value type implementing the Concept
- of a Sequence (vector, deque, list, slist)
-
- example:
-
- Sequence< sal_Int32 > aSequence;
- std::vector< sal_Int32 > aVector(
- ContainerToSequence::SequenceToSTLSequenceContainer< std::vector< sal_Int32 > >( aSequence );
-*/
-template< class Container >
- Container
- SequenceToSTLSequenceContainer( const css::uno::Sequence< typename Container::value_type > & rSeq )
-{
- Container aResult( rSeq.getLength());
- std::copy( rSeq.begin(), rSeq.end(), aResult.begin() );
- return aResult;
-}
-
-// concrete container methods for convenience
-
-/** converts a UNO sequence into a standard vector of same value type
-
- example:
-
- Sequence< sal_Int32 > aSequence;
- std::vector< sal_Int32 > aVector( ContainerHelper::SequenceToVector( aSequence ));
- */
-template< typename T >
- std::vector< T >
- SequenceToVector( const css::uno::Sequence< T > & rSeq )
-{
- return SequenceToSTLSequenceContainer< std::vector< T > >( rSeq );
-}
-
-} // namespace ContainerHelper
-} // namespace chart
-
-// INCLUDED_CHART2_SOURCE_INC_CONTAINERHELPER_HXX
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 5b5236da80de..94fa8592c1aa 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -20,7 +20,6 @@
#include <BaseCoordinateSystem.hxx>
#include <PropertyHelper.hxx>
#include <UserDefinedProperties.hxx>
-#include <ContainerHelper.hxx>
#include <CloneHelper.hxx>
#include <ModifyListenerHelper.hxx>
#include "Axis.hxx"
@@ -274,7 +273,7 @@ Sequence< Reference< chart2::XChartType > > SAL_CALL BaseCoordinateSystem::getCh
void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< chart2::XChartType > >& aChartTypes )
{
ModifyListenerHelper::removeListenerFromAllElements( m_aChartTypes, m_xModifyEventForwarder );
- m_aChartTypes = ContainerHelper::SequenceToVector( aChartTypes );
+ m_aChartTypes = comphelper::sequenceToContainer<std::vector< css::uno::Reference< css::chart2::XChartType > >>( aChartTypes );
ModifyListenerHelper::addListenerToAllElements( m_aChartTypes, m_xModifyEventForwarder );
fireModifyEvent();
}
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 7b8e7ec57f94..6fdc432a5aab 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -24,7 +24,6 @@
#include <UserDefinedProperties.hxx>
#include "DataPoint.hxx"
#include <DataSeriesHelper.hxx>
-#include <ContainerHelper.hxx>
#include <CloneHelper.hxx>
#include <ModifyListenerHelper.hxx>
#include <EventListenerHelper.hxx>
@@ -395,7 +394,7 @@ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data:
xModifyEventForwarder = m_xModifyEventForwarder;
xListener = this;
std::swap( aOldDataSequences, m_aDataSequences );
- aNewDataSequences = ContainerHelper::SequenceToVector( aData );
+ aNewDataSequences = comphelper::sequenceToContainer<tDataSequenceContainer>( aData );
m_aDataSequences = aNewDataSequences;
}
ModifyListenerHelper::removeListenerFromAllElements( aOldDataSequences, xModifyEventForwarder );
@@ -462,7 +461,7 @@ void SAL_CALL DataSeries::setRegressionCurves(
const Sequence< Reference< chart2::XRegressionCurve > >& aRegressionCurves )
{
tRegressionCurveContainerType aOldCurves;
- tRegressionCurveContainerType aNewCurves( ContainerHelper::SequenceToVector( aRegressionCurves ) );
+ auto aNewCurves( comphelper::sequenceToContainer<tRegressionCurveContainerType>( aRegressionCurves ) );
Reference< util::XModifyListener > xModifyEventForwarder;
{
MutexGuard aGuard( m_aMutex );
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index e203fec8316b..652b99bc94f6 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -20,7 +20,6 @@
#include "Title.hxx"
#include <LinePropertiesHelper.hxx>
#include <FillProperties.hxx>
-#include <ContainerHelper.hxx>
#include <CloneHelper.hxx>
#include <PropertyHelper.hxx>
#include <ModifyListenerHelper.hxx>
@@ -241,13 +240,15 @@ Title::Title( const Title & rOther ) :
CloneHelper::CloneRefSequence<chart2::XFormattedString>(
rOther.m_aStrings, m_aStrings );
ModifyListenerHelper::addListenerToAllElements(
- ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
+ comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( m_aStrings ),
+ m_xModifyEventForwarder );
}
Title::~Title()
{
ModifyListenerHelper::removeListenerFromAllElements(
- ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
+ comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( m_aStrings ),
+ m_xModifyEventForwarder );
}
// ____ XCloneable ____
@@ -273,9 +274,11 @@ void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XForm
}
//don't keep the mutex locked while calling out
ModifyListenerHelper::removeListenerFromAllElements(
- ContainerHelper::SequenceToVector( aOldStrings ), m_xModifyEventForwarder );
+ comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( aOldStrings ),
+ m_xModifyEventForwarder );
ModifyListenerHelper::addListenerToAllElements(
- ContainerHelper::SequenceToVector( rNewStrings ), m_xModifyEventForwarder );
+ comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( rNewStrings ),
+ m_xModifyEventForwarder );
fireModifyEvent();
}
diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx
index 389a10ededb8..480c6dafa596 100644
--- a/chart2/source/tools/DataSeriesHelper.cxx
+++ b/chart2/source/tools/DataSeriesHelper.cxx
@@ -19,7 +19,6 @@
#include <DataSeriesHelper.hxx>
#include <DataSource.hxx>
-#include <ContainerHelper.hxx>
#include <unonames.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -517,8 +516,8 @@ void deleteSeries(
try
{
Reference< chart2::XDataSeriesContainer > xSeriesCnt( xChartType, uno::UNO_QUERY_THROW );
- std::vector< Reference< chart2::XDataSeries > > aSeries(
- ContainerHelper::SequenceToVector( xSeriesCnt->getDataSeries()));
+ auto aSeries(
+ comphelper::sequenceToContainer<std::vector< Reference< chart2::XDataSeries > > >( xSeriesCnt->getDataSeries()));
std::vector< Reference< chart2::XDataSeries > >::iterator aIt =
std::find( aSeries.begin(), aSeries.end(), xSeries );
if( aIt != aSeries.end())
@@ -692,7 +691,7 @@ sal_Int32 translateIndexFromHiddenToFullSequence( sal_Int32 nIndex, const Refere
xProp->getPropertyValue( "HiddenValues" ) >>= aHiddenIndicesSeq;
if( aHiddenIndicesSeq.getLength() )
{
- std::vector< sal_Int32 > aHiddenIndices( ContainerHelper::SequenceToVector( aHiddenIndicesSeq ) );
+ auto aHiddenIndices( comphelper::sequenceToContainer<std::vector< sal_Int32 >>( aHiddenIndicesSeq ) );
std::sort( aHiddenIndices.begin(), aHiddenIndices.end() );
sal_Int32 nHiddenCount = static_cast<sal_Int32>(aHiddenIndices.size());
@@ -777,7 +776,7 @@ bool hasDataLabelAtPoint( const Reference< chart2::XDataSeries >& xSeries, sal_I
uno::Sequence< sal_Int32 > aAttributedDataPointIndexList;
if( xSeriesProperties->getPropertyValue( "AttributedDataPoints" ) >>= aAttributedDataPointIndexList )
{
- std::vector< sal_Int32 > aIndices( ContainerHelper::SequenceToVector( aAttributedDataPointIndexList ) );
+ auto aIndices( comphelper::sequenceToContainer<std::vector< sal_Int32 >>( aAttributedDataPointIndexList ) );
std::vector< sal_Int32 >::iterator aIt = std::find( aIndices.begin(), aIndices.end(), nPointIndex );
if( aIt != aIndices.end())
xProp = xSeries->getDataPointByIndex(nPointIndex);
diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx
index 07f00bee436e..f7249ceabf54 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -20,7 +20,6 @@
#include <DiagramHelper.hxx>
#include <DataSeriesHelper.hxx>
#include <AxisHelper.hxx>
-#include <ContainerHelper.hxx>
#include <ChartTypeHelper.hxx>
#include <ChartModel.hxx>
#include <ChartModelHelper.hxx>
@@ -1237,8 +1236,8 @@ bool DiagramHelper::areChartTypesCompatible( const Reference< ::chart2::XChartTy
if( !xFirstType.is() || !xSecondType.is() )
return false;
- std::vector< OUString > aFirstRoles( ContainerHelper::SequenceToVector( xFirstType->getSupportedMandatoryRoles() ) );
- std::vector< OUString > aSecondRoles( ContainerHelper::SequenceToVector( xSecondType->getSupportedMandatoryRoles() ) );
+ auto aFirstRoles( comphelper::sequenceToContainer<std::vector< OUString >>( xFirstType->getSupportedMandatoryRoles() ) );
+ auto aSecondRoles( comphelper::sequenceToContainer<std::vector< OUString >>( xSecondType->getSupportedMandatoryRoles() ) );
std::sort( aFirstRoles.begin(), aFirstRoles.end() );
std::sort( aSecondRoles.begin(), aSecondRoles.end() );
return ( aFirstRoles == aSecondRoles );
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 268c4988c904..f03887dc25d1 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -18,7 +18,6 @@
*/
#include <ErrorBar.hxx>
-#include <ContainerHelper.hxx>
#include <EventListenerHelper.hxx>
#include <CloneHelper.hxx>
#include <ModifyListenerHelper.hxx>
@@ -443,7 +442,7 @@ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::da
{
ModifyListenerHelper::removeListenerFromAllElements( m_aDataSequences, m_xModifyEventForwarder );
EventListenerHelper::removeListenerFromAllElements( m_aDataSequences, this );
- m_aDataSequences = ContainerHelper::SequenceToVector( aData );
+ m_aDataSequences = comphelper::sequenceToContainer<tDataSequenceContainer>( aData );
EventListenerHelper::addListenerToAllElements( m_aDataSequences, this );
ModifyListenerHelper::addListenerToAllElements( m_aDataSequences, m_xModifyEventForwarder );
}
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index a919375a7a85..9fdd59d66fbb 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -25,7 +25,6 @@
#include <LabeledDataSequence.hxx>
#include <DataSource.hxx>
#include <XMLRangeHelper.hxx>
-#include <ContainerHelper.hxx>
#include <CommonFunctors.hxx>
#include <UncachedDataSequence.hxx>
#include <DataSourceHelper.hxx>
@@ -132,7 +131,7 @@ struct lcl_internalizeSeries
if( xValues.is() )
{
- std::vector< double > aValues( ContainerHelper::SequenceToVector( xValues->getNumericalData()));
+ auto aValues( comphelper::sequenceToContainer<std::vector< double >>( xValues->getNumericalData()));
if( m_bDataInColumns )
m_rInternalData.setColumnValues( nNewIndex, aValues );
else
@@ -931,7 +930,7 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation
void SAL_CALL InternalDataProvider::setDataByRangeRepresentation(
const OUString& aRange, const Sequence< uno::Any >& aNewData )
{
- vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) );
+ auto aNewVector( comphelper::sequenceToContainer<vector< uno::Any >>(aNewData) );
if( aRange.match( lcl_aLabelRangePrefix ) )
{
sal_uInt32 nIndex = aRange.copy( strlen(lcl_aLabelRangePrefix)).toInt32();
@@ -1283,7 +1282,7 @@ vector< vector< Type > > lcl_convertSequenceSequenceToVectorVector( const Sequen
{
aRet.resize(nOuterCount);
for( sal_Int32 nN=0; nN<nOuterCount; nN++)
- aRet[nN]= ContainerHelper::SequenceToVector( rIn[nN] );
+ aRet[nN]= comphelper::sequenceToContainer<vector< Type >>( rIn[nN] );
}
return aRet;
}
diff --git a/chart2/source/tools/PropertyHelper.cxx b/chart2/source/tools/PropertyHelper.cxx
index 6ed262206cbf..b874f53027b3 100644
--- a/chart2/source/tools/PropertyHelper.cxx
+++ b/chart2/source/tools/PropertyHelper.cxx
@@ -18,9 +18,9 @@
*/
#include <PropertyHelper.hxx>
-#include <ContainerHelper.hxx>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <comphelper/sequence.hxx>
#include <osl/diagnose.h>
#include <tools/diagnose_ex.h>
@@ -118,7 +118,7 @@ OUString lcl_addNamedPropertyUniqueNameToTable(
try
{
Reference< container::XNameAccess > xNameAccess( xNameContainer, uno::UNO_QUERY_THROW );
- std::vector< OUString > aNames( ::chart::ContainerHelper::SequenceToVector( xNameAccess->getElementNames()));
+ auto aNames( comphelper::sequenceToContainer<std::vector< OUString >>( xNameAccess->getElementNames()));
std::vector< OUString >::const_iterator aIt(
std::find_if( aNames.begin(), aNames.end(), lcl_EqualsElement( rValue, xNameAccess )));
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 927b06d4b0e9..5212c8d842d8 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -23,7 +23,6 @@
#include <UserDefinedProperties.hxx>
#include <CharacterProperties.hxx>
#include <PropertyHelper.hxx>
-#include <ContainerHelper.hxx>
#include <ModifyListenerHelper.hxx>
#include <unonames.hxx>
#include <cppuhelper/supportsservice.hxx>
@@ -293,10 +292,12 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference<
{
MutexGuard aGuard( m_aMutex );
ModifyListenerHelper::removeListenerFromAllElements(
- ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
+ comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( m_aStrings ),
+ m_xModifyEventForwarder );
m_aStrings = Strings;
ModifyListenerHelper::addListenerToAllElements(
- ContainerHelper::SequenceToVector( m_aStrings ), m_xModifyEventForwarder );
+ comphelper::sequenceToContainer<std::vector<uno::Reference< chart2::XFormattedString > > >( m_aStrings ),
+ m_xModifyEventForwarder );
fireModifyEvent();
}
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 9caaff5de1da..8ab7e19e6013 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -26,7 +26,6 @@
#include <servicenames_coosystems.hxx>
#include <ObjectIdentifier.hxx>
#include <ExplicitCategoriesProvider.hxx>
-#include <ContainerHelper.hxx>
#include "VAxisBase.hxx"
#include <defines.hxx>
#include <chartview/ExplicitValueProvider.hxx>
@@ -202,7 +201,7 @@ Sequence< Reference< beans::XPropertySet > > VCoordinateSystem::getGridListFromA
if( xAxis.is() )
{
aRet.push_back( xAxis->getGridProperties() );
- std::vector< Reference< beans::XPropertySet > > aSubGrids( ContainerHelper::SequenceToVector( xAxis->getSubGridProperties() ) );
+ auto aSubGrids( comphelper::sequenceToContainer<std::vector< Reference< beans::XPropertySet > > >( xAxis->getSubGridProperties() ) );
aRet.insert( aRet.end(), aSubGrids.begin(), aSubGrids.end() );
}