Kaydet (Commit) dd93567a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Use vector<bool> instead of vector<sal_Bool>

Change-Id: Ibcaf1aeb773bb840c1d7a71b869137f21970eda1
üst 0568cd8c
...@@ -43,7 +43,7 @@ using namespace ::com::sun::star::sdbc; ...@@ -43,7 +43,7 @@ using namespace ::com::sun::star::sdbc;
extern extern
::std::vector< sal_Bool > entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry); ::std::vector<bool> entryMatchedByExpression(MQueryHelper* _aQuery, MQueryExpression* _aExpr, MQueryHelperResultEntry* entry);
MQueryHelperResultEntry::MQueryHelperResultEntry() MQueryHelperResultEntry::MQueryHelperResultEntry()
{ {
...@@ -253,9 +253,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression ...@@ -253,9 +253,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression
OUString valueOUString = OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 ); OUString valueOUString = OStringToOUString( valueOString, RTL_TEXTENCODING_UTF8 );
entry->setValue(key, valueOUString); entry->setValue(key, valueOUString);
} }
::std::vector< sal_Bool > vector = entryMatchedByExpression(this, &expr, entry); ::std::vector<bool> vector = entryMatchedByExpression(this, &expr, entry);
bool result = true; 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; result = result && *iter;
} }
...@@ -273,9 +273,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression ...@@ -273,9 +273,9 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression
return 0; 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; MQueryExpression::ExprVector::const_iterator evIter;
for( evIter = _aExpr->getExpressions().begin(); for( evIter = _aExpr->getExpressions().begin();
evIter != _aExpr->getExpressions().end(); evIter != _aExpr->getExpressions().end();
...@@ -336,17 +336,17 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression ...@@ -336,17 +336,17 @@ sal_Int32 MQueryHelper::executeQuery(OConnection* xConnection, MQueryExpression
SAL_INFO("connectivity.mork", "Appending Subquery Expression"); SAL_INFO("connectivity.mork", "Appending Subquery Expression");
MQueryExpression* queryExpression = static_cast<MQueryExpression*> (*evIter); MQueryExpression* queryExpression = static_cast<MQueryExpression*> (*evIter);
// recursive call // 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(); MQueryExpression::bool_cond condition = queryExpression->getExpressionCondition();
if (condition == MQueryExpression::OR) { if (condition == MQueryExpression::OR) {
bool result = false; 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; result = result || *iter;
} }
resultVector.push_back(result); resultVector.push_back(result);
} else if (condition == MQueryExpression::AND) { } else if (condition == MQueryExpression::AND) {
bool result = true; 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; result = result && *iter;
} }
resultVector.push_back(result); resultVector.push_back(result);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment