#87313#: embedded imagas as base 64

4 files changed, 18 insertions, 17 deletions

diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod
index 0545084bf7d9..bb78e5aed742 100644
--- a/xmloff/dtd/drawing.mod
+++ b/xmloff/dtd/drawing.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: drawing.mod,v 1.61 2001-06-15 11:30:58 cl Exp $
+	$Id: drawing.mod,v 1.62 2001-06-20 06:08:34 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -563,13 +563,13 @@
 <!ATTLIST draw:text-box draw:layer %layerName; #IMPLIED>
 
 <!-- image -->
-<!ELEMENT draw:image (office:events?,draw:image-map?,svg:desc?,(draw:contour-polygon|draw:contour-path)?)>
+<!ELEMENT draw:image (office:binary-data?,office:events?,draw:image-map?,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>
-<!ATTLIST draw:image xlink:type (simple) #FIXED "simple">
-<!ATTLIST draw:image xlink:show (embed) "embed">
-<!ATTLIST draw:image xlink:actuate (onLoad) "onLoad">
+<!ATTLIST draw:image xlink:href %uriReference; #IMPLIED>
+<!ATTLIST draw:image xlink:type (simple) #IMPLIED>
+<!ATTLIST draw:image xlink:show (embed) #IMPLIED>
+<!ATTLIST draw:image xlink:actuate (onLoad) #IMPLIED>
 <!ATTLIST draw:image draw:filter-name %string; #IMPLIED>
 <!ATTLIST draw:image %text-anchor;>
 <!ATTLIST draw:image %draw-position;>
@@ -608,8 +608,7 @@
 <!ATTLIST draw:object draw:id %shapeId;>
 <!ATTLIST draw:object draw:layer %layerName; #IMPLIED>
 
-<!-- one of the elements is allowed only, but this cannot be expressed by DTDs -->
-<!ELEMENT draw:object-ole (#PCDATA|office:events|draw:image-map|svg:desc|draw:contour-polygon|draw:contour-path|draw:thumbnail)*>
+<!ELEMENT draw:object-ole (office:binary-data?|office:events?|draw:image-map?|svg:desc?|draw:contour-polygon?|draw:contour-path?|draw:thumbnail?)>
 <!ATTLIST draw:object-ole draw:class-id CDATA #IMPLIED>
 <!ATTLIST draw:object-ole %draw-style-name;>
 <!ATTLIST draw:object-ole draw:name %string; #IMPLIED>
diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod
index d76e6f9cff77..d62f1d54ccda 100644
--- a/xmloff/dtd/office.mod
+++ b/xmloff/dtd/office.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: office.mod,v 1.41 2001-06-12 17:44:15 dvo Exp $
+	$Id: office.mod,v 1.42 2001-06-20 06:08:35 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -258,3 +258,5 @@
 <!ELEMENT office:change-info (text:p)*>
 <!ATTLIST office:change-info office:chg-author %string; #REQUIRED>
 <!ATTLIST office:change-info office:chg-date-time %timeInstance; #REQUIRED>
+
+<!ELEMENT office:binary-data (#PCDATA)>
diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod
index 887ba77bba1b..98738623f36a 100644
--- a/xmloff/dtd/style.mod
+++ b/xmloff/dtd/style.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: style.mod,v 1.38 2001-05-28 13:19:14 cl Exp $
+	$Id: style.mod,v 1.39 2001-06-20 06:08:35 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -277,7 +277,7 @@
 <!ATTLIST style:properties fo:break-after (auto|column|page) #IMPLIED>
 <!ATTLIST style:properties fo:background-color %transparentOrColor; #IMPLIED>
 
-<!ELEMENT style:background-image EMPTY>
+<!ELEMENT style:background-image (office:binary-data?)>
 <!ATTLIST style:background-image xlink:type (simple) #IMPLIED>
 <!ATTLIST style:background-image xlink:href %uriReference; #IMPLIED>
 <!ATTLIST style:background-image xlink:show (embed) #IMPLIED>
diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod
index 371f236ffe57..b2e48ef32b74 100644
--- a/xmloff/dtd/text.mod
+++ b/xmloff/dtd/text.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: text.mod,v 1.33 2001-06-12 17:46:19 dvo Exp $
+	$Id: text.mod,v 1.34 2001-06-20 06:08:35 mib Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -226,13 +226,13 @@
 <!ATTLIST text:list-level-style-bullet style:num-prefix %string; #IMPLIED>
 <!ATTLIST text:list-level-style-bullet style:num-suffix %string; #IMPLIED>
 
-<!ELEMENT text:list-level-style-image (style:properties?)>
+<!ELEMENT text:list-level-style-image (style:properties?,office:binary-data?)>
 
 <!ATTLIST text:list-level-style-image text:level %positiveInteger; #REQUIRED>
-<!ATTLIST text:list-level-style-image xlink:type (simple) #FIXED "simple">
-<!ATTLIST text:list-level-style-image xlink:href %uriReference; #REQUIRED>
-<!ATTLIST text:list-level-style-image xlink:actuate (onLoad) "onLoad">
-<!ATTLIST text:list-level-style-image xlink:show (embed) "embed">
+<!ATTLIST text:list-level-style-image xlink:type (simple) #IMPLIED>
+<!ATTLIST text:list-level-style-image xlink:href %uriReference; #IMPLIED>
+<!ATTLIST text:list-level-style-image xlink:actuate (onLoad) #IMPLIED>
+<!ATTLIST text:list-level-style-image xlink:show (embed) #IMPLIED>
 
 
 <!-- list properties -->