[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/db/SQLQueryComposer.java |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 4bf01389def5dc99a9f64ab551079e95d90501a6
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Aug 1 13:45:31 2013 +0200

    fdo#64117 *always* set the filter name to the correct name
    
    the removed test made absolutely no sense:
    aliasName is a fully-qualified name, but columns is indexed by column name.
    That is, schemaName.tableName.columnName as opposed to only columnName.
    
    Change-Id: I9066b5183298e3e6ab63c367594f92bb3e00979d
    Reviewed-on: https://gerrit.libreoffice.org/5249
    Reviewed-by: Miklos Vajna <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index 464c6c0..46c807e 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -239,8 +239,7 @@ public class SQLQueryComposer
             for (int m = 0; m < _filterconditions[n].length; m++)
             {
                 final String aliasName = getComposedAliasFieldName(_filterconditions[n][m].Name);
-                if ( columns.hasByName(aliasName))
-                    _filterconditions[n][m].Name = aliasName;
+                _filterconditions[n][m].Name = aliasName;
             }
         }
         return _filterconditions;