#79067#; add the elements and the end-position to all shapes

2 files changed, 35 insertions, 19 deletions

diff --git a/xmloff/dtd/chart.mod b/xmloff/dtd/chart.mod
index 59c1f6f5d629..dbdf08df7b74 100644
--- a/xmloff/dtd/chart.mod
+++ b/xmloff/dtd/chart.mod
@@ -1,56 +1,56 @@
 <!--
-	$Id: chart.mod,v 1.2 2000-10-19 13:49:05 bm Exp $
- 
+	$Id: chart.mod,v 1.3 2000-11-23 11:04:44 sab Exp $
+
    The Contents of this file are made available subject to the terms of
    either of the following licenses
- 
+
           - GNU Lesser General Public License Version 2.1
           - Sun Industry Standards Source License Version 1.1
- 
+
    Sun Microsystems Inc., October, 2000
- 
+
    GNU Lesser General Public License Version 2.1
    =============================================
    Copyright 2000 by Sun Microsystems, Inc.
    901 San Antonio Road, Palo Alto, CA 94303, USA
- 
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License version 2.1, as published by the Free Software Foundation.
- 
+
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.
- 
+
    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
    MA  02111-1307  USA
- 
- 
+
+
    Sun Industry Standards Source License Version 1.1
    =================================================
    The contents of this file are subject to the Sun Industry Standards
    Source License Version 1.1 (the "License"); You may not use this file
    except in compliance with the License. You may obtain a copy of the
    License at http://www.openoffice.org/license.html.
- 
+
    Software provided under this License is provided on an "AS IS" basis,
    WITHOUT WARRUNTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
    WITHOUT LIMITATION, WARRUNTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
    MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
    See the License for the specific provisions governing your rights and
    obligations concerning the Software.
- 
+
    The Initial Developer of the Original Code is: Sun Microsystems, Inc..
- 
+
    Copyright: 2000 by Sun Microsystems, Inc.
- 
+
    All Rights Reserved.
- 
+
    Contributor(s): _______________________________________
- 
+
 -->
 
 
@@ -66,8 +66,9 @@
 		  svg:width %length; #IMPLIED
 		  svg:height %length; #IMPLIED
 		  chart:style-name %styleName; #IMPLIED >
+<!ATTLIST chart:chart %draw-end-position; >
 
-<!ATTLIST style:properties 
+<!ATTLIST style:properties
 		  chart:scale-text %boolean; "true"
 		  chart:stock-updown-bars %boolean; "false"
 		  chart:stock-with-volume %boolean; "false"
@@ -168,7 +169,7 @@
 		  table:cell-range-address %cell-range-address; #REQUIRED >
 
 <!--
-	each series element must have an cell-range-address element that points 
+	each series element must have an cell-range-address element that points
 	to the underlying table data.
 	Impl. Note: Internally all href elements are merged to one table range
 	that represents the data for the whole chart
diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod
index 6156f3c2ea65..f2fc2a1047be 100644
--- a/xmloff/dtd/drawing.mod
+++ b/xmloff/dtd/drawing.mod
@@ -1,5 +1,5 @@
 <!--
-	$Id: drawing.mod,v 1.9 2000-11-20 09:06:23 cl Exp $
+	$Id: drawing.mod,v 1.10 2000-11-23 11:04:44 sab Exp $
 
    The Contents of this file are made available subject to the terms of
    either of the following licenses
@@ -57,6 +57,7 @@
 <!ENTITY % pathData "CDATA" >
 <!ENTITY % gradient-style "(linear|axial|radial|ellipsoid|square|rectangular)" >
 <!ENTITY % draw-position "svg:x %coordinate; #IMPLIED svg:y %coordinate; #IMPLIED">
+<!ENTITY % draw-end-position "table:end-cell-address %cell-address; #IMPLIED table:end-x %coordinate; #IMPLIED table:end-y %coordinate; #IMPLIED">
 <!ENTITY % draw-size "svg:width %coordinate; #IMPLIED svg:height %coordinate; #IMPLIED">
 <!ENTITY % draw-transform "svg:transform CDATA #IMPLIED">
 <!ENTITY % draw-viewbox "svg:viewBox CDATA #REQUIRED">
@@ -73,6 +74,7 @@
 <!-- Drawing shapes -->
 <!ELEMENT draw:rect %draw-text;>
 <!ATTLIST draw:rect %draw-position; >
+<!ATTLIST draw:rect %draw-end-position; >
 <!ATTLIST draw:rect %draw-size; >
 <!ATTLIST draw:rect %draw-style-name; >
 <!ATTLIST draw:rect %draw-transform; >
@@ -85,6 +87,7 @@
 <!ATTLIST draw:line svg:y2 %length; #REQUIRED>
 <!ATTLIST draw:line %draw-style-name; >
 <!ATTLIST draw:line %draw-transform; >
+<!ATTLIST draw:line %draw-end-position; >
 
 <!ELEMENT draw:polyline %draw-text; >
 <!ATTLIST draw:polyline %draw-position; >
@@ -93,9 +96,11 @@
 <!ATTLIST draw:polyline svg:points %points; #REQUIRED>
 <!ATTLIST draw:polyline %draw-style-name; >
 <!ATTLIST draw:polyline %draw-transform; >
+<!ATTLIST draw:polyline %draw-end-position; >
 
 <!ELEMENT draw:polygon %draw-text; >
 <!ATTLIST draw:polygon %draw-position; >
+<!ATTLIST draw:polygon %draw-end-position; >
 <!ATTLIST draw:polygon %draw-size; >
 <!ATTLIST draw:polygon %draw-viewbox; >
 <!ATTLIST draw:polygon svg:points %points; #REQUIRED >
@@ -104,6 +109,7 @@
 
 <!ELEMENT draw:path %draw-text; >
 <!ATTLIST draw:path %draw-position;>
+<!ATTLIST draw:path %draw-end-position; >
 <!ATTLIST draw:path %draw-size; >
 <!ATTLIST draw:path %draw-viewbox; >
 <!ATTLIST draw:path svg:d %pathData; #REQUIRED >
@@ -116,6 +122,7 @@
 <!ATTLIST draw:circle svg:r %nonNegativeLength; #REQUIRED >
 <!ATTLIST draw:circle %draw-style-name; >
 <!ATTLIST draw:circle %draw-transform; >
+<!ATTLIST draw:circle %draw-end-position; >
 
 <!ELEMENT draw:ellipse %draw-text; >
 <!ATTLIST draw:ellipse svg:cx %length; #REQUIRED >
@@ -124,6 +131,7 @@
 <!ATTLIST draw:ellipse svg:ry %length; #REQUIRED >
 <!ATTLIST draw:ellipse %draw-style-name; >
 <!ATTLIST draw:ellipse %draw-transform; >
+<!ATTLIST draw:ellipse %draw-end-position; >
 
 <!ELEMENT draw:connector %draw-text;>
 <!ATTLIST draw:connector draw:line-skew CDATA #IMPLIED>
@@ -136,18 +144,22 @@
 <!ATTLIST draw:connector draw:end-y %coordinate; #IMPLIED>
 <!ATTLIST draw:connector draw:end-shape %shapeId; #IMPLIED>
 <!ATTLIST draw:connector draw:end-glue-point %integer; #IMPLIED>
+<!ATTLIST draw:connector %draw-end-position; >
 
 <!ELEMENT draw:g (%shapes;)* >
 <!ATTLIST draw:g %draw-transform; >
+<!ATTLIST draw:g %draw-end-position; >
 
 <!ELEMENT draw:page-thumbnail EMPTY>
 <!ATTLIST draw:page-thumbnail %draw-position; >
 <!ATTLIST draw:page-thumbnail %draw-size; >
 <!ATTLIST draw:page-thumbnail %draw-style-name; >
 <!ATTLIST draw:page-thumbnail %presentation-class; >
+<!ATTLIST draw:page-thumbnail %draw-end-position; >
 
 <!ELEMENT text:text-box %draw-text;>
 <!ATTLIST text:text-box %draw-position; >
+<!ATTLIST text:text-box %draw-end-position; >
 <!ATTLIST text:text-box %draw-size; >
 <!ATTLIST text:text-box %draw-style-name; >
 <!ATTLIST text:text-box %presentation-class; >
@@ -155,6 +167,7 @@
 
 <!ELEMENT draw:caption %draw-text;>
 <!ATTLIST draw:caption %draw-position; >
+<!ATTLIST draw:caption %draw-end-position; >
 <!ATTLIST draw:caption %draw-size; >
 <!ATTLIST draw:caption %draw-style-name; >
 <!ATTLIST draw:caption %draw-transform; >
@@ -163,12 +176,14 @@
 
 <!ELEMENT draw:measure %draw-text;>
 <!ATTLIST draw:measure %draw-position; >
+<!ATTLIST draw:measure %draw-end-position; >
 <!ATTLIST draw:measure %draw-size; >
 <!ATTLIST draw:measure %draw-style-name; >
 <!ATTLIST draw:measure %draw-transform; >
 
 <!ELEMENT office:image EMPTY>
 <!ATTLIST office:image %draw-position; >
+<!ATTLIST office:image %draw-end-position; >
 <!ATTLIST office:image %draw-size; >
 <!ATTLIST office:image %draw-transform; >
 <!ATTLIST office:image %draw-style-name; >