cui/source/tabpages/paragrph.cxx | 6 +++--- cui/source/tabpages/textanim.cxx | 4 ++-- sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 2 +- sw/source/uibase/utlui/prcntfld.cxx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 9785ac1b84233ed6ecf09c2673b44cb3b475f08c Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 14 08:37:42 2025 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 14 14:05:07 2025 +0200 cid#1667055 silence Overflowed constant and cid#1667057 Overflowed constant cid#1667063 Overflowed constant cid#1667097 Overflowed constant Change-Id: I2ae609bf9b13af2de2439151e1f49f9bac6b0d39 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/192369 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 88129d4655a7..3d285f514e84 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1687,7 +1687,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, TextDirectionHdl_Impl, weld::ComboBox&, voi IMPL_LINK_NOARG(SvxParaAlignTabPage, WordSpacingHdl_Impl, weld::MetricSpinButton&, void) { - sal_Int16 nDesired = m_xWordSpacing->get_value(FieldUnit::PERCENT); + auto nDesired = m_xWordSpacing->get_value(FieldUnit::PERCENT); if (nDesired < m_xWordSpacingMinimum->get_value(FieldUnit::PERCENT)) m_xWordSpacingMinimum->set_value(nDesired, FieldUnit::PERCENT); if (nDesired > m_xWordSpacingMaximum->get_value(FieldUnit::PERCENT)) @@ -1696,7 +1696,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, WordSpacingHdl_Impl, weld::MetricSpinButton IMPL_LINK_NOARG(SvxParaAlignTabPage, WordSpacingMinimumHdl_Impl, weld::MetricSpinButton&, void) { - sal_Int16 nMinimum = m_xWordSpacingMinimum->get_value(FieldUnit::PERCENT); + auto nMinimum = m_xWordSpacingMinimum->get_value(FieldUnit::PERCENT); if (nMinimum > m_xWordSpacing->get_value(FieldUnit::PERCENT)) m_xWordSpacing->set_value(nMinimum, FieldUnit::PERCENT); if (nMinimum > m_xWordSpacingMaximum->get_value(FieldUnit::PERCENT)) @@ -1705,7 +1705,7 @@ IMPL_LINK_NOARG(SvxParaAlignTabPage, WordSpacingMinimumHdl_Impl, weld::MetricSpi IMPL_LINK_NOARG(SvxParaAlignTabPage, WordSpacingMaximumHdl_Impl, weld::MetricSpinButton&, void) { - sal_Int16 nMaximum = m_xWordSpacingMaximum->get_value(FieldUnit::PERCENT); + auto nMaximum = m_xWordSpacingMaximum->get_value(FieldUnit::PERCENT); if (nMaximum < m_xWordSpacingMinimum->get_value(FieldUnit::PERCENT)) m_xWordSpacingMinimum->set_value(nMaximum, FieldUnit::PERCENT); if (nMaximum < m_xWordSpacing->get_value(FieldUnit::PERCENT)) diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 191d00cd6e50..64474a67b1cb 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -479,7 +479,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::Toggleable&, voi TriState eState = m_xTsbPixel->get_state(); if (eState == TRISTATE_TRUE) { - int nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE) / 10; + auto nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE) / 10; m_xMtrFldAmount->set_sensitive(true); m_xMtrFldAmount->set_unit(FieldUnit::CUSTOM); m_xMtrFldAmount->set_digits(0); @@ -491,7 +491,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::Toggleable&, voi } else if( eState == TRISTATE_FALSE ) { - int nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE) * 10; + auto nValue = m_xMtrFldAmount->get_value(FieldUnit::NONE) * 10; m_xMtrFldAmount->set_sensitive(true); m_xMtrFldAmount->set_unit(eFUnit); m_xMtrFldAmount->set_digits(2); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 6f4885988205..15a8e91f9cf0 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -165,7 +165,7 @@ IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl, weld::Toggleable&, void IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl, weld::MetricSpinButton&, void) { - sal_uInt16 nVal = mxMFLeftIndent->get_value(FieldUnit::NONE); + auto nVal = mxMFLeftIndent->get_value(FieldUnit::NONE); ScIndentItem aItem(static_cast<sal_uInt16>(CalcToUnit(nVal, MapUnit::MapTwip))); GetBindings()->GetDispatcher()->ExecuteList(SID_ATTR_ALIGN_INDENT, diff --git a/sw/source/uibase/utlui/prcntfld.cxx b/sw/source/uibase/utlui/prcntfld.cxx index e00377de7fb6..5f54c0165766 100644 --- a/sw/source/uibase/utlui/prcntfld.cxx +++ b/sw/source/uibase/utlui/prcntfld.cxx @@ -157,8 +157,8 @@ void SwPercentField::set_min(sal_Int64 nNewMin, FieldUnit eInUnit) eInUnit = m_eOldUnit; m_nOldMin = Convert(nNewMin, eInUnit, m_eOldUnit); - int nPercent = Convert(nNewMin, eInUnit, FieldUnit::PERCENT); - m_pField->set_min(std::max(1, nPercent), FieldUnit::NONE); + sal_Int64 nPercent = Convert(nNewMin, eInUnit, FieldUnit::PERCENT); + m_pField->set_min(std::max<sal_Int64>(1, nPercent), FieldUnit::NONE); } }
