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

Переделала запсиь/чтение в бинарник св-ва alnAt в break (в Run)

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64163 954022d7-b5bf-4e40-9824-e11837661b57
parent a479b2a2
...@@ -7901,7 +7901,7 @@ ParaRun.prototype.Save_Changes = function(Data, Writer) ...@@ -7901,7 +7901,7 @@ ParaRun.prototype.Save_Changes = function(Data, Writer)
} }
if ( undefined != this.MathPrp.brk ) if ( undefined != this.MathPrp.brk )
{ {
Writer.WriteBool( this.MathPrp.brk ); this.MathPrp.brk.Write_ToBinary(Writer);
Flags |= 2; Flags |= 2;
} }
if ( undefined != this.MathPrp.lit ) if ( undefined != this.MathPrp.lit )
...@@ -8547,8 +8547,13 @@ ParaRun.prototype.Load_Changes = function(Reader, Reader2, Color) ...@@ -8547,8 +8547,13 @@ ParaRun.prototype.Load_Changes = function(Reader, Reader2, Color)
var Flags = Reader.GetLong(); var Flags = Reader.GetLong();
if ( Flags & 1 ) if ( Flags & 1 )
this.MathPrp.aln = Reader.GetBool(); this.MathPrp.aln = Reader.GetBool();
if ( Flags & 2 ) if ( Flags & 2 )
this.MathPrp.brk = Reader.GetBool(); {
this.MathPrp.brk = new CMathBreak();
this.MathPrp.brk.Read_FromBinary(Reader);
}
if ( Flags & 4 ) if ( Flags & 4 )
this.MathPrp.lit = Reader.GetBool(); this.MathPrp.lit = Reader.GetBool();
if ( Flags & 8 ) if ( Flags & 8 )
...@@ -9075,24 +9080,6 @@ ParaRun.prototype.Math_SetPosition = function(pos, PosInfo) ...@@ -9075,24 +9080,6 @@ ParaRun.prototype.Math_SetPosition = function(pos, PosInfo)
// Get_WidthVisible - Width + Gaps с учетом настроек состояния // Get_WidthVisible - Width + Gaps с учетом настроек состояния
} }
}; };
ParaRun.prototype.Math_GetWidth = function(_CurLine, _CurRange)
{
var CurLine = _CurLine - this.StartLine;
var CurRange = ( 0 === CurLine ? _CurRange - this.StartRange : _CurRange );
var StartPos = this.protected_GetRangeStartPos(CurLine, CurRange);
var EndPos = this.protected_GetRangeEndPos(CurLine, CurRange);
var W = 0;
for(var i = StartPos; i < EndPos; i++)
{
W += this.Content[i].Get_WidthVisible(); // Get_Width => Get_WidthVisible
// Get_WidthVisible - Width + Gaps с учетом настроек состояния
}
return W;
};
ParaRun.prototype.Math_Get_StartRangePos = function(_CurLine, _CurRange, SearchPos, Depth, bStartLine) ParaRun.prototype.Math_Get_StartRangePos = function(_CurLine, _CurRange, SearchPos, Depth, bStartLine)
{ {
var CurLine = _CurLine - this.StartLine; var CurLine = _CurLine - this.StartLine;
......
...@@ -28,7 +28,7 @@ CMathBreak.prototype.Write_ToBinary = function(Writer) ...@@ -28,7 +28,7 @@ CMathBreak.prototype.Write_ToBinary = function(Writer)
if(this.alnAt !== undefined) if(this.alnAt !== undefined)
{ {
Writer.WriteBool(false); Writer.WriteBool(false);
Writer.WriteLong(this.alnAt); Writer.WriteByte(this.alnAt);
} }
else else
{ {
...@@ -39,7 +39,7 @@ CMathBreak.prototype.Read_FromBinary = function(Reader) ...@@ -39,7 +39,7 @@ CMathBreak.prototype.Read_FromBinary = function(Reader)
{ {
if(Reader.GetBool() == false) if(Reader.GetBool() == false)
{ {
this.alnAt = Reader.GetLong(); this.alnAt = Reader.GetByte();
} }
else else
{ {
......
...@@ -486,8 +486,6 @@ CRadical.prototype.ApplyProperties = function(RPI) ...@@ -486,8 +486,6 @@ CRadical.prototype.ApplyProperties = function(RPI)
this.elements[0][0] = this.Iterator; this.elements[0][0] = this.Iterator;
this.elements[0][1] = this.Base; this.elements[0][1] = this.Base;
//this.Iterator.setArgSize(-2);
this.RealBase = this.Base; this.RealBase = this.Base;
} }
......
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