diff options
Diffstat (limited to 'xmloff/dtd')
-rw-r--r-- | xmloff/dtd/drawing.mod | 13 | ||||
-rw-r--r-- | xmloff/dtd/form.mod | 38 | ||||
-rw-r--r-- | xmloff/dtd/office.mod | 4 | ||||
-rw-r--r-- | xmloff/dtd/script.mod | 3 | ||||
-rw-r--r-- | xmloff/dtd/style.mod | 4 |
5 files changed, 31 insertions, 31 deletions
diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod index f2cd89bfff67..ea07fd8dd01a 100644 --- a/xmloff/dtd/drawing.mod +++ b/xmloff/dtd/drawing.mod @@ -1,5 +1,5 @@ <!-- - $Id: drawing.mod,v 1.33 2001-02-01 19:12:31 cl Exp $ + $Id: drawing.mod,v 1.34 2001-02-06 14:08:19 dvo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -469,9 +469,9 @@ <!ATTLIST style:properties draw:background-size (full|border) #IMPLIED> <!-- text boxes --> -<!ELEMENT draw:text-box (text:h|text:p|text:ordered-list| +<!ELEMENT draw:text-box (office:events?,(text:h|text:p|text:ordered-list| text:unordered-list|table:table|chart:chart| - draw:a|draw:text-box|draw:image)*> + draw:a|draw:text-box|draw:image)*)> <!ATTLIST draw:text-box %draw-style-name;> <!ATTLIST draw:text-box draw:name %string; #IMPLIED> <!ATTLIST draw:text-box draw:chain-next-name %string; #IMPLIED> @@ -490,7 +490,7 @@ <!ATTLIST draw:text-box draw:layer %layerName; #IMPLIED> <!-- image --> -<!ELEMENT draw:image (svg:desc?,(draw:contour-polygon|draw:contour-path)?)> +<!ELEMENT draw:image (office:events?,svg:desc?,(draw:contour-polygon|draw:contour-path)?)> <!ATTLIST draw:image %draw-style-name;> <!ATTLIST draw:image draw:name %string; #IMPLIED> <!ATTLIST draw:image xlink:href %uriReference; #REQUIRED> @@ -509,7 +509,7 @@ <!ATTLIST draw:image draw:id %shapeId;> <!-- objects --> -<!ELEMENT draw:object (svg:desc?,(draw:contour-polygon|draw:contour-path)?)> +<!ELEMENT draw:object (office:events?, svg:desc?,(draw:contour-polygon|draw:contour-path)?)> <!ATTLIST draw:object %draw-style-name;> <!ATTLIST draw:object draw:name %string; #IMPLIED> <!ATTLIST draw:object xlink:href %uriReference; #REQUIRED> @@ -526,7 +526,7 @@ <!ATTLIST draw:object %zindex;> <!ATTLIST draw:object draw:id %shapeId;> -<!ELEMENT draw:object-ole (svg:desc?,(draw:contour-polygon|draw:contour-path)?)> +<!ELEMENT draw:object-ole (office:events?, svg:desc?,(draw:contour-polygon|draw:contour-path)?)> <!ATTLIST draw:object-ole %draw-style-name;> <!ATTLIST draw:object-ole draw:name %string; #IMPLIED> <!ATTLIST draw:object-ole xlink:href %uriReference; #REQUIRED> @@ -668,4 +668,3 @@ <!ATTLIST draw:layer draw:locked %boolean; #IMPLIED> <!ATTLIST draw:layer draw:printable %boolean; #IMPLIED> <!ATTLIST draw:layer draw:visible %boolean; #IMPLIED> - diff --git a/xmloff/dtd/form.mod b/xmloff/dtd/form.mod index 369eec85909b..1d670df1e198 100644 --- a/xmloff/dtd/form.mod +++ b/xmloff/dtd/form.mod @@ -1,5 +1,5 @@ <!-- - $Id: form.mod,v 1.2 2001-01-18 14:40:19 cl Exp $ + $Id: form.mod,v 1.3 2001-02-06 14:08:19 dvo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -71,7 +71,7 @@ %service-name; %control-id;> -<!ELEMENT form:form (form:properties?, script:events?, (form:control|form:form)*)> +<!ELEMENT form:form (form:properties?, office:events?, (form:control|form:form)*)> <!ATTLIST form:form %name; %service-name;> <!ATTLIST form:form xlink:href %url; #IMPLIED> <!ATTLIST form:form form:enctype CDATA "application/x-www-form-urlencoded"> @@ -95,7 +95,7 @@ <!ELEMENT office:forms (form:form*)> -<!ELEMENT form:text (form:properties?, script:events?)> +<!ELEMENT form:text (form:properties?, office:events?)> <!ATTLIST form:text %style-name; %current-value; %disabled; @@ -109,7 +109,7 @@ %convert-empty; %data-field;> -<!ELEMENT form:textarea (form:properties?, script:events?)> +<!ELEMENT form:textarea (form:properties?, office:events?)> <!ATTLIST form:textarea %style-name; %current-value; %disabled; @@ -123,7 +123,7 @@ %convert-empty; %data-field;> -<!ELEMENT form:password (form:properties?, script:events?)> +<!ELEMENT form:password (form:properties?, office:events?)> <!ATTLIST form:password %style-name; %disabled; %max-length; @@ -134,7 +134,7 @@ %value;> <!ATTLIST form:password form:echo-char CDATA "*"> -<!ELEMENT form:file (form:properties?, script:events?)> +<!ELEMENT form:file (form:properties?, office:events?)> <!ATTLIST form:file %style-name; %current-value; %disabled; @@ -146,7 +146,7 @@ %title; %value;> -<!ELEMENT form:formatted-text (form:properties?, script:events?)> +<!ELEMENT form:formatted-text (form:properties?, office:events?)> <!ATTLIST form:formatted-text %style-name; %current-value; %disabled; @@ -163,7 +163,7 @@ <!ATTLIST form:formatted-text form:min-value CDATA #IMPLIED> <!ATTLIST form:formatted-text form:validation %boolean; "false"> -<!ELEMENT form:fixed-text (form:properties?, script:events?)> +<!ELEMENT form:fixed-text (form:properties?, office:events?)> <!ATTLIST form:fixed-text %style-name; %for; %disabled; @@ -172,7 +172,7 @@ %title;> <!ATTLIST form:fixed-text form:multi-line %boolean; "false"> -<!ELEMENT form:combobox (form:properties?, script:events?, form:item*)> +<!ELEMENT form:combobox (form:properties?, office:events?, form:item*)> <!ATTLIST form:combobox %style-name; %current-value; %disabled; @@ -194,7 +194,7 @@ <!ELEMENT form:item (#PCDATA)> <!ATTLIST form:item %label;> -<!ELEMENT form:listbox (form:properties?, script:events?, form:option*)> +<!ELEMENT form:listbox (form:properties?, office:events?, form:option*)> <!ATTLIST form:listbox %style-name; %disabled; %dropdown; @@ -215,7 +215,7 @@ %label; %value;> -<!ELEMENT form:button (form:properties?, script:events?)> +<!ELEMENT form:button (form:properties?, office:events?)> <!ATTLIST form:button %style-name; %button-type; %disabled; @@ -230,7 +230,7 @@ %value;> <!ATTLIST form:button form:default-button %boolean; "false"> -<!ELEMENT form:image (form:properties?, script:events?)> +<!ELEMENT form:image (form:properties?, office:events?)> <!ATTLIST form:image %style-name; %button-type; %disabled; @@ -243,7 +243,7 @@ %title; %value;> -<!ELEMENT form:checkbox (form:properties?, script:events?)> +<!ELEMENT form:checkbox (form:properties?, office:events?)> <!ATTLIST form:checkbox %style-name; %disabled; %label; @@ -258,7 +258,7 @@ <!ATTLIST form:checkbox form:is-tristate %boolean; "false"> <!ATTLIST form:checkbox form:state %states; "unchecked"> -<!ELEMENT form:radio (form:properties?, script:events?)> +<!ELEMENT form:radio (form:properties?, office:events?)> <!ATTLIST form:radio %style-name; %current-selected; %disabled; @@ -271,7 +271,7 @@ %value; %data-field;> -<!ELEMENT form:frame (form:properties?, script:events?)> +<!ELEMENT form:frame (form:properties?, office:events?)> <!ATTLIST form:frame %style-name; %disabled; %for; @@ -279,7 +279,7 @@ %printable; %title;> -<!ELEMENT form:image-frame (form:properties?, script:events?)> +<!ELEMENT form:image-frame (form:properties?, office:events?)> <!ATTLIST form:image-frame %style-name; %disabled; %image-data; @@ -288,12 +288,12 @@ %title; %data-field;> -<!ELEMENT form:hidden (form:properties?, script:events?)> +<!ELEMENT form:hidden (form:properties?, office:events?)> <!ATTLIST form:hidden %name; %service-name; %value;> -<!ELEMENT form:grid (form:properties?, script:events?, form:column*)> +<!ELEMENT form:grid (form:properties?, office:events?, form:column*)> <!ATTLIST form:grid %style-name; %disabled; %printable; @@ -306,7 +306,7 @@ %service-name; %label;> -<!ELEMENT form:generic-control (form:properties?, script:events?)> +<!ELEMENT form:generic-control (form:properties?, office:events?)> <!ATTLIST form:generic-control %style-name;> diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod index 8beb613d8787..d75b878a6166 100644 --- a/xmloff/dtd/office.mod +++ b/xmloff/dtd/office.mod @@ -1,5 +1,5 @@ <!-- - $Id: office.mod,v 1.28 2001-02-01 17:38:58 sab Exp $ + $Id: office.mod,v 1.29 2001-02-06 14:08:19 dvo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -152,6 +152,8 @@ presentation:shows?)"> <!ELEMENT office:body %body;> +<!ELEMENT office:events (script:event*)> + <!-- DDE source: for text sections and tables --> <!ELEMENT office:dde-source EMPTY> <!ATTLIST office:dde-source office:dde-application CDATA #IMPLIED> diff --git a/xmloff/dtd/script.mod b/xmloff/dtd/script.mod index 16a4ad277e67..27de2346298d 100644 --- a/xmloff/dtd/script.mod +++ b/xmloff/dtd/script.mod @@ -1,5 +1,5 @@ <!-- - $Id: script.mod,v 1.5 2001-01-03 16:18:24 fs Exp $ + $Id: script.mod,v 1.6 2001-02-06 14:08:20 dvo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -77,4 +77,3 @@ %event-name; %library; %macro-name;> -<!ELEMENT script:events (script:event*)> diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod index 0ce255012d97..a4cdef7328f2 100644 --- a/xmloff/dtd/style.mod +++ b/xmloff/dtd/style.mod @@ -1,5 +1,5 @@ <!-- - $Id: style.mod,v 1.28 2001-02-01 17:42:47 sab Exp $ + $Id: style.mod,v 1.29 2001-02-06 14:08:20 dvo Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -64,7 +64,7 @@ <!ATTLIST style:font-decl style:font-pitch %fontPitch; #IMPLIED> <!ATTLIST style:font-decl style:font-charset %textEncoding; #IMPLIED> -<!ELEMENT style:style ( style:properties?,style:map*)> +<!ELEMENT style:style ( style:properties?,office:events?,style:map*)> <!ATTLIST style:style style:name %styleName; #REQUIRED> |