diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2019-10-08 20:43:03 +0200 |
---|---|---|
committer | Julien Nabet <serval2412@yahoo.fr> | 2019-10-09 14:09:22 +0200 |
commit | 8e0c45246a3de75d84875500ce3485e1ded4b934 (patch) | |
tree | a35ef3841aa5759efea866800738420697a8eb60 /dbaccess | |
parent | 728de28b8b7f334fd2102e132539a059d6a0a66f (diff) |
Resolve FIXME Decimal Separator should be OUString (connectivity/dbaccess/svx)
instead of a sal_Char
Change-Id: I14fd983dac7ceb83a788c26dd4ea9d1c87444c9a
Reviewed-on: https://gerrit.libreoffice.org/80493
Tested-by: Jenkins
Reviewed-by: Lionel Elie Mamane <lionel@mamane.lu>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'dbaccess')
-rw-r--r-- | dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 26 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/QueryDesignView.cxx | 18 | ||||
-rw-r--r-- | dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 4 |
3 files changed, 24 insertions, 24 deletions
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 46e6adc2c303..9dda10cfcecb 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -1127,7 +1127,7 @@ bool OSingleSelectQueryComposer::setLikePredicate(OSQLParseNode const * pConditi for (size_t i=2; i < pPart2->count(); i++) { pPart2->getChild(i)->parseNodeToPredicateStr( - aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>(m_sDecimalSep.toChar() ) ); + aValue, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); } aItem.Name = getColumnName(pRowValue,_rIterator); @@ -1140,9 +1140,9 @@ bool OSingleSelectQueryComposer::setLikePredicate(OSQLParseNode const * pConditi OUString aValue; OUString aColumnName; - pPart2->getChild(2)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); - pPart2->getChild(3)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); - pRowValue->parseNodeToPredicateStr( aColumnName, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep .toChar() ) ); + pPart2->getChild(2)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); + pPart2->getChild(3)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); + pRowValue->parseNodeToPredicateStr( aColumnName, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); aItem.Name = getColumnName(pRowValue,_rIterator); aItem.Value <<= aValue; @@ -1156,12 +1156,12 @@ bool OSingleSelectQueryComposer::setLikePredicate(OSQLParseNode const * pConditi // Field names for (size_t i=0;i< pRowValue->count();i++) - pRowValue->getChild(i)->parseNodeToPredicateStr( aName, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); + pRowValue->getChild(i)->parseNodeToPredicateStr( aName, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); // Criterion for(size_t i=0;i< pValue->count();i++) - pValue->getChild(i)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); - pPart2->getChild(3)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); + pValue->getChild(i)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); + pPart2->getChild(3)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); aItem.Name = aName; aItem.Value <<= aValue; @@ -1190,7 +1190,7 @@ bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode const * pC // go forward - don't display the operator for (i++;i < pCondition->count();i++) pCondition->getChild(i)->parseNodeToPredicateStr( - aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>(m_sDecimalSep.toChar() ) ); + aValue, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); } else if (SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref)) { @@ -1228,7 +1228,7 @@ bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode const * pC // go backward - don't display the operator for (i--; i >= 0; i--) pCondition->getChild(i)->parseNodeToPredicateStr( - aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); + aValue, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); } else return false; @@ -1244,8 +1244,8 @@ bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode const * pC OUString aValue; OUString aColumnName; - pCondition->getChild(2)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); - pCondition->getChild(0)->parseNodeToPredicateStr( aColumnName, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep .toChar() ) ); + pCondition->getChild(2)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); + pCondition->getChild(0)->parseNodeToPredicateStr( aColumnName, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); aItem.Name = getColumnName(pCondition->getChild(0),_rIterator); aItem.Value <<= aValue; @@ -1262,12 +1262,12 @@ bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode const * pC // Field names for (size_t i=0;i< pLhs->count();i++) - pLhs->getChild(i)->parseNodeToPredicateStr( aName, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); + pLhs->getChild(i)->parseNodeToPredicateStr( aName, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); // Criterion aItem.Handle = getPredicateType(pCondition->getChild(1)); for(size_t i=0;i< pRhs->count();i++) - pRhs->getChild(i)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, static_cast<sal_Char>( m_sDecimalSep.toChar() ) ); + pRhs->getChild(i)->parseNodeToPredicateStr(aValue, m_xConnection, xFormatter, m_aLocale, m_sDecimalSep ); aItem.Name = aName; aItem.Value <<= aValue; diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 1b2e6e61ddd8..e4b6ad431ea4 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -201,7 +201,7 @@ namespace xConnection, rController.getNumberFormatter(), _rLocale, - static_cast<sal_Char>(_sDecimal.toChar()), + _sDecimal, &rController.getParser().getContext()); } return aCondition; @@ -1341,14 +1341,14 @@ namespace xConnection, rController.getNumberFormatter(), aLocale, - static_cast<sal_Char>(sDecimal.toChar()), + sDecimal, &rController.getParser().getContext()); pValueExp->parseNodeToPredicateStr( aColumnName, xConnection, rController.getNumberFormatter(), aLocale, - static_cast<sal_Char>(sDecimal.toChar()), + sDecimal, &rController.getParser().getContext()); // don't display the column name @@ -1417,7 +1417,7 @@ namespace xConnection, rController.getNumberFormatter(), aLocale, - static_cast<sal_Char>(sDecimal.toChar()), + sDecimal, &rController.getParser().getContext()); OTableFieldDescRef aDragLeft = new OTableFieldDesc(); @@ -1472,7 +1472,7 @@ namespace xConnection, rController.getNumberFormatter(), _pView->getLocale(), - static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), + _pView->getDecimalSeparator(), &rController.getParser().getContext()); pFunction->parseNodeToStr( aColumnName, @@ -1633,7 +1633,7 @@ namespace xConnection, rController.getNumberFormatter(), _pView->getLocale(), - static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), + _pView->getDecimalSeparator(), &rController.getParser().getContext()); } } @@ -1675,7 +1675,7 @@ namespace xConnection, rController.getNumberFormatter(), _pView->getLocale(), - static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), + _pView->getDecimalSeparator(), &rController.getParser().getContext()); } @@ -2115,7 +2115,7 @@ namespace xConnection, rController.getNumberFormatter(), _pView->getLocale(), - static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), + _pView->getDecimalSeparator(), &rController.getParser().getContext()); sal_Int32 nFunctionType = FKT_NONE; @@ -2280,7 +2280,7 @@ namespace xConnection, rController.getNumberFormatter(), _pView->getLocale(), - static_cast<sal_Char>(_pView->getDecimalSeparator().toChar()), + _pView->getDecimalSeparator(), &rController.getParser().getContext()); _pView->fillFunctionInfo(pArgument,sCondition,aDragLeft); aDragLeft->SetFunctionType(FKT_OTHER); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index edb0799da3bc..85df2321b40e 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -1096,7 +1096,7 @@ bool OSelectionBrowseBox::SaveModified() xColumn, pEntry->GetAlias(), getDesignView()->getLocale(), - static_cast<sal_Char>(getDesignView()->getDecimalSeparator().toChar()), + getDesignView()->getDecimalSeparator(), &(static_cast<OQueryController&>(getDesignView()->getController()).getParser().getContext())); } else @@ -1133,7 +1133,7 @@ bool OSelectionBrowseBox::SaveModified() xColumn, pEntry->GetAlias(), getDesignView()->getLocale(), - static_cast<sal_Char>(getDesignView()->getDecimalSeparator().toChar()), + getDesignView()->getDecimalSeparator(), &(static_cast<OQueryController&>(getDesignView()->getController()).getParser().getContext())); } else |