Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -675,21 +675,13 @@ public class GoogleDocsServiceImpl extends TransactionListenerAdapter
ContentData contentData = (ContentData) nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
String fileExtension = mimetypeService.getExtension(contentData.getMimetype());
if (fileExtension.equals("docx"))
{
fileExtension = "doc";
}
else if (fileExtension.equals("xlsx"))
{
fileExtension = "xls";
}
if (docType.equals(TYPE_DOCUMENT) || docType.equals(TYPE_PRESENTATION))
{
StringBuffer buffer = new StringBuffer(this.downloadUrl);
buffer.append("/").
append(docType).append("s").
append("/Export?docId=").append(document.getDocId()).
append("/Export?id=").append(document.getDocId()).
append("&exportFormat=").append(fileExtension);
downloadUrl = buffer.toString();