sd/source/filter/eppt/epptso.cxx | 2 +- sd/source/filter/eppt/pptx-stylesheet.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit b21978ba644f85ca259b7d58193c6caf03291105 Author: Mike Kaganski <[email protected]> AuthorDate: Sat Apr 13 23:39:01 2024 +0500 Commit: Mike Kaganski <[email protected]> CommitDate: Sun Apr 14 06:51:49 2024 +0200 Use more o3tl::convert Change-Id: I56d6909dc3b1a7d45e4e3f45583321b1338838cd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166063 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx index 97a0f170edf0..b8d7f8fdf6e3 100644 --- a/sd/source/filter/eppt/epptso.cxx +++ b/sd/source/filter/eppt/epptso.cxx @@ -662,7 +662,7 @@ void PPTWriter::ImplWriteParagraphs( SvStream& rOut, TextObj& rTextObj ) } else { - if ( !pPara->mbFixedLineSpacing && rPortion.mnCharHeight > static_cast<sal_uInt16>( static_cast<double>(-nLineSpacing) * 0.001 * 72.0 / 2.54 ) ) // 1/100mm to point + if ( !pPara->mbFixedLineSpacing && rPortion.mnCharHeight > o3tl::make_unsigned( o3tl::convert(-nLineSpacing, o3tl::Length::mm100, o3tl::Length::pt) ) ) nLineSpacing = nNormalSpacing; else nLineSpacing = static_cast<sal_Int16>( convertMm100ToMasterUnit(nLineSpacing) ); diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx index 459020278fc9..fff1b5d06f2d 100644 --- a/sd/source/filter/eppt/pptx-stylesheet.cxx +++ b/sd/source/filter/eppt/pptx-stylesheet.cxx @@ -249,7 +249,7 @@ void PPTExParaSheet::SetStyleSheet( const css::uno::Reference< css::beans::XProp } else { - if ( rCharLevel.mnFontHeight > static_cast<sal_uInt16>( static_cast<double>(-nLineSpacing) * 0.001 * 72.0 / 2.54 ) ) // 1/100mm to point + if ( rCharLevel.mnFontHeight > o3tl::make_unsigned(o3tl::convert(-nLineSpacing, o3tl::Length::mm100, o3tl::Length::pt) ) ) { const FontCollectionEntry* pDesc = rFontCollection.GetById( rCharLevel.mnFont ); if ( pDesc )
