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

Переделана структура для записи контентов у радикала

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56795 954022d7-b5bf-4e40-9824-e11837661b57
parent 54a4d1f1
......@@ -35,7 +35,7 @@ function CMathBase()
// убрать !!!
this.bMObjs = false;
this.elements = null;
this.elements = new Array();
this.dW = 0; //column gap, gap width
this.dH = 0; //row gap, gap height
......@@ -62,8 +62,6 @@ CMathBase.prototype =
constructor: CMathBase,
setContent: function()
{
this.elements = [];
for(var i=0; i < this.nRow; i++)
{
this.elements[i] = [];
......@@ -93,7 +91,11 @@ CMathBase.prototype =
this.alignment.wdt[i] = MCJC_CENTER;
for(var j=0; j < this.nRow; j++)
{
this.elements[j] = new Array();
this.alignment.hgt[j] = MCJC_CENTER;
}
},
///////// RunPrp, CtrPrp
setCtrPrp: function(txtPrp) // выставляем ctrPrp на чтение
......@@ -1185,8 +1187,7 @@ CMathBase.prototype =
bUpperLevel = true;
break;
}
} while( this.elements[this.CurPos_X][this.CurPos_Y].IsJustDraw() )
;
} while( this.elements[this.CurPos_X][this.CurPos_Y].IsJustDraw() );
var SelectContent;
if( bUpperLevel )
......@@ -1261,6 +1262,10 @@ CMathBase.prototype =
// Word
// в случае, если в xml отсутствуют элементы в контенте, то выставляются плейсхолдеры
/*if(this.Parent.constructor.name == "CRadical")
console.log("X : " + disp.pos.x + ", " + " Y : " + disp.pos.y);*/
var pos = disp.pos;
SearchPos.Pos.Update(pos.x, Depth);
......
......@@ -853,7 +853,7 @@ function CMathContent()
{
width: 0,
height: 0,
center: 0
ascent: 0
};
......
This diff is collapsed.
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