diff options
-rw-r--r-- | xmlscript/dtd/dialog.dtd | 30 | ||||
-rw-r--r-- | xmlscript/test/test.xml | 12 |
2 files changed, 18 insertions, 24 deletions
diff --git a/xmlscript/dtd/dialog.dtd b/xmlscript/dtd/dialog.dtd index 652bbcb396f3..57d9cfbf2b7a 100644 --- a/xmlscript/dtd/dialog.dtd +++ b/xmlscript/dtd/dialog.dtd @@ -1,5 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> <!-- - $Id: dialog.dtd,v 1.1 2001-02-27 12:19:03 dbo Exp $ + $Id: dialog.dtd,v 1.2 2001-02-27 16:17:31 dbo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -54,7 +55,6 @@ --> <!ENTITY % boolean "(true|false)"> -<!ENTITY % decimal "(0|1|2|3|4|5|6|7|8|9)"> <!ENTITY % numeric "CDATA"> <!ENTITY % date-format "(system short|system short YY|system short YYYY|system long|short DDMMYY|short MMDDYY|short YYMMDD|short DDMMYYYY|short MMDDYYYY|short YYYYMMDD|short YYMMDD DIN5008|short YYYYMMDD DIN5008)"> <!ENTITY % time-format "(24h short|24h long|12h short|12h long|Duration short|Duration long)"> @@ -92,8 +92,8 @@ dialog:font-family (decorative|modern|roman|script|swiss|system) #IMPLIED dialog:font-charset (ansi|mac|ibmpc_437|ibmpc_850|ibmpc_860|ibmpc_861|ibmpc_863|ibmpc_865|system|symbol) #IMPLIED dialog:font-pitch (fixed|variable) #IMPLIED - dialog:font-charwidth CDATA #IMPLIED - dialog:font-weight CDATA #IMPLIED + dialog:font-charwidth %numeric; #IMPLIED + dialog:font-weight %numeric; #IMPLIED dialog:font-slant (oblique|italic|reverse_oblique|reverse_italic) #IMPLIED dialog:font-underline (single|double|dotted|dash|longdash|dashdot|dashdotdot|smallwave|wave|doublewave|bold|bolddotted|bolddash|boldlongdash|bolddashdot|bolddashdotdot|boldwave) #IMPLIED dialog:font-strikeout (single|double|bold|slash|x) #IMPLIED @@ -210,10 +210,10 @@ dialog:strict-format %boolean; #IMPLIED dialog:decimal-accuracy %numeric; #IMPLIED dialog:thousands-separator %boolean; #IMPLIED - dialog:value CDATA #IMPLIED - dialog:value-min CDATA #IMPLIED - dialog:value-max CDATA #IMPLIED - dialog:value-step CDATA #IMPLIED + dialog:value %numeric; #IMPLIED + dialog:value-min %numeric; #IMPLIED + dialog:value-max %numeric; #IMPLIED + dialog:value-step %numeric; #IMPLIED dialog:spin %boolean; #IMPLIED > @@ -223,9 +223,9 @@ dialog:readonly %boolean; #IMPLIED dialog:strict-format %boolean; #IMPLIED dialog:date-format %date-format; #IMPLIED - dialog:value %numeric; #IMPLIED - dialog:value-min %numeric; #IMPLIED - dialog:value-max %numeric; #IMPLIED + dialog:value CDATA #IMPLIED + dialog:value-min CDATA #IMPLIED + dialog:value-max CDATA #IMPLIED dialog:spin %boolean; #IMPLIED > @@ -236,10 +236,10 @@ dialog:strict-format %boolean; #IMPLIED dialog:decimal-accuracy %numeric; #IMPLIED dialog:thousands-separator %boolean; #IMPLIED - dialog:value CDATA #IMPLIED - dialog:value-min CDATA #IMPLIED - dialog:value-max CDATA #IMPLIED - dialog:value-step CDATA #IMPLIED + dialog:value %numeric; #IMPLIED + dialog:value-min %numeric; #IMPLIED + dialog:value-max %numeric; #IMPLIED + dialog:value-step %numeric; #IMPLIED dialog:spin %boolean; #IMPLIED > diff --git a/xmlscript/test/test.xml b/xmlscript/test/test.xml index 0071adeed71b..22824398205e 100644 --- a/xmlscript/test/test.xml +++ b/xmlscript/test/test.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE dialogs SYSTEM "../dtd/dialog.dtd"> +<!DOCTYPE dialog:dialogs SYSTEM "../dtd/dialog.dtd"> <dialogs xmlns="http://openoffice.org/2000/dialog"> @@ -64,15 +64,9 @@ <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="$"/> + <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"/> - <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" /> ---> </dlg:bulletinboard> </window> |