Реализовал подсветку диапазонов в строке формулы. Баг http://bugzserver/show_bug.cgi?id=18073

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

Excel/apiDefines.js

@@ -444,6 +444,11 @@ var c_oAscCoAuthoringLockTablePropertiesBorderColor	= new window.CColor(255, 144
 var c_oAscCoAuthoringDottedWidth					= 2;
 var c_oAscCoAuthoringDottedDistance					= 2;
 
+var c_oAscFormulaRangeBorderColor = [
+	new window.CColor(95, 140, 237), new window.CColor(235, 94, 96), new window.CColor(141, 97, 194),
+	new window.CColor(45, 150, 57), new window.CColor(191, 76, 145), new window.CColor(227, 130, 34),
+	new window.CColor(55, 127, 158)];
+
 var c_oAscLockNameFrozenPane	= "frozenPane";
 var c_oAscLockNameTabColor		= "tabColor";
 

Excel/view/WorkbookView.js

@@ -442,7 +442,8 @@
 						    },
 							"applyCloseEvent"			: function () {self.controller._onWindowKeyDown.apply(self.controller, arguments);},
 							"isViewerMode"				: function () {return self.controller.settings.isViewerMode;},
-							"popUpSelectorKeyDown"	: function (event) {return self._onPopUpSelectorKeyDown(event);}
+							"popUpSelectorKeyDown"	: function (event) {return self._onPopUpSelectorKeyDown(event);},
+							"getFormulaRanges"			: function () {return self.getWorksheet().getFormulaRanges();}
 					    },
 					    /*settings*/{
 						    font: this.defaultFont

Excel/view/WorksheetView.js

@@ -219,9 +219,6 @@
 			this.activeCellBorderColor = new CColor(105, 119, 62, 0.7);
 			this.activeCellBackground = new CColor(157, 185, 85, 0.2);
 
-			this.formulaRangeBorderColor = [
-				new CColor(95, 140, 237), new CColor(235, 94, 96), new CColor(141, 97, 194), new CColor(45, 150, 57),
-				new CColor(191, 76, 145), new CColor(227, 130, 34), new CColor(55, 127, 158)];
 			// Цвет заливки границы выделения области автозаполнения
 			this.fillHandleBorderColorSelect = new CColor(255, 255, 255, 1);
 
@@ -3718,12 +3715,11 @@
 		};
 
 		WorksheetView.prototype._drawFormulaRanges = function (arrRanges){
-			var lineWidth = 1, isDashLine = false,
-				opt = this.settings, lengthColors = opt.formulaRangeBorderColor.length;
+			var lineWidth = 1, isDashLine = false, opt = this.settings, length = c_oAscFormulaRangeBorderColor.length;
 			var strokeColor, fillColor;
 			for (var i in arrRanges) {
 				var oFormulaRange = arrRanges[i].clone(true);
-				strokeColor = fillColor = opt.formulaRangeBorderColor[i%lengthColors];
+				strokeColor = fillColor = c_oAscFormulaRangeBorderColor[i % length];
 				this._drawElements(this, this._drawSelectionElement, oFormulaRange, isDashLine, lineWidth,
 					strokeColor, fillColor);
 			}
@@ -10503,6 +10499,10 @@
 			return bSuccess;
 		};
 
+		WorksheetView.prototype.getFormulaRanges = function () {
+			return this.arrActiveFormulaRanges;
+		};
+
 		WorksheetView.prototype._updateCellsRange = function (range, canChangeColWidth, lockDraw) {
 			var r, c, h, d, ct, isMerged;
 			var mergedRange, bUpdateRowHeight;