Добавил прототипы функций для выставления данных из MailMerge

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

Excel/api.js

@@ -491,7 +491,6 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 		};
 
 		spreadsheet_api.prototype.asc_LoadEmptyDocument = function () {
-
 			var emptyWorkbook = getEmptyWorkbook() + "";
 			if (emptyWorkbook.length && (Asc.c_oSerFormat.Signature === emptyWorkbook.substring(0, Asc.c_oSerFormat.Signature.length))) {
 				this.isChartEditor = true;
@@ -2525,7 +2524,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 			}, rData );
 		};
 
-		spreadsheet_api.prototype.asc_showImageFileDialog = function (options) {
+		spreadsheet_api.prototype.asc_showImageFileDialog = function () {
 			if (undefined != window['appBridge']) {
 				window['appBridge']['dummyCommandAddImage'] ();
 				return;
@@ -2567,6 +2566,14 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
             }
 		};
 
+		// Выставление данных
+		spreadsheet_api.prototype.asc_setData = function(data) {
+			this.wb.getWorksheet().setData(data);
+		};
+		spreadsheet_api.prototype.asc_getData = function() {
+			return this.wb.getWorksheet().getData();
+		};
+
 		// Cell comment interface
 		spreadsheet_api.prototype.asc_addComment = function(oComment) {
 			if (oComment.bDocument)
@@ -3799,6 +3806,8 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
 		prot["asc_getWordChartObject"] = prot.asc_getWordChartObject;
 		prot["asc_cleanWorksheet"] = prot.asc_cleanWorksheet;
 		prot["asc_showImageFileDialog"] = prot.asc_showImageFileDialog;
+		prot["asc_setData"] = prot.asc_setData;
+		prot["asc_getData"] = prot.asc_getData;
 		
 		// Cell comment interface
 		prot["asc_addComment"] = prot.asc_addComment;

Excel/view/WorksheetView.js

@@ -10979,6 +10979,13 @@
 			api._loadFonts(fonts, callback);
 		};
 
+		WorksheetView.prototype.setData = function (data) {
+			// ToDo Add code here
+		};
+		WorksheetView.prototype.getData = function () {
+			// ToDo Add code here
+		};
+
 		/*
 		 * Export
 		 * -----------------------------------------------------------------------------

Word/api.js

@@ -7157,6 +7157,15 @@ asc_docs_api.prototype.sync_closeChartEditor = function()
     this.asc_fireCallback("asc_onCloseChartEditor");
 };
 
+asc_docs_api.prototype.asc_getMailMergeData = function()
+{
+	// ToDo Add code here
+};
+asc_docs_api.prototype.asc_setMailMergeData = function(data)
+{
+	// ToDo Add code here
+};
+
 asc_docs_api.prototype.asc_setDrawCollaborationMarks = function (bDraw)
 {
     if ( bDraw !== this.isCoMarksDraw )