вставка контента в формулу

правка багов на чтение

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

Word/Editor/Math.js

@@ -90,25 +90,52 @@ ParaMath.prototype =
     Add : function(Item)
     {
 		var Type = Item.Type;
-		var oPos = this.GetSelectContent();
+		var oContent = this.GetSelectContent();
+		var oStartContent = oContent.Content.content[oContent.Start];
+		var oEndContent = oContent.Content.content[oContent.End];
 
 		if ( para_Text === Type)
 		{
 			var oText = new CMathText();
 			oText.addTxt(Item.Value);
-			oPos.Content.content[oPos.Start].Add(oText);
+			oStartContent.Add(oText);
 		}
 		else if ( para_Space === Type )
 		{
-			var oSpace = new ParaSpace(1);
-			oPos.Content.content[oPos.Start].Add(oSpace);
+			//var oSpace = new ParaSpace(1);
+			var oText = new CMathText();
+			oText.addTxt(" ");
+			oStartContent.Add(oText);
 		}
-		else if ( para_Math === Type )
+		/*else if ( para_Math === Type )
 		{
-			var rPr = this.Math.GetCurrentRunPrp();
-			Item.Math.Root.setRPrp(rPr);
-			this.Math.AddToComposition(Item.Math.Root);
-		}
+			nPosStart = oStartContent.State.ContentPos;
+			nLenStart = oStartContent.Content.length;
+			nPosEnd = oEndContent.State.ContentPos;
+			
+			History.Create_NewPoint();
+			
+			var oMRun = new ParaRun(null, true);
+			oMRun.Pr = oStartContent.Pr;
+			for (i=nPosStart; i<nLenStart; i++)
+			{
+				var Pos = oMRun.Content.length;
+				var EndPos = Pos + 1;
+				var oItem = oStartContent.Content[i];
+				History.Add( oMRun, { Type : historyitem_ParaRun_AddItem, Pos : Pos, EndPos : EndPos, Items : [ oItem ] } );
+				oMRun.Content.push(Item);
+				oStartContent.Remove_FromContent(i, 1, false);
+			}
+			
+			//Item.Math.AddToComposition(Item.Math.Root);
+			var oNewContent = Item.Math.Root.content;
+			for(var i = 0; i < oNewContent.length; i++)
+				oContent.Content.content.push(oNewContent[i]);
+
+			oContent.Content.content.push(oMRun);
+
+			oContent.Content.SetRunEmptyToContent(false);
+		}*/
 	},
 
     AddText : function(oElem, sText, props)

Word/Editor/Serialize2.js

@@ -8896,7 +8896,7 @@ function Binary_oMathReader(stream)
         }
 		else if (c_oSer_OMathBottomNodesValType.AlnAt === type)
         {
-			props.alnAt = this.stream.GetBool(length);
+			props.alnAt = this.stream.GetULongLE();
         }
 		else
             res = c_oSerConstants.ReadUnknown;
@@ -10187,18 +10187,17 @@ function Binary_oMathReader(stream)
 			var str = "";
 			for (var i = 0; i < text.length; ++i)
             {
-                if (text[i] != ' ')
+				//управляющие символы 
+				if (0x001F < text[i].charCodeAt(0))
 				{
-					//управляющие символы 
-					if (0x001F < text[i].charCodeAt(0))
-					{
-						var oText = new CMathText();
-						oText.addTxt(text[i]);
-						oMRun.Content.splice( i, 0, oText );						
-					}
+					var oText = new CMathText();
+					oText.addTxt(text[i]);
+					oMRun.Content.splice( i, 0, oText );						
 				}
+				/*в будущем переделка под para_space
 				else if (text[i] == ' ')
-					oMRun.Content.splice(oMRun.Content.length, 0, new ParaSpace(1));
+					oMRun.Content.splice(oMRun.Content.length, 0, new ParaSpace(1));				
+				*/				
             }
 			oParent.addElementToContent(oMRun);
         }
@@ -10505,6 +10504,7 @@ function Binary_oMathReader(stream)
             res = this.bcr.Read1(length, function(t, l){
                 return oThis.ReadMathArg(t,l,oOMathPara.Root);
             });
+			oOMathPara.Root.SetRunEmptyToContent(true);
         }
 		else if (c_oSer_OMathContentType.OMathParaPr === type)
 		{
@@ -10748,7 +10748,7 @@ function Binary_oMathReader(stream)
             res = c_oSerConstants.ReadUnknown;
         return res;
     };
-	this.ReadMathRad = function(type, length, oRad, props, oParent)
+	this.ReadMathRadCollaborative = function(type, length, oRad, props, oParent)
     {
         var res = c_oSerConstants.ReadOk;
         var oThis = this;