[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]
Subject: [OASIS Issue Tracker] (OFFICE-4107) 19.615.2 <table:filter-condition>: Extend table:data-type attributes to filter by color
[ https://issues.oasis-open.org/browse/OFFICE-4107?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Michael Stahl updated OFFICE-4107: ---------------------------------- Proposal: *Section 19.615.2 <table:filter-condition> changes to:* The table:data-type attribute specifies whether a comparison shall take place as text, numeric values, or as color. The defined values for the table:data-type attribute are: \* number: comparison as numeric values. \* text: comparison as text values. \* text-color: comparison based on the text color. \* background-color: comparison based on the cell background color, as determined by the applicable <style:table-cell-properties> element. Inside of <table:data-pilot-table> [9.6.3], text-color and background-color are not allowed. For a <table:filter-condition> 9.5.5 element the default value for this attribute is text. *19.688 table:operator* add at the end: All operations are allowed on string values. Some operators are allowed on numeric values. Only = and != operations are allowed on color values. *Diff* {noformat} diff --git a/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng b/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng index dc77c4f..b83aba8 100644 --- a/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng +++ b/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng @@ -14901,12 +14901,6 @@ <rng:attribute name="table:field-number"> <rng:ref name="nonNegativeInteger"/> </rng:attribute> - <rng:attribute name="table:value"> - <rng:choice> - <rng:ref name="string"/> - <rng:ref name="double"/> - </rng:choice> - </rng:attribute> <rng:attribute name="table:operator"> <rng:ref name="string"/> </rng:attribute> @@ -14915,14 +14909,38 @@ <rng:ref name="string"/> </rng:attribute> </rng:optional> - <rng:optional> - <rng:attribute name="table:data-type"> - <rng:choice> - <rng:value>text</rng:value> - <rng:value>number</rng:value> - </rng:choice> - </rng:attribute> - </rng:optional> + <rng:choice> + <rng:group> + <rng:optional> + <rng:attribute name="table:data-type"> + <rng:choice> + <rng:value>text</rng:value> + <rng:value>number</rng:value> + </rng:choice> + </rng:attribute> + </rng:optional> + <rng:attribute name="table:value"> + <rng:choice> + <rng:ref name="string"/> + <rng:ref name="double"/> + </rng:choice> + </rng:attribute> + </rng:group> + <rng:group> + <rng:attribute name="table:data-type"> + <rng:choice> + <rng:value>text-color</rng:value> + <rng:value>background-color</rng:value> + </rng:choice> + </rng:attribute> + <rng:attribute name="table:value"> + <rng:choice> + <rng:ref name="color"/> + <rng:value>none</rng:value> + </rng:choice> + </rng:attribute> + </rng:group> + </rng:choice> </rng:interleave> </rng:define> <rng:define name="table-filter-or"> {noformat} was: *Section 19.615.2 <table:filter-condition> changes to:* The table:data-type attribute specifies whether a comparison shall take place as text, numeric values, or as color. The defined values for the table:data-type attribute are: \* number: comparison as numeric values. \* text: comparison as text values. \* text-color: comparison based on the text color. \* background-color: comparison based on the cell background color, as . For a <table:filter-condition> 9.5.5 element the default value for this attribute is text. *19.688 table:operator* add at the end: All operations are allowed on string values. Some operators are allowed on numeric values. Only = and != operations are allowed on color values. *Diff* {noformat} diff --git a/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng b/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng index dc77c4f..b83aba8 100644 --- a/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng +++ b/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng @@ -14901,12 +14901,6 @@ <rng:attribute name="table:field-number"> <rng:ref name="nonNegativeInteger"/> </rng:attribute> - <rng:attribute name="table:value"> - <rng:choice> - <rng:ref name="string"/> - <rng:ref name="double"/> - </rng:choice> - </rng:attribute> <rng:attribute name="table:operator"> <rng:ref name="string"/> </rng:attribute> @@ -14915,14 +14909,38 @@ <rng:ref name="string"/> </rng:attribute> </rng:optional> - <rng:optional> - <rng:attribute name="table:data-type"> - <rng:choice> - <rng:value>text</rng:value> - <rng:value>number</rng:value> - </rng:choice> - </rng:attribute> - </rng:optional> + <rng:choice> + <rng:group> + <rng:optional> + <rng:attribute name="table:data-type"> + <rng:choice> + <rng:value>text</rng:value> + <rng:value>number</rng:value> + </rng:choice> + </rng:attribute> + </rng:optional> + <rng:attribute name="table:value"> + <rng:choice> + <rng:ref name="string"/> + <rng:ref name="double"/> + </rng:choice> + </rng:attribute> + </rng:group> + <rng:group> + <rng:attribute name="table:data-type"> + <rng:choice> + <rng:value>text-color</rng:value> + <rng:value>background-color</rng:value> + </rng:choice> + </rng:attribute> + <rng:attribute name="table:value"> + <rng:choice> + <rng:ref name="color"/> + <rng:value>none</rng:value> + </rng:choice> + </rng:attribute> + </rng:group> + </rng:choice> </rng:interleave> </rng:define> <rng:define name="table-filter-or"> {noformat} > 19.615.2 <table:filter-condition>: Extend table:data-type attributes to filter by color > --------------------------------------------------------------------------------------- > > Key: OFFICE-4107 > URL: https://issues.oasis-open.org/browse/OFFICE-4107 > Project: OASIS Open Document Format for Office Applications (OpenDocument) TC > Issue Type: New Feature > Components: Part (Schema), Table > Affects Versions: ODF 1.3 > Reporter: Michael Stahl > Priority: Major > Fix For: ODF 1.4 > > Attachments: Example in Excel.xlsx > > > 19.615.2 <table:filter-condition>: Extend table:data-type attributes to filter by color -- This message was sent by Atlassian Jira (v8.3.3#803004)
[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]