Custom display names in data pilot tables

https://wiki.oasis-open.org/office/display_names_in_data_pilot Scheme diff as requested on TC call on 2015-06-22: --- OpenDocument-v1.2-os-schema.rng 2015-03-19 10:26:06.000000000 +0100 +++ OpenDocument-v1.2-os-schema-pivot.rng 2015-07-05 22:40:43.447730926 +0200 @@ -4747,6 +4747,32 @@ </zeroOrMore> </element> </define> + <define name="table-display-name"> + <interleave> + <optional> + <attribute name="table:display-name"> + <ref name="string"/> + </attribute> + </optional> + <interleave> + </define> + <define name="table-data-pilot-grand-total"> + <element name="table:data-pilot-grand-total"> + <group> + <attribute name="table:orientation"> + <choice> + <value>row</value> + <value>column</value> + <value>both</value> + </choice> + </attribute> + <attribute name="table:display"> + <ref name="boolean"/> + </attribute> + <ref name="table-display-name"/> + </group> + </element> + </define> <define name="table-data-pilot-table"> <element name="table:data-pilot-table"> <ref name="table-data-pilot-table-attlist"/> @@ -4759,6 +4785,9 @@ <ref name="table-source-cell-range"/> </choice> </optional> + <zeroOrMore> + <ref name="table-data-pilot-grand-total"/> + </zeroOrMore> <oneOrMore> <ref name="table-data-pilot-field"/> </oneOrMore> @@ -4922,6 +4951,7 @@ <ref name="integer"/> </attribute> </optional> + <ref name="table-display-name"/> </interleave> </define> <define name="table-data-pilot-level"> @@ -4965,23 +4995,30 @@ </element> </define> <define name="table-data-pilot-subtotal-attlist"> - <attribute name="table:function"> - <choice> - <value>auto</value> - <value>average</value> - <value>count</value> - <value>countnums</value> - <value>max</value> - <value>min</value> - <value>product</value> - <value>stdev</value> - <value>stdevp</value> - <value>sum</value> - <value>var</value> - <value>varp</value> - <ref name="string"/> - </choice> - </attribute> + <choice> + <attribute name="table:function"> + <choice> + <value>average</value> + <value>count</value> + <value>countnums</value> + <value>max</value> + <value>min</value> + <value>product</value> + <value>stdev</value> + <value>stdevp</value> + <value>sum</value> + <value>var</value> + <value>varp</value> + <ref name="string"/> + </choice> + </attribute> + <group> + <attribute name="table:function"> + <value>auto</value> + </attribute> + <ref name="table-display-name"/> + </group> + </choice> </define> <define name="table-data-pilot-members"> <element name="table:data-pilot-members"> @@ -5011,6 +5048,7 @@ <ref name="boolean"/> </attribute> </optional> + <ref name="table-display-name"/> </interleave> </define> <define name="table-data-pilot-display-info">