баг на удалении формулы

мелкие правки

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

Word/Editor/Math.js

@@ -349,19 +349,17 @@ ParaMath.prototype =
         var start = oContent.Start,
             end   = oContent.End,
             oMathContent = oContent.Content;
+		var len = end - start + 1;
 
         History.Create_NewPoint();		
         History.Create_NewPoint();
-		var oStartContent = oContent.Content.content[oContent.Start];
-		var oEndContent = oContent.Content.content[oContent.End];		
+		var oStartContent = oContent.Content.content[start];
+		var oEndContent = oContent.Content.content[end];
 		var Items = [];
-		for (var i=oContent.Start; i<=oContent.End; i++)
-		{
+		for (var i=start; i<=end; i++)
 			Items.push(oContent.Content.content[i]);
-			oContent.Content.content.splice( i, 1 );
-			if (Direction < 0)
-				oContent.Content.CurPos--;
-		}
+
+		oContent.Content.content.splice( oContent.Start, len );
 		History.Add(oContent.Content, {Type: historyitem_Math_RemoveItem, Items:Items, Pos: oContent.Start});
 		return;
     },

Word/Editor/Serialize2.js

@@ -8328,7 +8328,7 @@ function Binary_oMathReader(stream)
         {
 			var oMatrix = {};
 			var arrContent = [];
-			props.mc = [];
+			props.mcs = [];
             res = this.bcr.Read1(length, function(t, l){				
                 return oThis.ReadMathMatrix(t,l,props,oElem,oMatrix,arrContent);
             });			
@@ -9331,7 +9331,7 @@ function Binary_oMathReader(stream)
 			for(var i=0; i<props.row; i++)
 			{
 				arrContent[i] = [];
-				for(var j=0; j<props.mc[i].count; j++)
+				for(var j=0; j<props.mcs[i].count; j++)
 					arrContent[i][j] = oMatrix.getElement(i,j);
 			}
         }
@@ -9411,7 +9411,7 @@ function Binary_oMathReader(stream)
 			res = this.bcr.Read1(length, function(t, l){
                 return oThis.ReadMathMc(t,l,mc);
             });	
-			props.mc.push(mc);
+			props.mcs.push(mc);
         }
         else
             res = c_oSerConstants.ReadUnknown;

Word/Math/accent.js

@@ -1260,7 +1260,7 @@ CAccent.prototype.Write_ToBinary2 = function( Writer )
     var Flags = 0;
 	if ( undefined != this.Pr.chr )
     {
-		Writer.WriteString2(this.Pr.chr);	
+		Writer.WriteLong(this.Pr.chr);	
 		Flags |= 1;
 	}
 	var EndPos = Writer.GetCurPosition();
@@ -1279,7 +1279,7 @@ CAccent.prototype.Read_FromBinary2 = function( Reader )
 	
 	var Flags = Reader.GetLong();
 	if ( Flags & 1 )
-		props.chr = Reader.GetString2();	
+		props.chr = Reader.GetLong();	
 		
 	this.fillMathComposition (props, arrElems);
 }
\ No newline at end of file

Word/Math/operators.js

@@ -3948,9 +3948,9 @@ CDelimiter.prototype.Refresh_RecalcData = function(Data)
 CDelimiter.prototype.Write_ToBinary2 = function( Writer )
 {
 	Writer.WriteLong( historyitem_type_delimiter );
-	Writer.WriteLong(this.column);	
+	Writer.WriteLong(this.Pr.column);	
 	
-	for (var i=0; i<this.column; i++)
+	for (var i=0; i<this.Pr.column; i++)
 		Writer.WriteString2( this.getBase(i).Id );
 	
 	this.CtrPrp.Write_ToBinary(Writer);