From 387a88fa252990ded26ee7ea6b89b11be7616986 Mon Sep 17 00:00:00 2001
From: Noel <noelgrandin@gmail.com>
Date: Wed, 21 Oct 2020 09:29:45 +0200
Subject: use tools::Long in basegfx..chart2

Change-Id: Ide4014348d51f0b5f59e1e91b8d41c7748853254
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104608
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 chart2/source/view/axes/DateHelper.cxx                |  2 +-
 chart2/source/view/axes/MinimumAndMaximumSupplier.cxx |  8 ++++----
 chart2/source/view/axes/ScaleAutomatism.cxx           | 15 ++++++++-------
 3 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'chart2/source/view/axes')

diff --git a/chart2/source/view/axes/DateHelper.cxx b/chart2/source/view/axes/DateHelper.cxx
index f705a7346091..4c4a96dce2f8 100644
--- a/chart2/source/view/axes/DateHelper.cxx
+++ b/chart2/source/view/axes/DateHelper.cxx
@@ -66,7 +66,7 @@ bool DateHelper::IsLessThanOneYearAway( const Date& rD1, const Date& rD2 )
     return rD2 > aDMin && rD2 < aDMax;
 }
 
-double DateHelper::RasterizeDateValue( double fValue, const Date& rNullDate, long TimeResolution )
+double DateHelper::RasterizeDateValue( double fValue, const Date& rNullDate, tools::Long TimeResolution )
 {
     if (std::isnan(fValue))
         return fValue;
diff --git a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
index 2bb936567469..2c9264786edf 100644
--- a/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
+++ b/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
@@ -185,19 +185,19 @@ void MergedMinimumAndMaximumSupplier::clearMinimumAndMaximumSupplierList()
     m_aMinimumAndMaximumSupplierList.clear();
 }
 
-long MergedMinimumAndMaximumSupplier::calculateTimeResolutionOnXAxis()
+tools::Long MergedMinimumAndMaximumSupplier::calculateTimeResolutionOnXAxis()
 {
-    long nRet = css::chart::TimeUnit::YEAR;
+    tools::Long nRet = css::chart::TimeUnit::YEAR;
     for (auto const& elem : m_aMinimumAndMaximumSupplierList)
     {
-        long nCurrent = elem->calculateTimeResolutionOnXAxis();
+        tools::Long nCurrent = elem->calculateTimeResolutionOnXAxis();
         if(nRet>nCurrent)
             nRet=nCurrent;
     }
     return nRet;
 }
 
-void MergedMinimumAndMaximumSupplier::setTimeResolutionOnXAxis( long nTimeResolution, const Date& rNullDate )
+void MergedMinimumAndMaximumSupplier::setTimeResolutionOnXAxis( tools::Long nTimeResolution, const Date& rNullDate )
 {
     for (auto const& elem : m_aMinimumAndMaximumSupplierList)
         elem->setTimeResolutionOnXAxis( nTimeResolution, rNullDate );
diff --git a/chart2/source/view/axes/ScaleAutomatism.cxx b/chart2/source/view/axes/ScaleAutomatism.cxx
index 10fc3ccd4f56..7557f9b3d95b 100644
--- a/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/chart2/AxisType.hpp>
 
 #include <rtl/math.hxx>
+#include <tools/long.hxx>
 #include <limits>
 
 namespace chart
@@ -612,11 +613,11 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis(
         nMaxMainIncrementCount--;
 
     //choose major time interval:
-    long nDayCount = aMaxDate - aMinDate;
-    long nMainIncrementCount = 1;
+    tools::Long nDayCount = aMaxDate - aMinDate;
+    tools::Long nMainIncrementCount = 1;
     if( !bAutoMajor )
     {
-        long nIntervalDayCount = rExplicitIncrement.MajorTimeInterval.Number;
+        tools::Long nIntervalDayCount = rExplicitIncrement.MajorTimeInterval.Number;
         if( rExplicitIncrement.MajorTimeInterval.TimeUnit < rExplicitScale.TimeResolution )
             rExplicitIncrement.MajorTimeInterval.TimeUnit = rExplicitScale.TimeResolution;
         switch( rExplicitIncrement.MajorTimeInterval.TimeUnit )
@@ -636,8 +637,8 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis(
     }
     if( bAutoMajor )
     {
-        long nNumer = 1;
-        long nIntervalDays =  nDayCount / nMaxMainIncrementCount;
+        tools::Long nNumer = 1;
+        tools::Long nIntervalDays =  nDayCount / nMaxMainIncrementCount;
         double nDaysPerInterval = 1.0;
         if( nIntervalDays>365 || rExplicitScale.TimeResolution==YEAR )
         {
@@ -672,7 +673,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis(
             }
         }
         rExplicitIncrement.MajorTimeInterval.Number = nNumer;
-        nMainIncrementCount = static_cast<long>(nDayCount/(nNumer*nDaysPerInterval));
+        nMainIncrementCount = static_cast<tools::Long>(nDayCount/(nNumer*nDaysPerInterval));
     }
 
     //choose minor time interval:
@@ -680,7 +681,7 @@ void ScaleAutomatism::calculateExplicitIncrementAndScaleForDateTimeAxis(
     {
         if( rExplicitIncrement.MinorTimeInterval.TimeUnit > rExplicitIncrement.MajorTimeInterval.TimeUnit )
             rExplicitIncrement.MinorTimeInterval.TimeUnit = rExplicitIncrement.MajorTimeInterval.TimeUnit;
-        long nIntervalDayCount = rExplicitIncrement.MinorTimeInterval.Number;
+        tools::Long nIntervalDayCount = rExplicitIncrement.MinorTimeInterval.Number;
         switch( rExplicitIncrement.MinorTimeInterval.TimeUnit )
         {
         case DAY:
-- 
cgit v1.2.3