diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-08-14 10:29:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-08-14 15:28:44 +0200 |
| commit | 97e49876086bbdcb58ae0c22d9145c453f239468 (patch) | |
| tree | 202257093db0b02a1dcfbb22543b65fd4f3217ec | |
| parent | fa575be1e59b333a9aadcf4161686dfae2faa555 (diff) | |
tdf#135526 ranges overflowing to become negative
the properties panel uses huge min/maxes which can overflow
when the number of digits changes
Change-Id: Idbb998a065ce8f2b918fceea2076b794cbde3368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100731
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | extensions/source/propctrlr/standardcontrol.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index 2084a9dae6bf..436f5b412e27 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -331,9 +331,13 @@ namespace pcr return getTypedControlWindow()->get_digits(); } - void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 _decimaldigits ) + void SAL_CALL ONumericControl::setDecimalDigits( ::sal_Int16 decimaldigits ) { - getTypedControlWindow()->set_digits( _decimaldigits ); + weld::MetricSpinButton* pControlWindow = getTypedControlWindow(); + int min, max; + pControlWindow->get_range(min, max, FieldUnit::NONE); + pControlWindow->set_digits(decimaldigits); + pControlWindow->set_range(min, max, FieldUnit::NONE); } Optional< double > SAL_CALL ONumericControl::getMinValue() diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index b7e77efb7c17..b0cb0e053fce 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -342,7 +342,12 @@ namespace weld int MetricSpinButton::ConvertValue(int nValue, FieldUnit eInUnit, FieldUnit eOutUnit) const { - return vcl::ConvertValue(nValue, 0, m_xSpinButton->get_digits(), eInUnit, eOutUnit); + auto nRet = vcl::ConvertValue(nValue, 0, m_xSpinButton->get_digits(), eInUnit, eOutUnit); + if (nRet > SAL_MAX_INT32) + nRet = SAL_MAX_INT32; + else if (nRet < SAL_MIN_INT32) + nRet = SAL_MIN_INT32; + return nRet; } IMPL_LINK(MetricSpinButton, spin_button_input, int*, result, bool) |