diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:11:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 11:11:37 +0000 |
| commit | 870a139559d91dc7e3d8bd7f05b8d47f3623fdfb (patch) | |
| tree | 5f8661ba63f938c17695a37066351073d384431e /xmloff | |
| parent | b47e2afcdcee1fb2e8f0da4bed2ed3062176eb63 (diff) | |
INTEGRATION: CWS oasisbf1 (1.18.2); FILE MERGED
2004/11/02 08:42:47 oj 1.18.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/form.mod | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/xmloff/dtd/form.mod b/xmloff/dtd/form.mod index 1381eee7eac8..0e8a7ada6172 100644 --- a/xmloff/dtd/form.mod +++ b/xmloff/dtd/form.mod @@ -1,5 +1,5 @@ <!-- - $Id: form.mod,v 1.18 2004-08-02 14:09:36 hr Exp $ + $Id: form.mod,v 1.19 2004-11-09 12:11:37 hr Exp $ The Contents of this file are made available subject to the terms of either of the following licenses @@ -85,7 +85,6 @@ <!ENTITY % tab-index "form:tab-index CDATA #IMPLIED"> <!ENTITY % target-frame "office:target-frame CDATA '_blank'"> <!ENTITY % target-location "xlink:href %url; #IMPLIED"> -<!ENTITY % database-location "xlink:href %url; #IMPLIED"> <!ENTITY % tab-stop "form:tab-stop %boolean; 'true'"> <!ENTITY % title "form:title CDATA #IMPLIED"> <!ENTITY % default-value "form:default-value CDATA #IMPLIED"> @@ -102,19 +101,14 @@ <!ENTITY % list-source-types "(table|query|sql|sql-pass-through|value-list|table-fields)"> <!ENTITY % list-source-type "form:list-source-type %list-source-types; #IMPLIED"> <!ENTITY % column-style-name "form:column-style-name %styleName; #IMPLIED"> -<!ENTITY % min-value "form:min-value %float; #IMPLIED"> -<!ENTITY % max-value "form:max-value %float; #IMPLIED"> -<!ENTITY % step-size "form:step-size %positiveInteger; '1'"> -<!ENTITY % page-step-size "form:page-step-size %positiveInteger; #IMPLIED"> -<!ENTITY % delay-for-repeat "form:delay-for-repeat %positiveInteger; #IMPLIED"> -<!ENTITY % orientation "form:orientation (horizontal|vertical) #IMPLIED"> + <!ELEMENT form:control (%controls;)+> <!ATTLIST form:control %name; %service-name; %control-id;> -<!ELEMENT form:form (form:properties?, office:events?, (form:control|form:form)*, form:datasource?)> +<!ELEMENT form:form (form:properties?, office:events?, (form:control|form:form)*)> <!ATTLIST form:form %name; %service-name;> <!ATTLIST form:form xlink:href %url; #IMPLIED> <!ATTLIST form:form form:enctype CDATA "application/x-www-form-urlencoded"> @@ -136,10 +130,6 @@ <!ATTLIST form:form form:order CDATA #IMPLIED> <!ATTLIST form:form form:tab-cycle %cycles; #IMPLIED> -<!ATTLIST form:datasource %database-location; - connection-resource %string; #IMPLIED -> - <!ELEMENT office:forms (form:form*)> <!ATTLIST office:forms form:automatic-focus %boolean; "false"> <!ATTLIST office:forms form:apply-design-mode %boolean; "true"> @@ -386,6 +376,13 @@ %delay-for-repeat; %orientation;> +<!ENTITY % min-value "form:min-value %float; #IMPLIED"> +<!ENTITY % max-value "form:max-value %float; #IMPLIED"> +<!ENTITY % step-size "form:step-size %positiveInteger; '1'"> +<!ENTITY % page-step-size "form:page-step-size %positiveInteger; #IMPLIED"> +<!ENTITY % delay-for-repeat "form:delay-for-repeat %positiveInteger; #IMPLIED"> +<!ENTITY % orientation "form:orientation (horizontal|vertical) #IMPLIED"> + <!ELEMENT form:properties (form:property+)> <!ELEMENT form:property (form:property-value*)> <!ATTLIST form:property form:property-is-list %boolean; #IMPLIED> |