summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-10-28 09:15:54 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-10-28 12:03:48 +0100
commit7a09d67e1c76db7cb6a87a2ceaa6de7325342b75 (patch)
treeb768459ca830b343a3c53d1cea8b80de328ee1fb /sw
parent49a39d1abccc61b6dace3e92059ae50a6a2c298d (diff)
convert some more long -> tools::Long
Change-Id: Ide9811c1a7582454b3fcf655b70ea106ed56509a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104914 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx2
-rw-r--r--sw/source/core/docnode/ndtbl.cxx8
-rw-r--r--sw/source/core/inc/tblrwcl.hxx2
3 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index f5a6d5806a13..516edd30c799 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -180,7 +180,7 @@ class SwTaggedPDFHelper
* painting process, the parameter bEditEngineOnly indicated that only
* the bookmarks from the EditEngine have to be processed.
*/
-typedef std::set< long, lt_TableColumn > TableColumnsMapEntry;
+typedef std::set< tools::Long, lt_TableColumn > TableColumnsMapEntry;
typedef std::pair< SwRect, sal_Int32 > IdMapEntry;
typedef std::vector< IdMapEntry > LinkIdMap;
typedef std::map< const SwTable*, TableColumnsMapEntry > TableColumnsMap;
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index ff1db5358919..79b685f32359 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2600,12 +2600,12 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCellFrame* pBoxFrame )
rFill.SetRight( nRight );
rFill.SetRightMax( nRightMax );
- typedef std::map< long, std::pair< long, long >, FuzzyCompare > BoundaryMap;
+ typedef std::map< tools::Long, std::pair< tools::Long, long >, FuzzyCompare > BoundaryMap;
BoundaryMap aBoundaries;
BoundaryMap::iterator aIter;
- std::pair< long, long > aPair;
+ std::pair< tools::Long, long > aPair;
- typedef std::map< long, bool > HiddenMap;
+ typedef std::map< tools::Long, bool > HiddenMap;
HiddenMap aHidden;
HiddenMap::iterator aHiddenIter;
@@ -2665,7 +2665,7 @@ void SwDoc::GetTabRows( SwTabCols &rFill, const SwCellFrame* pBoxFrame )
{
const tools::Long nTabTop = aRectFnSet.GetPrtTop(*pTab);
const tools::Long nKey = aRectFnSet.YDiff( rEntry.first, nTabTop );
- const std::pair< long, long > aTmpPair = rEntry.second;
+ const std::pair< tools::Long, long > aTmpPair = rEntry.second;
const tools::Long nFirst = aRectFnSet.YDiff( aTmpPair.first, nTabTop );
const tools::Long nSecond = aTmpPair.second;
diff --git a/sw/source/core/inc/tblrwcl.hxx b/sw/source/core/inc/tblrwcl.hxx
index 095c5a3c458c..cc1f0a514769 100644
--- a/sw/source/core/inc/tblrwcl.hxx
+++ b/sw/source/core/inc/tblrwcl.hxx
@@ -111,7 +111,7 @@ void sw_BoxSetSplitBoxFormats( SwTableBox* pBox, SwCollectTableLineBoxes* pSplPa
struct SwSaveRowSpan
{
sal_uInt16 mnSplitLine; // the line number where the table has been split
- std::vector< long > mnRowSpans; // the row span attributes in this line
+ std::vector< tools::Long > mnRowSpans; // the row span attributes in this line
SwSaveRowSpan( SwTableBoxes& rBoxes, sal_uInt16 nSplitLn );
};