Commit ed213142 authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

1. Убрала fillContent для limit

2. SetRunEmpty(false) в Serialize2

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57442 954022d7-b5bf-4e40-9824-e11837661b57
parent a42eee17
...@@ -857,14 +857,12 @@ ParaMath.prototype = ...@@ -857,14 +857,12 @@ ParaMath.prototype =
//var StartPos = this.Lines[CurLine].Ranges[CurRange].StartPos; //var StartPos = this.Lines[CurLine].Ranges[CurRange].StartPos;
var EndPos = this.Lines[CurLine].Ranges[CurRange].EndPos; var EndPos = this.Lines[CurLine].Ranges[CurRange].EndPos;
if(this.Id == "81") /*if(this.Id == "81")
{ {
console.log("CurLine " + _CurLine +" CurRange " + _CurRange ); console.log("CurLine " + _CurLine +" CurRange " + _CurRange );
console.log("StartLine " + this.StartLine + " StartRange " + this.StartRange); console.log("StartLine " + this.StartLine + " StartRange " + this.StartRange);
console.log("Current CurLine "+ CurLine + " Current CurRange " + CurRange); console.log("Current CurLine "+ CurLine + " Current CurRange " + CurRange);
} }*/
var result = {X: _X + this.Root.size.width}; var result = {X: _X + this.Root.size.width};
......
...@@ -8420,7 +8420,7 @@ function Binary_oMathReader(stream) ...@@ -8420,7 +8420,7 @@ function Binary_oMathReader(stream)
res = c_oSerConstants.ReadUnknown; res = c_oSerConstants.ReadUnknown;
if (oElem && bLast) if (oElem && bLast)
oElem.SetRunEmptyToContent(true); oElem.SetRunEmptyToContent(false);
return res; return res;
}; };
......
...@@ -24,8 +24,9 @@ function CLimit(props) ...@@ -24,8 +24,9 @@ function CLimit(props)
extend(CLimit, CMathBase); extend(CLimit, CMathBase);
CLimit.prototype.init = function(props) CLimit.prototype.init = function(props)
{ {
// посмотреть GetAllFonts
this.setProperties(props); this.setProperties(props);
this.fillContent(); //this.fillContent();
} }
CLimit.prototype.getAscent = function() CLimit.prototype.getAscent = function()
{ {
...@@ -72,7 +73,7 @@ CLimit.prototype.fillContent = function() ...@@ -72,7 +73,7 @@ CLimit.prototype.fillContent = function()
{ {
this.setDimension(2, 1); this.setDimension(2, 1);
var oBase = new CMathContent(); /*var oBase = new CMathContent();
var oIter = new CMathContent(); var oIter = new CMathContent();
//oIter.decreaseArgSize(); //oIter.decreaseArgSize();
...@@ -80,7 +81,7 @@ CLimit.prototype.fillContent = function() ...@@ -80,7 +81,7 @@ CLimit.prototype.fillContent = function()
if(this.Pr.type == LIMIT_LOW) if(this.Pr.type == LIMIT_LOW)
this.addMCToContent([oBase, oIter]); this.addMCToContent([oBase, oIter]);
else if(this.Pr.type == LIMIT_UP) else if(this.Pr.type == LIMIT_UP)
this.addMCToContent([oIter, oBase]); this.addMCToContent([oIter, oBase]);*/
} }
CLimit.prototype.fillMathComposition = function(props, contents /*array*/) CLimit.prototype.fillMathComposition = function(props, contents /*array*/)
{ {
...@@ -112,6 +113,8 @@ CLimit.prototype.Resize = function(oMeasure, Parent, ParaMath, RPI, ArgSize) ...@@ -112,6 +113,8 @@ CLimit.prototype.Resize = function(oMeasure, Parent, ParaMath, RPI, ArgSize)
if(this.RecalcInfo.bProps == true) if(this.RecalcInfo.bProps == true)
{ {
this.setDimension(2, 1);
if(this.Pr.type == LIMIT_LOW) if(this.Pr.type == LIMIT_LOW)
{ {
this.elements[0][0] = this.FName; this.elements[0][0] = this.FName;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment