Remove unused list elements

Change them to choice, what was probably really meant here: allow one of
the values, not a whitespace-separated list of one or more values.

Also, clean up nested choices.

Change-Id: I87bc30b710569e317da05933502b36d8d97e4155

writerfilter/source/ooxml/model.xml

@@ -10555,9 +10555,9 @@
     <start name="AlternateContent"/>
     <grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://schemas.openxmlformats.org/markup-compatibility/2006" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
       <define name="nsList">
-        <list>
+        <choice>
             <data type="NCName"/>
-        </list>
+        </choice>
       </define>
       <define name="AlternateContent">
         <element name="AlternateContent">
@@ -10925,10 +10925,10 @@
         </attribute>
       </define>
       <define name="ST_HexColorAuto">
-        <list>
+        <choice>
           <!-- Automatically Determined Color -->
           <value>auto</value>
-        </list>
+        </choice>
       </define>
       <define name="ST_HexColorRGB">
         <data type="hexBinary"/>
@@ -12051,16 +12051,16 @@
           </choice>
       </define>
       <define name="ST_AlgClass">
-        <list>
+        <choice>
           <!-- Hashing -->
           <value>hash</value>
-        </list>
+        </choice>
       </define>
       <define name="ST_AlgType">
-        <list>
+        <choice>
           <!-- Any Type -->
           <value>typeAny</value>
-        </list>
+        </choice>
       </define>
       <define name="AG_Password">
         <attribute name="cryptProviderType">
@@ -12771,7 +12771,6 @@
               <element name="statusText">
                 <ref name="CT_FFStatusText"/>
               </element>
-            <choice>
               <element name="checkBox">
                 <ref name="CT_FFCheckBox"/>
               </element>
@@ -12782,7 +12781,6 @@
                 <ref name="CT_FFTextInput"/>
               </element>
           </choice>
-          </choice>
       </define>
       <define name="CT_FFHelpText">
         <attribute name="type">
@@ -14024,7 +14022,6 @@
               <element name="tag">
                 <ref name="CT_String"/>
               </element>
-              <choice>
                 <element name="equation">
                   <ref name="CT_OnOff"/>
                 </element>
@@ -14065,7 +14062,6 @@
                   <ref name="CT_Empty"/>
                 </element>
           </choice>
-          </choice>
       </define>
       <define name="CT_SdtEndPr">
             <element name="rPr">