diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-07-06 19:36:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-07 22:01:01 +0200 |
| commit | c5e4534808c03ce30c7b3e4bbed38ed5fca2d77f (patch) | |
| tree | de059f4b070448e25f0f6e75d86618b307ebde6e /dbaccess | |
| parent | 6c4224b7ac9d8b016759ae8b5c0afdbef473a16f (diff) | |
remove nullptr checks on STL search result iterators
results are in the range of first_iterator to last_iterator.
If one of those is nullptr the algorithm would fail anyway.
This removes some impossible checks in
sw/source/core/unocore/unochart.cxx:
SwChartDataProvider::detectArguments.
A sorted range still holds the same values and has
the same length as the original range.
Replacing raw pointers eases reading this code.
Change-Id: If96bd11e9167488346a57e9e08507ac42338d3cd
Reviewed-on: https://gerrit.libreoffice.org/39683
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/UITools.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index eefea14eebe9..f2e2cabb553b 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1038,13 +1038,13 @@ void fillAutoIncrementValue(const Reference<XPropertySet>& _xDatasource, [](const PropertyValue& lhs) {return TPropertyValueEqualFunctor()(lhs, PROPERTY_AUTOINCREMENTCREATION);} ); - if ( pValue && pValue != aInfo.end() ) + if ( pValue != aInfo.end() ) pValue->Value >>= _rsAutoIncrementValue; pValue =std::find_if(aInfo.begin(), aInfo.end(), [](const PropertyValue& lhs) {return TPropertyValueEqualFunctor()(lhs, "IsAutoRetrievingEnabled");} ); - if ( pValue && pValue != aInfo.end() ) + if ( pValue != aInfo.end() ) pValue->Value >>= _rAutoIncrementValueEnabled; } } |