diff options
| author | Olivier Ploton <olivier.ploton@univ-tours.fr> | 2012-12-12 22:04:38 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2013-05-07 13:21:00 +0200 |
| commit | 86da39ecaaf2a018de2de95ceb452a96b0e0acc8 (patch) | |
| tree | ef2561770defd5b4147fb29db2f063abb33befdf /connectivity | |
| parent | 76c389ec5bfe85cb9b60bf8c7f6ceb55ca88d96e (diff) | |
Base: fix incorrect field removal in criterion inside query design view
Includes following master commits:
commit 6536d0eb4f56e64c9b74b358642e3ee1e39353e5
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date: Tue Apr 23 06:44:57 2013 +0200
reword comment
commit 5143e162f81ec64db4ed2b11a3a79183c4901c79
Author: Lionel Elie Mamane <lionel@mamane.lu>
Date: Tue Apr 23 06:44:42 2013 +0200
isEmpty() instead of getLength()==0
commit f0c38b6355333c0bbb02e52a732f04ab0d519ecf
Author: Olivier Ploton <olivier.ploton@univ-tours.fr>
Date: Wed Dec 12 22:04:38 2012 +0100
Base: fix incorrect field removal in criterion inside query design view
Change-Id: I2fedae672c24a269fca3dfc1bacc66fd53fc61af
Signed-off-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/parse/sqlnode.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index 73fd5101c7cb..4704b74ef4a7 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -463,8 +463,13 @@ void OSQLParseNode::impl_parseNodeToString_throw(::rtl::OUStringBuffer& rString, if (rParam.xField.is() && SQL_ISRULE(pSubTree,subquery)) aNewParam.xField = NULL; - // if there is a field given we don't display the fieldname, if there is any - if (rParam.xField.is() && SQL_ISRULE(pSubTree,column_ref)) + // When we are building a criterion inside a query view, + // simplify criterion display by removing: + // "currentFieldName" + // "currentFieldName" = + // but only at the very beginning of the criterion + // (not embedded deep in the expression). + if (rString.getLength() == 0 && rParam.xField.is() && SQL_ISRULE(pSubTree,column_ref)) { sal_Bool bFilter = sal_False; // retrieve the fields name |