Heinous merge from HEAD. Seems to basically work. Be on guard however.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@4137 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-10-18 02:24:36 +00:00
parent 6441f470f5
commit 111296d4dc
156 changed files with 18940 additions and 14167 deletions

View File

@@ -10,6 +10,7 @@
<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>
@@ -26,7 +27,8 @@
- 1. additional files may be generated for images and this would require extra care in a servlet environment
- 2. output quality does not seem to be very good in many cases
-->
<document-format><name>HTML</name>
<document-format><name>Html</name>
<family>Html</family>
<mime-type>text/html</mime-type>
<file-extension>html</file-extension>
<export-filters>
@@ -44,6 +46,7 @@
<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>