Schemarestriktionen wieder wie ursprünglich gesetzt:

- table/@width nicht erlaubt
- @valign, @halign in allen Tabellenelementen nicht erlaubt (table, tr, th, td, col, colgroup)
- @style in allen Elementen nicht erlaubt


git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@94 d688527b-c9ab-4aba-bd8d-4036d912da1d

3 files changed, 0 insertions, 41 deletions

diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd
index 8e91a8d06..140b35e84 100644
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd
+++ b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-model-1.xsd
@@ -58,9 +58,6 @@
         SLXHTML: attributeGroup "style.attrib" removed.

        </xs:documentation>

     </xs:annotation>      

-    <!-- Beginn: Workaround E-Recht 20031218 -->

-    <xs:attributeGroup ref="style.attrib"/>
-    <!-- Ende: Workaround E-Recht 20031218 -->

   </xs:attributeGroup>

 

   <xs:attributeGroup name="Core.extra.attrib">

diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd
index d18640e7f..d58fe93f0 100644
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd
+++ b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml-module-redefines-1.xsd
@@ -161,10 +161,6 @@
       <xs:attributeGroup ref="Common.attrib"/>

       <xs:attribute name="rowspan" type="Number" default="1"/>

       <xs:attribute name="colspan" type="Number" default="1"/>

-      <!-- Beginn: Workaround E-Recht 20031218 -->

-      <xs:attributeGroup ref="CellHAlign.attrib"/>

-      <xs:attributeGroup ref="CellVAlign.attrib"/>

-      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="th.attlist">

@@ -178,10 +174,6 @@
       <xs:attributeGroup ref="Common.attrib"/>

       <xs:attribute name="rowspan" type="Number" default="1"/>

       <xs:attribute name="colspan" type="Number" default="1"/>

-      <!-- Beginn: Workaround E-Recht 20031218 -->

-      <xs:attributeGroup ref="CellHAlign.attrib"/>

-      <xs:attributeGroup ref="CellVAlign.attrib"/>

-      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="tr.attlist">

@@ -192,10 +184,6 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

-      <!-- Beginn: Workaround E-Recht 20031218 -->

-      <xs:attributeGroup ref="CellHAlign.attrib"/>

-      <xs:attributeGroup ref="CellVAlign.attrib"/>

-      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="col.attlist">

@@ -207,10 +195,6 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

-      <!-- Beginn: Workaround E-Recht 20031218 -->

-      <xs:attributeGroup ref="CellHAlign.attrib"/>

-      <xs:attributeGroup ref="CellVAlign.attrib"/>

-      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="colgroup.attlist">

@@ -222,10 +206,6 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

-      <!-- Beginn: Workaround E-Recht 20031218 -->

-      <xs:attributeGroup ref="CellHAlign.attrib"/>

-      <xs:attributeGroup ref="CellVAlign.attrib"/>

-      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="tbody.attlist">

@@ -236,10 +216,6 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

-      <!-- Beginn: Workaround E-Recht 20031218 -->

-      <xs:attributeGroup ref="CellHAlign.attrib"/>

-      <xs:attributeGroup ref="CellVAlign.attrib"/>

-      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="tfoot.attlist">

@@ -250,10 +226,6 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

-      <!-- Beginn: Workaround E-Recht 20031218 -->

-      <xs:attributeGroup ref="CellHAlign.attrib"/>

-      <xs:attributeGroup ref="CellVAlign.attrib"/>

-      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="thead.attlist">

@@ -264,10 +236,6 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

-      <!-- Beginn: Workaround E-Recht 20031218 -->

-      <xs:attributeGroup ref="CellHAlign.attrib"/>

-      <xs:attributeGroup ref="CellVAlign.attrib"/>

-      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

 

     <xs:attributeGroup name="table.attlist">

@@ -279,9 +247,6 @@
         </xs:documentation>

       </xs:annotation>

       <xs:attributeGroup ref="Common.attrib"/>

-      <!-- Beginn: Workaround E-Recht 20031218 -->

-      <xs:attribute name="width" type="Length"/>

-      <!-- Ende: Workaround E-Recht 20031218 -->

     </xs:attributeGroup>

   </xs:redefine>

 

diff --git a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd
index 6f85b1fad..05087803f 100644
--- a/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd
+++ b/spss.slinterface/res/resources/schemas/slxhtml-1.0/slxhtml.xsd
@@ -170,7 +170,4 @@
       </xs:documentation>

     </xs:annotation>

   </xs:include>-->

-  <!-- Beginn: Workaround E-Recht 20031218 -->

-  <xs:include schemaLocation="xhtml-inlstyle-1.xsd"/>
-  <!-- Beginn: Workaround E-Recht 20031218 -->

 </xs:schema>