From 7bd867808aad05d691456a8301c8737ded9fd64b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 25 Aug 2011 10:54:47 +0100
Subject: [PATCH] Remove sub-classing from OO.o mime-types

https://bugs.freedesktop.org/show_bug.cgi?id=40354
---
 freedesktop.org.xml.in | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/freedesktop.org.xml.in b/freedesktop.org.xml.in
index 29ed9ef..542f1f7 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -845,7 +845,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.calc">
     <comment>OpenOffice Calc spreadsheet</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -858,7 +857,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.calc.template">
     <comment>OpenOffice Calc template</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -871,7 +869,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.draw">
     <comment>OpenOffice Draw drawing</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -884,7 +881,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.draw.template">
     <comment>OpenOffice Draw template</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -897,7 +893,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.impress">
     <comment>OpenOffice Impress presentation</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-presentation"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -910,7 +905,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.impress.template">
     <comment>OpenOffice Impress template</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-presentation"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -923,7 +917,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.math">
     <comment>OpenOffice Math formula</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -936,7 +929,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.writer">
     <comment>OpenOffice Writer document</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -949,7 +941,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.writer.global">
     <comment>OpenOffice Writer global document</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -962,7 +953,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.sun.xml.writer.template">
     <comment>OpenOffice Writer template</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -977,7 +967,6 @@ command to generate the output files.
     <comment>ODT document</comment>
     <acronym>ODT</acronym>
     <expanded-acronym>OpenDocument Text</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -992,7 +981,6 @@ command to generate the output files.
     <comment>ODT document (Flat XML)</comment>
     <acronym>FODT</acronym>
     <expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym>
-    <sub-class-of type="application/xml"/>
     <generic-icon name="x-office-document"/>
     <glob pattern="*.fodt"/>
   </mime-type>
@@ -1000,7 +988,6 @@ command to generate the output files.
     <comment>ODT template</comment>
     <acronym>ODT</acronym>
     <expanded-acronym>OpenDocument Text</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1015,7 +1002,6 @@ command to generate the output files.
     <comment>OTH template</comment>
     <acronym>OTH</acronym>
     <expanded-acronym>OpenDocument HTML</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="text-html"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1030,7 +1016,6 @@ command to generate the output files.
     <comment>ODM document</comment>
     <acronym>ODM</acronym>
     <expanded-acronym>OpenDocument Master</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1045,7 +1030,6 @@ command to generate the output files.
     <comment>ODG drawing</comment>
     <acronym>ODG</acronym>
     <expanded-acronym>OpenDocument Drawing</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1060,7 +1044,6 @@ command to generate the output files.
     <comment>ODG drawing (Flat XML)</comment>
     <acronym>FODG</acronym>
     <expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym>
-    <sub-class-of type="application/xml"/>
     <generic-icon name="image-x-generic"/>
     <glob pattern="*.fodg"/>
   </mime-type>
@@ -1068,7 +1051,6 @@ command to generate the output files.
     <comment>ODG template</comment>
     <acronym>ODG</acronym>
     <expanded-acronym>OpenDocument Drawing</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1083,7 +1065,6 @@ command to generate the output files.
     <comment>ODP presentation</comment>
     <acronym>ODP</acronym>
     <expanded-acronym>OpenDocument Presentation</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-presentation"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1098,7 +1079,6 @@ command to generate the output files.
     <comment>ODP presentation (Flat XML)</comment>
     <acronym>FODP</acronym>
     <expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym>
-    <sub-class-of type="application/xml"/>
     <generic-icon name="x-office-presentation"/>
     <glob pattern="*.fodp"/>
   </mime-type>
@@ -1106,7 +1086,6 @@ command to generate the output files.
     <comment>ODP template</comment>
     <acronym>ODP</acronym>
     <expanded-acronym>OpenDocument Presentation</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-presentation"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1121,7 +1100,6 @@ command to generate the output files.
     <comment>ODS spreadsheet</comment>
     <acronym>ODS</acronym>
     <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1136,7 +1114,6 @@ command to generate the output files.
     <comment>ODS spreadsheet (Flat XML)</comment>
     <acronym>FODS</acronym>
     <expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym>
-    <sub-class-of type="application/xml"/>
     <generic-icon name="x-office-spreadsheet"/>
     <glob pattern="*.fods"/>
   </mime-type>
@@ -1144,7 +1121,6 @@ command to generate the output files.
     <comment>ODS template</comment>
     <acronym>ODS</acronym>
     <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1159,7 +1135,6 @@ command to generate the output files.
     <comment>ODC chart</comment>
     <acronym>ODC</acronym>
     <expanded-acronym>OpenDocument Chart</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1174,7 +1149,6 @@ command to generate the output files.
     <comment>ODC template</comment>
     <acronym>ODC</acronym>
     <expanded-acronym>OpenDocument Chart</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-spreadsheet"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1189,7 +1163,6 @@ command to generate the output files.
     <comment>ODF formula</comment>
     <acronym>ODF</acronym>
     <expanded-acronym>OpenDocument Formula</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1204,7 +1177,6 @@ command to generate the output files.
     <comment>ODF template</comment>
     <acronym>ODF</acronym>
     <expanded-acronym>OpenDocument Formula</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1219,7 +1191,6 @@ command to generate the output files.
     <comment>ODB database</comment>
     <acronym>ODB</acronym>
     <expanded-acronym>OpenDocument Database</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1235,7 +1206,6 @@ command to generate the output files.
     <comment>ODI image</comment>
     <acronym>ODI</acronym>
     <expanded-acronym>OpenDocument Image</expanded-acronym>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="image-x-generic"/>
     <magic priority="70">
       <match type="string" value="PK\003\004" offset="0">
@@ -1248,7 +1218,6 @@ command to generate the output files.
   </mime-type>
   <mime-type type="application/vnd.openofficeorg.extension">
     <comment>OpenOffice.org extension</comment>
-    <sub-class-of type="application/zip"/>
     <generic-icon name="x-office-document"/>
     <glob pattern="*.oxt" />
   </mime-type>
-- 
2.7.4