fixed date-format and time-format attribute values; dtd; tests

1 files changed, 15 insertions, 12 deletions

diff --git a/xmlscript/test/test.xml b/xmlscript/test/test.xml
index 9834965bde50..7a087447e92b 100644
--- a/xmlscript/test/test.xml
+++ b/xmlscript/test/test.xml
@@ -4,7 +4,7 @@
 <dialogs xmlns="http://openoffice.org/2000/dialog">
 
     <window xmlns:dlg="http://openoffice.org/2000/dialog"
-        label="Test-Dialog" height="700" width="700">
+        title="Test-Dialog" left="50" top="50" height="660" width="400">
 
         <dlg:styles>
             <dlg:style style-id="bla" background-color="0xffffff" dlg:text-color="255"/>
@@ -13,6 +13,7 @@
         </dlg:styles>
 
         <dlg:bulletinboard xmlns:ns="http://www.fake">
+
             <button dlg:id="button1" ns:value="hallo" dlg:left="50" ns:top="50" width="50" height="50" style-id="bla3" xmlns:ns="http://openoffice.org/2000/dialog">
                 <event listener-type="type" event-method="clicked" script-type="basic" script-code="code" param="testi"/>
             </button>
@@ -23,14 +24,14 @@
             <menulist id="list1" multiselection="true" left="50" top="400" width="100" height="100">
                 <menupopup>
                     <menuitem value="item1"/>
-                    <menuitem value="item2" selected="true"/>
-                    <menuitem value="item3" selected="true"/>
+                    <menuitem value="item2 sel" selected="true"/>
+                    <menuitem value="item3 sel" selected="true"/>
                 </menupopup>
             </menulist>
             <menulist id="list2" left="250" top="400" width="100" height="100">
                 <menupopup>
-                    <menuitem value="item4"/>
-                    <menuitem value="item5" selected="true"/>
+                    <menuitem value="item4" selected="false"/>
+                    <menuitem value="item5 sel" selected="true"/>
                     <menuitem value="item6"/>
                 </menupopup>
             </menulist>
@@ -63,21 +64,23 @@
             <textfield id="field1" left="250" top="520" width="50" height="40" value="edit no text here..." readonly="true" vscroll="true" multiline="true" align="right" style-id="no_border"/>
             <textfield id="field2" left="320" top="520" width="50" height="40" value="hidden text" hscroll="true" echochar="*" align="left"/>
             <img id="image1" left="50" top="600" width="80" height="50" src="../../test/w3c.jpg"/>
-            <filecontrol id="file1" left="150" top="600" width="100" height="100" value="f:\script\xmlscript\test\w3c.jpg"/>
-<!--            <currencyfield id="currency1" left="250" top="600" width="100" height="20" value="5.6075" value-min="0.5" value-max="10.0" value-step="0.1" spin="true" thousands-separator="true" currency-symbol="$"/> -->
-                 <numericfield id="numeric1" left="400" top="100" width="100" height="20" value="5.6075" value-min="0.5" value-max="10.0" value-step="0.1" thousands-separator="true"/>
+            <filecontrol id="file1" left="150" top="600" width="100" height="20" value="../../test/w3c.jpg"/>
 
         </dlg:bulletinboard>
 
     </window>
 
     <window xmlns:dlg2="http://openoffice.org/2000/dialog"
-        label="Test-Dialog2" height="100" width="200">
+        title="Test-Dialog2" left="100" top="100" height="200" width="200">
 
         <dlg2:bulletinboard>
-            <dlg2:datefield id="datefield1" left="20" top="20" width="100" height="20" date-format="short DDMMYY" spin="true"/>
-            <timefield id="time1" left="20" top="50" width="100" height="20" time-format="24h short" value-min="0" value-max="12" strict-format="true" value="6" spin="true"/>
-            <patternfield id="pattern1" left="20" top="70" width="100" height="20" value="pattern" strict-format="true" readonly="true"/>
+
+            <dlg2:datefield id="datefield1" left="20" top="20" width="100" height="20" date-format="short_DDMMYY" spin="true" value="20010301"/>
+            <timefield id="time1" left="20" top="50" width="100" height="20" time-format="24h_long" value-min="0" value-max="24000000" strict-format="true" value="12000000" spin="true"/>
+            <patternfield id="pattern1" left="20" top="80" width="100" height="20" value="pattern" strict-format="true" readonly="true"/>
+            <currencyfield id="currency1" left="20" top="110" width="100" height="20" value="5.6075" value-min="0.5" value-max="10.0" value-step="0.1" spin="true" thousands-separator="true" currency-symbol="$"/>
+                 <numericfield id="numeric1" left="20" top="140" width="100" height="20" value="5.6075" value-min="0.5" value-max="10.0" value-step="0.1" thousands-separator="true"/>
+
         </dlg2:bulletinboard>
 
     </window>