diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-17 17:22:36 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-06-17 20:56:04 +0200 |
| commit | 4a2894a2b9c973b275788190220d205e41eb92db (patch) | |
| tree | ae94b5bad00fe0e02284ffd4f411902cb95edda7 /editeng | |
| parent | f946edbe6e9c35e3b19dbfad327ff87afd1f4789 (diff) | |
tdf#142839: do not forget to initialize *pHeightNTP
Regression after commit d0a1616ccad0dd5f5a02c1b0204f537b57d0b4b5
Change-Id: Iaa8f67e0c7e3d99b057294717d24ffac4ad3534c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117389
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 59611f7b6acbf643bde0e0121ee51e2df53e7d50)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117305
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/editeng/impedit2.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 4980c5730de8..ff080b1444dd 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -3437,6 +3437,8 @@ sal_uInt32 ImpEditEngine::GetTextHeightNTP() const tools::Long ImpEditEngine::Calc1ColumnTextHeight(tools::Long* pHeightNTP) { tools::Long nHeight = 0; + if (pHeightNTP) + *pHeightNTP = 0; // Pretend that we have ~infinite height to get total height comphelper::ValueRestorationGuard aGuard(nCurTextHeight, std::numeric_limits<tools::Long>::max()); @@ -3467,6 +3469,8 @@ tools::Long ImpEditEngine::CalcTextHeight(tools::Long* pHeightNTP) tools::Long nTentativeColHeight = mnMinColumnWrapHeight; tools::Long nWantedIncrease = 0; tools::Long nCurrentTextHeight; + if (pHeightNTP) + *pHeightNTP = 0; // This does the necessary column balancing for the case when the text does not fit min height. // When the height of column (taken from nCurTextHeight) is too small, the last column will |