convert more long -> tools::Long

found by grepping and changed by hand.

Change-Id: I3c720859dba430fde3abc76c6c5cb58269efaf4b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105512
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 9 insertions, 9 deletions

diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx
index 4ac9114337d8..e2ef44e785bd 100644
--- a/sc/source/core/data/dpgroup.cxx
+++ b/sc/source/core/data/dpgroup.cxx
@@ -639,7 +639,7 @@ public:
 void ScDPGroupTableData::ModifyFilterCriteria(vector<ScDPFilteredCache::Criterion>& rCriteria)
 {
     // Build dimension ID to object map for group dimensions.
-    typedef std::unordered_map<long, const ScDPGroupDimension*> GroupFieldMapType;
+    typedef std::unordered_map<tools::Long, const ScDPGroupDimension*> GroupFieldMapType;
     GroupFieldMapType aGroupFieldIds;
 
     for (const auto& rGroup : aGroups)
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 7dc080a37eb4..95bd2a84985f 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -1213,7 +1213,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
         return;
 
     // First, build a dimension name-to-index map.
-    typedef std::unordered_map<OUString, long> NameIndexMap;
+    typedef std::unordered_map<OUString, tools::Long> NameIndexMap;
     NameIndexMap aMap;
     tools::Long nColCount = pData->GetColumnCount();
     for (tools::Long i = 0; i < nColCount; ++i)
@@ -1255,7 +1255,7 @@ void ScDPSaveData::BuildAllDimensionMembers(ScDPTableData* pData)
 
 void ScDPSaveData::SyncAllDimensionMembers(ScDPTableData* pData)
 {
-    typedef std::unordered_map<OUString, long> NameIndexMap;
+    typedef std::unordered_map<OUString, tools::Long> NameIndexMap;
 
     // First, build a dimension name-to-index map.
     NameIndexMap aMap;
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 263db7ea5a2b..c0022282a9d6 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -3906,7 +3906,7 @@ void ScDPResultVisibilityData::addVisibleMember(const OUString& rDimName, const
 
 void ScDPResultVisibilityData::fillFieldFilters(vector<ScDPFilteredCache::Criterion>& rFilters) const
 {
-    typedef std::unordered_map<OUString, long> FieldNameMapType;
+    typedef std::unordered_map<OUString, tools::Long> FieldNameMapType;
     FieldNameMapType aFieldNames;
     ScDPTableData* pData = mpSource->GetData();
     sal_Int32 nColumnCount = pData->GetColumnCount();
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 826c7125a89e..d8fb7fac5b0f 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -3955,7 +3955,7 @@ sal_uLong ScTable::GetRowOffset( SCROW nRow, bool bHiddenAsZero ) const
 
         n = GetTotalRowHeight(0, nRow-1, bHiddenAsZero);
 #if OSL_DEBUG_LEVEL > 0
-        if (n == ::std::numeric_limits<unsigned long>::max())
+        if (n == ::std::numeric_limits<tools::ULong>::max())
             OSL_FAIL("ScTable::GetRowOffset: row heights overflow");
 #endif
     }
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index f2c248ee7fbf..34c49a281f33 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -236,9 +236,9 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea )
         if ( bStartOfPage && bRepeatRow && nY>nRepeatStartY && !bRowFound )
         {
             // subtract size of repeat rows from page size
-            unsigned long nHeights = GetTotalRowHeight(nRepeatStartY, nRepeatEndY);
+            tools::ULong nHeights = GetTotalRowHeight(nRepeatStartY, nRepeatEndY);
 #if OSL_DEBUG_LEVEL > 0
-            if (nHeights == ::std::numeric_limits<unsigned long>::max())
+            if (nHeights == ::std::numeric_limits<tools::ULong>::max())
                 OSL_FAIL("ScTable::UpdatePageBreaks: row heights overflow");
 #endif
             nPageSizeY -= nHeights;
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index 47891ece7a8d..4c74ceb4e04e 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -194,7 +194,7 @@ private:
     DECL_LINK(DblClickHdl, weld::TreeView&, bool);
 
 private:
-    typedef std::unordered_map<OUString, long> DimNameIndexMap;
+    typedef std::unordered_map<OUString, tools::Long> DimNameIndexMap;
     DimNameIndexMap     maNameIndexMap;
     ScDPObject&         mrDPObj;
 
diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx
index 1895799f7531..4026c175e13e 100644
--- a/sc/source/ui/inc/viewdata.hxx
+++ b/sc/source/ui/inc/viewdata.hxx
@@ -121,7 +121,7 @@ class ScPositionHelper
 {
 public:
     typedef SCCOLROW index_type;
-    typedef std::pair<index_type, long> value_type;
+    typedef std::pair<index_type, tools::Long> value_type;
     static_assert(std::numeric_limits<index_type>::is_signed, "ScPositionCache: index type is not signed");
 
 private: