summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2021-05-02 18:00:32 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-05-02 19:33:14 +0200
commit6549aa9afa7f39b45a0d402d83f4975f37bcc2fb (patch)
tree289b30fe2cef993a0b22af25cd4837dd69e8c357 /sw/source
parent211a63a780659b404541cae619d10f204a8bfe65 (diff)
sal_uLong->sal_uInt32 in SvParser
Change-Id: Ibe5599e1cc136330a8e9c089c7cc66d0ef4bc966 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115002 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/inc/txtfrm.hxx4
-rw-r--r--sw/source/core/text/txtfrm.cxx4
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx
index ff6086e1ac1f..1473697a07ad 100644
--- a/sw/source/core/inc/txtfrm.hxx
+++ b/sw/source/core/inc/txtfrm.hxx
@@ -171,8 +171,8 @@ class SW_DLLPUBLIC SwTextFrame: public SwContentFrame
static constexpr tools::Long nMinPrtLine = 0; // This Line must not be underrun when printing
// Hack for table cells stretching multiple pages
- sal_uLong mnAllLines :24; // Line count for the Paint (including nThisLines)
- sal_uLong mnThisLines :8; // Count of Lines of the Frame
+ sal_uInt32 mnAllLines :24; // Line count for the Paint (including nThisLines)
+ sal_uInt32 mnThisLines :8; // Count of Lines of the Frame
// The x position for flys anchored at this paragraph.
// These values are calculated in SwTextFrame::CalcBaseOfstForFly()
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 6a63cc26500b..acd1b1b4f5be 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -3756,7 +3756,7 @@ sal_uInt16 SwTextFrame::GetLineCount(TextFrameIndex const nPos)
void SwTextFrame::ChgThisLines()
{
// not necessary to format here (GetFormatted etc.), because we have to come from there!
- sal_uLong nNew = 0;
+ sal_uInt32 nNew = 0;
const SwLineNumberInfo &rInf = GetDoc().GetLineNumberInfo();
if ( !GetText().isEmpty() && HasPara() )
{
@@ -3765,7 +3765,7 @@ void SwTextFrame::ChgThisLines()
if ( rInf.IsCountBlankLines() )
{
aLine.Bottom();
- nNew = static_cast<sal_uLong>(aLine.GetLineNr());
+ nNew = aLine.GetLineNr();
}
else
{