INTEGRATION: CWS qwizards2 (1.2.2); FILE MERGED

2004/07/19 13:51:38 rpiterman 1.2.2.2: added static method attachLabel
Issue number:
Submitted by:
Reviewed by:
2004/06/02 15:22:40 rpiterman 1.2.2.1: attachData/TimeField were not using a Type as last arguement. That was a bug. Now they pass new Integer(0).
Issue number:
Submitted by:
Reviewed by:

1 files changed, 11 insertions, 5 deletions

diff --git a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
index 548ff627c0fd..da259e55a1ed 100644
--- a/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
+++ b/wizards/com/sun/star/wizards/ui/event/UnoDataAware.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoDataAware.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $  $Date: 2004-05-19 13:10:17 $
+ *  last change: $Author: obo $  $Date: 2004-09-08 14:10:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -181,15 +181,14 @@ public class UnoDataAware extends DataAware {
 
 
     public static UnoDataAware attachDateControl(Object data, String prop, Object unoControl, Listener listener, boolean field) {
-        return attachTextControl(data, prop, unoControl, listener, "Date",field, null);
+        return attachTextControl(data, prop, unoControl, listener, "Date",field, new Integer(0));
     }
 
 
     public static UnoDataAware attachTimeControl(Object data, String prop, Object unoControl, Listener listener, boolean field) {
-        return attachTextControl(data, prop, unoControl, listener, "Time", field, null);
+        return attachTextControl(data, prop, unoControl, listener, "Time", field, new Integer(0));
     }
 
-
     public static UnoDataAware attachNumericControl(Object data, String prop, Object unoControl, Listener listener, boolean field) {
         return attachTextControl(data, prop, unoControl, listener, "Value",field, new Double(0));
     }
@@ -217,6 +216,13 @@ public class UnoDataAware extends DataAware {
         };
     }
 
+    public static UnoDataAware attachLabel(Object data, String prop, Object label, final Listener listener, boolean field) {
+        return new UnoDataAware(data,
+           field ? DataAwareFields.getFieldValueFor(data,prop,"")
+                    : new DataAware.PropertyValue(prop,data),
+                label , "Label");
+    }
+
     public static UnoDataAware attachListBox(Object data, String prop, Object listBox, final Listener listener, boolean field) {
         XListBox xListBox = (XListBox) UnoRuntime.queryInterface(XListBox.class, listBox);
         final UnoDataAware uda = new UnoDataAware(data,