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>

4 files changed, 17 insertions, 17 deletions

diff --git a/sw/source/filter/ww8/WW8TableInfo.cxx b/sw/source/filter/ww8/WW8TableInfo.cxx
index 0f9e509b16b7..03f376fbeec9 100644
--- a/sw/source/filter/ww8/WW8TableInfo.cxx
+++ b/sw/source/filter/ww8/WW8TableInfo.cxx
@@ -199,7 +199,7 @@ GridColsPtr WW8TableNodeInfoInner::getGridColsOfRow(AttributeOutputBase & rBase,
         return pResult;
 
     const SwFormatFrameSize &rSize = pFormat->GetFrameSize();
-    unsigned long nTableSz = static_cast<unsigned long>(rSize.GetWidth());
+    tools::ULong nTableSz = static_cast<tools::ULong>(rSize.GetWidth());
 
     tools::Long nPageSize = 0;
     bool bRelBoxSize = false;
@@ -1076,7 +1076,7 @@ CellInfoMultiSet::const_iterator WW8TableCellGrid::getCellsEnd(tools::Long nTop)
 
 void WW8TableCellGrid::insert(const SwRect & rRect,
                               WW8TableNodeInfo * pNodeInfo,
-                              const unsigned long * pFormatFrameWidth)
+                              const tools::ULong * pFormatFrameWidth)
 {
     CellInfo aCellInfo(rRect, pNodeInfo);
 
@@ -1117,7 +1117,7 @@ void WW8TableCellGrid::addShadowCells()
                     *aRowSpanIt < aCellIt->bottom())
                 {
                     aRect.Top(*aRowSpanIt);
-                    unsigned long nFormatFrameWidth = aCellIt->getFormatFrameWidth();
+                    tools::ULong nFormatFrameWidth = aCellIt->getFormatFrameWidth();
                     insert(aRect, nullptr, &nFormatFrameWidth);
 
                     bVertMerge = true;
diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx
index ce7dbbb5faa7..5b3294cd506e 100644
--- a/sw/source/filter/ww8/WW8TableInfo.hxx
+++ b/sw/source/filter/ww8/WW8TableInfo.hxx
@@ -116,7 +116,7 @@ class CellInfo
 {
     SwRect m_aRect;
     WW8TableNodeInfo * m_pNodeInfo;
-    unsigned long m_nFormatFrameWidth;
+    tools::ULong m_nFormatFrameWidth;
 
 public:
     CellInfo(const SwRect & aRect, WW8TableNodeInfo * pNodeInfo);
@@ -139,12 +139,12 @@ public:
     const SwRect& getRect() const { return m_aRect; }
     WW8TableNodeInfo * getTableNodeInfo() const
     { return m_pNodeInfo; }
-    unsigned long getFormatFrameWidth() const
+    tools::ULong getFormatFrameWidth() const
     {
         return m_nFormatFrameWidth;
     }
 
-    void setFormatFrameWidth(unsigned long nFormatFrameWidth)
+    void setFormatFrameWidth(tools::ULong nFormatFrameWidth)
     {
         m_nFormatFrameWidth = nFormatFrameWidth;
     }
@@ -256,7 +256,7 @@ public:
 class WW8TableCellGrid
 {
     typedef std::set<tools::Long> RowTops_t;
-    typedef std::map<long, WW8TableCellGridRow::Pointer_t> Rows_t;
+    typedef std::map<tools::Long, WW8TableCellGridRow::Pointer_t> Rows_t;
 
     RowTops_t m_aRowTops;
     Rows_t m_aRows;
@@ -274,7 +274,7 @@ public:
     ~WW8TableCellGrid();
 
     void insert(const SwRect & rRect, WW8TableNodeInfo * pNodeInfo,
-                unsigned long const * pFormatFrameWidth = nullptr);
+                tools::ULong const * pFormatFrameWidth = nullptr);
     void addShadowCells();
     WW8TableNodeInfo *connectCells(RowEndInners_t &rLastRowEnds);
 
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index 413ef854121d..5e54f9443c84 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -179,10 +179,10 @@ public:
     WW8_FC GetStartFc() const       { return nStartFc; }
 };
 
-typedef std::map<OUString,long> BKMKNames;
+typedef std::map<OUString,tools::Long> BKMKNames;
 typedef std::pair<bool,OUString> BKMK;
-typedef std::pair<long,BKMK> BKMKCP;
-typedef std::multimap<long,BKMKCP*> BKMKCPs;
+typedef std::pair<tools::Long,BKMK> BKMKCP;
+typedef std::multimap<tools::Long,BKMKCP*> BKMKCPs;
 typedef BKMKCPs::iterator CPItr;
 
 class WW8_WrtBookmarks
@@ -223,12 +223,12 @@ WW8_WrtBookmarks::~WW8_WrtBookmarks()
 
 void WW8_WrtBookmarks::Append( WW8_CP nStartCp, const OUString& rNm)
 {
-    std::pair<BKMKNames::iterator, bool> aResult = maSwBkmkNms.insert(std::pair<OUString,long>(rNm,0L));
+    std::pair<BKMKNames::iterator, bool> aResult = maSwBkmkNms.insert(std::pair<OUString,tools::Long>(rNm,0L));
     if (aResult.second)
     {
         BKMK aBK(false,rNm);
         BKMKCP* pBKCP = new BKMKCP(static_cast<tools::Long>(nStartCp),aBK);
-        aSttCps.insert(std::pair<long,BKMKCP*>(nStartCp,pBKCP));
+        aSttCps.insert(std::pair<tools::Long,BKMKCP*>(nStartCp,pBKCP));
         aResult.first->second = static_cast<tools::Long>(nStartCp);
     }
     else
@@ -261,7 +261,7 @@ void WW8_WrtBookmarks::Write( WW8Export& rWrt)
     {
         if (rEntry.second)
         {
-            aEndCps.insert(std::pair<long,BKMKCP*>(rEntry.second->first, rEntry.second));
+            aEndCps.insert(std::pair<tools::Long,BKMKCP*>(rEntry.second->first, rEntry.second));
             aNames.push_back(rEntry.second->second.second);
             SwWW8Writer::WriteLong(aTempStrm1, rEntry.first);
         }
@@ -312,7 +312,7 @@ void WW8_WrtBookmarks::MoveFieldMarks(WW8_CP nFrom, WW8_CP nTo)
                 aItr->second->second.first = true;
                 aItr->second->first = nTo;
             }
-            aSttCps.insert(std::pair<long,BKMKCP*>(nTo,aItr->second));
+            aSttCps.insert(std::pair<tools::Long,BKMKCP*>(nTo,aItr->second));
             aItr->second = nullptr;
             aRange = aSttCps.equal_range(nFrom);
             aItr = aRange.first;
@@ -2450,7 +2450,7 @@ void AttributeOutputBase::GetTablePageSize( ww8::WW8TableNodeInfoInner const * p
     if ( (pFormat->GetHoriOrient().GetHoriOrient() == text::HoriOrientation::FULL) || bManualAligned )
         nWidthPercent = 100;
     bool bRelBoxSize = nWidthPercent != 0;
-    unsigned long nTableSz = static_cast<unsigned long>(rSize.GetWidth());
+    tools::ULong nTableSz = static_cast<tools::ULong>(rSize.GetWidth());
     if (nTableSz > USHRT_MAX/2 && !bRelBoxSize)
     {
         OSL_ENSURE(bRelBoxSize, "huge table width but not relative, suspicious");
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index cba66a28dbf5..a2b9289349b3 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -2537,7 +2537,7 @@ WW8PLCFpcd::WW8PLCFpcd(SvStream* pSt, sal_uInt32 nFilePos,
 
     nIMax = ( nPLCF - 4 ) / ( 4 + nStruct );
 #ifdef OSL_BIGENDIAN
-    for( long nI = 0; nI <= nIMax; nI++ )
+    for( tools::Long nI = 0; nI <= nIMax; nI++ )
       pPLCF_PosArray[nI] = OSL_SWAPDWORD( pPLCF_PosArray[nI] );
 #endif // OSL_BIGENDIAN