add g_fLoadFileContent

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

Common/editorscommon.js

@@ -181,6 +181,17 @@ function g_fSaveWithParts(fSendCommand, fCallback, fCallbackRequest, oAdditional
 	}, oAdditionalData, dataContainer);
 }
 
+function g_fLoadFileContent(url, callback) {
+  asc_ajax({
+    url: url,
+    dataType: "text",
+    success: callback,
+    error: function() {
+      callback(null);
+    }
+  });
+}
+
 function g_fGetJSZipUtils() {
   return window['JSZipUtils'] ? window['JSZipUtils'] : require('jsziputils');
 }

Word/api.js

@@ -1933,20 +1933,17 @@ asc_docs_api.prototype.processSavedFile = function(url, downloadType) {
 	var t = this;
 	if (DownloadType.MailMerge === downloadType) {
 		this.mailMergeFileData = null;
-		asc_ajax({
-			url: url,
-			dataType: "text",
-			success: function (result) {
-				try {
-					t.asc_StartMailMergeByList(JSON.parse(result));
-				} catch (e) {
-					t.asc_fireCallback("asc_onError", c_oAscError.ID.MailMergeLoadFile, c_oAscError.Level.NoCritical);
-				}
-			},
-			error: function () {
-				t.asc_fireCallback("asc_onError", c_oAscError.ID.MailMergeLoadFile, c_oAscError.Level.NoCritical);
-			}
-		});
+    g_fLoadFileContent(url, function(result) {
+      if (null === result) {
+        t.asc_fireCallback("asc_onError", c_oAscError.ID.MailMergeLoadFile, c_oAscError.Level.NoCritical);
+        return;
+      }
+      try {
+        t.asc_StartMailMergeByList(JSON.parse(result));
+      } catch (e) {
+        t.asc_fireCallback("asc_onError", c_oAscError.ID.MailMergeLoadFile, c_oAscError.Level.NoCritical);
+      }
+    });
 	} else {
     this.constructor.prototype.processSavedFile(url, downloadType);
 	}