diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-12 11:21:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-28 11:23:34 +0200 |
| commit | 9348b322a5c230dfcc2231661b73e480b130fcd9 (patch) | |
| tree | 2c81a97d6f54229c87c5e2a37c73935ffc2527ac /sot | |
| parent | 5bcd18461b8cb63b477dbb74025374b4c963161a (diff) | |
clang-tidy readability-simplify-boolean-expr
Change-Id: Iea7ab64683f0b29794d50d774cc482b54a00e70a
Reviewed-on: https://gerrit.libreoffice.org/36450
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sot')
| -rw-r--r-- | sot/source/base/exchange.cxx | 6 | ||||
| -rw-r--r-- | sot/source/sdstor/stg.cxx | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx index 95b02b2b9f3a..943fbbe7c303 100644 --- a/sot/source/base/exchange.cxx +++ b/sot/source/base/exchange.cxx @@ -498,16 +498,14 @@ OUString SotExchange::GetFormatName( SotClipboardFormatId nFormat ) bool SotExchange::IsInternal( const SvGlobalName& rName ) { - if ( rName == SvGlobalName(SO3_SW_CLASSID_60) || + return rName == SvGlobalName(SO3_SW_CLASSID_60) || rName == SvGlobalName(SO3_SC_CLASSID_60) || rName == SvGlobalName(SO3_SIMPRESS_CLASSID_60) || rName == SvGlobalName(SO3_SDRAW_CLASSID_60) || rName == SvGlobalName(SO3_SCH_CLASSID_60) || rName == SvGlobalName(SO3_SM_CLASSID_60) || rName == SvGlobalName(SO3_SWWEB_CLASSID_60) || - rName == SvGlobalName(SO3_SWGLOB_CLASSID_60) ) - return true; - return false; + rName == SvGlobalName(SO3_SWGLOB_CLASSID_60); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx index 7f4c0fb50157..d5e0bf691877 100644 --- a/sot/source/sdstor/stg.cxx +++ b/sot/source/sdstor/stg.cxx @@ -116,13 +116,11 @@ OLEStorageBase::~OLEStorageBase() bool OLEStorageBase::Validate_Impl( bool bWrite ) const { - if( pIo + return pIo && pIo->m_pTOC && pEntry && !pEntry->m_bInvalid - && ( !bWrite || !pEntry->m_bDirect || ( nStreamMode & StreamMode::WRITE ) ) ) - return true; - return false; + && ( !bWrite || !pEntry->m_bDirect || ( nStreamMode & StreamMode::WRITE ) ); } bool OLEStorageBase::ValidateMode_Impl( StreamMode m, StgDirEntry* p ) |