diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-11 12:13:53 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@oracle.com> | 2011-03-11 12:13:53 +0100 |
| commit | 1b2e30d8807688be6883208a278474b762601bbf (patch) | |
| tree | f6decacafce7ab96793eb1f6052822bfbe61ff97 /wizards/com/sun/star/wizards/db | |
| parent | ca77c69321dcf7ef2238011c6b82d5167a748916 (diff) | |
| parent | d9caca9dd735394857a0b15ddf3c6fc86e243bdd (diff) | |
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34d
Diffstat (limited to 'wizards/com/sun/star/wizards/db')
| -rw-r--r-- | wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index 879cb216a08a..75c1bb1aa926 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -235,11 +235,16 @@ public class SQLQueryComposer private PropertyValue[][] replaceConditionsByAlias(PropertyValue _filterconditions[][]) { + XColumnsSupplier columnSup = UnoRuntime.queryInterface(XColumnsSupplier.class, m_xQueryAnalyzer); + XNameAccess columns = columnSup.getColumns(); for (int n = 0; n < _filterconditions.length; n++) { for (int m = 0; m < _filterconditions[n].length; m++) { _filterconditions[n][m].Name = getComposedAliasFieldName(_filterconditions[n][m].Name); + final String aliasName = getComposedAliasFieldName(_filterconditions[n][m].Name); + if ( columns.hasByName(aliasName)) + _filterconditions[n][m].Name = aliasName; } } return _filterconditions; |