[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

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

New commits:
commit 4dc362917597f0e3b890ef7d8d190749b20abce4
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Oct 9 19:32:39 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Oct 10 15:50:38 2021 +0200

    cid#1492337 Unintended sign extension
    
    Change-Id: I6836e83ba17de646bfb661281b76c2b5e58b76c2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123323
    Tested-by: Jenkins
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 8c96cf56222d..35f88bb46326 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -509,7 +509,7 @@ SwTwips SwTextAdjuster::CalcKanaAdj( SwLineLayout* pCurrent 
)
     {
         if ( pPos->InTextGrp() )
         {
-            const sal_uInt16 nMinWidth = pPos->Width();
+            const SwTwips nMinWidth = pPos->Width();
 
             // get maximum portion width from info structure, calculated
             // during text formatting
@@ -524,7 +524,7 @@ SwTwips SwTextAdjuster::CalcKanaAdj( SwLineLayout* pCurrent 
)
         }
         else if( pPos->InGlueGrp() && pPos->InFixMargGrp() )
         {
-            pPos->Width( o3tl::narrowing<sal_uInt16>(pPos->Width() - 
nDecompress) );
+            pPos->Width(pPos->Width() - nDecompress);
 
             if ( pPos->InTabGrp() )
                 // set fix width to width