asc_findText теперь принимает опции asc_CFindOptions

Добавил методы: asc_setFindWhat, asc_setScanByRows, asc_setScanForward, asc_setIsMatchCase, asc_setIsWholeCell, asc_setScanOnOnlySheet, asc_setLookIn, asc_setReplaceWith, asc_setIsReplaceAll

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

Excel/api.js

@@ -2324,15 +2324,20 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
             asc_searchEnabled: function(bIsEnabled) {
             },
 
-			asc_findText: function (text, scanByRows, scanForward, isMatchCase, isWholeCell) {
-				var temp = new asc.asc_CFindOptions();
-				temp.findWhat = text;
-				temp.scanByRows = scanByRows;
-				temp.scanForward = scanForward;
-				temp.isMatchCase = isMatchCase;
-				temp.isWholeCell = isWholeCell;
+			asc_findText: function () {
+				var options = null;
+				if(1 != arguments.length) {
+					// Временная заглушка
+					options = new asc.asc_CFindOptions();
+					options.findWhat = arguments[0]; //text
+					options.scanByRows = arguments[1]; //scanByRows
+					options.scanForward = arguments[2]; //scanForward
+					options.isMatchCase = arguments[3]; //isMatchCase
+					options.isWholeCell = arguments[4]; //isWholeCell
+				} else
+					options = arguments[0];
 
-				var d = this.wb.findCellText(temp);
+				var d = this.wb.findCellText(options);
 				if (d) {
 					if (d.deltaX) {this.controller.scrollHorizontal(d.deltaX);}
 					if (d.deltaY) {this.controller.scrollVertical(d.deltaY);}

Excel/utils/utils.js

@@ -1418,6 +1418,16 @@
 			this.countReplaceAll += this.countReplace;
 		};
 
+		asc_CFindOptions.prototype.asc_setFindWhat = function (val) {this.findWhat = val;};
+		asc_CFindOptions.prototype.asc_setScanByRows = function (val) {this.scanByRows = val;};
+		asc_CFindOptions.prototype.asc_setScanForward = function (val) {this.scanForward = val;};
+		asc_CFindOptions.prototype.asc_setIsMatchCase = function (val) {this.isMatchCase = val;};
+		asc_CFindOptions.prototype.asc_setIsWholeCell = function (val) {this.isWholeCell = val;};
+		asc_CFindOptions.prototype.asc_setScanOnOnlySheet = function (val) {this.scanOnOnlySheet = val;};
+		asc_CFindOptions.prototype.asc_setLookIn = function (val) {this.lookIn = val;};
+		asc_CFindOptions.prototype.asc_setReplaceWith = function (val) {this.replaceWith = val;};
+		asc_CFindOptions.prototype.asc_setIsReplaceAll = function (val) {this.isReplaceAll = val;};
+
 		/*
 		 * Export
 		 * -----------------------------------------------------------------------------
@@ -1560,6 +1570,15 @@
 		prot["asc_getMax"] = prot.asc_getMax;
 
 		window["Asc"]["asc_CFindOptions"] = window["Asc"].asc_CFindOptions = asc_CFindOptions;
-
+		prot = asc_CFindOptions.prototype;
+		prot["asc_setFindWhat"] = prot.asc_setFindWhat;
+		prot["asc_setScanByRows"] = prot.asc_setScanByRows;
+		prot["asc_setScanForward"] = prot.asc_setScanForward;
+		prot["asc_setIsMatchCase"] = prot.asc_setIsMatchCase;
+		prot["asc_setIsWholeCell"] = prot.asc_setIsWholeCell;
+		prot["asc_setScanOnOnlySheet"] = prot.asc_setScanOnOnlySheet;
+		prot["asc_setLookIn"] = prot.asc_setLookIn;
+		prot["asc_setReplaceWith"] = prot.asc_setReplaceWith;
+		prot["asc_setIsReplaceAll"] = prot.asc_setIsReplaceAll;
 }
 )(jQuery, window);