Merge 1.4 to HEAD

svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4340 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4350 .
   svn resolved root\projects\3rd-party\.classpath
   svn resolved root\projects\repository\source\java\org\alfresco\repo\workflow\WorkflowInterpreter.java
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4379 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4380 .
   svn merge svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4420 svn://svn.alfresco.com:3691/alfresco/BRANCHES/V1.4@4421 .
   svn resolved root\projects\3rd-party\.classpath


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4655 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/mimetype/openoffice-document-formats.xml

@@ -10,7 +10,6 @@
 	   <entry><family>Presentation</family><string>impress_pdf_Export</string></entry>
       <entry><family>Spreadsheet</family><string>calc_pdf_Export</string></entry>
       <entry><family>Text</family><string>writer_pdf_Export</string></entry>
-      <entry><family>Html</family><string>writer_web_pdf_Export</string></entry>
     </export-filters>
   </document-format>
 
@@ -28,7 +27,7 @@
 	-  2. output quality does not seem to be very good in many cases
   -->
   <document-format><name>Html</name>
-    <family>Html</family>
+    <family>Text</family>
     <mime-type>text/html</mime-type>
     <file-extension>html</file-extension>
     <export-filters>
@@ -46,7 +45,6 @@
     <file-extension>odt</file-extension>
     <export-filters>
       <entry><family>Text</family><string>writer8</string></entry>
-      <entry><family>Html</family><string>writerweb8_writer</string></entry>
     </export-filters>
   </document-format>