Bug 31104 - При нажатии на Mail Merge скачивается JSON файл

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66846 954022d7-b5bf-4e40-9824-e11837661b57

Word/Private/MailMerge.js

@@ -151,7 +151,7 @@ asc_docs_api.prototype.asc_DownloadAsMailMerge = function(typeFile, StartIndex,
         var options = {oDocumentMailMerge: oDocumentMailMerge, downloadType: DownloadType.MailMerge, errorDirect: c_oAscError.ID.MailMergeSaveFile};
         if (bIsDownload) {
             actionType = c_oAscAsyncAction.DownloadMerge;
-            options.downloadType = null;
+            options.downloadType = DownloadType.None;
         }
         _downloadAs(this, "save", typeFile, actionType, options, null);
     }

Word/api.js

@@ -1915,7 +1915,7 @@ asc_docs_api.prototype.SetFontRenderingMode = function(mode)
 };
 asc_docs_api.prototype.processSavedFile = function(url, downloadType) {
 	var t = this;
-	if (DownloadType.MailMerge === downloadType) {
+	if (this.mailMergeFileData) {
 		this.mailMergeFileData = null;
     g_fLoadFileContent(url, function(result) {
       if (null === result) {