diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2013-04-26 12:14:33 +0200 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2013-04-26 16:49:48 +0200 |
| commit | 1bc4a49d9ba99ff0531bafc2cf0183f726bfe14b (patch) | |
| tree | b980c3c940e1d7c233e2c6d19da7cd7d55b5ad1a /svx | |
| parent | fae7a3d060664e6540dbdfc3babd54ac9ccb45bf (diff) | |
QueryDesign: in criteria, remove column_ref when table *and* column name match
As opposed to only the column name
Change-Id: I261d13f23214f950daa55a5b63cd486e59a0e127
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 5 | ||||
| -rw-r--r-- | svx/source/form/filtnav.cxx | 2 | ||||
| -rw-r--r-- | svx/source/form/formcontroller.cxx | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index f7dcf1144d1b..22b4716829d8 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -2985,7 +2985,10 @@ sal_Bool DbFilterField::commitControl() xParseNode->parseNodeToPredicateStr(aPreparedText, xConnection, xNumberFormatter, - m_rColumn.GetField(),aAppLocale,'.', + m_rColumn.GetField(), + OUString(), + aAppLocale, + '.', getParseContext()); m_aText = aPreparedText; } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9bd657063ea6..8b665eb9a508 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -903,7 +903,7 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUStr OUString aPreparedText; Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale(); xParseNode->parseNodeToPredicateStr( - aPreparedText, xConnection, xFormatter, xField, aAppLocale, '.', getParseContext() ); + aPreparedText, xConnection, xFormatter, xField, OUString(), aAppLocale, '.', getParseContext() ); rText = aPreparedText; return sal_True; } diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index c9fab0b9761c..313fcd84e7f2 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -3246,6 +3246,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos) ,xConnection ,xFormatter ,xField + ,OUString() ,aAppLocale ,cDecimalSeparator ,getParseContext()); |