memory: из класса Row убрано дублирующее поле r

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

Excel/model/Serialize.js

@@ -2912,11 +2912,11 @@
         this.WriteRow = function(oRow)
         {
             var oThis = this;
-            if(null != oRow.r)
+            if(null != oRow.index)
             {
                 this.memory.WriteByte(c_oSerRowTypes.Row);
                 this.memory.WriteByte(c_oSerPropLenType.Long);
-                this.memory.WriteLong(oRow.r);
+                this.memory.WriteLong(oRow.index + 1);
             }
             if(null != oRow.xfs)
             {
@@ -5599,8 +5599,8 @@
                 res = this.bcr.Read2Spreadsheet(length, function(t,l){
                     return oThis.ReadRow(t,l, oNewRow, ws);
                 });
-                if(null != oNewRow.r)
-                    ws.aGCells[oNewRow.r - 1] = oNewRow;
+                if(null != oNewRow.index)
+                    ws.aGCells[oNewRow.index] = oNewRow;
             }
             else
                 res = c_oSerConstants.ReadUnknown;
@@ -5612,10 +5612,9 @@
             var oThis = this;
             if ( c_oSerRowTypes.Row == type )
             {
-                oRow.r = this.stream.GetULongLE();
-                oRow.index = oRow.r - 1;
-                if(oRow.r > ws.nRowsCount)
-                    ws.nRowsCount = oRow.r;
+                oRow.index = this.stream.GetULongLE() - 1;
+                if(oRow.index + 1 > ws.nRowsCount)
+                    ws.nRowsCount = oRow.index + 1;
             }
             else if ( c_oSerRowTypes.Style == type )
             {

Excel/model/WorkbookElems.js

@@ -2405,7 +2405,6 @@ function Row(worksheet)
 	this.sm = this.ws.workbook.oStyleManager;
 	this.cs = this.ws.workbook.CellStyles;
 	this.c = {};
-    this.r = null;
 	this.index = null;
     this.xfs = null;
     this.h = null;
@@ -2420,12 +2419,11 @@ Row.prototype =
 	create : function(row)
 	{
 		this.index = row - 1;
-		this.r = row;
 		this.xfs = null;
 	},
 	moveVer : function(nDif)
 	{
-		this.r += nDif;
+		this.index += nDif;
 	},
 	isEmpty : function()
 	{
@@ -2454,7 +2452,7 @@ Row.prototype =
         if(!oNewWs)
             oNewWs = this.ws;
         var oNewRow = new Row(oNewWs);
-		oNewRow.r = this.r;
+		oNewRow.index = this.index;
 		if(null != this.xfs)
 			oNewRow.xfs = this.xfs.clone();
 		if(null != this.h)