connectivity/source/parse/sqlbison.y | 4 ++--
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 6 +++---
dbaccess/source/core/inc/SingleSelectQueryComposer.hxx | 2 +-
include/connectivity/sqlparse.hxx | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 11ee7b59dda5ff2beb65fdf003e7748e541db777
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Apr 25 19:17:12 2020 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Apr 25 20:19:58 2020 +0200
Typo: *Comparsion* -> *Comparison* in dbaccess/connectivity
Change-Id: I9dfe37b290dbb83b1dfb2f92669ae254898ee72e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92898
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/connectivity/source/parse/sqlbison.y
b/connectivity/source/parse/sqlbison.y
index 4c1294a07e58..1d9a0d36a36d 100644
--- a/connectivity/source/parse/sqlbison.y
+++ b/connectivity/source/parse/sqlbison.y
@@ -1118,7 +1118,7 @@ boolean_primary:
}
else
{
- nErg =
xxx_pGLOBAL_SQLPARSER->buildComparsionRule($$,$1);
+ nErg =
xxx_pGLOBAL_SQLPARSER->buildComparisonRule($$,$1);
}
if(nErg == 1)
{
@@ -4760,7 +4760,7 @@ sal_Int16 OSQLParser::buildStringNodes(OSQLParseNode*&
pLiteral)
return 1;
}
-sal_Int16 OSQLParser::buildComparsionRule(OSQLParseNode*&
pAppend,OSQLParseNode* pLiteral)
+sal_Int16 OSQLParser::buildComparisonRule(OSQLParseNode*&
pAppend,OSQLParseNode* pLiteral)
{
OSQLParseNode* pComp = new OSQLInternalNode("=", SQLNodeType::Equal);
return buildPredicateRule(pAppend,pLiteral,pComp);
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index ba3b02d2da69..62709c8e7902 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -999,7 +999,7 @@ bool OSingleSelectQueryComposer::setANDCriteria(
OSQLParseNode const * pConditio
}
else if (SQL_ISRULE(pCondition, comparison_predicate))
{
- return
setComparsionPredicate(pCondition,_rIterator,rFilter,xFormatter);
+ return
setComparisonPredicate(pCondition,_rIterator,rFilter,xFormatter);
}
else if (SQL_ISRULE(pCondition,like_predicate))
{
@@ -1166,10 +1166,10 @@ bool
OSingleSelectQueryComposer::setLikePredicate(OSQLParseNode const * pConditi
return true;
}
-bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode const *
pCondition, OSQLParseTreeIterator const & _rIterator,
+bool OSingleSelectQueryComposer::setComparisonPredicate(OSQLParseNode const *
pCondition, OSQLParseTreeIterator const & _rIterator,
std::vector < PropertyValue >&
rFilter, const Reference< css::util::XNumberFormatter > & xFormatter) const
{
- OSL_ENSURE(SQL_ISRULE(pCondition,
comparison_predicate),"setComparsionPredicate: pCondition is not a
ComparsionPredicate");
+ OSL_ENSURE(SQL_ISRULE(pCondition,
comparison_predicate),"setComparisonPredicate: pCondition is not a
ComparisonPredicate");
if (SQL_ISRULE(pCondition->getChild(0), column_ref) ||
SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref))
{
diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
index 77d0a178e99a..bb2634b7611d 100644
--- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
+++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
@@ -116,7 +116,7 @@ namespace dbaccess
std::vector < css::beans::PropertyValue > & rFilters, const
css::uno::Reference< css::util::XNumberFormatter > & xFormatter) const;
bool setLikePredicate(::connectivity::OSQLParseNode const *
pCondition, ::connectivity::OSQLParseTreeIterator const & _rIterator,
std::vector < css::beans::PropertyValue > & rFilters, const
css::uno::Reference< css::util::XNumberFormatter > & xFormatter) const;
- bool setComparsionPredicate(::connectivity::OSQLParseNode const *
pCondition, ::connectivity::OSQLParseTreeIterator const & _rIterator,
+ bool setComparisonPredicate(::connectivity::OSQLParseNode const *
pCondition, ::connectivity::OSQLParseTreeIterator const & _rIterator,
std::vector < css::beans::PropertyValue > & rFilters, const
css::uno::Reference< css::util::XNumberFormatter > & xFormatter) const;
static OUString getColumnName(::connectivity::OSQLParseNode const *
pColumnRef, ::connectivity::OSQLParseTreeIterator const & _rIterator);
diff --git a/include/connectivity/sqlparse.hxx
b/include/connectivity/sqlparse.hxx
index 6f3bbe56c39a..814615aef5b4 100644
--- a/include/connectivity/sqlparse.hxx
+++ b/include/connectivity/sqlparse.hxx
@@ -220,7 +220,7 @@ namespace connectivity
// does not change the pLiteral argument
sal_Int16 buildNode(OSQLParseNode*& pAppend,OSQLParseNode*
pCompare,OSQLParseNode* pLiteral,OSQLParseNode* pLiteral2);
- sal_Int16 buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode*
pLiteral);
+ sal_Int16 buildComparisonRule(OSQLParseNode*& pAppend,OSQLParseNode*
pLiteral);
// pCompre will be deleted if it is not used
sal_Int16 buildPredicateRule(OSQLParseNode*& pAppend,OSQLParseNode*
const pLiteral,OSQLParseNode* pCompare,OSQLParseNode* pLiteral2 = nullptr);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
