summaryrefslogtreecommitdiff
path: root/chart2/source/view/charttypes
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view/charttypes')
-rw-r--r--chart2/source/view/charttypes/AreaChart.cxx40
-rw-r--r--chart2/source/view/charttypes/BarChart.cxx34
-rw-r--r--chart2/source/view/charttypes/BubbleChart.cxx28
-rw-r--r--chart2/source/view/charttypes/CandleStickChart.cxx14
-rw-r--r--chart2/source/view/charttypes/NetChart.cxx40
-rw-r--r--chart2/source/view/charttypes/PieChart.cxx12
-rw-r--r--chart2/source/view/charttypes/PieChart.hxx4
-rw-r--r--chart2/source/view/charttypes/Splines.cxx24
-rw-r--r--chart2/source/view/charttypes/VSeriesPlotter.cxx134
9 files changed, 165 insertions, 165 deletions
diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx
index b0f3fdb63d86..da8a20f3e117 100644
--- a/chart2/source/view/charttypes/AreaChart.cxx
+++ b/chart2/source/view/charttypes/AreaChart.cxx
@@ -531,19 +531,19 @@ void AreaChart::impl_createSeriesShapes()
//the polygon shapes for each series need to be created before
//iterate through all series again to create the series shapes
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex
drawing::PolyPolygonShape3D* pSeriesPoly = nullptr;
@@ -580,20 +580,20 @@ void AreaChart::impl_createSeriesShapes()
namespace
{
-void lcl_reorderSeries( ::std::vector< ::std::vector< VDataSeriesGroup > >& rZSlots )
+void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >& rZSlots )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > > aRet;
+ std::vector< std::vector< VDataSeriesGroup > > aRet;
aRet.reserve( rZSlots.size() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() );
+ std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() );
+ std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() );
for( ; aZIt != aZEnd; ++aZIt )
{
- ::std::vector< VDataSeriesGroup > aXSlot;
+ std::vector< VDataSeriesGroup > aXSlot;
aXSlot.reserve( aZIt->size() );
- ::std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() );
- ::std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() );
+ std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() );
+ std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() );
for( ; aXIt != aXEnd; ++aXIt )
aXSlot.push_back(*aXIt);
@@ -667,14 +667,14 @@ void AreaChart::createShapes()
bool bDateCategory = (m_pExplicitCategoriesProvider && m_pExplicitCategoriesProvider->isDateAxis());
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
std::vector<std::map< sal_Int32, double > > aLogicYSumMapByX(nEndIndex);//one for each different nAttachedAxisIndex
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end();
//iterate through all x slots in this category to get 100percent sum
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
@@ -715,8 +715,8 @@ void AreaChart::createShapes()
aZSlotIter = m_aZSlots.begin();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
//for the area chart there should be at most one x slot (no side by side stacking available)
//attention different: xSlots are always interpreted as independent areas one behind the other: @todo this doesn't work why not???
diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx
index 764dae06a6eb..df796f73e04e 100644
--- a/chart2/source/view/charttypes/BarChart.cxx
+++ b/chart2/source/view/charttypes/BarChart.cxx
@@ -451,15 +451,15 @@ void BarChart::createShapes()
//iterate through all x values per indices
for( sal_Int32 nPointIndex = nStartIndex; nPointIndex < nEndIndex; nPointIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
//sum up the values for all series in a complete z zlot per attached axis
- ::std::map< sal_Int32, double > aLogicYSumMap;
+ std::map< sal_Int32, double > aLogicYSumMap;
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( aXSlotIter = aZSlotIter->begin(); aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
@@ -485,8 +485,8 @@ void BarChart::createShapes()
aZSlotIter = m_aZSlots.begin();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
//iterate through all x slots in this category
double fSlotX=0;
@@ -508,7 +508,7 @@ void BarChart::createShapes()
pPosHelper->updateSeriesCount( aZSlotIter->size() );
double fLogicBaseWidth = pPosHelper->getScaledSlotWidth();
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
// get distance from base value to maximum and minimum
@@ -553,8 +553,8 @@ void BarChart::createShapes()
double fPositiveLogicYForNextSeries = fBaseValue;
double fNegativeLogicYForNextSeries = fBaseValue;
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
@@ -862,12 +862,12 @@ void BarChart::createShapes()
}//next category
if( bDrawConnectionLines )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
BarPositionHelper* pPosHelper = m_pMainPosHelper.get();
if( aXSlotIter != aXSlotEnd )
@@ -883,10 +883,10 @@ void BarChart::createShapes()
//iterate through all x slots in this category
for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx
index a435ceed43d6..5bb940aa7dc4 100644
--- a/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/chart2/source/view/charttypes/BubbleChart.cxx
@@ -72,17 +72,17 @@ void BubbleChart::calculateMaximumLogicBubbleSize()
sal_Int32 nEndIndex = VSeriesPlotter::getPointCount();
for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
VDataSeries* pSeries( *aSeriesIter );
@@ -215,19 +215,19 @@ void BubbleChart::createShapes()
//iterate through all x values per indices
for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( sal_Int32 nX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, ++nX )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series
for( sal_Int32 nSeriesIndex = 0; aSeriesIter != aSeriesEnd; ++aSeriesIter, ++nSeriesIndex )
diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx
index 439ed56ea1ce..58e0f3aac533 100644
--- a/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -139,12 +139,12 @@ void CandleStickChart::createShapes()
//iterate through all x values per indices
for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=0; aZSlotIter != aZSlotEnd; ++aZSlotIter, nZ++ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
sal_Int32 nAttachedAxisIndex = 0;
BarPositionHelper* pPosHelper = m_pMainPosHelper.get();
@@ -163,10 +163,10 @@ void CandleStickChart::createShapes()
//iterate through all x slots in this category
for( double fSlotX=0; aXSlotIter != aXSlotEnd; ++aXSlotIter, fSlotX+=1.0 )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx
index 591e4c98969e..c1cebdcc97bd 100644
--- a/chart2/source/view/charttypes/NetChart.cxx
+++ b/chart2/source/view/charttypes/NetChart.cxx
@@ -244,19 +244,19 @@ void NetChart::impl_createSeriesShapes()
//the polygon shapes for each series need to be created before
//iterate through all series again to create the series shapes
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
std::map< sal_Int32, drawing::PolyPolygonShape3D* > aPreviousSeriesPolyMap;//a PreviousSeriesPoly for each different nAttachedAxisIndex
drawing::PolyPolygonShape3D* pSeriesPoly = nullptr;
@@ -290,20 +290,20 @@ void NetChart::impl_createSeriesShapes()
namespace
{
-void lcl_reorderSeries( ::std::vector< ::std::vector< VDataSeriesGroup > >& rZSlots )
+void lcl_reorderSeries( std::vector< std::vector< VDataSeriesGroup > >& rZSlots )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > > aRet;
+ std::vector< std::vector< VDataSeriesGroup > > aRet;
aRet.reserve( rZSlots.size() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() );
+ std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZIt( rZSlots.rbegin() );
+ std::vector< std::vector< VDataSeriesGroup > >::reverse_iterator aZEnd( rZSlots.rend() );
for( ; aZIt != aZEnd; ++aZIt )
{
- ::std::vector< VDataSeriesGroup > aXSlot;
+ std::vector< VDataSeriesGroup > aXSlot;
aXSlot.reserve( aZIt->size() );
- ::std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() );
- ::std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() );
+ std::vector< VDataSeriesGroup >::reverse_iterator aXIt( aZIt->rbegin() );
+ std::vector< VDataSeriesGroup >::reverse_iterator aXEnd( aZIt->rend() );
for( ; aXIt != aXEnd; ++aXIt )
aXSlot.push_back(*aXIt);
@@ -375,14 +375,14 @@ void NetChart::createShapes()
//iterate through all x values per indices
for( sal_Int32 nIndex = nStartIndex; nIndex < nEndIndex; nIndex++ )
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
std::map< sal_Int32, double > aLogicYSumMap;//one for each different nAttachedAxisIndex
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::iterator aXSlotEnd = aZSlotIter->end();
//iterate through all x slots in this category to get 100percent sum
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
@@ -419,8 +419,8 @@ void NetChart::createShapes()
aZSlotIter = m_aZSlots.begin();
for( sal_Int32 nZ=1; aZSlotIter != aZSlotEnd; ++aZSlotIter, ++nZ )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
//for the area chart there should be at most one x slot (no side by side stacking available)
//attention different: xSlots are always interpreted as independent areas one behind the other: @todo this doesn't work why not???
diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index a510604d44fc..34001ef1f9f0 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -394,7 +394,7 @@ double PieChart::getMaxOffset()
if( m_aZSlots[0].size()<=0 )
return m_fMaxOffset;
- const ::std::vector< VDataSeries* >& rSeriesList( m_aZSlots[0][0].m_aSeriesVector );
+ const std::vector< VDataSeries* >& rSeriesList( m_aZSlots[0][0].m_aSeriesVector );
if( rSeriesList.size()<=0 )
return m_fMaxOffset;
@@ -511,8 +511,8 @@ void PieChart::createShapes()
///that the radius axis scale is the one with index 0 and the angle axis
///scale is the one with index 1.
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = m_aZSlots[0].begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = m_aZSlots[0].end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = m_aZSlots[0].begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = m_aZSlots[0].end();
///m_bUseRings == true if chart type is `donut`, == false if chart type is
///`pie`; if the chart is of `donut` type we have as many rings as many data
@@ -527,7 +527,7 @@ void PieChart::createShapes()
///the `explodeable` ring is the first one except when the radius axis
///orientation is reversed (always!?) and we are dealing with a donut: in
///such a case the `explodeable` ring is the last one.
- ::std::vector< VDataSeriesGroup >::size_type nExplodeableSlot = 0;
+ std::vector< VDataSeriesGroup >::size_type nExplodeableSlot = 0;
if( m_pPosHelper->isMathematicalOrientationRadius() && m_bUseRings )
nExplodeableSlot = m_aZSlots[0].size()-1;
@@ -552,7 +552,7 @@ void PieChart::createShapes()
{
ShapeParam aParam;
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
if( pSeriesList->size()<=0 )//there should be only one series in each x slot
continue;
VDataSeries* pSeries = (*pSeriesList)[0];
@@ -628,7 +628,7 @@ void PieChart::createShapes()
///property of the current data series entry only for slices
///belonging to the outer ring
aParam.mfExplodePercentage = 0.0;
- bool bDoExplode = ( nExplodeableSlot == static_cast< ::std::vector< VDataSeriesGroup >::size_type >(fSlotX) );
+ bool bDoExplode = ( nExplodeableSlot == static_cast< std::vector< VDataSeriesGroup >::size_type >(fSlotX) );
if(bDoExplode) try
{
xPointProperties->getPropertyValue( "Offset") >>= aParam.mfExplodePercentage;
diff --git a/chart2/source/view/charttypes/PieChart.hxx b/chart2/source/view/charttypes/PieChart.hxx
index 6ec5356a6eeb..8743bc0d2af8 100644
--- a/chart2/source/view/charttypes/PieChart.hxx
+++ b/chart2/source/view/charttypes/PieChart.hxx
@@ -44,7 +44,7 @@ public:
virtual void createShapes() override;
virtual void rearrangeLabelToAvoidOverlapIfRequested( const css::awt::Size& rPageSize ) override;
- virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override;
+ virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override;
virtual void addSeries( VDataSeries* pSeries, sal_Int32 zSlot = -1, sal_Int32 xSlot = -1,sal_Int32 ySlot = -1 ) override;
virtual css::drawing::Direction3D getPreferredDiagramAspectRatio() const override;
@@ -134,7 +134,7 @@ private: //member
css::awt::Point aPreviousPosition;
};
- ::std::vector< PieLabelInfo > m_aLabelInfoList;
+ std::vector< PieLabelInfo > m_aLabelInfoList;
double m_fMaxOffset; /// cached max offset value (init'ed to NaN)
};
diff --git a/chart2/source/view/charttypes/Splines.cxx b/chart2/source/view/charttypes/Splines.cxx
index a06a76a2be8f..ca8051155164 100644
--- a/chart2/source/view/charttypes/Splines.cxx
+++ b/chart2/source/view/charttypes/Splines.cxx
@@ -33,8 +33,8 @@ using namespace ::com::sun::star;
namespace
{
-typedef ::std::pair< double, double > tPointType;
-typedef ::std::vector< tPointType > tPointVecType;
+typedef std::pair< double, double > tPointType;
+typedef std::vector< tPointType > tPointVecType;
typedef tPointVecType::size_type lcl_tSizeType;
class lcl_SplineCalculation
@@ -76,7 +76,7 @@ private:
tPointVecType m_aPoints;
/// the result of the Calculate() method
- ::std::vector< double > m_aSecDerivY;
+ std::vector< double > m_aSecDerivY;
double m_fYp1;
double m_fYpN;
@@ -146,7 +146,7 @@ void lcl_SplineCalculation::Calculate()
// n is the last valid index to m_aPoints
const lcl_tSizeType n = m_aPoints.size() - 1;
- ::std::vector< double > u( n );
+ std::vector< double > u( n );
m_aSecDerivY.resize( n + 1, 0.0 );
if( ::rtl::math::isInf( m_fYp1 ) )
@@ -219,25 +219,25 @@ void lcl_SplineCalculation::CalculatePeriodic()
// u is used for vector f in A*c=f in [3], vector a in Ax=a in [2],
// vector z in Rtranspose z = a and Dr=z in [2]
- ::std::vector< double > u( n + 1, 0.0 );
+ std::vector< double > u( n + 1, 0.0 );
// used for vector c in A*c=f and vector x in Ax=a in [2]
m_aSecDerivY.resize( n + 1, 0.0 );
// diagonal of matrix A, used index 1 to n
- ::std::vector< double > Adiag( n + 1, 0.0 );
+ std::vector< double > Adiag( n + 1, 0.0 );
// secondary diagonal of matrix A with index 1 to n-1 and upper right element in A[n]
- ::std::vector< double > Aupper( n + 1, 0.0 );
+ std::vector< double > Aupper( n + 1, 0.0 );
// diagonal of matrix D in A=(R transpose)*D*R in [2], used index 1 to n
- ::std::vector< double > Ddiag( n+1, 0.0 );
+ std::vector< double > Ddiag( n+1, 0.0 );
// right column of matrix R, used index 1 to n-2
- ::std::vector< double > Rright( n-1, 0.0 );
+ std::vector< double > Rright( n-1, 0.0 );
// secondary diagonal of matrix R, used index 1 to n-1
- ::std::vector< double > Rupper( n, 0.0 );
+ std::vector< double > Rupper( n, 0.0 );
if (n<4)
{
@@ -557,7 +557,7 @@ void SplineCalculater::CalculateCubicSplines(
const double* pOldY = rInput.SequenceY[nOuter].getConstArray();
const double* pOldZ = rInput.SequenceZ[nOuter].getConstArray();
- ::std::vector < double > aParameter(nMaxIndexPoints+1);
+ std::vector < double > aParameter(nMaxIndexPoints+1);
aParameter[0]=0.0;
for( sal_uInt32 nIndex=1; nIndex<=nMaxIndexPoints; nIndex++ )
{
@@ -703,7 +703,7 @@ void SplineCalculater::CalculateBSplines(
aPointsIn[ i ].first = pOldX[i];
aPointsIn[ i ].second = pOldY[i];
}
- aPointsIn.erase( ::std::unique( aPointsIn.begin(), aPointsIn.end()),
+ aPointsIn.erase( std::unique( aPointsIn.begin(), aPointsIn.end()),
aPointsIn.end() );
// n is the last valid index to the reduced aPointsIn
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx
index ebdb4f82755c..134a9898e6d4 100644
--- a/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -118,8 +118,8 @@ VDataSeriesGroup::~VDataSeriesGroup()
void VDataSeriesGroup::deleteSeries()
{
//delete all data series help objects:
- ::std::vector< VDataSeries* >::const_iterator aIter = m_aSeriesVector.begin();
- const ::std::vector< VDataSeries* >::const_iterator aEnd = m_aSeriesVector.end();
+ std::vector< VDataSeries* >::const_iterator aIter = m_aSeriesVector.begin();
+ const std::vector< VDataSeries* >::const_iterator aEnd = m_aSeriesVector.end();
for( ; aIter != aEnd; ++aIter )
{
delete *aIter;
@@ -158,12 +158,12 @@ VSeriesPlotter::VSeriesPlotter( const uno::Reference<XChartType>& xChartTypeMode
VSeriesPlotter::~VSeriesPlotter()
{
//delete all data series help objects:
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
aXSlotIter->deleteSeries();
@@ -209,14 +209,14 @@ void VSeriesPlotter::addSeries( VDataSeries* pSeries, sal_Int32 zSlot, sal_Int32
if(zSlot<0 || zSlot>=static_cast<sal_Int32>(m_aZSlots.size()))
{
//new z slot
- ::std::vector< VDataSeriesGroup > aZSlot;
+ std::vector< VDataSeriesGroup > aZSlot;
aZSlot.push_back( VDataSeriesGroup(pSeries) );
m_aZSlots.push_back( aZSlot );
}
else
{
//existing zslot
- ::std::vector< VDataSeriesGroup >& rXSlots = m_aZSlots[zSlot];
+ std::vector< VDataSeriesGroup >& rXSlots = m_aZSlots[zSlot];
if(xSlot<0 || xSlot>=static_cast<sal_Int32>(rXSlots.size()))
{
@@ -271,18 +271,18 @@ drawing::Direction3D VSeriesPlotter::getPreferredDiagramAspectRatio() const
void VSeriesPlotter::releaseShapes()
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
@@ -1558,12 +1558,12 @@ void VSeriesPlotter::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximu
::rtl::math::setInf(&rfMinimum, false);
::rtl::math::setInf(&rfMaximum, true);
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
double fLocalMinimum, fLocalMaximum;
@@ -1585,12 +1585,12 @@ void VSeriesPlotter::getMinimumAndMaximiumYInContinuousXRange( double& rfMinY, d
::rtl::math::setInf(&rfMinY, false);
::rtl::math::setInf(&rfMaxY, true);
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
double fLocalMinimum, fLocalMaximum;
@@ -1611,13 +1611,13 @@ sal_Int32 VSeriesPlotter::getPointCount() const
{
sal_Int32 nRet = 0;
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
@@ -1651,8 +1651,8 @@ sal_Int32 VDataSeriesGroup::getPointCount() const
return m_nMaxPointCount;
sal_Int32 nRet = 0;
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter)
{
@@ -1670,8 +1670,8 @@ sal_Int32 VDataSeriesGroup::getPointCount() const
sal_Int32 VDataSeriesGroup::getAttachedAxisIndexForFirstSeries() const
{
sal_Int32 nRet = 0;
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
if( aSeriesIter != aSeriesEnd )
nRet = (*aSeriesIter)->getAttachedAxisIndex();
@@ -1681,10 +1681,10 @@ sal_Int32 VDataSeriesGroup::getAttachedAxisIndexForFirstSeries() const
void VDataSeriesGroup::getMinimumAndMaximiumX( double& rfMinimum, double& rfMaximum ) const
{
- const ::std::vector< VDataSeries* >* pSeriesList = &this->m_aSeriesVector;
+ const std::vector< VDataSeries* >* pSeriesList = &this->m_aSeriesVector;
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
::rtl::math::setInf(&rfMinimum, false);
::rtl::math::setInf(&rfMaximum, true);
@@ -1916,8 +1916,8 @@ void VDataSeriesGroup::calculateYMinAndMaxForCategory( sal_Int32 nCategoryIndex
::rtl::math::setNan( &fFirstPositiveY );
::rtl::math::setNan( &fFirstNegativeY );
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
- ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = m_aSeriesVector.begin();
+ std::vector< VDataSeries* >::const_iterator aSeriesEnd = m_aSeriesVector.end();
if( bSeparateStackingForDifferentSigns )
{
@@ -2063,12 +2063,12 @@ void VSeriesPlotter::rearrangeLabelToAvoidOverlapIfRequested( const awt::Size& /
VDataSeries* VSeriesPlotter::getFirstSeries() const
{
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() );
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() );
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() );
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
if( aXSlotIter != aXSlotEnd )
{
@@ -2086,18 +2086,18 @@ VDataSeries* VSeriesPlotter::getFirstSeries() const
uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const
{
- ::std::vector< OUString > aRetVector;
+ std::vector< OUString > aRetVector;
OUString aRole;
if( m_xChartTypeModel.is() )
aRole = m_xChartTypeModel->getRoleOfSequenceForSeriesLabel();
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() );
- ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() );
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotIter( m_aZSlots.begin() );
+ std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd( m_aZSlots.end() );
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::const_iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
if( aXSlotIter != aXSlotEnd )
{
@@ -2119,13 +2119,13 @@ uno::Sequence< OUString > VSeriesPlotter::getSeriesNames() const
namespace
{
-struct lcl_setRefSizeAtSeriesGroup : public ::std::unary_function< VDataSeriesGroup, void >
+struct lcl_setRefSizeAtSeriesGroup : public std::unary_function< VDataSeriesGroup, void >
{
explicit lcl_setRefSizeAtSeriesGroup( awt::Size aRefSize ) : m_aRefSize( aRefSize ) {}
void operator()( VDataSeriesGroup & rGroup )
{
- ::std::vector< VDataSeries* >::iterator aIt( rGroup.m_aSeriesVector.begin());
- const ::std::vector< VDataSeries* >::iterator aEndIt( rGroup.m_aSeriesVector.end());
+ std::vector< VDataSeries* >::iterator aIt( rGroup.m_aSeriesVector.begin());
+ const std::vector< VDataSeries* >::iterator aEndIt( rGroup.m_aSeriesVector.end());
for( ; aIt != aEndIt; ++aIt )
(*aIt)->setPageReferenceSize( m_aRefSize );
}
@@ -2141,8 +2141,8 @@ void VSeriesPlotter::setPageReferenceSize( const css::awt::Size & rPageRefSize )
// set reference size also at all data series
- ::std::vector< VDataSeriesGroup > aSeriesGroups( FlattenVector( m_aZSlots ));
- ::std::for_each( aSeriesGroups.begin(), aSeriesGroups.end(),
+ std::vector< VDataSeriesGroup > aSeriesGroups( FlattenVector( m_aZSlots ));
+ std::for_each( aSeriesGroups.begin(), aSeriesGroups.end(),
lcl_setRefSizeAtSeriesGroup( m_aPageReferenceSize ));
}
@@ -2180,17 +2180,17 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
//iterate through all series
bool bBreak = false;
bool bFirstSeries = true;
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter!=aZSlotEnd && !bBreak; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter!=aXSlotEnd && !bBreak; ++aXSlotIter )
{
- ::std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
+ std::vector< VDataSeries* >* pSeriesList = &(aXSlotIter->m_aSeriesVector);
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = pSeriesList->begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = pSeriesList->end();
//iterate through all series in this x slot
for( ; aSeriesIter!=aSeriesEnd && !bBreak; ++aSeriesIter )
{
@@ -2232,18 +2232,18 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries(
return aResult;
}
-::std::vector< VDataSeries* > VSeriesPlotter::getAllSeries()
+std::vector< VDataSeries* > VSeriesPlotter::getAllSeries()
{
- ::std::vector< VDataSeries* > aAllSeries;
- ::std::vector< ::std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
- const ::std::vector< ::std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
+ std::vector< VDataSeries* > aAllSeries;
+ std::vector< std::vector< VDataSeriesGroup > >::iterator aZSlotIter = m_aZSlots.begin();
+ const std::vector< std::vector< VDataSeriesGroup > >::const_iterator aZSlotEnd = m_aZSlots.end();
for( ; aZSlotIter != aZSlotEnd; ++aZSlotIter )
{
- ::std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
- const ::std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
+ std::vector< VDataSeriesGroup >::iterator aXSlotIter = aZSlotIter->begin();
+ const std::vector< VDataSeriesGroup >::const_iterator aXSlotEnd = aZSlotIter->end();
for( ; aXSlotIter != aXSlotEnd; ++aXSlotIter )
{
- ::std::vector< VDataSeries* > aSeriesList = aXSlotIter->m_aSeriesVector;
+ std::vector< VDataSeries* > aSeriesList = aXSlotIter->m_aSeriesVector;
aAllSeries.insert( aAllSeries.end(), aSeriesList.begin(), aSeriesList.end() );
}
}
@@ -2301,9 +2301,9 @@ awt::Size VSeriesPlotter::getPreferredLegendKeyAspectRatio()
bool bSeriesAllowsLines = (getLegendSymbolStyle() == LegendSymbolStyle_LINE);
bool bHasLines = false;
bool bHasDashedLines = false;
- ::std::vector< VDataSeries* > aAllSeries( getAllSeries() );
- ::std::vector< VDataSeries* >::const_iterator aSeriesIter = aAllSeries.begin();
- const ::std::vector< VDataSeries* >::const_iterator aSeriesEnd = aAllSeries.end();
+ std::vector< VDataSeries* > aAllSeries( getAllSeries() );
+ std::vector< VDataSeries* >::const_iterator aSeriesIter = aAllSeries.begin();
+ const std::vector< VDataSeries* >::const_iterator aSeriesEnd = aAllSeries.end();
//iterate through all series
for( ; aSeriesIter != aSeriesEnd; ++aSeriesIter )
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 11:34:59 +0000