Merged 5.1.N (5.1.1) to HEAD (5.2)

122665 aleahu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1) (PARTIAL MERGE)
      122615 rneamtu: Merged DEV to 5.0.N (5.0.4)
         122454 rneamtu: MNT-14602: Add config to support Visio 2013 previews and thumbnails
            - Added support for vsdx mimetype


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123682 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 22:31:52 +00:00
parent 963320d6c2
commit b6bec0669e
3 changed files with 13 additions and 1 deletions

View File

@@ -405,6 +405,15 @@
</export-filters>
</document-format>
<document-format><name>Microsoft Visio 2013</name>
<family>Presentation</family>
<mime-type>application/vnd.visio2013</mime-type>
<file-extension>vsdx</file-extension>
<export-filters>
<entry><family>Presentation</family><string>MS Visio</string></entry>
</export-filters>
</document-format>
<document-format><name>OpenDocument Drawing</name>
<family>Presentation</family>
<mime-type>application/vnd.oasis.opendocument.graphics</mime-type>

View File

@@ -195,6 +195,7 @@ content.transformer.JodConverter.extensions.ppam.pdf.maxSourceSizeKBytes=4096
content.transformer.JodConverter.extensions.dotm.pdf.maxSourceSizeKBytes=768
content.transformer.JodConverter.extensions.doc.pdf.maxSourceSizeKBytes=10240
content.transformer.JodConverter.extensions.vsd.pdf.maxSourceSizeKBytes=4096
content.transformer.JodConverter.extensions.vsdx.pdf.maxSourceSizeKBytes=4096
content.transformer.JodConverter.extensions.ppsx.pdf.maxSourceSizeKBytes=4096
content.transformer.JodConverter.Html2Pdf.edition=Enterprise
@@ -290,6 +291,7 @@ content.transformer.OpenOffice.extensions.ppam.pdf.maxSourceSizeKBytes=4096
content.transformer.OpenOffice.extensions.dotm.pdf.maxSourceSizeKBytes=768
content.transformer.OpenOffice.extensions.doc.pdf.maxSourceSizeKBytes=10240
content.transformer.OpenOffice.extensions.vsd.pdf.maxSourceSizeKBytes=4096
content.transformer.OpenOffice.extensions.vsdx.pdf.maxSourceSizeKBytes=4096
content.transformer.OpenOffice.extensions.ppsx.pdf.maxSourceSizeKBytes=4096
content.transformer.OpenOffice.Html2Pdf.pipeline=OpenOffice|odt|OpenOffice

View File

@@ -73,7 +73,8 @@ public class OfficeMetadataExtracter extends TikaPoweredMetadataExtracter
MimetypeMap.MIMETYPE_WORD,
MimetypeMap.MIMETYPE_EXCEL,
MimetypeMap.MIMETYPE_PPT,
MimetypeMap.MIMETYPE_VISIO },
MimetypeMap.MIMETYPE_VISIO,
MimetypeMap.MIMETYPE_VISIO_2013 },
new OfficeParser()
);
static {