diff options
author | Christian Lippka <cl@openoffice.org> | 2001-05-28 12:20:52 +0000 |
---|---|---|
committer | Christian Lippka <cl@openoffice.org> | 2001-05-28 12:20:52 +0000 |
commit | b8adfa8685abcd00c5eb6fb8402f797d4417fb93 (patch) | |
tree | 72cadd048114a5a5d5b9c7d5667846e1c2f6b1e0 | |
parent | c2a4f08a290a22da718196a6c56eb7baced54aa4 (diff) |
#86971# added style:handout-master
-rw-r--r-- | xmloff/dtd/drawing.mod | 6 | ||||
-rw-r--r-- | xmloff/dtd/office.mod | 4 | ||||
-rw-r--r-- | xmloff/dtd/style.mod | 8 | ||||
-rw-r--r-- | xmloff/inc/xmlkywd.hxx | 8 |
4 files changed, 18 insertions, 8 deletions
diff --git a/xmloff/dtd/drawing.mod b/xmloff/dtd/drawing.mod index 949ee1ffdfc6..872edc6b3771 100644 --- a/xmloff/dtd/drawing.mod +++ b/xmloff/dtd/drawing.mod @@ -1,5 +1,5 @@ <!-- - $Id: drawing.mod,v 1.53 2001-05-23 11:53:10 cl Exp $ + $Id: drawing.mod,v 1.54 2001-05-28 13:19:14 cl Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -684,6 +684,7 @@ <!ATTLIST dr3d:cube %draw-end-position; > <!ATTLIST dr3d:cube %table-background; > <!ATTLIST dr3d:cube %draw-style-name; > +<!ATTLIST dr3d:cube draw:layer %layerName; #IMPLIED> <!ELEMENT dr3d:sphere EMPTY> <!ATTLIST dr3d:sphere dr3d:transform CDATA #IMPLIED> @@ -694,6 +695,7 @@ <!ATTLIST dr3d:sphere %draw-end-position; > <!ATTLIST dr3d:sphere %table-background; > <!ATTLIST dr3d:sphere %draw-style-name; > +<!ATTLIST dr3d:sphere draw:layer %layerName; #IMPLIED> <!ELEMENT dr3d:extrude EMPTY> <!ATTLIST dr3d:extrude dr3d:transform CDATA #IMPLIED> @@ -704,6 +706,7 @@ <!ATTLIST dr3d:extrude %draw-end-position; > <!ATTLIST dr3d:extrude %table-background; > <!ATTLIST dr3d:extrude %draw-style-name; > +<!ATTLIST dr3d:extrude draw:layer %layerName; #IMPLIED> <!ELEMENT dr3d:rotate EMPTY> <!ATTLIST dr3d:rotate dr3d:transform CDATA #IMPLIED> @@ -714,6 +717,7 @@ <!ATTLIST dr3d:rotate %draw-end-position; > <!ATTLIST dr3d:rotate %table-background; > <!ATTLIST dr3d:rotate %draw-style-name; > +<!ATTLIST dr3d:rotate draw:layer %layerName; #IMPLIED> <!ELEMENT dr3d:scene (dr3d:light*,(%shapes3d;)*)> <!ATTLIST dr3d:scene %draw-style-name; > diff --git a/xmloff/dtd/office.mod b/xmloff/dtd/office.mod index c7bd4b747b3f..4d86e2b4a8cd 100644 --- a/xmloff/dtd/office.mod +++ b/xmloff/dtd/office.mod @@ -1,5 +1,5 @@ <!-- - $Id: office.mod,v 1.39 2001-05-09 12:30:34 mib Exp $ + $Id: office.mod,v 1.40 2001-05-28 13:19:14 cl Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -225,7 +225,7 @@ <!ELEMENT office:automatic-styles (%styles;|style:page-master)*> -<!ELEMENT office:master-styles (draw:layer-set?,style:master-page*) > +<!ELEMENT office:master-styles (draw:layer-set?,style:handout-master?,style:master-page*) > <!ENTITY % text-decls "text:variable-decls?, text:sequence-decls?, text:user-field-decls?, text:dde-connection-decls?, diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod index b709cb3085bf..887ba77bba1b 100644 --- a/xmloff/dtd/style.mod +++ b/xmloff/dtd/style.mod @@ -1,5 +1,5 @@ <!-- - $Id: style.mod,v 1.37 2001-05-15 12:44:13 dvo Exp $ + $Id: style.mod,v 1.38 2001-05-28 13:19:14 cl Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -387,7 +387,7 @@ <!ATTLIST style:footnote-sep style:distance-before-sep %length; #IMPLIED> <!ATTLIST style:footnote-sep style:distance-after-sep %length; #IMPLIED> -<!-- master page properties --> +<!-- master page --> <!ELEMENT style:master-page ( (style:header, style:header-left?)?, (style:footer, style:footer-left?)?, office:forms?,style:style*, (%shapes;)*, presentation:notes? )> <!ATTLIST style:master-page style:name %styleName; #REQUIRED> @@ -395,6 +395,10 @@ <!ATTLIST style:master-page style:next-style-name %styleName; #IMPLIED> <!ATTLIST style:master-page draw:style-name %styleName; #IMPLIED> +<!-- handout master --> +<!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?) )"> <!ELEMENT style:header %hd-ft-content;> <!ELEMENT style:footer %hd-ft-content;> diff --git a/xmloff/inc/xmlkywd.hxx b/xmloff/inc/xmlkywd.hxx index 2a34ec53ccd8..8139304e3c2c 100644 --- a/xmloff/inc/xmlkywd.hxx +++ b/xmloff/inc/xmlkywd.hxx @@ -2,9 +2,9 @@ * * $RCSfile: xmlkywd.hxx,v $ * - * $Revision: 1.161 $ + * $Revision: 1.162 $ * - * last change: $Author: bm $ $Date: 2001-05-28 08:06:33 $ + * last change: $Author: cl $ $Date: 2001-05-28 13:20:52 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -2005,7 +2005,9 @@ XML_CONSTASCII_ACTION( sXML_straight_line, "straight-line" ); XML_CONSTASCII_ACTION( sXML_angled_line, "angled-line" ); XML_CONSTASCII_ACTION( sXML_angled_connector_line, "angled-connector-line" ); -XML_CONSTASCII_ACTION( sXML_play, "play" ); XML_CONSTASCII_ACTION( sXML_data_source_has_labels, "data-source-has-labels" ); +XML_CONSTASCII_ACTION( sXML_play, "play" ); +XML_CONSTASCII_ACTION( sXML_handout_master, "handout-master" ); + #endif |