From 29595e15d6fe2f7e69e46575ea5acf91f685f700 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Thu, 20 May 2010 09:11:19 +0000
Subject: [PATCH] Google Doc integration fixes:   - Fixed up inconsistancies in
 powerpoint and excel mimetypes set throughout the code   - Unit tests
 failures for excel sheets fixed   - Able to now create and checkout docs,
 sheets and presentations successfullly   - Docs, sheets and presentations
 downloadable and viewable   - Fixed ALF-2700

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20306 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 config/alfresco/web-client-config.xml                         | 4 ++--
 .../alfresco/web/app/servlet/BaseDownloadContentServlet.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/alfresco/web-client-config.xml b/config/alfresco/web-client-config.xml
index b916d6f248..ec4f55faa0 100644
--- a/config/alfresco/web-client-config.xml
+++ b/config/alfresco/web-client-config.xml
@@ -404,8 +404,8 @@
          <transformer name="image/gif"/>
          <transformer name="image/jpeg"/>
          <transformer name="application/msword"/>
-         <transformer name="application/vnd.excel"/>
-         <transformer name="application/vnd.powerpoint"/>
+         <transformer name="application/vnd.ms-excel"/>
+         <transformer name="application/vnd.ms-powerpoint"/>
       </transformers>
       <image-transformers>
          <transformer name="image/gif"/>
diff --git a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
index 45a1da45a5..cd8125b7f5 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
@@ -72,7 +72,7 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
 
    private static final long serialVersionUID = -4558907921887235967L;
    
-   private static final String POWER_POINT_DOCUMENT_MIMETYPE = "application/vnd.powerpoint";
+   private static final String POWER_POINT_DOCUMENT_MIMETYPE = "application/vnd.ms-powerpoint";
    private static final String POWER_POINT_2007_DOCUMENT_MIMETYPE = "application/vnd.openxmlformats-officedocument.presentationml.presentation";
    
    private static final String MULTIPART_BYTERANGES_BOUNDRY = "<ALF4558907921887235966L>";