summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@collabora.com>2014-10-10 11:40:55 -0400
committerKohei Yoshida <kohei.yoshida@collabora.com>2014-10-10 15:42:30 -0400
commitacfabbf06d37b5bcd18dc27fcbf75a3943f498f8 (patch)
treeb526a37a4181ee6ef5b7982d71e2a0373d8ba9eb /chart2
parent2ba6c00d37606595244ea2e67ddc14e129805b48 (diff)
prepareScaleAutomatismForDimensionAndIndex -> prepareAutomaticAxisScaling.
Change-Id: Ic66d2fcf78603bdd4fa1e08933900f49c66384b7
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/view/axes/VCoordinateSystem.cxx2
-rw-r--r--chart2/source/view/inc/VCoordinateSystem.hxx2
-rw-r--r--chart2/source/view/main/ChartView.cxx4
3 files changed, 4 insertions, 4 deletions
diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx
index 457ff8288c24..1f1fe68386a9 100644
--- a/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -356,7 +356,7 @@ void VCoordinateSystem::updateScalesAndIncrementsOnAxes()
{
}
-void VCoordinateSystem::prepareScaleAutomatismForDimensionAndIndex( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex )
+void VCoordinateSystem::prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex )
{
if( rScaleAutomatism.getScale().AxisType==AxisType::DATE && nDimIndex==0 )
{
diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx
index 54df0b35fd7e..7439535da4ee 100644
--- a/chart2/source/view/inc/VCoordinateSystem.hxx
+++ b/chart2/source/view/inc/VCoordinateSystem.hxx
@@ -86,7 +86,7 @@ public:
bool hasMinimumAndMaximumSupplier( MinimumAndMaximumSupplier* pMinimumAndMaximumSupplier );
void clearMinimumAndMaximumSupplierList();
- void prepareScaleAutomatismForDimensionAndIndex( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex );
+ void prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAutomatism, sal_Int32 nDimIndex, sal_Int32 nAxisIndex );
void setExplicitScaleAndIncrement( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex
, const ExplicitScaleData& rExplicitScale
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index f3f14a4d8b8c..1ecbe06ec660 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -227,7 +227,7 @@ void AxisUsage::prepareAutomaticAxisScaling( ScaleAutomatism& rScaleAutomatism,
{
std::vector<VCoordinateSystem*> aVCooSysList = getCoordinateSystems(nDimIndex, nAxisIndex);
for (size_t i = 0, n = aVCooSysList.size(); i < n; ++i)
- aVCooSysList[i]->prepareScaleAutomatismForDimensionAndIndex(rScaleAutomatism, nDimIndex, nAxisIndex);
+ aVCooSysList[i]->prepareAutomaticAxisScaling(rScaleAutomatism, nDimIndex, nAxisIndex);
}
void AxisUsage::setExplicitScaleAndIncrement(
@@ -793,7 +793,7 @@ void SeriesPlotterContainer::AdaptScaleOfYAxisWithoutAttachedSeries( ChartModel&
{
for( size_t nC = 0; nC < aVCooSysList_Y.size(); ++nC )
{
- aVCooSysList_Y[nC]->prepareScaleAutomatismForDimensionAndIndex( rAxisUsage.aAutoScaling, 1, nAttachedAxisIndex );
+ aVCooSysList_Y[nC]->prepareAutomaticAxisScaling( rAxisUsage.aAutoScaling, 1, nAttachedAxisIndex );
ExplicitScaleData aExplicitScaleSource = aVCooSysList_Y[nC]->getExplicitScale( 1,nAttachedAxisIndex );
ExplicitIncrementData aExplicitIncrementSource = aVCooSysList_Y[nC]->getExplicitIncrement( 1,nAttachedAxisIndex );