diff options
author | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 10:07:42 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-27 10:07:42 +0000 |
commit | bd5b488d25930826d17d37c0f1d78c9faf940ea8 (patch) | |
tree | 7e97e6132b37ca9dfab7d01f6d264bfc11e69033 /xmloff/dtd | |
parent | 7d1a579c027a39b8f82cc88388538f6e72f181be (diff) |
INTEGRATION: CWS oasisbf4 (1.61.114); FILE MERGED
2004/12/23 10:52:26 mib 1.61.114.2: #i38326#: Added fo:keep-together
2004/12/23 10:44:04 mib 1.61.114.1: #i39502#: errors reported by MSV
Diffstat (limited to 'xmloff/dtd')
-rw-r--r-- | xmloff/dtd/style.mod | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod index 995b395197c1..935f6a12a535 100644 --- a/xmloff/dtd/style.mod +++ b/xmloff/dtd/style.mod @@ -1,5 +1,5 @@ <!-- - $Id: style.mod,v 1.61 2004-07-06 13:16:25 rt Exp $ + $Id: style.mod,v 1.62 2005-01-27 11:07:42 rt Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -240,6 +240,8 @@ <!ATTLIST style:properties fo:text-align-last (start|center|justify) #IMPLIED> <!ATTLIST style:properties style:text-align-source (fix|value-type) #IMPLIED> <!ATTLIST style:properties style:justify-single-word %boolean; #IMPLIED> +<!-- fo:keep-together is new in OOo 2.0 --> +<!ATTLIST style:properties fo:keep-together (auto|always) #IMPLIED> <!ATTLIST style:properties style:break-inside (auto|avoid) #IMPLIED> <!ATTLIST style:properties fo:widows %nonNegativeInteger; #IMPLIED> <!ATTLIST style:properties fo:orphans %nonNegativeInteger; #IMPLIED> @@ -376,7 +378,7 @@ <!ATTLIST style:column-sep style:style (none|solid|dotted|dashed|dot-dashed) "solid"> <!ATTLIST style:column-sep style:width %length; #REQUIRED> -<!ATTLIST style:column-sep style:height %percentage; "100%"> +<!ATTLIST style:column-sep style:height %percentage; "100%"> <!ATTLIST style:column-sep style:vertical-align (top|middle|bottom) "top"> <!ATTLIST style:column-sep style:color %color; "#000000"> |