diff options
| -rw-r--r-- | xmloff/dtd/chart.mod | 17 | ||||
| -rw-r--r-- | xmloff/dtd/nmspace.mod | 6 | ||||
| -rw-r--r-- | xmloff/dtd/office.mod | 14 |
3 files changed, 27 insertions, 10 deletions
diff --git a/xmloff/dtd/chart.mod b/xmloff/dtd/chart.mod index 19d35dc6b73a..4634b90f7757 100644 --- a/xmloff/dtd/chart.mod +++ b/xmloff/dtd/chart.mod @@ -1,5 +1,5 @@ <!-- - $Id: chart.mod,v 1.29 2002-05-06 08:52:55 bm Exp $ + $Id: chart.mod,v 1.30 2002-05-06 09:34:55 bm Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -230,9 +230,9 @@ that represents the data for the whole chart --> <!ELEMENT chart:series ( chart:domain*, - mean-value, - regression-curve, - error-indicator, + chart:mean-value, + chart:regression-curve, + chart:error-indicator, chart:data-point* )> <!ATTLIST chart:series chart:values-cell-range-address %cell-range-address; #IMPLIED @@ -252,9 +252,12 @@ <!-- statistical properties --> -<!ELEMENT chart:mean-value chart:style-name %styleName; #IMPLIED > -<!ELEMENT chart:regression-curve chart:style-name %styleName; #IMPLIED > -<!ELEMENT chart:error-indicator chart:style-name %styleName; #IMPLIED > +<!ELEMENT chart:mean-value EMPTY> +<!ELEMENT chart:regression-curve EMPTY > +<!ELEMENT chart:error-indicator EMPTY > +<!ATTLIST chart:mean-value chart:style-name %styleName; #IMPLIED > +<!ATTLIST chart:regression-curve chart:style-name %styleName; #IMPLIED > +<!ATTLIST chart:error-indicator chart:style-name %styleName; #IMPLIED > <!ATTLIST style:properties chart:mean-value %boolean; #IMPLIED diff --git a/xmloff/dtd/nmspace.mod b/xmloff/dtd/nmspace.mod index bee922ac07f9..642ec233f3f7 100644 --- a/xmloff/dtd/nmspace.mod +++ b/xmloff/dtd/nmspace.mod @@ -1,5 +1,5 @@ <!-- - $Id: nmspace.mod,v 1.4 2001-03-23 07:46:50 sab Exp $ + $Id: nmspace.mod,v 1.5 2002-05-06 09:34:55 bm Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -56,6 +56,7 @@ <!ENTITY nFO "http://www.w3.org/1999/XSL/Format"> <!ENTITY nXLink "http://www.w3.org/1999/xlink"> <!ENTITY nSVG "http://www.w3.org/2000/svg"> +<!ENTITY nMath "http://www.w3.org/1998/Math/MathML"> <!-- StarOffice namespace names and prefixes --> @@ -71,8 +72,9 @@ <!ENTITY nDraw "&nOpenOffice;/drawing"> <!ENTITY nChart "&nOpenOffice;/chart"> <!ENTITY nNumber "&nOpenOffice;/datastyle"> +<!ENTITY nDr3D "&nOpenOffice;/dr3d"> +<!ENTITY nForm "&nOpenOffice;/form"> <!ENTITY nConfig "&nOpenOffice2001;/config"> - <!-- dublin core namespace name and prefic --> <!ENTITY nDC "http://purl.org/dc/elements/1.1/"> diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod index a9062ca04115..cd8a05f5d55a 100644 --- a/xmloff/dtd/office.mod +++ b/xmloff/dtd/office.mod @@ -1,5 +1,5 @@ <!-- - $Id: office.mod,v 1.45 2002-02-28 14:42:15 dvo Exp $ + $Id: office.mod,v 1.46 2002-05-06 09:34:55 bm Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -75,6 +75,9 @@ <!ATTLIST office:document xmlns:xlink CDATA #FIXED "&nXLink;"> <!ATTLIST office:document xmlns:svg CDATA #FIXED "&nSVG;"> <!ATTLIST office:document xmlns:dc CDATA #FIXED "&nDC;"> +<!ATTLIST office:document xmlns:dr3d CDATA #FIXED "&nDr3D;"> +<!ATTLIST office:document xmlns:math CDATA #FIXED "&nMath;"> +<!ATTLIST office:document xmlns:form CDATA #FIXED "&nForm;"> <!ATTLIST office:document office:class (text|text-global| @@ -103,6 +106,9 @@ <!ATTLIST office:document-styles xmlns:xlink CDATA #FIXED "&nXLink;"> <!ATTLIST office:document-styles xmlns:svg CDATA #FIXED "&nSVG;"> <!ATTLIST office:document-styles xmlns:dc CDATA #FIXED "&nDC;"> +<!ATTLIST office:document-styles xmlns:dr3d CDATA #FIXED "&nDr3D;"> +<!ATTLIST office:document-styles xmlns:math CDATA #FIXED "&nMath;"> +<!ATTLIST office:document-styles xmlns:form CDATA #FIXED "&nForm;"> <!ATTLIST office:document-styles office:version %string; #IMPLIED> @@ -127,6 +133,9 @@ <!ATTLIST office:document-content xmlns:xlink CDATA #FIXED "&nXLink;"> <!ATTLIST office:document-content xmlns:svg CDATA #FIXED "&nSVG;"> <!ATTLIST office:document-content xmlns:dc CDATA #FIXED "&nDC;"> +<!ATTLIST office:document-content xmlns:dr3d CDATA #FIXED "&nDr3D;"> +<!ATTLIST office:document-content xmlns:math CDATA #FIXED "&nMath;"> +<!ATTLIST office:document-content xmlns:form CDATA #FIXED "&nForm;"> <!ATTLIST office:document-content office:class (text|text-global| @@ -152,6 +161,9 @@ <!ATTLIST office:document-meta xmlns:xlink CDATA #FIXED "&nXLink;"> <!ATTLIST office:document-meta xmlns:svg CDATA #FIXED "&nSVG;"> <!ATTLIST office:document-meta xmlns:dc CDATA #FIXED "&nDC;"> +<!ATTLIST office:document-meta xmlns:dr3d CDATA #FIXED "&nDr3D;"> +<!ATTLIST office:document-meta xmlns:math CDATA #FIXED "&nMath;"> +<!ATTLIST office:document-meta xmlns:form CDATA #FIXED "&nForm;"> <!ATTLIST office:document-meta office:version %string; #IMPLIED> |