From 7daa5141b600715e1ee324a420a9f44598ba16f1 Mon Sep 17 00:00:00 2001 From: Neil McErlean Date: Wed, 31 Mar 2010 15:07:29 +0000 Subject: [PATCH] Fix for HEAD builds running on panda build server. OOo was recently installed on panda which has activated various OOo-related transformations/extractions in the test code. It appears that OOo does not support some transformations from Office 97 to Office 2007. Specifically doc to docx and xls to xlsx. These transformations have now been marked as unavailable. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../OpenOfficeContentTransformerWorker.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java b/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java index f8eb99adbe..ed27034f09 100644 --- a/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java +++ b/source/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java @@ -150,6 +150,19 @@ public class OpenOfficeContentTransformerWorker extends ContentTransformerHelper { return false; } + // OpenOffice 3.2.x doesn't seem to support all Office 97 to Office 07 conversions + else if (sourceMimetype.equals(MimetypeMap.MIMETYPE_WORD) && targetMimetype.equals(MimetypeMap.MIMETYPE_OPENXML_WORDPROCESSING)) + { + return false; + } + else if (sourceMimetype.equals(MimetypeMap.MIMETYPE_EXCEL) && targetMimetype.equals(MimetypeMap.MIMETYPE_OPENXML_SPREADSHEET)) + { + return false; + } + else if (sourceMimetype.equals(MimetypeMap.MIMETYPE_HTML) && targetMimetype.equals(MimetypeMap.MIMETYPE_OPENXML_WORDPROCESSING)) + { + return false; + } MimetypeService mimetypeService = getMimetypeService(); String sourceExtension = mimetypeService.getExtension(sourceMimetype);