db34c: #i108415# check if column exists

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 966da2722ff0..967ed753e6df 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -239,11 +239,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;