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 /chart2 | |
| 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 'chart2')
| -rw-r--r-- | chart2/qa/extras/chart2export.cxx | 1 | ||||
| -rw-r--r-- | chart2/source/controller/main/DrawCommandDispatch.cxx | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 89ae67d570d6..11f37235835b 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -205,7 +205,6 @@ OUString findChartFile(const OUString& rDir, uno::Reference< container::XNameAcc uno::Sequence<OUString> aNames = xNames->getElementNames(); OUString* pElement = std::find_if(aNames.begin(), aNames.end(), CheckForChartName(rDir)); - CPPUNIT_ASSERT(pElement); CPPUNIT_ASSERT(pElement != aNames.end()); return *pElement; } diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index cded08bb68c8..d990e351bbd1 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -363,7 +363,7 @@ void DrawCommandDispatch::execute( const OUString& rCommand, const Sequence< bea [&sKeyModifier](const beans::PropertyValue& lhs) {return lhs.Name == sKeyModifier;} ); sal_Int16 nKeyModifier = 0; - if ( pKeyModifier != pEnd && pKeyModifier && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) + if ( pKeyModifier != pEnd && ( pKeyModifier->Value >>= nKeyModifier ) && nKeyModifier == KEY_MOD1 ) { if ( eDrawMode == CHARTDRAW_INSERT ) { |