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 /filter | |
| parent | add some libs to libmerged (diff) | |
| download | core-9b25614939f7709e3d67949f49c4beeec0cdc534.tar.gz core-9b25614939f7709e3d67949f49c4beeec0cdc534.zip | |
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 'filter')
| -rw-r--r-- | filter/source/msfilter/msdffimp.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/msvbahelper.cxx | 2 | ||||
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 8f8e5d015728..da5b636172c9 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -3634,7 +3634,7 @@ void SvxMSDffManager::ReadObjText( SvStream& rStream, SdrObject* pObj ) DffRecordHeader aRecHd; if (!ReadDffRecordHeader(rStream, aRecHd)) return; - if( !(aRecHd.nRecType == DFF_msofbtClientTextbox || aRecHd.nRecType == 0x1022) ) + if( aRecHd.nRecType != DFF_msofbtClientTextbox && aRecHd.nRecType != 0x1022 ) return; while (rStream.good() && rStream.Tell() < aRecHd.GetRecEndFilePos()) diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index 92e53386fcb3..8c44140397b1 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -718,7 +718,7 @@ awt::KeyEvent parseKeyEvent( const OUString& Key ) } else // key should be enclosed in '{}' { - if ( sKeyCode.getLength() < 3 || !( sKeyCode[0] == '{' && sKeyCode[sKeyCode.getLength() - 1 ] == '}' ) ) + if ( sKeyCode.getLength() < 3 || sKeyCode[0] != '{' || sKeyCode[sKeyCode.getLength() - 1 ] != '}' ) throw uno::RuntimeException(); sKeyCode = sKeyCode.copy(1, sKeyCode.getLength() - 2 ); diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 9734c6d3464f..385551be007a 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -606,7 +606,7 @@ void SdrEscherImport::RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic .ReadUInt16( nX ) .ReadUInt16( nX ); - if ( !(( nGlobalColorsCount <= 64 ) && ( nFillColorsCount <= 64 )) ) + if ( ( nGlobalColorsCount > 64 ) || ( nFillColorsCount > 64 ) ) return; if ( static_cast<sal_uInt32>( ( nGlobalColorsCount + nFillColorsCount ) * 44 + 12 ) != nRecLen ) |