summaryrefslogtreecommitdiff
path: root/connectivity/source/drivers
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-04-22 15:52:20 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-04-23 09:30:54 +0200
commitdd93567ace49ebd09217e1de3a7198fff5b02f0f (patch)
treef2451b142d4359468d20a35b3439f9817490ed82 /connectivity/source/drivers
parent0568cd8cf740be45360fd94405fc6a85f2dfb4c2 (diff)
Use vector<bool> instead of vector<sal_Bool>
Change-Id: Ibcaf1aeb773bb840c1d7a71b869137f21970eda1
Diffstat (limited to 'connectivity/source/drivers')
-rw-r--r--connectivity/source/drivers/mork/MQueryHelper.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 36f8a2e6b467..865a7b562044 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::sdbc;
extern
-::std::vector< sal_Bool > entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry);
+::std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry);
MQueryHelperResultEntry::MQueryHelperResultEntry()
{
@@ -253,9 +253,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression
OUString valueOUString = OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 );
entry->setValue(key, valueOUString);
}
- ::std::vector< sal_Bool > vector = entryMatchedByExpression(this, &expr, entry);
+ ::std::vector<bool> vector = entryMatchedByExpression(this, &expr, entry);
bool result = true;
- for (::std::vector<sal_Bool>::iterator iter = vector.begin(); iter != vector.end(); ++iter)
+ for (::std::vector<bool>::iterator iter = vector.begin(); iter != vector.end(); ++iter)
{
result = result && *iter;
}
@@ -273,9 +273,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression
return 0;
}
-::std::vector< sal_Bool > entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry)
+::std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry)
{
- ::std::vector< sal_Bool > resultVector;
+ ::std::vector<bool> resultVector;
MQueryExpression::ExprVector::const_iterator evIter;
for( evIter = _aExpr->getExpressions().begin();
evIter != _aExpr->getExpressions().end();
@@ -336,17 +336,17 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression
SAL_INFO("connectivity.mork", "Appending Subquery Expression");
MQueryExpression* queryExpression = static_cast<MQueryExpression*> (*evIter);
// recursive call
- ::std::vector<sal_Bool> subquery_result = entryMatchedByExpression(_aQuery, queryExpression, entry);
+ ::std::vector<bool> subquery_result = entryMatchedByExpression(_aQuery, queryExpression, entry);
MQueryExpression::bool_cond condition = queryExpression->getExpressionCondition();
if (condition == MQueryExpression::OR) {
bool result = false;
- for (::std::vector<sal_Bool>::iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) {
+ for (::std::vector<bool>::iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) {
result = result || *iter;
}
resultVector.push_back(result);
} else if (condition == MQueryExpression::AND) {
bool result = true;
- for (::std::vector<sal_Bool>::iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) {
+ for (::std::vector<bool>::iterator iter = subquery_result.begin(); iter != subquery_result.end(); ++iter) {
result = result && *iter;
}
resultVector.push_back(result);