diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-04-23 18:30:45 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-04-23 18:39:07 +0200 |
| commit | 22401181774dfb3882e7ad0335f1267d7885ff48 (patch) | |
| tree | cc31d4ef17eef1e76458e47cef8675458c8719ea /connectivity | |
| parent | 6425f7ff616f9aaad8b4e279385ed3f5ab65bfe2 (diff) | |
Improved loplugin:literaltoboolconversion looking into cond. exprs.
...automatic rewriter fixes
Change-Id: I6b04ca80f08f8a71ff94e309fd52f44d736751ee
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/kab/KStatement.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/drivers/mork/MQueryHelper.cxx | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index c776bd8a584f..ec619ee7db5d 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -272,8 +272,8 @@ KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNo pColumnRef->getChild(0)->getTokenValue(); bool bAscending = SQL_ISTOKEN(pAscendingDescending, DESC)? - sal_False: - sal_True; + false: + true; return new KabSimpleOrder(sColumnName, bAscending); } diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx index fdfcd9162fc4..5cfb9b76c908 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.cxx +++ b/connectivity/source/drivers/mork/MQueryHelper.cxx @@ -298,22 +298,22 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression OUString searchedValue = evStr->getValue(); if (evStr->getCond() == MQueryOp::Is) { SAL_INFO("connectivity.mork", "MQueryOp::Is; done"); - resultVector.push_back((currentValue == searchedValue) ? sal_True : sal_False); + resultVector.push_back((currentValue == searchedValue) ? true : false); } else if (evStr->getCond() == MQueryOp::IsNot) { SAL_INFO("connectivity.mork", "MQueryOp::IsNot; done"); - resultVector.push_back((currentValue == searchedValue) ? sal_False : sal_True); + resultVector.push_back((currentValue == searchedValue) ? false : true); } else if (evStr->getCond() == MQueryOp::EndsWith) { SAL_INFO("connectivity.mork", "MQueryOp::EndsWith; done"); - resultVector.push_back((currentValue.endsWith(searchedValue)) ? sal_True : sal_False); + resultVector.push_back((currentValue.endsWith(searchedValue)) ? true : false); } else if (evStr->getCond() == MQueryOp::BeginsWith) { SAL_INFO("connectivity.mork", "MQueryOp::BeginsWith; done"); - resultVector.push_back((currentValue.startsWith(searchedValue)) ? sal_True : sal_False); + resultVector.push_back((currentValue.startsWith(searchedValue)) ? true : false); } else if (evStr->getCond() == MQueryOp::Contains) { SAL_INFO("connectivity.mork", "MQueryOp::Contains; done"); - resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? sal_False : sal_True); + resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? false : true); } else if (evStr->getCond() == MQueryOp::DoesNotContain) { SAL_INFO("connectivity.mork", "MQueryOp::DoesNotContain; done"); - resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? sal_True : sal_False); + resultVector.push_back((currentValue.indexOf(searchedValue) == -1) ? true : false); } else if (evStr->getCond() == MQueryOp::RegExp) { SAL_INFO("connectivity.mork", "MQueryOp::RegExp; done"); utl::SearchParam param( @@ -326,10 +326,10 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression } } else if (evStr->getCond() == MQueryOp::Exists) { SAL_INFO("connectivity.mork", "MQueryOp::Exists; done"); - resultVector.push_back((currentValue.isEmpty()) ? sal_False : sal_True); + resultVector.push_back((currentValue.isEmpty()) ? false : true); } else if (evStr->getCond() == MQueryOp::DoesNotExist) { SAL_INFO("connectivity.mork", "MQueryOp::DoesNotExist; done"); - resultVector.push_back((currentValue.isEmpty()) ? sal_True : sal_False); + resultVector.push_back((currentValue.isEmpty()) ? true : false); } } else if ( (*evIter)->isExpr() ) { |