diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 09:33:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-08-19 09:33:34 +0000 |
| commit | 2d339c2072584b34fe898a984e0c43443ceb1f16 (patch) | |
| tree | 89cba6f6bd421cbe1f8fdd818f6624d3da4dccfa /wizards | |
| parent | 20ae1fdebd26a0dfb6fe72db6964c8d537fdfe4b (diff) | |
INTEGRATION: CWS dba31a (1.14.10); FILE MERGED
2008/07/02 12:05:50 fs 1.14.10.1: copying following changes from CWS dba30f to CWS dba31a:
2008/07/01 09:41:33 lla 1.14.2.1: #i82743# problem with 'Title' as DB Entry name
Diffstat (limited to 'wizards')
| -rw-r--r-- | wizards/com/sun/star/wizards/db/RecordParser.java | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index 52f008e8aebb..7dace146960c 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RecordParser.java,v $ - * $Revision: 1.14 $ + * $Revision: 1.15 $ * * This file is part of OpenOffice.org. * @@ -213,25 +213,36 @@ public class RecordParser extends QueryMetaData { - public boolean getFields(String[] _sFieldNames, boolean binitializeDBColumns){ - try{ - if (binitializeDBColumns == true){ + public boolean getFields(String[] _sFieldNames, boolean binitializeDBColumns) + { + try + { + if (binitializeDBColumns == true) + { initializeFieldColumns(_sFieldNames, xColumns); } String[] AllQueryFieldNames = xColumns.getElementNames(); String[] sFieldNames = getFieldNames(); - for (int i = 0; i < FieldColumns.length; i++) { - FieldColumns[i].ColIndex = JavaTools.FieldInList(AllQueryFieldNames, FieldColumns[i].FieldName) + 1; - if (FieldColumns[i].ColIndex == -1) + for (int i = 0; i < FieldColumns.length; i++) + { + String sFieldName = FieldColumns[i].FieldName; + int nColIndex = JavaTools.FieldInList(AllQueryFieldNames, sFieldName) + 1; + FieldColumns[i].ColIndex = nColIndex; + if (nColIndex == -1) + { throw new InvalidQueryException(xMSF, Command); + } } GroupFieldColumns = getFieldColumnList(GroupFieldNames); RecordFieldColumns = getFieldColumnList(getRecordFieldNames()); return true; - } catch (InvalidQueryException queryexception) { + } + catch (InvalidQueryException queryexception) + { queryexception.printStackTrace(System.out); return false; - }} + } + } private FieldColumn[] getFieldColumnList(String[] _FieldNames) { |