From 08ec80c7af7f4fae1d2593ba1ed404d53bd5b18e Mon Sep 17 00:00:00 2001
From: Daniel Vogelheim <dvo@openoffice.org>
Date: Thu, 20 Sep 2001 16:47:53 +0000
Subject: #92280# fixed DTD

---
 xmloff/dtd/drawing.mod | 8 ++++----
 xmloff/dtd/office.mod  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'xmloff/dtd')

diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod
index d3981968fa7f..ff1842a71131 100644
--- a/xmloff/dtd/drawing.mod
+++ b/xmloff/dtd/drawing.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: drawing.mod,v 1.68 2001-08-13 11:04:09 cl Exp $
+	$Id: drawing.mod,v 1.69 2001-09-20 17:47:53 dvo Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -537,9 +537,7 @@
 
 <!-- text boxes -->
 <!ELEMENT draw:text-box (office:events?,draw:image-map?,
-		(text:h|text:p|text:ordered-list|
-		text:unordered-list|table:table|chart:chart|
-		draw:a|draw:text-box|draw:image)*)>
+		%sectionText;)>
 <!ATTLIST draw:text-box %draw-style-name;>
 <!ATTLIST draw:text-box %draw-transform; >
 <!ATTLIST draw:text-box draw:name %string; #IMPLIED>
@@ -551,6 +549,8 @@
 <!ATTLIST draw:text-box %table-background; >
 <!ATTLIST draw:text-box svg:width %lengthOrPercentage; #IMPLIED>
 <!ATTLIST draw:text-box svg:height %lengthOrPercentage; #IMPLIED>
+<!ATTLIST draw:text-box style:rel-width %percentage; #IMPLIED>
+<!ATTLIST draw:text-box style:rel-height %percentage; #IMPLIED>
 <!ATTLIST draw:text-box fo:min-height %lengthOrPercentage; #IMPLIED>
 <!ATTLIST draw:text-box %zindex;>
 <!ATTLIST draw:text-box %presentation-class; >
diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod
index e42279faefab..8e0f58090687 100644
--- a/xmloff/dtd/office.mod
+++ b/xmloff/dtd/office.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: office.mod,v 1.43 2001-07-31 14:47:55 dvo Exp $
+	$Id: office.mod,v 1.44 2001-09-20 17:47:53 dvo Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -184,8 +184,8 @@
 <!ELEMENT office:meta %meta;>
 
 <!ENTITY % script	"(script:library-embedded |
-					  script:library-linked)*">
-<!ELEMENT office:script %script;>
+					  script:library-linked)*,office:events?">
+<!ELEMENT office:script (%script;)>
 
 <!ELEMENT office:font-decls (style:font-decl)*>
 
-- 
cgit