summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--xmloff/dtd/chart.mod5
-rw-r--r--xmloff/dtd/office.dtd6
-rw-r--r--xmloff/dtd/style.mod13
-rw-r--r--xmloff/dtd/text.mod34
4 files changed, 31 insertions, 27 deletions
diff --git a/xmloff/dtd/chart.mod b/xmloff/dtd/chart.mod
index 699e45da1cab..6989f8b8d464 100644
--- a/xmloff/dtd/chart.mod
+++ b/xmloff/dtd/chart.mod
@@ -1,5 +1,5 @@
<!--
- $Id: chart.mod,v 1.26 2001-11-19 13:23:39 bm Exp $
+ $Id: chart.mod,v 1.27 2001-12-14 18:47:17 dvo Exp $
The Contents of this file are made available subject to the terms of
either of the following licenses
@@ -95,7 +95,8 @@
chart:lines-used %nonNegativeInteger; "0"
chart:connect-bars %boolean; "false"
chart:spline-order %nonNegativeInteger; "2"
- chart:spline-resolution %nonNegativeInteger; "20">
+ chart:spline-resolution %nonNegativeInteger; "20"
+ chart:pie-offset %nonNegativeInteger; "0">
<!-- Main/Sub Title -->
<!-- the cell-address attribute is currently not supported for titles -->
diff --git a/xmloff/dtd/office.dtd b/xmloff/dtd/office.dtd
index 9fdb061deca9..801ddc4e117b 100644
--- a/xmloff/dtd/office.dtd
+++ b/xmloff/dtd/office.dtd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- $Id: office.dtd,v 1.5 2001-03-23 07:47:56 sab Exp $
+ $Id: office.dtd,v 1.6 2001-12-14 18:47:17 dvo Exp $
The Contents of this file are made available subject to the terms of
either of the following licenses
@@ -58,10 +58,10 @@
%dtypes-mod;
<!ENTITY % nmspace-mod SYSTEM "nmspace.mod">
%nmspace-mod;
-<!ENTITY % style-mod SYSTEM "style.mod">
-%style-mod;
<!ENTITY % office-mod SYSTEM "office.mod">
%office-mod;
+<!ENTITY % style-mod SYSTEM "style.mod">
+%style-mod;
<!ENTITY % meta-mod SYSTEM "meta.mod">
%meta-mod;
<!ENTITY % script-mod SYSTEM "script.mod">
diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod
index 3b0cd65157e5..af7895a621a1 100644
--- a/xmloff/dtd/style.mod
+++ b/xmloff/dtd/style.mod
@@ -1,5 +1,5 @@
<!--
- $Id: style.mod,v 1.44 2001-11-29 15:54:42 mib Exp $
+ $Id: style.mod,v 1.45 2001-12-14 18:47:17 dvo Exp $
The Contents of this file are made available subject to the terms of
either of the following licenses
@@ -405,7 +405,16 @@
<!ELEMENT style:handout-master (%shapes;)*>
<!ATTLIST style:handout-master presentation:presentation-page-layout-name %styleName; #IMPLIED>
-<!ENTITY % hd-ft-content "( text:p | (style:region-left?, style:region-center?, style:region-right?) )">
+
+<!ENTITY % headerText "(text:h|text:p|text:ordered-list|
+ text:unordered-list|table:table|text:section|
+ text:table-of-content|text:illustration-index|
+ text:table-index|text:object-index|text:user-index|
+ text:alphabetical-index|text:bibliography|
+ text:index-title|%change-marks;)*">
+
+
+<!ENTITY % hd-ft-content "( %headerText; | (style:region-left?, style:region-center?, style:region-right?) )">
<!ELEMENT style:header %hd-ft-content;>
<!ELEMENT style:footer %hd-ft-content;>
<!ELEMENT style:header-left %hd-ft-content;>
diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod
index 00f06f7a0a37..6de92214ace4 100644
--- a/xmloff/dtd/text.mod
+++ b/xmloff/dtd/text.mod
@@ -1,5 +1,5 @@
<!--
- $Id: text.mod,v 1.37 2001-12-06 18:35:56 dvo Exp $
+ $Id: text.mod,v 1.38 2001-12-14 18:47:17 dvo Exp $
The Contents of this file are made available subject to the terms of
either of the following licenses
@@ -721,21 +721,22 @@
text:ordered-list|text:unordered-list)*>
<!ENTITY % sectionText "(text:h|text:p|text:ordered-list|
- text:unordered-list|table:table|chart:chart|draw:page|
- draw:a|draw:text-box|draw:image|text:section|
+ text:unordered-list|table:table|text:section|
text:table-of-content|text:illustration-index|
text:table-index|text:object-index|text:user-index|
text:alphabetical-index|text:bibliography|
text:index-title|%change-marks;)*">
+<!ENTITY % sectionAttr "text:name CDATA #REQUIRED
+ text:style-name %styleName; #IMPLIED
+ text:protected %boolean; 'false' ">
+
<!ELEMENT text:section ((text:section-source|office:dde-source)?,
%sectionText;) >
-<!ATTLIST text:section text:name CDATA #REQUIRED>
-<!ATTLIST text:section text:style-name %styleName; #IMPLIED>
+<!ATTLIST text:section %sectionAttr;>
<!ATTLIST text:section text:display (true|none|condition) "true">
<!ATTLIST text:section text:condition %formula; #IMPLIED>
-<!ATTLIST text:section text:protected %boolean; "false">
<!ATTLIST text:section text:protection-key CDATA #IMPLIED>
<!ELEMENT text:section-source EMPTY>
@@ -747,8 +748,7 @@
<!ELEMENT text:table-of-content (text:table-of-content-source,
text:index-body) >
-<!ATTLIST text:table-of-content text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:table-of-content text:protected %boolean; "false">
+<!ATTLIST text:table-of-content %sectionAttr;>
<!ELEMENT text:table-of-content-source (text:index-title-template? ,
text:table-of-content-entry-template*,
@@ -779,8 +779,7 @@
<!ELEMENT text:illustration-index
(text:illustration-index-source, text:index-body)>
-<!ATTLIST text:illustration-index text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:illustration-index text:protected %boolean; "false">
+<!ATTLIST text:illustration-index %sectionAttr;>
<!ELEMENT text:illustration-index-source (text:index-title-template?,
text:illustration-index-entry-template?) >
@@ -806,8 +805,7 @@
%styleName; #REQUIRED>
<!ELEMENT text:table-index (text:table-index-source, text:index-body)>
-<!ATTLIST text:table-index text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:table-index text:protected %boolean; "false">
+<!ATTLIST text:table-index %sectionAttr;>
<!ELEMENT text:table-index-source (text:index-title-template?,
text:table-index-entry-template?) >
@@ -832,8 +830,7 @@
%styleName; #REQUIRED>
<!ELEMENT text:object-index ( text:object-index-source, text:index-body ) >
-<!ATTLIST text:object-index text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:object-index text:protected %boolean; "false">
+<!ATTLIST text:object-index %sectionAttr;>
<!ELEMENT text:object-index-source ( text:index-title-template?,
text:object-index-entry-template? ) >
@@ -859,8 +856,7 @@
%styleName; #REQUIRED >
<!ELEMENT text:user-index (text:user-index-source, text:index-body) >
-<!ATTLIST text:user-index text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:user-index text:protected %boolean; "false">
+<!ATTLIST text:user-index %sectionAttr;>
<!ELEMENT text:user-index-source ( text:index-title-template?,
text:user-index-entry-template*,
@@ -891,8 +887,7 @@
<!ELEMENT text:alphabetical-index (text:alphabetical-index-source,
text:index-body)>
-<!ATTLIST text:alphabetical-index text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:alphabetical-index text:protected %boolean; "false">
+<!ATTLIST text:alphabetical-index %sectionAttr;>
<!ELEMENT text:alphabetical-index-source ( text:index-title-template?,
text:alphabetical-index-entry-template* ) >
@@ -936,8 +931,7 @@
<!ATTLIST text:alphabetical-index-auto-mark-file xlink:type (simple) #FIXED "simple">
<!ELEMENT text:bibliography (text:bibliography-source, text:index-body) >
-<!ATTLIST text:bibliography text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:bibliography text:protected %boolean; "false">
+<!ATTLIST text:bibliography %sectionAttr;>
<!ELEMENT text:bibliography-source ( text:index-title-template?,
text:bibliography-entry-template* ) >
generated by cgit (git 2.34.1) at 2025-03-01 06:26:09 +0000