tdf#141467 xmloff,sc,sw: ODF export: reorder flys' ZOrder/z-index harder

Also keep the control layer distinct from the foreground, as a follow-up
to tdf#133487.

Try to improve the detection of already sorted indexes a bit to avoid
unnecessary sorting.

Hilariously the test docs require adding 3 additional items to the
extension schema.

Change-Id: I629d5b09294f679717677b9d89537d905ac4c404
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113696
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

1 files changed, 146 insertions, 0 deletions

diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index 3898ed2f73ab..8907ac4eb3b2 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -1579,6 +1579,138 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
       </rng:choice>
     </rng:define>
 
+    <rng:define name="style-graphic-fill-properties-attlist">
+      <rng:interleave>
+        <rng:optional>
+          <rng:attribute name="draw:fill">
+            <rng:choice>
+              <rng:value>none</rng:value>
+              <rng:value>solid</rng:value>
+              <rng:value>bitmap</rng:value>
+              <rng:value>gradient</rng:value>
+              <rng:value>hatch</rng:value>
+            </rng:choice>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-color">
+            <rng:ref name="color"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:secondary-fill-color">
+            <rng:ref name="color"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-gradient-name">
+            <rng:ref name="styleNameRef"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:gradient-step-count">
+            <rng:ref name="nonNegativeInteger"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-hatch-name">
+            <rng:ref name="styleNameRef"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-hatch-solid">
+            <rng:ref name="boolean"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-image-name">
+            <rng:ref name="styleNameRef"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="style:repeat">
+            <rng:choice>
+              <rng:value>no-repeat</rng:value>
+              <rng:value>repeat</rng:value>
+              <rng:value>stretch</rng:value>
+    <!-- OFFICE-4106 7a5d79f2297a43d0a854e304b0792164272edfe0 in xmloff/source/forms/formenums.cxx -->
+              <rng:value>scale</rng:value>
+            </rng:choice>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-image-width">
+            <rng:choice>
+              <rng:ref name="length"/>
+              <rng:ref name="percent"/>
+            </rng:choice>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-image-height">
+            <rng:choice>
+              <rng:ref name="length"/>
+              <rng:ref name="percent"/>
+            </rng:choice>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-image-ref-point-x">
+            <rng:ref name="percent"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-image-ref-point-y">
+            <rng:ref name="percent"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:fill-image-ref-point">
+            <rng:choice>
+              <rng:value>top-left</rng:value>
+              <rng:value>top</rng:value>
+              <rng:value>top-right</rng:value>
+              <rng:value>left</rng:value>
+              <rng:value>center</rng:value>
+              <rng:value>right</rng:value>
+              <rng:value>bottom-left</rng:value>
+              <rng:value>bottom</rng:value>
+              <rng:value>bottom-right</rng:value>
+            </rng:choice>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:tile-repeat-offset">
+            <rng:list>
+              <rng:ref name="zeroToHundredPercent"/>
+              <rng:choice>
+                <rng:value>horizontal</rng:value>
+                <rng:value>vertical</rng:value>
+              </rng:choice>
+            </rng:list>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:opacity">
+            <rng:ref name="zeroToHundredPercent"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="draw:opacity-name">
+            <rng:ref name="styleNameRef"/>
+          </rng:attribute>
+        </rng:optional>
+        <rng:optional>
+          <rng:attribute name="svg:fill-rule">
+            <rng:choice>
+              <rng:value>nonzero</rng:value>
+              <rng:value>evenodd</rng:value>
+            </rng:choice>
+          </rng:attribute>
+        </rng:optional>
+      </rng:interleave>
+    </rng:define>
+
   </rng:include>
 
     <!-- TODO no proposal -->
@@ -2279,6 +2411,20 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
       </rng:attribute>
     </rng:optional>
   </rng:define>
+  <rng:define name="form-image-frame-attlist" combine="interleave">
+    <rng:optional>
+      <rng:attribute name="form:input-required">
+        <rng:ref name="boolean"/>
+      </rng:attribute>
+    </rng:optional>
+  </rng:define>
+  <rng:define name="form-listbox-attlist" combine="interleave">
+    <rng:optional>
+      <rng:attribute name="form:input-required">
+        <rng:ref name="boolean"/>
+      </rng:attribute>
+    </rng:optional>
+  </rng:define>
 
   <!-- https://issues.oasis-open.org/browse/OFFICE-4030 -->
   <rng:define name="common-writing-mode-attlist" combine="interleave">