sc/source/filter/excel/xiescher.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e3fc69457d6b43f88c7540b39564a914648e7f3f
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Oct 10 15:07:59 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Oct 10 18:26:53 2021 +0200
ofz: Integer-overflow
seeing as GetHmmFromInch is already using limit_cast, use saturating_add
here
Change-Id: I3123ac15edd300f6d7d64c458ce95b20c9220117
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123340
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/filter/excel/xiescher.cxx
b/sc/source/filter/excel/xiescher.cxx
index 6677578801e4..0cf6fb125971 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -1824,8 +1824,8 @@ void XclImpChartObj::FinalizeTabChart()
tools::Long nHeight = XclTools::GetHmmFromTwips( aPaperSize.Height() );
// subtract page margins, give some more extra space
- nWidth -= (XclTools::GetHmmFromInch( rPageData.mfLeftMargin +
rPageData.mfRightMargin ) + 2000);
- nHeight -= (XclTools::GetHmmFromInch( rPageData.mfTopMargin +
rPageData.mfBottomMargin ) + 1000);
+ nWidth -=
o3tl::saturating_add(XclTools::GetHmmFromInch(rPageData.mfLeftMargin +
rPageData.mfRightMargin), static_cast<sal_Int32>(2000));
+ nHeight -=
o3tl::saturating_add(XclTools::GetHmmFromInch(rPageData.mfTopMargin +
rPageData.mfBottomMargin), static_cast<sal_Int32>(1000));
// print column/row headers?
if( rPageData.mbPrintHeadings )
