INTEGRATION: CWS qiq (1.9.20); FILE MERGED

2006/07/05 10:00:59 bc 1.9.20.3: #i67000# Aliasnames now only assigned whe needed
2006/07/05 08:59:08 fs 1.9.20.2: merging the changes from CWS dbwizardpp4 into this CWS, to prevent conflicts on integration
2006/06/20 14:39:56 bc 1.9.20.1: #i51143# Querywizards made ready for queries in queries

1 files changed, 7 insertions, 3 deletions

diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index 26415e121464..fe9471be0070 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: QueryWizard.java,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2006-07-06 14:21:55 $
+ *  last change: $Author: obo $ $Date: 2006-07-10 16:40:14 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -41,6 +41,7 @@ import com.sun.star.beans.PropertyValue;
 import com.sun.star.wizards.common.*;
 import com.sun.star.wizards.db.*;
 import com.sun.star.wizards.document.OfficeDocument;
+import com.sun.star.wizards.form.FormWizard.FieldSelectionListener;
 import com.sun.star.sdbc.SQLException;
 import com.sun.star.uno.*;
 import com.sun.star.wizards.ui.*;
@@ -213,7 +214,10 @@ public class QueryWizard extends WizardDialog {
     public void buildSteps() {
         try {
             boolean bEnabled;
-            CurDBCommandFieldSelection = new CommandFieldSelection(this, CurDBMetaData, 120, reslblFields, reslblSelFields, reslblTables, false, 40850);
+//            curDBCommandFieldSelection = new CommandFieldSelection(this, curFormDocument.oMainFormDBMetaData, 92, slblFields, slblSelFields,  slblTables, true, 34411);
+//            curDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
+
+            CurDBCommandFieldSelection = new CommandFieldSelection(this, CurDBMetaData, 120, reslblFields, reslblSelFields, reslblTables, true, 40850);
             CurDBCommandFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
             CurSortingComponent = new SortingComponent(this, SOSORTINGPAGE, 95, 27, 210, 40865);
             CurFilterComponent = new FilterComponent(this, xMSF, SOFILTERPAGE, 97, 27, 209, 3, CurDBMetaData, 40878);