From 39d463badd049b8ebdb6938dd60cfb6443ee044b Mon Sep 17 00:00:00 2001
From: Pascal Junck <pjunck@openoffice.org>
Date: Wed, 27 Oct 2004 12:30:50 +0000
Subject: [PATCH] INTEGRATION: CWS dbwizard1 (1.2.36); FILE MERGED 2004/10/01
 12:38:58 bc 1.2.36.3: ## several changes in dbwizards 2004/09/16 11:02:06 bc
 1.2.36.2: ## Retrieving the columndata in Dataimport improved 2004/09/01
 14:50:46 bc 1.2.36.1: ##several changes

---
 .../com/sun/star/wizards/db/RecordParser.java | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index 47ad038c0107..1e086b4b0f5b 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -2,9 +2,9 @@
 *
 *  $RCSfile: RecordParser.java,v $
 *
-*  $Revision: 1.2 $
+*  $Revision: 1.3 $
 *
-*  last change: $Author: kz $ $Date: 2004-05-19 12:41:14 $
+*  last change: $Author: pjunck $ $Date: 2004-10-27 13:30:50 $
 *
 *  The Contents of this file are made available subject to the terms of
 *  either of the following licenses
@@ -88,9 +88,6 @@ public class RecordParser extends QueryMetaData {
     XColumnsSupplier xRowSetColumnsSupplier;
     XComponent xRowSetComponent;
     XInteractionHandler xInteraction;
-    long lDateCorrection;
-    //    int[] SelColIndices = null;
-    //    int[] GroupColIndices = null;
     public FieldColumn[] GroupFieldColumns;
     public FieldColumn[] RecordFieldColumns;
 
@@ -237,10 +234,10 @@ public class RecordParser extends QueryMetaData {
             XColumnsSupplier xDBCols = (XColumnsSupplier) UnoRuntime.queryInterface(XColumnsSupplier.class, ResultSet);
             xColumns = xDBCols.getColumns();
             String[] sElementNames = xColumns.getElementNames();
-            CommandType = com.sun.star.sdb.CommandType.COMMAND;
+            setCommandType(com.sun.star.sdb.CommandType.COMMAND);
 
             if (binitializeDBColumns == true)
-                setFieldNames(FieldNames);
+                setFieldNames(FieldNames, xColumns);
 //              super.setFieldColumns(false);
             this.setColindices();
             GroupFieldColumns = getFieldColumnList(GroupFieldNames);
@@ -294,19 +291,6 @@ public class RecordParser extends QueryMetaData {
 
     }
 
-    /*    public int[] getSelectedQueryFields(String[] FieldNames) throws InvalidQueryException{
-            String CurFieldName;
-            String[] AllQueryFieldNames = xColumns.getElementNames();
-            int FieldCount = FieldNames.length;
-            int[] SelColIndices = JavaTools.initializeintArray(FieldCount, -1);
-            for (int i=0; i<FieldCount; i++){
-                CurFieldName = FieldNames[i];
-                SelColIndices[i] = JavaTools.FieldInList(AllQueryFieldNames, CurFieldName)+1;
-                if (SelColIndices[i] == -1)
-                    throw new InvalidQueryException(xMSF, Command);
-            }
-            return SelColIndices;
-        } */
 
     public void dispose() {
         if (xRowSetComponent != null)