filter/source/msfilter/svdfppt.cxx | 2 +- oox/source/export/drawingml.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 12c639145df4450f7cba3abe0628ad016071a3a5 Author: Karthik Godha <[email protected]> AuthorDate: Thu Nov 6 18:35:51 2025 +0530 Commit: Xisco Fauli <[email protected]> CommitDate: Wed Nov 26 20:25:45 2025 +0100 tdf#168843: Sanitize font size read from PPT Add validation checks for font size when importing a PPT. Minimum accepted value for font size is 100. Change-Id: I0c00705eafde1befe459cf8ba52ce32b1dbfbd5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193539 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> (cherry picked from commit 28273e586b398e2ce181c4ce9e740949fad11876) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194633 Code-Style: Xisco Fauli <[email protected]> Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins (cherry picked from commit 5f1043dab5435ae036bcbca288ca5c55d4bd930f) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194651 Tested-by: Xisco Fauli <[email protected]> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 60d3320af05e..377f9fa7dbbc 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -5594,7 +5594,7 @@ void PPTPortionObj::ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, T } if ( GetAttrib( PPT_CharAttr_FontHeight, nVal, nDestinationInstance ) ) // Schriftgrad in Point { - constexpr sal_uInt32 MIN_FONT_HEIGHT_PT = 2; + constexpr sal_uInt32 MIN_FONT_HEIGHT_PT = 1; sal_uInt32 nHeight = rManager.ScalePoint(std::max(nVal, MIN_FONT_HEIGHT_PT)); rSet.Put( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT ) ); diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 2d27fabd84a2..e6cadc40c258 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2697,7 +2697,7 @@ void DrawingML::WriteRunProperties( const Reference< XPropertySet >& rRun, bool } } - assert(nSize >= 200 && "Minimum accepted value for fontsize(ST_TextFontSize) is 200"); + assert(nSize >= 100 && "Minimum accepted value for fontsize(ST_TextFontSize) is 100"); mpFS->startElementNS( XML_a, nElement, XML_lang, sax_fastparser::UseIf(usLanguage, !usLanguage.isEmpty()),
