[Libreoffice-commits] core.git: Branch 'distro/vector/vector-7.0' - sw/source

[Miklos Vajna (via logerrit)]

 sw/source/core/text/porrst.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6041add19bafabd48ad6f9ae6da3e1f7f537032c
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Jun 9 14:58:03 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Jun 9 14:58:10 2021 +0200

    sw: allow the height of a line to be larger than 65536 twips, fix two warnings
    
    This was a mistake introduced by the vector-7.0 backport, the patch was
    already warning-free on master.
    
    Change-Id: Ie2d3ab2e6b92bc947a4f99ffd4cae9f5fd217d8d

diff --git a/sw/source/core/text/porrst.cxx b/sw/source/core/text/porrst.cxx
index 69183bc58557..259fd485a224 100644
--- a/sw/source/core/text/porrst.cxx
+++ b/sw/source/core/text/porrst.cxx
@@ -592,12 +592,12 @@ void SwControlCharPortion::Paint( const SwTextPaintInfo &rInf ) const
                     aNewPos.AdjustY(deltaY);
                     break;
                 case 900:
-                    aNewPos.AdjustY(-deltaX);
+                    aNewPos.AdjustY(-static_cast<SwTwips>(deltaX));
                     aNewPos.AdjustX(deltaY);
                     break;
                 case 2700:
                     aNewPos.AdjustY(deltaX);
-                    aNewPos.AdjustX(-deltaY);
+                    aNewPos.AdjustX(-static_cast<SwTwips>(deltaY));
                     break;
                 default:
                     assert(false);