diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-24 09:24:05 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-04-24 11:31:02 +0200 |
| commit | 63df0796f5ec500f3b6fb34510d4bc79c009e76d (patch) | |
| tree | 1abacb83b15612c8ef712c89eb3dc15f28bc41c4 /sal | |
| parent | 1c8f03b48a02a56bc4eb364d8a4e9bd4715a530a (diff) | |
clang-tidy readability-simplify-boolean-expr in oox..sal
Change-Id: I1e14e5b15d2dd9e35477f8189cbecf0b443b9381
Reviewed-on: https://gerrit.libreoffice.org/36875
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/profile.cxx | 10 | ||||
| -rw-r--r-- | sal/qa/OStringBuffer/rtl_OStringBuffer.cxx | 12 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 5 |
3 files changed, 4 insertions, 23 deletions
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx index a979c7b8e71b..c5e5dd77d819 100644 --- a/sal/osl/unx/profile.cxx +++ b/sal/osl/unx/profile.cxx @@ -890,15 +890,7 @@ static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode) sal_Char* pEnvValue; pEnvValue = getenv( "STAR_PROFILE_LOCKING_DISABLED" ); - if ( pEnvValue == nullptr ) - { - bLockingDisabled = false; - - } - else - { - bLockingDisabled = true; - } + bLockingDisabled = pEnvValue != nullptr; bIsInitialized = true; } diff --git a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx index bcdc5c5ab07c..caad268044da 100644 --- a/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx +++ b/sal/qa/OStringBuffer/rtl_OStringBuffer.cxx @@ -14661,11 +14661,7 @@ namespace rtl_OStringBuffer OString sBufferString(_sStrBuf.getStr()); sal_Int32 nPos = sBufferString.indexOf(sFloatValue); - if ( nPos >= 0 && nPos == _nLen) - { - return true; - } - return false; + return nPos >= 0 && nPos == _nLen; } }; @@ -15829,11 +15825,7 @@ namespace rtl_OStringBuffer OString sBufferString(_sStrBuf.getStr()); sal_Int32 nPos = sBufferString.indexOf(sDoubleValue); - if ( nPos >= 0 && nPos == _nLen) - { - return true; - } - return false; + return nPos >= 0 && nPos == _nLen; } }; diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 77ddcdede871..027c556d5cb8 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -351,10 +351,7 @@ inline bool checkDirectory( const ::rtl::OUString & str, oslCheckMode nCheckMode case oslCheckMode::ReadAccess: //rc = pDir->getNextItem( rItem, 0 ); rc = aDir.getNextItem( rItem ); - if ( ( rc == ::osl::FileBase::E_None ) || ( rc == ::osl::FileBase::E_NOENT ) ) - bCheckResult = true; - else - bCheckResult = false; + bCheckResult = ( rc == ::osl::FileBase::E_None ) || ( rc == ::osl::FileBase::E_NOENT ); break; case oslCheckMode::WriteAccess: ( ( aUString += str ) += aSlashURL ) += aTmpName2; |