diff options
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/filtnav.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 10 |
3 files changed, 4 insertions, 10 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 004830ff8f9f..911d814285e2 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2904,7 +2904,7 @@ bool DbFilterField::commitControl() m_rColumn.GetField(), OUString(), aAppLocale, - '.', + OUString("."), getParseContext()); m_aText = aPreparedText; } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 0d29422d6429..9b4052de5cb9 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -817,7 +817,7 @@ bool FmFilterModel::ValidateText(FmFilterItem const * pItem, OUString& rText, OU OUString aPreparedText; Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); pParseNode->parseNodeToPredicateStr( - aPreparedText, xConnection, xFormatter, xField, OUString(), aAppLocale, '.', getParseContext() ); + aPreparedText, xConnection, xFormatter, xField, OUString(), aAppLocale, OUString("."), getParseContext() ); rText = aPreparedText; return true; } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index 025b6ca05026..e460a025de90 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3034,13 +3034,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) xFormatter->attachNumberFormatsSupplier(xFormatSupplier); Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetUILocaleDataWrapper() ); - /* FIXME: casting this to sal_Char is plain wrong and of course only - * works for ASCII separators, but - * pParseNode->parseNodeToPredicateStr() expects a sal_Char. Fix it - * there. */ - sal_Char cDecimalSeparator = static_cast<sal_Char>(rLocaleWrapper.getNumDecimalSep()[0]); - SAL_WARN_IF( static_cast<sal_Unicode>(cDecimalSeparator) != rLocaleWrapper.getNumDecimalSep()[0], - "svx.form", "FormController::setFilter: wrong cast of decimal separator to sal_Char!"); + OUString strDecimalSeparator = rLocaleWrapper.getNumDecimalSep(); // retrieving the filter for (const Sequence < PropertyValue >& rRow : aFilterRows) @@ -3157,7 +3151,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) ,xField ,OUString() ,aAppLocale - ,cDecimalSeparator + ,strDecimalSeparator ,getParseContext()); aRow[rFieldInfo.xText] = sCriteria; } |