INTEGRATION: CWS dbawizards (1.10.58); FILE MERGED

2008/01/03 13:55:16 bc 1.10.58.2: #i49332# resetting fixed property for date textfields
2008/01/02 13:46:37 bc 1.10.58.1: #i72887# incorrect behaviour of < in wizard

1 files changed, 11 insertions, 3 deletions

diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index 8658019e84e7..ae86d1fc9868 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: FieldSelection.java,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: rt $ $Date: 2006-12-01 16:49:43 $
+ *  last change: $Author: vg $ $Date: 2008-01-28 15:32:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -439,7 +439,6 @@ public class FieldSelection {
             }
             else
                 xSelFieldsListBox.addItems(SelFieldItems, xSelFieldsListBox.getItemCount());
-
         } else {
             SelFieldItems = xFieldsListBox.getSelectedItems();
             int MaxSourceSelected = SelFieldItems.length;
@@ -495,6 +494,15 @@ public class FieldSelection {
             xFieldSelection.shiftFromRightToLeft(OldSelFieldItems, NewSelFieldItems);
     }
 
+    public void addItemsToFieldsListbox(String[] _sItems) {
+        String[] sOldList = xFieldsListBox.getItems();
+        for (int i = 0; i < _sItems.length; i++) {
+            if (JavaTools.FieldInList(sOldList, _sItems[i]) < 0) {
+                xFieldsListBox.addItem(_sItems[i], xFieldsListBox.getItemCount());
+            }
+        }
+    }
+
     public String[] getSelectedFieldNames() {
         return (String[]) CurUnoDialog.getControlProperty("lstSelFields" + sIncSuffix, "StringItemList");
     }