diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-12-09 09:57:11 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-12-09 16:02:46 +0100 |
commit | 9eda23ddcd9767c89364016a92eaab4a823df39a (patch) | |
tree | 0fb13da193aac7664ce361191903aa9217b0a8d6 /writerfilter | |
parent | f23388c4356c1c488f8445e97ba8d567d5bae8f1 (diff) |
negative return passed to parameter that cannot be negative
I wonder if the test != 0 is what was really intended here, but
keep that legacy logic anyway
Change-Id: I4b39a2130e961c6f2ca97695e4625df5a95e00b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107478
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 9ec336f263eb..86dcf63416fc 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -79,6 +79,7 @@ #include <com/sun/star/document/XFilter.hpp> #include <editeng/flditem.hxx> #include <editeng/unotext.hxx> +#include <o3tl/safeint.hxx> #include <o3tl/temporary.hxx> #include <oox/mathml/import.hxx> #include <xmloff/odffields.hxx> @@ -157,7 +158,7 @@ static void lcl_handleDropdownField( const uno::Reference< beans::XPropertySet > rxFieldProps->setPropertyValue( "Items", uno::makeAny( sItems ) ); sal_Int32 nResult = pFFDataHandler->getDropDownResult().toInt32(); - if ( nResult ) + if (nResult > 0 && o3tl::make_unsigned(nResult) < sItems.size()) rxFieldProps->setPropertyValue( "SelectedItem", uno::makeAny( sItems[ nResult ] ) ); if ( !pFFDataHandler->getHelpText().isEmpty() ) rxFieldProps->setPropertyValue( "Help", uno::makeAny( pFFDataHandler->getHelpText() ) ); |