diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:11:50 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:11:50 +0000 |
| commit | d374786b2da85a42ba8bcedf086db80dc0dd5532 (patch) | |
| tree | d278dade6c507f5e0e7a0abd01e6dc849d3fa1de /xmloff | |
| parent | af684296498d08a00a4b28920b7f47f9349b2896 (diff) | |
INTEGRATION: CWS oasisbf1 (1.56.2); FILE MERGED
2004/11/02 08:42:46 oj 1.56.2.1: #i36481# remove changes from new format, the files should be untouched, as mib said
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/dtd/text.mod | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/xmloff/dtd/text.mod b/xmloff/dtd/text.mod index 11c237af2402..bc316b17b8f3 100644 --- a/xmloff/dtd/text.mod +++ b/xmloff/dtd/text.mod @@ -1,5 +1,5 @@ <!-- - $Id: text.mod,v 1.56 2004-08-02 14:09:49 hr Exp $ + $Id: text.mod,v 1.57 2004-11-09 12:11:50 hr Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -425,35 +425,32 @@ <!ELEMENT text:text-input (#PCDATA)> <!ATTLIST text:text-input text:description %string; #IMPLIED> -<!ENTITY % database-table "text:database-name CDATA #IMPLIED +<!ENTITY % database-table "text:database-name CDATA #REQUIRED text:table-name CDATA #REQUIRED text:table-type (table|query|command) #IMPLIED"> -<!ELEMENT form:connection-resource EMPTY> -<!ATTLIST form:connection-resource xlink:href %uriReference; #IMPLIED> - -<!ELEMENT text:database-display ( #PCDATA | form:connection-resource )* > +<!ELEMENT text:database-display (#PCDATA)> <!ATTLIST text:database-display %database-table;> <!ATTLIST text:database-display text:column-name %string; #REQUIRED> <!ATTLIST text:database-display style:data-style-name %styleName; #IMPLIED> <!ATTLIST text:database-display text:display (none|value) #IMPLIED> -<!ELEMENT text:database-next ( #PCDATA | form:connection-resource )*> +<!ELEMENT text:database-next (#PCDATA)> <!ATTLIST text:database-next %database-table;> <!ATTLIST text:database-next text:condition %formula; #IMPLIED> -<!ELEMENT text:database-select ( #PCDATA | form:connection-resource )*> +<!ELEMENT text:database-select (#PCDATA)> <!ATTLIST text:database-select %database-table;> <!ATTLIST text:database-select text:condition %formula; #IMPLIED> <!ATTLIST text:database-select text:row-number %integer; #REQUIRED> -<!ELEMENT text:database-row-number ( #PCDATA | form:connection-resource )*> +<!ELEMENT text:database-row-number (#PCDATA)> <!ATTLIST text:database-row-number %database-table;> <!ATTLIST text:database-row-number %numFormat;> <!ATTLIST text:database-row-number text:value %integer; #IMPLIED> <!ATTLIST text:database-row-number text:display (none|value) #IMPLIED> -<!ELEMENT text:database-name ( #PCDATA | form:connection-resource )*> +<!ELEMENT text:database-name (#PCDATA)> <!ATTLIST text:database-name %database-table;> <!ATTLIST text:database-name text:display (none|value) #IMPLIED> |