mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No apparent need to restrict intermediate values to sal_uInt16

Browse Source 
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@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2018-01-31 08:47:30 +01:00
parent a3251b83e3
commit c3e5fba9da
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
filter/source/msfilter/svdfppt.cxx
View File

@@ -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 )