add asc_CRect (замена asc_CCellRect)

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

Common/apiCommon.js

@@ -777,6 +777,30 @@
 
 
     window["asc_CatAxisSettings"] = asc_CatAxisSettings;
+
+	/** @constructor */
+	function asc_CRect (x, y, width, height) {
+		// private members
+		this._x = x;
+		this._y = y;
+		this._width = width;
+		this._height = height;
+	}
+
+	asc_CRect.prototype = {
+		asc_getX:		function () { return this._x; },
+		asc_getY:		function () { return this._y; },
+		asc_getWidth:	function () { return this._width; },
+		asc_getHeight:	function () { return this._height; }
+	};
+
+	window["Asc"].asc_CRect = asc_CRect;
+	prot = asc_CRect.prototype;
+
+	prot["asc_getX"]			= prot.asc_getX;
+	prot["asc_getY"]			= prot.asc_getY;
+	prot["asc_getWidth"]		= prot.asc_getWidth;
+	prot["asc_getHeight"]		= prot.asc_getHeight;
 }
 )(window);
 

Excel/model/CellInfo.js

@@ -203,30 +203,5 @@
 		prot["asc_getStyleName"]		= prot.asc_getStyleName;
 		prot["asc_getNumFormatType"]	= prot.asc_getNumFormatType;
 		prot["asc_getAngle"]			= prot.asc_getAngle;
-
-		// Класс точки
-		function asc_CCellRect (x, y, width, height) {
-			// private members
-			this._x = x;
-			this._y = y;
-			this._width = width;
-			this._height = height;
-		}
-
-		asc_CCellRect.prototype = {
-			asc_getX:		function () { return this._x; },
-			asc_getY:		function () { return this._y; },
-			asc_getWidth:	function () { return this._width; },
-			asc_getHeight:	function () { return this._height; }
-		};
-
-		window["Asc"].asc_CCellRect = asc_CCellRect;
-		prot = asc_CCellRect.prototype;
-
-		prot["asc_getX"]			= prot.asc_getX;
-		prot["asc_getY"]			= prot.asc_getY;
-		prot["asc_getWidth"]		= prot.asc_getWidth;
-		prot["asc_getHeight"]		= prot.asc_getHeight;
-
 	}
 )(window);
\ No newline at end of file

Excel/view/WorksheetView.js

@@ -37,7 +37,7 @@
 		var asc_CFont			= asc.asc_CFont;
 		var asc_CFill			= asc.asc_CFill;
 		var asc_CCellInfo		= asc.asc_CCellInfo;
-		var asc_CCellRect		= asc.asc_CCellRect;
+		var asc_CRect			= asc.asc_CRect;
 		var asc_CHyperlink		= asc.asc_CHyperlink;
 		var asc_CPageOptions	= asc.asc_CPageOptions;
 		var asc_CPageSetup		= asc.asc_CPageSetup;
@@ -6354,7 +6354,7 @@
 			yL *= asc_getcvt( 1/*pt*/, 0/*px*/, this._getPPIY() );
 			var width = this.getColumnWidth (this.activeRange.startCol, /*px*/0);
 			var height = this.getRowHeight(this.activeRange.startRow, /*px*/0);
-			return new asc_CCellRect (xL, yL, width, height);
+			return new asc_CRect (xL, yL, width, height);
 		};
 
 		WorksheetView.prototype._checkSelectionShape = function () {