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

[Stephan Bergmann]

 filter/source/msfilter/svdfppt.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c3e5fba9da796c8af47141cc98ef127cac0bbe7e
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 31 08:47:30 2018 +0100

    No apparent need to restrict intermediate values to sal_uInt16
    
    PPTNumberFOrmatCreator's nTextOfs and nBulletOfs are both sal_uInt32, while
    SvxNumberFormat's SetAbsLSpace and SetFirstLineOffset both take short parameters
    
    Change-Id: I2512fad4387bc8393be694b67be03ac8ea543cce
    Reviewed-on: https://gerrit.libreoffice.org/48954
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index bb44fae227dd..3e03e069c161 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -3761,10 +3761,10 @@ void PPTNumberFormatCreator::ImplGetNumberFormat( SdrPowerPointImport const & rM
     rNumberFormat.SetBulletChar( nBuChar );
     rNumberFormat.SetBulletRelSize( static_cast<sal_uInt16>(nBulletHeight) );
     rNumberFormat.SetBulletColor( aCol );
-    sal_uInt16 nAbsLSpace = static_cast<sal_uInt16>( ( nTextOfs * 2540 ) / 576 );
-    sal_uInt16 nFirstLineOffset = nAbsLSpace - static_cast<sal_uInt16>( ( nBulletOfs * 2540 ) / 576 );
+    sal_uInt32 nAbsLSpace = ( nTextOfs * 2540 ) / 576;
+    sal_uInt32 nFirstLineOffset = nAbsLSpace - ( nBulletOfs * 2540 ) / 576;
     rNumberFormat.SetAbsLSpace( nAbsLSpace );
-    rNumberFormat.SetFirstLineOffset( -nFirstLineOffset );
+    rNumberFormat.SetFirstLineOffset( -static_cast<sal_Int32>(nFirstLineOffset) );
 }
 
 PPTCharSheet::PPTCharSheet( TSS_Type nInstance )