diff options
| author | Noel <noelgrandin@gmail.com> | 2020-10-26 14:17:32 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-10-28 07:21:59 +0100 |
| commit | 6436302f40252bc6619e304e2051115fee902e20 (patch) | |
| tree | a32659b4fecc9fbf8fad3e379ddd8645a2a52e0b /sw/source/filter | |
| parent | 35f16614ee7ddf518d4c01de6b1d800f5ff1ba7e (diff) | |
convert some more long -> tools::Long
grepping for stuff in template params this time
Change-Id: Ia37bfd85480b3a72c3c465489581d56ad8dde851
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104855
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter')
| -rw-r--r-- | sw/source/filter/html/htmlcss1.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/writer/wrtswtbl.cxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/WW8TableInfo.hxx | 2 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx index 69eccc08fd33..c404d77d58b1 100644 --- a/sw/source/filter/html/htmlcss1.cxx +++ b/sw/source/filter/html/htmlcss1.cxx @@ -2049,7 +2049,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo, nWidth = MINFLY; break; case SVX_CSS1_LTYPE_TWIP: - nWidth = std::max<long>(rPropInfo.m_nWidth, MINFLY); + nWidth = std::max<tools::Long>(rPropInfo.m_nWidth, MINFLY); nPercentWidth = 0; break; default: @@ -2063,7 +2063,7 @@ void SwHTMLParser::SetVarSize( SvxCSS1PropertyInfo const &rPropInfo, case SVX_CSS1_LTYPE_TWIP: // Netscape and MS-IE interpreting the height incorrectly as minimum height, // therefore we are doing the same. - nHeight = std::max<long>(rPropInfo.m_nHeight, MINFLY); + nHeight = std::max<tools::Long>(rPropInfo.m_nHeight, MINFLY); break; default: ; diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx index 3c9c031c16fb..911bed91cc59 100644 --- a/sw/source/filter/writer/wrtswtbl.cxx +++ b/sw/source/filter/writer/wrtswtbl.cxx @@ -383,7 +383,7 @@ tools::Long SwWriteTable::GetAbsHeight(tools::Long nRawHeight, size_t const nRow } OSL_ENSURE( nRawHeight > 0, "Row Height <= 0. OK?" ); - return std::max<long>(nRawHeight, 0); + return std::max<tools::Long>(nRawHeight, 0); } bool SwWriteTable::ShouldExpandSub(const SwTableBox *pBox, bool /*bExpandedBefore*/, diff --git a/sw/source/filter/ww8/WW8TableInfo.hxx b/sw/source/filter/ww8/WW8TableInfo.hxx index ca2cfb2c9252..ce7dbbb5faa7 100644 --- a/sw/source/filter/ww8/WW8TableInfo.hxx +++ b/sw/source/filter/ww8/WW8TableInfo.hxx @@ -255,7 +255,7 @@ public: class WW8TableCellGrid { - typedef std::set<long> RowTops_t; + typedef std::set<tools::Long> RowTops_t; typedef std::map<long, WW8TableCellGridRow::Pointer_t> Rows_t; RowTops_t m_aRowTops; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index c535dd054588..544baec382ad 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -1246,7 +1246,7 @@ static tools::Long lcl_GetTrueMargin(const SvxLRSpaceItem &rLR, const SwNumForma const tools::Long nReverseListIndented = GetListFirstLineIndent(rFormat); tools::Long nExtraListIndent = nPseudoListBodyIndent + nReverseListIndented; - return std::max<long>(nExtraListIndent, 0); + return std::max<tools::Long>(nExtraListIndent, 0); } // #i103711# |