From 891adc1a347de5c30fe8a88e904c25120e9de45a 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 02cf266..6d9f907 100644
--- a/freedesktop.org.xml.in
+++ b/freedesktop.org.xml.in
@@ -821,7 +821,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -834,7 +833,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -847,7 +845,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -860,7 +857,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -873,7 +869,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -886,7 +881,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -899,7 +893,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -912,7 +905,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -925,7 +917,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -938,7 +929,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>
       <match type="string" value="PK\003\004" offset="0">
@@ -953,7 +943,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -968,7 +957,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>
@@ -976,7 +964,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -991,7 +978,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1006,7 +992,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1021,7 +1006,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1036,7 +1020,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>
@@ -1044,7 +1027,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1059,7 +1041,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1074,7 +1055,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>
@@ -1082,7 +1062,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1097,7 +1076,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1112,7 +1090,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>
@@ -1120,7 +1097,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1135,7 +1111,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1150,7 +1125,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1165,7 +1139,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1180,7 +1153,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1195,7 +1167,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1211,7 +1182,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="50">
       <match type="string" value="PK\003\004" offset="0">
@@ -1224,7 +1194,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