diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-29 11:34:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-05-29 14:44:37 +0200 |
| commit | 9b25614939f7709e3d67949f49c4beeec0cdc534 (patch) | |
| tree | c1e25fc743202c1fd8288ef5f8c0332203b1fc5c /formula | |
| parent | 6647a167400753df45dba788ed793d55ca0be9f8 (diff) | |
loplugin:simplifybool in dbaccess..framework
Change-Id: I0d73bb7d8d3fde426edc0a10c0750758b68aceb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95099
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'formula')
| -rw-r--r-- | formula/source/core/api/token.cxx | 2 | ||||
| -rw-r--r-- | formula/source/ui/dlg/formula.cxx | 2 | ||||
| -rw-r--r-- | formula/source/ui/dlg/parawin.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/formula/source/core/api/token.cxx b/formula/source/core/api/token.cxx index 0b8b373a9de3..68df38517f76 100644 --- a/formula/source/core/api/token.cxx +++ b/formula/source/core/api/token.cxx @@ -1357,7 +1357,7 @@ FormulaTokenArray * FormulaTokenArray::RewriteMissing( const MissingConvention & // Omit everything except a trailing separator, the leading // separator is omitted below. The other way around would leave // an extraneous separator if no parameter followed. - if (!(pOcas[ i ] == nFn && pCur->GetOpCode() == ocSep)) + if (pOcas[ i ] != nFn || pCur->GetOpCode() != ocSep) bAdd = false; } } diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 330217c80292..b92824fc60a5 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -585,7 +585,7 @@ void FormulaDlg_Impl::CalcStruct( const OUString& rStrExp, bool bForceRecalcStru void FormulaDlg_Impl::MakeTree(StructPage* _pTree, weld::TreeIter* pParent, const FormulaToken* pFuncToken, const FormulaToken* _pToken, long Count) { - if ( !(_pToken != nullptr && Count > 0) ) + if ( _pToken == nullptr || Count <= 0 ) return; long nParas = _pToken->GetParamCount(); diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index ceb50d8d7e6d..4a3b76838d7b 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -108,7 +108,7 @@ void ParaWin::UpdateArgDesc( sal_uInt16 nArg ) if (nMaxArgs > 4) nArg = sal::static_int_cast<sal_uInt16>( nArg + GetSliderPos() ); - if (!((nMaxArgs > 0) && (nArg<nMaxArgs))) + if ((nMaxArgs <= 0) || (nArg >= nMaxArgs)) return; OUString aArgDesc; |