editeng/source/editeng/impedit.hxx | 4 ++--
editeng/source/editeng/impedit2.cxx | 4 ++--
editeng/source/editeng/impedit3.cxx | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit cefb71424d105a15e2a1fda2f7ac095ef430c8d7
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Jul 31 09:51:42 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sat Jul 31 15:56:38 2021 +0200
editengine-columns: number of columns is sal_Int16
Change-Id: If0e46614a398a1b2fe93eb1bfa25b5670be3511b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119725
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit ff1fdf19c44835071916d20e879c383d1513265e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119623
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
diff --git a/editeng/source/editeng/impedit.hxx
b/editeng/source/editeng/impedit.hxx
index 0e280835480f..362df78817cc 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -1140,7 +1140,7 @@ public:
};
struct LineAreaInfo
{
- sal_Int32 nColumn; // Column number; when overflowing, equal to total
number of columns
+ sal_Int16 nColumn; // Column number; when overflowing, equal to total
number of columns
ParaPortion& rPortion; // Current ParaPortion
sal_Int32 nPortion;
EditLine* pLine; // Current line, or nullptr for paragraph start
@@ -1159,7 +1159,7 @@ public:
void IterateLineAreas(const IterateLinesAreasFunc& f, IterFlag eOptions);
tools::Long GetColumnWidth(const Size& rPaperSize) const;
- Point MoveToNextLine(Point& rMovePos, tools::Long nLineHeight, sal_Int32&
nColumn,
+ Point MoveToNextLine(Point& rMovePos, tools::Long nLineHeight, sal_Int16&
nColumn,
Point aOrigin, tools::Long* pnHeightNeededToNotWrap =
nullptr) const;
tools::Long getWidthDirectionAware(const Size& sz) const;
diff --git a/editeng/source/editeng/impedit2.cxx
b/editeng/source/editeng/impedit2.cxx
index 7e5ee3832f44..3d083bfbf118 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -3139,7 +3139,7 @@ void ImpEditEngine::IterateLineAreas(const
IterateLinesAreasFunc& f, IterFlag eO
Point aLineStart(aOrigin);
const tools::Long nVertLineSpacing = CalcVertLineSpacing(aLineStart);
const tools::Long nColumnWidth = GetColumnWidth(aPaperSize);
- sal_Int32 nColumn = 0;
+ sal_Int16 nColumn = 0;
for (sal_Int32 n = 0, nPortions = GetParaPortions().Count(); n <
nPortions; ++n)
{
ParaPortion& rPortion = *GetParaPortions()[n];
@@ -3521,7 +3521,7 @@ tools::Long ImpEditEngine::CalcTextHeight(tools::Long*
pHeightNTP)
nCurrentTextHeight = 0;
if (pHeightNTP)
*pHeightNTP = 0;
- auto GetHeightAndWantedIncrease = [&, minHeight = tools::Long(0),
lastCol = sal_Int32(0)](
+ auto GetHeightAndWantedIncrease = [&, minHeight = tools::Long(0),
lastCol = sal_Int16(0)](
const LineAreaInfo& rInfo)
mutable {
if (rInfo.pLine)
{
diff --git a/editeng/source/editeng/impedit3.cxx
b/editeng/source/editeng/impedit3.cxx
index 4680889423d8..b905c4ab4f27 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -3049,7 +3049,7 @@ Size ImpEditEngine::getTopLeftDocOffset(const
tools::Rectangle& rect) const
Point ImpEditEngine::MoveToNextLine(
Point& rMovePos, // [in, out] Point that will move to the next line
tools::Long nLineHeight, // [in] Y-direction move distance
(direction-aware)
- sal_Int32& rColumn, // [in, out] current column number
+ sal_Int16& rColumn, // [in, out] current column number
Point aOrigin, // [in] Origin point to calculate limits and initial Y
position in a new column
tools::Long* pnHeightNeededToNotWrap // On column wrap, returns how much
more height is needed
) const
@@ -3127,7 +3127,7 @@ void ImpEditEngine::Paint( OutputDevice* pOutDev,
tools::Rectangle aClipRect, Po
tools::Long nVertLineSpacing = CalcVertLineSpacing(aStartPos);
- sal_Int32 nColumn = 0;
+ sal_Int16 nColumn = 0;
// Over all the paragraphs...
