cui/source/tabpages/grfpage.cxx | 2 ++ cui/source/tabpages/textanim.cxx | 9 +++++---- sw/source/uibase/utlui/prcntfld.cxx | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-)
New commits: commit 9c546721fcf68d2218d6671ed5eaf96539e0c8e3 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Nov 22 14:53:12 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Nov 23 17:54:51 2025 +0100 cid#1667078 silence Overflowed constant Change-Id: Ic537fc5e1b1ae8af7bcb3d7fc5d5c4320dcea79a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194393 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index e5e18fdad9b7..53e78ddcc72d 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -652,11 +652,13 @@ void SvxGrfCropPage::GraphicHasChanged( bool bFound ) m_aExampleWN.SetBottom(nVal); } + assert(nSpin >= SAL_MIN_INT64 / 10 && nSpin <= SAL_MAX_INT64 / 10); m_xLeftMF->set_increments(nSpin, nSpin * 10, FieldUnit::NONE); m_xRightMF->set_increments(nSpin, nSpin * 10, FieldUnit::NONE); nSpin = m_xTopMF->normalize(m_aOrigSize.Height()) / 20; nSpin = vcl::ConvertValue( nSpin, m_aOrigSize.Width(), 0, eUnit, m_xLeftMF->get_unit() ); + assert(nSpin >= SAL_MIN_INT64 / 10 && nSpin <= SAL_MAX_INT64 / 10); m_xTopMF->set_increments(nSpin, nSpin * 10, FieldUnit::NONE); m_xBottomMF->set_increments(nSpin, nSpin * 10, FieldUnit::NONE); commit 03dcd59bb3d56156b694004d118c526b2ae4076a Author: Caolán McNamara <[email protected]> AuthorDate: Sat Nov 22 14:48:39 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Nov 23 17:54:44 2025 +0100 cid#1667063 silence Overflowed constant Change-Id: Ie7c7661fe774b18e5e478305f23a675c79edc211 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194392 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 3460b0cdf772..b7ffa7c21267 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -478,7 +478,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::Toggleable&, voi TriState eState = m_xTsbPixel->get_state(); if (eState == TRISTATE_TRUE) { - auto nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE) / 10; + auto nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE); m_xMtrFldAmount->set_sensitive(true); m_xMtrFldAmount->set_unit(FieldUnit::CUSTOM); m_xMtrFldAmount->set_digits(0); @@ -486,11 +486,11 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::Toggleable&, voi m_xMtrFldAmount->set_increments(1, 10, FieldUnit::NONE); m_xMtrFldAmount->set_range(1, 100, FieldUnit::NONE); - m_xMtrFldAmount->set_value(nValue, FieldUnit::NONE); + m_xMtrFldAmount->set_value(nValue / 10, FieldUnit::NONE); } else if( eState == TRISTATE_FALSE ) { - auto nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE) * 10; + auto nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE); m_xMtrFldAmount->set_sensitive(true); m_xMtrFldAmount->set_unit(eFUnit); m_xMtrFldAmount->set_digits(2); @@ -498,7 +498,8 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::Toggleable&, voi m_xMtrFldAmount->set_increments(10, 100, FieldUnit::NONE); m_xMtrFldAmount->set_range(1, 10000, FieldUnit::NONE); - m_xMtrFldAmount->set_value(nValue, FieldUnit::NONE); + assert(nValue >= 1 && nValue <= 100 && "given original range"); + m_xMtrFldAmount->set_value(nValue * 10, FieldUnit::NONE); } } commit a6f3e832232b71f3d145a2a124eea17a677dba04 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Nov 22 14:55:36 2025 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Nov 23 17:54:37 2025 +0100 cid#1667094 silence Overflowed constant and cid#1667101 Overflowed constant cid#1669071 Overflowed constant Change-Id: Ic86e2e87744a3ab9de1733142506f970460986b2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194391 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/sw/source/uibase/utlui/prcntfld.cxx b/sw/source/uibase/utlui/prcntfld.cxx index 503df074d971..2f18c026fa60 100644 --- a/sw/source/uibase/utlui/prcntfld.cxx +++ b/sw/source/uibase/utlui/prcntfld.cxx @@ -78,6 +78,7 @@ void SwPercentField::ShowPercent(bool bPercent, sal_uInt16 nMaxPercent) sal_Int64 nCurrentWidth = vcl::ConvertValue(m_nOldMin, 0, m_nOldDigits, m_eOldUnit, FieldUnit::TWIP); nCurrentWidth = UpscaleTwoDecimalPlaces(nCurrentWidth, m_nOldDigits); + assert(nCurrentWidth >= SAL_MIN_INT64 / 10 && nCurrentWidth <= SAL_MAX_INT64 / 10); // round to 0.5 percent int nPercent = m_nRefValue ? (((nCurrentWidth * 10) / m_nRefValue + 5) / 10) : 0; @@ -140,6 +141,7 @@ void SwPercentField::set_value(sal_Int64 nNewValue, FieldUnit eInUnit) nCurrentWidth = vcl::ConvertValue(nValue, 0, m_nOldDigits, m_eOldUnit, FieldUnit::TWIP); } nCurrentWidth = UpscaleTwoDecimalPlaces(nCurrentWidth, m_nOldDigits); + assert(nCurrentWidth >= SAL_MIN_INT64 / 10 && nCurrentWidth <= SAL_MAX_INT64 / 10); nPercent = m_nRefValue ? (((nCurrentWidth * 10) / m_nRefValue + 5) / 10) : 0; m_pField->set_value(nPercent, FieldUnit::NONE); } @@ -239,6 +241,7 @@ sal_Int64 SwPercentField::Convert(sal_Int64 nValue, FieldUnit eInUnit, FieldUnit else nCurrentWidth = vcl::ConvertValue(nValue, 0, m_nOldDigits, eInUnit, FieldUnit::TWIP); nCurrentWidth = UpscaleTwoDecimalPlaces(nCurrentWidth, m_nOldDigits); + assert(nCurrentWidth >= SAL_MIN_INT64 / 10 && nCurrentWidth <= SAL_MAX_INT64 / 10); // Round to 0.5 percent return m_nRefValue ? (((nCurrentWidth * 1000) / m_nRefValue + 5) / 10) : 0; }
