summaryrefslogtreecommitdiff
path: root/chart2/source/view/axes
diff options
context:
space:
mode:
Diffstat (limited to 'chart2/source/view/axes')
-rw-r--r--chart2/source/view/axes/ScaleAutomatism.cxx6
-rw-r--r--chart2/source/view/axes/VAxisProperties.hxx2
-rw-r--r--chart2/source/view/axes/VCartesianAxis.cxx22
-rw-r--r--chart2/source/view/axes/VCartesianGrid.cxx4
-rw-r--r--chart2/source/view/axes/VCartesianGrid.hxx2
-rw-r--r--chart2/source/view/axes/VPolarAxis.hxx2
-rw-r--r--chart2/source/view/axes/VPolarGrid.cxx6
-rw-r--r--chart2/source/view/axes/VPolarGrid.hxx4
-rw-r--r--chart2/source/view/axes/VPolarRadiusAxis.hxx2
9 files changed, 25 insertions, 25 deletions
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 022025ba8751..1c7016e0e94a 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -353,7 +353,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
double fTempValue = fSourceMinimum;
fSourceMinimum = -fSourceMaximum;
fSourceMaximum = -fTempValue;
- ::std::swap( bAutoMinimum, bAutoMaximum );
+ std::swap( bAutoMinimum, bAutoMaximum );
}
// *** STEP 2: find temporary (unrounded) axis minimum and maximum ***
@@ -518,7 +518,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLogarithmic(
rExplicitScale.Maximum = 10.0;
}
if( rExplicitScale.Maximum < rExplicitScale.Minimum )
- ::std::swap( rExplicitScale.Maximum, rExplicitScale.Minimum );
+ std::swap( rExplicitScale.Maximum, rExplicitScale.Minimum );
}
//fill explicit sub increment
@@ -773,7 +773,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForLinear(
double fTempValue = fSourceMinimum;
fSourceMinimum = -fSourceMaximum;
fSourceMaximum = -fTempValue;
- ::std::swap( bAutoMinimum, bAutoMaximum );
+ std::swap( bAutoMinimum, bAutoMaximum );
}
// *** STEP 2: find temporary (unrounded) axis minimum and maximum ***
diff --git a/chart2/source/view/axes/VAxisProperties.hxx b/chart2/source/view/axes/VAxisProperties.hxx
index 53770dc9b6b2..8178ab8c6edf 100644
--- a/chart2/source/view/axes/VAxisProperties.hxx
+++ b/chart2/source/view/axes/VAxisProperties.hxx
@@ -129,7 +129,7 @@ struct AxisProperties final
*/
sal_Int32 m_nMajorTickmarks;
sal_Int32 m_nMinorTickmarks;
- ::std::vector<TickmarkProperties> m_aTickmarkPropertiesList;
+ std::vector<TickmarkProperties> m_aTickmarkPropertiesList;
VLineProperties m_aLineProperties;
diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx
index 5dcb9a89bd1a..8a38c8cb1597 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -295,9 +295,9 @@ B2DVector lcl_getLabelsDistance( TickIter& rIter, const B2DVector& rDistanceTick
{
awt::Size aSize = AbstractShapeFactory::getSizeAfterRotation( xShape2DText, fRotationAngleDegree );
if(fabs(aStaggerDirection.getX())>fabs(aStaggerDirection.getY()))
- nDistance = ::std::max(nDistance,aSize.Width);
+ nDistance = std::max(nDistance,aSize.Width);
else
- nDistance = ::std::max(nDistance,aSize.Height);
+ nDistance = std::max(nDistance,aSize.Height);
}
}
@@ -1092,8 +1092,8 @@ VCartesianAxis::ScreenPosAndLogicPos VCartesianAxis::getScreenPosAndLogicPos( do
return aRet;
}
-typedef ::std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList;
-struct lcl_LessXPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
+typedef std::vector< VCartesianAxis::ScreenPosAndLogicPos > tScreenPosAndLogicPosList;
+struct lcl_LessXPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
{
inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
{
@@ -1101,7 +1101,7 @@ struct lcl_LessXPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLogicP
}
};
-struct lcl_GreaterYPos : ::std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
+struct lcl_GreaterYPos : std::binary_function< VCartesianAxis::ScreenPosAndLogicPos, VCartesianAxis::ScreenPosAndLogicPos, bool >
{
inline bool operator() ( const VCartesianAxis::ScreenPosAndLogicPos& rPos1, const VCartesianAxis::ScreenPosAndLogicPos& rPos2 )
{
@@ -1201,14 +1201,14 @@ void VCartesianAxis::get2DAxisMainLine(
{
rAlignment.meAlignment = LABEL_ALIGN_LEFT;
//choose most left positions
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
rAlignment.mfLabelDirection = (fDeltaY < 0) ? -1.0 : 1.0;
}
else
{
rAlignment.meAlignment = LABEL_ALIGN_BOTTOM;
//choose most bottom positions
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
rAlignment.mfLabelDirection = (fDeltaX < 0) ? -1.0 : 1.0;
}
ScreenPosAndLogicPos aBestPos( aPosList[0] );
@@ -1255,14 +1255,14 @@ void VCartesianAxis::get2DAxisMainLine(
{
rAlignment.meAlignment = LABEL_ALIGN_LEFT;
//choose most left positions
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_LessXPos() );
rAlignment.mfLabelDirection = (fDeltaY < 0) ? -1.0 : 1.0;
}
else
{
rAlignment.meAlignment = LABEL_ALIGN_BOTTOM;
//choose most bottom positions
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
rAlignment.mfLabelDirection = (fDeltaX < 0) ? -1.0 : 1.0;
}
ScreenPosAndLogicPos aBestPos( aPosList[0] );
@@ -1330,7 +1330,7 @@ void VCartesianAxis::get2DAxisMainLine(
aPosList.push_back( getScreenPosAndLogicPos( fXOther, fYOnYPlane, fMinZ ) );
aPosList.push_back( getScreenPosAndLogicPos( fXOnXPlane, fYOther, fMinZ ) );
- ::std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
+ std::sort( aPosList.begin(), aPosList.end(), lcl_GreaterYPos() );
ScreenPosAndLogicPos aBestPos( aPosList[0] );
ScreenPosAndLogicPos aNotSoGoodPos( aPosList[1] );
@@ -1768,7 +1768,7 @@ void VCartesianAxis::createShapes()
pTickFactory2D->updateScreenValues( aComplexTickInfos );
hideIdenticalScreenValues( aComplexTickInfos );
- ::std::vector<TickmarkProperties> aTickmarkPropertiesList;
+ std::vector<TickmarkProperties> aTickmarkPropertiesList;
static bool bIncludeSpaceBetweenTickAndText = false;
sal_Int32 nOffset = static_cast<sal_Int32>(pTickFactory2D->getDistanceAxisTickToText( m_aAxisProperties, false, bIncludeSpaceBetweenTickAndText ).getLength());
sal_Int32 nTextLevelCount = getTextLevelCount();
diff --git a/chart2/source/view/axes/VCartesianGrid.cxx b/chart2/source/view/axes/VCartesianGrid.cxx
index 02b23221c50a..8da909ffef3f 100644
--- a/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/chart2/source/view/axes/VCartesianGrid.cxx
@@ -174,7 +174,7 @@ VCartesianGrid::~VCartesianGrid()
m_pPosHelper = nullptr;
}
-void VCartesianGrid::fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList
+void VCartesianGrid::fillLinePropertiesFromGridModel( std::vector<VLineProperties>& rLinePropertiesList
, const Sequence< Reference< beans::XPropertySet > > & rGridPropertiesList )
{
rLinePropertiesList.clear();
@@ -205,7 +205,7 @@ void VCartesianGrid::createShapes()
if(!xGroupShape_Shapes.is())
return;
- ::std::vector<VLineProperties> aLinePropertiesList;
+ std::vector<VLineProperties> aLinePropertiesList;
fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList );
//create all scaled tickmark values
diff --git a/chart2/source/view/axes/VCartesianGrid.hxx b/chart2/source/view/axes/VCartesianGrid.hxx
index dddb629bd6dd..31b6fb878775 100644
--- a/chart2/source/view/axes/VCartesianGrid.hxx
+++ b/chart2/source/view/axes/VCartesianGrid.hxx
@@ -40,7 +40,7 @@ public:
virtual void createShapes() override;
- static void fillLinePropertiesFromGridModel( ::std::vector<VLineProperties>& rLinePropertiesList
+ static void fillLinePropertiesFromGridModel( std::vector<VLineProperties>& rLinePropertiesList
, const css::uno::Sequence<
css::uno::Reference< css::beans::XPropertySet > >& rGridPropertiesList );
diff --git a/chart2/source/view/axes/VPolarAxis.hxx b/chart2/source/view/axes/VPolarAxis.hxx
index 6eaed3385128..997663b6e325 100644
--- a/chart2/source/view/axes/VPolarAxis.hxx
+++ b/chart2/source/view/axes/VPolarAxis.hxx
@@ -49,7 +49,7 @@ protected:
protected: //member
PolarPlottingPositionHelper* m_pPosHelper;
- ::std::vector< ExplicitIncrementData > m_aIncrements;
+ std::vector< ExplicitIncrementData > m_aIncrements;
};
} //namespace chart
diff --git a/chart2/source/view/axes/VPolarGrid.cxx b/chart2/source/view/axes/VPolarGrid.cxx
index 9dbc47df44cd..c20f1a68730e 100644
--- a/chart2/source/view/axes/VPolarGrid.cxx
+++ b/chart2/source/view/axes/VPolarGrid.cxx
@@ -105,7 +105,7 @@ void VPolarGrid::createLinePointSequence_ForAngleAxis(
void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicTarget
, TickInfoArraysType& /* rRadiusTickInfos */
, TickInfoArraysType& rAngleTickInfos
- , const ::std::vector<VLineProperties>& rLinePropertiesList )
+ , const std::vector<VLineProperties>& rLinePropertiesList )
{
Reference< drawing::XShapes > xMainTarget(
this->createGroupShape( xLogicTarget, m_aCID ) );
@@ -159,7 +159,7 @@ void VPolarGrid::create2DAngleGrid( const Reference< drawing::XShapes >& xLogicT
void VPolarGrid::create2DRadiusGrid( const Reference< drawing::XShapes >& xLogicTarget
, TickInfoArraysType& rRadiusTickInfos
, TickInfoArraysType& rAngleTickInfos
- , const ::std::vector<VLineProperties>& rLinePropertiesList )
+ , const std::vector<VLineProperties>& rLinePropertiesList )
{
Reference< drawing::XShapes > xMainTarget(
this->createGroupShape( xLogicTarget, m_aCID ) );
@@ -233,7 +233,7 @@ void VPolarGrid::createShapes()
getAllTickInfos( 0, aAngleTickInfos );
getAllTickInfos( 1, aRadiusTickInfos );
- ::std::vector<VLineProperties> aLinePropertiesList;
+ std::vector<VLineProperties> aLinePropertiesList;
VCartesianGrid::fillLinePropertiesFromGridModel( aLinePropertiesList, m_aGridPropertiesList );
//create tick mark line shapes
diff --git a/chart2/source/view/axes/VPolarGrid.hxx b/chart2/source/view/axes/VPolarGrid.hxx
index 6d8a128b3210..645c341bf4fc 100644
--- a/chart2/source/view/axes/VPolarGrid.hxx
+++ b/chart2/source/view/axes/VPolarGrid.hxx
@@ -57,14 +57,14 @@ private: //member
css::uno::Sequence<
css::uno::Reference< css::beans::XPropertySet > > m_aGridPropertiesList;//main grid, subgrid, subsubgrid etc
PolarPlottingPositionHelper* m_pPosHelper;
- ::std::vector< ExplicitIncrementData > m_aIncrements;
+ std::vector< ExplicitIncrementData > m_aIncrements;
void getAllTickInfos( sal_Int32 nDimensionIndex, TickInfoArraysType& rAllTickInfos ) const;
void create2DRadiusGrid( const css::uno::Reference<css::drawing::XShapes>& xLogicTarget
, TickInfoArraysType& rRadiusTickInfos
, TickInfoArraysType& rAngleTickInfos
- , const ::std::vector<VLineProperties>& rLinePropertiesList );
+ , const std::vector<VLineProperties>& rLinePropertiesList );
};
} //namespace chart
diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx
index e4f2d85da738..bdf23f29751b 100644
--- a/chart2/source/view/axes/VPolarRadiusAxis.hxx
+++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx
@@ -47,7 +47,7 @@ public:
virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ) override;
- virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override;
+ virtual void setScales( const std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ) override;
virtual void setExplicitScaleAndIncrement(
const ExplicitScaleData& rScale
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 10:41:53 +0000