- подсветка таблиц в формулах;

- более жирная подсветка выбранных диапазонов в формулах;
- штрих-линия 4 через 2, убран 0.5, для точности, посмотреть будут ли смазываться линии.

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

Excel/apiDefines.js

@@ -317,7 +317,7 @@ var c_oAscAutoFilterTypes = {
 var c_oAscCoAuthoringMeBorderColor = new window["CColor"](22, 156, 0);
 var c_oAscCoAuthoringOtherBorderColor = new window["CColor"](238, 53, 37);
 var c_oAscCoAuthoringLockTablePropertiesBorderColor = new window["CColor"](255, 144, 0);
-var c_oAscCoAuthoringDottedWidth = 2;
+var c_oAscCoAuthoringDottedWidth = 4;
 var c_oAscCoAuthoringDottedDistance = 2;
 
 var c_oAscFormulaRangeBorderColor = [

Excel/graphics/DrawingContext.js

@@ -1032,9 +1032,9 @@
 		var _x2 = this._mct.transformPointX(x2, y);
 		var ctx = this.ctx;
 
-		_x1 = (_x1 >> 0) + 0.5;
+		_x1 = (_x1 >> 0);
 		_y  = (_y  >> 0) + 0.5;
-		_x2 = (_x2 >> 0) + 0.5;
+		_x2 = (_x2 >> 0);
 
 		for (; _x1 < _x2; _x1 += w_dist) {
 			ctx.moveTo(_x1, _y);
@@ -1053,9 +1053,9 @@
 		var _y2 = this._mct.transformPointY(x, y2);
 		var ctx = this.ctx;
 
-		_y1 = (_y1 >> 0) + 0.5;
+		_y1 = (_y1 >> 0);
 		_x  = (_x  >> 0) + 0.5;
-		_y2 = (_y2 >> 0) + 0.5;
+		_y2 = (_y2 >> 0);
 
 		for (; _y1 < _y2; _y1 += w_dist) {
 			ctx.moveTo(_x, _y1);

Excel/model/FormulaObjects/parserFormula.js

@@ -1437,7 +1437,7 @@ cName.prototype.Calculate = function () {
 
 /** @constructor */
 function cStrucTable( val, wb, ws, cell ) {
-    this.constructor.call( this, val[0], cElementType.table );
+    this.constructor.call( this, val[0].replace("[]",""), cElementType.table );
     this.wb = wb;
     this.ws = ws;
     this.tableName = val['tableName'];
@@ -1520,7 +1520,7 @@ cStrucTable.prototype.toString = function () {
 		}
 		return tblStr.replace( "%1", data );
 	}
-	return tblStr.replace( "%1", "" );
+	return tblStr.replace( "%1", "" ).replace("[]","");
 };
 cStrucTable.prototype.toLocaleString = function () {
 	var tblStr, columns_1, columns_2;
@@ -1579,7 +1579,7 @@ cStrucTable.prototype.toLocaleString = function () {
 		}
 		return tblStr.replace( "%1", data );
 	}
-	return tblStr.replace( "%1", "" );
+	return tblStr.replace( "%1", "" ).replace("[]","");
 };
 cStrucTable.prototype.changeArea = function ( offset ) {
     return this.area;

Excel/view/CellEditorView.js

@@ -872,6 +872,7 @@
 						_s = _e - r.oper.value.length;
 						break;
 					}
+					case cElementType.table          :
 					case cElementType.name          :
 					{
 						var nameRef = r.oper.toRef();
@@ -879,7 +880,7 @@
 						switch ( nameRef.type ) {
 
 							case cElementType.cellsRange3D          :{
-								if ( !r.oper.isSingleSheet() ) {
+								if ( !nameRef.isSingleSheet() ) {
 									continue;
 								}
 							}
@@ -987,16 +988,16 @@
 						_s = _e - r.oper.value.length + 1;
 						break;
 					}
+					case cElementType.table          :
 					case cElementType.name          :
 					{
-//						continue;
 						var nameRef = r.oper.toRef();
 						if ( nameRef instanceof cError ) continue;
 						switch ( nameRef.type ) {
 
 							case cElementType.cellsRange3D          :
 							{
-								if ( !r.oper.isSingleSheet() ) {
+								if ( !nameRef.isSingleSheet() ) {
 									continue;
 								}
 							}