summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Brauer <mib@openoffice.org>2000-11-23 11:39:22 +0000
committerMichael Brauer <mib@openoffice.org>2000-11-23 11:39:22 +0000
commitc7306ba644312b617c52b75a9818a362a52a5c4c (patch)
tree5f178b175bafd60a04f0ae54d545c86207f723e0
parent49fb691f157337cf88162cff4cd05b71d1212df5 (diff)
#80624#: Finish StarOffice-API and XML filter for I18N attributes
-rw-r--r--xmloff/dtd/meta.mod19
-rw-r--r--xmloff/dtd/style.mod15
2 files changed, 21 insertions, 13 deletions
diff --git a/xmloff/dtd/meta.mod b/xmloff/dtd/meta.mod
index d1e84c570d93..9ddbfa486158 100644
--- a/xmloff/dtd/meta.mod
+++ b/xmloff/dtd/meta.mod
@@ -1,5 +1,5 @@
<!--
- $Id: meta.mod,v 1.2 2000-11-23 11:01:53 sab Exp $
+ $Id: meta.mod,v 1.3 2000-11-23 12:39:22 mib Exp $
The Contents of this file are made available subject to the terms of
either of the following licenses
@@ -106,12 +106,13 @@
<!ELEMENT meta:document-statistic EMPTY>
<!ATTLIST meta:document-statistic meta:page-count %positiveInteger; #IMPLIED
- meta:table-count %positiveInteger; #IMPLIED
- meta:draw-count %positiveInteger; #IMPLIED
- meta:ole-object-count %positiveInteger; #IMPLIED
- meta:paragraph-count %positiveInteger; #IMPLIED
- meta:word-count %positiveInteger; #IMPLIED
- meta:character-count %positiveInteger; #IMPLIED
- meta:row-count %positiveInteger; #IMPLIED
- meta:cell-count %positiveInteger; #IMPLIED
+ meta:table-count %nonNegativeInteger; #IMPLIED
+ meta:draw-count %nonNegativeInteger; #IMPLIED
+ meta:image-count %nonNegativeInteger; #IMPLIED
+ meta:ole-object-count %nonNegativeInteger; #IMPLIED
+ meta:paragraph-count %nonNegativeInteger; #IMPLIED
+ meta:word-count %nonNegativeInteger; #IMPLIED
+ meta:character-count %nonNegativeInteger; #IMPLIED
+ meta:row-count %nonNegativeInteger; #IMPLIED
+ meta:cell-count %nonNegativeInteger; #IMPLIED
meta:object-count %positiveInteger; #IMPLIED>
diff --git a/xmloff/dtd/style.mod b/xmloff/dtd/style.mod
index f1fed948a241..5ad8340a254c 100644
--- a/xmloff/dtd/style.mod
+++ b/xmloff/dtd/style.mod
@@ -1,5 +1,5 @@
<!--
- $Id: style.mod,v 1.11 2000-11-15 14:01:52 mib Exp $
+ $Id: style.mod,v 1.12 2000-11-23 12:39:22 mib Exp $
The Contents of this file are made available subject to the terms of
either of the following licenses
@@ -185,15 +185,23 @@
dot-dot-dash|wave|bold|bold-dotted|bold-dash|
bold-long-dash|bold-dot-dash|bold-dot-dot-dash|
bold-wave|double-wave|small-wave) #IMPLIED>
+<!ENTITY % fontColorOrColor "CDATA">
+<!ATTLIST style:properties style:text-underline-color %fontColorOrColor;
+ #IMPLIED>
<!ATTLIST style:properties fo:font-weight CDATA #IMPLIED>
-<!ATTLIST style:properties fo:font-weight-asian CDATA #IMPLIED>
-<!ATTLIST style:properties fo:font-weight-complex CDATA #IMPLIED>
+<!ATTLIST style:properties style:font-weight-asian CDATA #IMPLIED>
+<!ATTLIST style:properties style:font-weight-complex CDATA #IMPLIED>
<!ATTLIST style:properties fo:score-spaces %boolean; #IMPLIED>
<!ATTLIST style:properties style:letter-kerning %boolean; #IMPLIED>
<!ATTLIST style:properties style:text-blinking %boolean; #IMPLIED>
<!ATTLIST style:properties style:text-background-color %transparentOrColor;
#IMPLIED>
+<!ATTLIST style:properties style:text-combine (none|letters|lines) #IMPLIED>
+<!ATTLIST style:properties style:text-combine-start-char %character; #IMPLIED>
+<!ATTLIST style:properties style:text-combine-end-char %character; #IMPLIED>
+<!ATTLIST style:properties style:text-emphasize CDATA #IMPLIED>
+
<!-- paragraph properties -->
<!ENTITY % nonNegativeLengthOrPercentageOrNormal "CDATA">
<!ATTLIST style:properties fo:line-height
@@ -322,7 +330,6 @@
<!ATTLIST style:properties fo:page-height %length; #IMPLIED>
<!ATTLIST style:properties style:paper-tray-number %positiveNumberOrDefault; #IMPLIED>
<!ATTLIST style:properties style:print-orientation (portrait|landscape) #IMPLIED>
-<!ATTLIST style:properties style:register-truth-ref-style-name %styleName; #IMPLIED>
<!ATTLIST style:properties style:print CDATA #IMPLIED>
<!ATTLIST style:properties style:print-page-order (ttb|ltr) #IMPLIED>
<!ATTLIST style:properties style:first-page-number %positiveInteger; #IMPLIED>