Skip to content

S
sdkjs
Commit bf997f67 authored by Sergey.Tsarkov's avatar Sergey.Tsarkov Committed by Alexander.Trofimov
Browse files
Options

для совместного редактирования добавлены запись и чтение свойств формул 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56251 954022d7-b5bf-4e40-9824-e11837661b57
parent 4f67a32e
Hide whitespace changes
Inline Side-by-side
Showing with 597 additions and 6 deletions
Word/Math/accent.js
View file @ bf997f67
......@@ -1712,6 +1712,21 @@ CAccent.prototype.Write_ToBinary2 = function( Writer )
{
Writer.WriteLong( historyitem_type_acc );
Writer.WriteString2( this.elements[0][0].Id );
this.CtrPrp.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.chr )
{
Writer.WriteLong(this.chr);
Flags |= 1;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CAccent.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -1720,8 +1735,15 @@ CAccent.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][0] = Element;
if (Element.content.length == 0)
this.fillPlaceholders();
this.CtrPrp.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.chr = Reader.GetLong();
}
CAccent.prototype.Get_Id = function()
{
return this.Id;
}
Word/Math/borderBox.js
View file @ bf997f67
......@@ -318,6 +318,56 @@ CBorderBox.prototype.Write_ToBinary2 = function( Writer )
{
Writer.WriteLong( historyitem_type_borderBox );
Writer.WriteString2( this.elements[0][0].Id );
this.ctrlPr.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.hideBot )
{
Writer.WriteBool( this.hideBot );
Flags |= 1;
}
if ( undefined != this.hideLeft )
{
Writer.WriteBool( this.hideLeft );
Flags |= 2;
}
if ( undefined != this.hideRight )
{
Writer.WriteBool( this.hideRight );
Flags |= 4;
}
if ( undefined != this.hideTop )
{
Writer.WriteBool( this.hideTop );
Flags |= 8;
}
if ( undefined != this.strikeBLTR )
{
Writer.WriteBool( this.strikeBLTR );
Flags |= 16;
}
if ( undefined != this.strikeH )
{
Writer.WriteBool( this.strikeH );
Flags |= 32;
}
if ( undefined != this.strikeTLBR )
{
Writer.WriteBool( this.strikeTLBR );
Flags |= 64;
}
if ( undefined != this.strikeV )
{
Writer.WriteBool( this.strikeV );
Flags |= 128;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CBorderBox.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -326,6 +376,26 @@ CBorderBox.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][0] = Element;
if (Element.content.length == 0)
this.fillPlaceholders();
this.ctrlPr.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.hideBot = Reader.GetBool();
if ( Flags & 2 )
this.hideLeft = Reader.GetBool();
if ( Flags & 4 )
this.hideRight = Reader.GetBool();
if ( Flags & 8 )
this.hideTop = Reader.GetBool();
if ( Flags & 16 )
this.strikeBLTR = Reader.GetBool();
if ( Flags & 32 )
this.strikeH = Reader.GetBool();
if ( Flags & 64 )
this.strikeTLBR = Reader.GetBool();
if ( Flags & 128 )
this.strikeV = Reader.GetBool();
}
CBorderBox.prototype.Get_Id = function()
{
......@@ -407,6 +477,41 @@ CBox.prototype.Write_ToBinary2 = function( Writer )
{
Writer.WriteLong( historyitem_type_box );
Writer.WriteString2( this.elements[0][0].Id );
this.ctrlPr.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.aln )
{
Writer.WriteBool(this.aln);
Flags |= 1;
}
if ( undefined != this.brk )
{
Writer.WriteLong(this.brk);
Flags |= 2;
}
if ( undefined != this.diff )
{
Writer.WriteBool(this.diff);
Flags |= 4;
}
if ( undefined != this.noBreak )
{
Writer.WriteBool(this.noBreak);
Flags |= 8;
}
if ( undefined != this.opEmu )
{
Writer.WriteBool(this.opEmu);
Flags |= 16;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CBox.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -415,6 +520,20 @@ CBox.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][0] = Element;
if (Element.content.length == 0)
this.fillPlaceholders();
this.ctrlPr.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.aln = Reader.GetBool();
if ( Flags & 2 )
this.brk = Reader.GetLong();
if ( Flags & 4 )
this.diff = Reader.GetBool();
if ( Flags & 8 )
this.noBreak = Reader.GetBool();
if ( Flags & 16 )
this.opEmu = Reader.GetBool();
}
CBox.prototype.Get_Id = function()
{
......@@ -503,7 +622,23 @@ CBar.prototype.Refresh_RecalcData = function(Data)
CBar.prototype.Write_ToBinary2 = function( Writer )
{
Writer.WriteLong( historyitem_type_bar );
Writer.WriteString2( this.elements[0][0].Id );
Writer.WriteString2( this.elements[0][0].Id );
this.ctrlPr.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.pos )
{
Writer.WriteString2( this.pos );
Flags |= 1;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CBar.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -511,7 +646,13 @@ CBar.prototype.Read_FromBinary2 = function( Reader )
Element.Parent = this;
this.elements[0][0] = Element;
if (Element.content.length == 0)
this.fillPlaceholders();
this.fillPlaceholders();
this.ctrlPr.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.pos = Reader.GetString2();
}
CBar.prototype.Get_Id = function()
{
......@@ -560,6 +701,41 @@ CPhantom.prototype.Write_ToBinary2 = function( Writer )
{
Writer.WriteLong( historyitem_type_phant );
Writer.WriteString2( this.elements[0][0].Id );
this.ctrlPr.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.show )
{
Writer.WriteBool( this.show );
Flags |= 1;
}
if ( undefined != this.transp )
{
Writer.WriteBool( this.transp );
Flags |= 2;
}
if ( undefined != this.zeroAsc )
{
Writer.WriteBool( this.zeroAsc );
Flags |= 4;
}
if ( undefined != this.zeroDesc )
{
Writer.WriteBool( this.zeroDesc );
Flags |= 8;
}
if ( undefined != this.zeroWid )
{
Writer.WriteBool( this.zeroWid );
Flags |= 16;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CPhantom.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -568,6 +744,20 @@ CPhantom.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][0] = Element;
if (Element.content.length == 0)
this.fillPlaceholders();
this.ctrlPr.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.show = Reader.GetBool();
if ( Flags & 2 )
this.transp = Reader.GetBool();
if ( Flags & 4 )
this.zeroAsc = Reader.GetBool();
if ( Flags & 8 )
this.zeroDesc = Reader.GetBool();
if ( Flags & 16 )
this.zeroWid = Reader.GetBool();
}
CPhantom.prototype.Get_Id = function()
{
......
Word/Math/degree.js
View file @ bf997f67
......@@ -501,6 +501,10 @@ CDegree.prototype.Write_ToBinary2 = function( Writer )
Writer.WriteLong( historyitem_type_deg );
Writer.WriteString2( this.elements[0][0].Id );
Writer.WriteString2( this.elements[0][1].Id );
this.ctrlPr.Write_ToBinary(Writer);
Writer.WriteLong( this.type );
}
CDegree.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -515,6 +519,9 @@ CDegree.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][1] = Element1;
if (Element1.content.length == 0)
this.fillPlaceholders();
this.CtrPrp.Read_FromBinary(Reader);
this.type = Reader.GetLong();
}
CDegree.prototype.Get_Id = function()
{
......@@ -1192,6 +1199,24 @@ CDegreeSubSup.prototype.Write_ToBinary2 = function( Writer )
Writer.WriteLong( historyitem_type_deg_subsup );
Writer.WriteString2( this.elements[0][0].Id );
Writer.WriteString2( this.elements[0][1].Id );
this.ctrlPr.Write_ToBinary(Writer);
Writer.WriteLong( this.type );
if ( this.type == DEGREE_SubSup )
{
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.alnScr )
{
Writer.WriteBool( this.alnScr );
Flags |= 1;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
}
CDegreeSubSup.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -1206,6 +1231,15 @@ CDegreeSubSup.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][1] = Element1;
if (Element1.content.length == 0)
this.fillPlaceholders();
this.CtrPrp.Read_FromBinary(Reader);
this.type = Reader.GetLong();
if ( this.type == DEGREE_SubSup )
{
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.alnScr = Writer.GetBool();
}
}
CDegreeSubSup.prototype.Get_Id = function()
{
......
Word/Math/fraction.js
View file @ bf997f67
......@@ -437,6 +437,55 @@ CFraction.prototype.Write_ToBinary2 = function( Writer )
Writer.WriteString2( this.elements[0][0].elements[0][0].Id );
Writer.WriteString2( this.elements[1][0].elements[0][0].Id );
this.CtrPrp.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.baseJc )
{
Writer.WriteLong(this.baseJc);
Flags |= 1;
}
if ( undefined != this.cGp )
{
Writer.WriteLong(this.cGp);
Flags |= 2;
}
if ( undefined != this.cGpRule )
{
Writer.WriteLong(this.cGpRule);
Flags |= 4;
}
if ( undefined != this.cSp )
{
Writer.WriteLong(this.cSp);
Flags |= 8;
}
if ( undefined != this.mcs )
{
Writer.WriteLong(this.mcs);
Flags |= 16;
}
if ( undefined != this.plcHide )
{
Writer.WriteBool(this.plcHide);
Flags |= 32;
}
if ( undefined != this.rSp )
{
Writer.WriteLong(this.rSp);
Flags |= 64;
}
if ( undefined != this.rSpRule )
{
Writer.WriteLong(this.rSpRule);
Flags |= 128;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CFraction.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -450,7 +499,27 @@ CFraction.prototype.Read_FromBinary2 = function( Reader )
Element1.Parent = this.elements[1][0];
this.elements[1][0].elements[0][0] = Element1;
if (Element1.content.length == 0)
this.elements[1][0].fillPlaceholders()
this.elements[1][0].fillPlaceholders();
this.CtrPrp.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.baseJc = Reader.GetLong();
if ( Flags & 2 )
this.cGp = Reader.GetLong();
if ( Flags & 4 )
this.cGpRule = Reader.GetLong();
if ( Flags & 8 )
this.cSp = Reader.GetLong();
if ( Flags & 16 )
this.mcs = Reader.GetLong();
if ( Flags & 32 )
this.plcHide = Reader.GetBool()
if ( Flags & 64 )
this.rSp = Reader.GetLong();
if ( Flags & 128 )
this.rSpRule = Reader.GetLong();
}
CFraction.prototype.Get_Id = function()
{
......
Word/Math/limit.js
View file @ bf997f67
......@@ -81,9 +81,13 @@ CLimit.prototype.Refresh_RecalcData = function(Data)
{
}
CLimit.prototype.Write_ToBinary2 = function( Writer )
{ Writer.WriteLong( historyitem_type_lim );
{
Writer.WriteLong( historyitem_type_lim );
Writer.WriteString2( this.elements[0][0].Id );
Writer.WriteString2( this.elements[1][0].Id );
this.CtrPrp.Write_ToBinary(Writer);
Writer.WriteLong(this.type);
}
CLimit.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -98,6 +102,9 @@ CLimit.prototype.Read_FromBinary2 = function( Reader )
this.elements[1][0] = Element1;
if (Element1.content.length == 0)
this.fillPlaceholders();
this.CtrPrp.Read_FromBinary(Reader);
this.type = Reader.GetLong();
}
CLimit.prototype.Get_Id = function()
{
......@@ -151,6 +158,8 @@ CMathFunc.prototype.Write_ToBinary2 = function( Writer )
Writer.WriteLong( historyitem_type_mathFunc );
Writer.WriteString2( this.elements[0][0].Id );
Writer.WriteString2( this.elements[0][1].Id );
this.CtrPrp.Write_ToBinary(Writer);
}
CMathFunc.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -165,6 +174,8 @@ CMathFunc.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][1] = Element1;
if (Element1.content.length == 0)
this.fillPlaceholders();
this.CtrPrp.Read_FromBinary(Reader);
}
CMathFunc.prototype.Get_Id = function()
{
......
Word/Math/matrix.js
View file @ bf997f67
......@@ -521,6 +521,56 @@ CMathMatrix.prototype.Write_ToBinary2 = function( Writer )
for(var i=0; i<this.nRow; i++)
for(var j=0; j<this.nCol; j++)
Writer.WriteString2( this.elements[i][j].Id );
this.ctrlPr.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.baseJc )
{
Writer.WriteLong( this.baseJc );
Flags |= 1;
}
if ( undefined != this.cGp )
{
Writer.WriteLong( this.cGp );
Flags |= 2;
}
if ( undefined != this.cGpRule )
{
Writer.WriteLong( this.cGpRule );
Flags |= 4;
}
if ( undefined != this.cSp )
{
Writer.WriteLong( this.cSp );
Flags |= 8;
}
if ( undefined != this.mcs )
{
Writer.WriteLong( this.mcs );
Flags |= 16;
}
if ( undefined != this.plcHide )
{
Writer.WriteBool( this.plcHide );
Flags |= 32;
}
if ( undefined != this.rSp )
{
Writer.WriteLong( this.rSp );
Flags |= 64;
}
if ( undefined != this.rSpRule )
{
Writer.WriteLong( this.rSpRule );
Flags |= 128;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CMathMatrix.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -539,6 +589,26 @@ CMathMatrix.prototype.Read_FromBinary2 = function( Reader )
this.fillPlaceholders();
}
}
this.CtrPrp.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.baseJc = Reader.GetLong();
if ( Flags & 2 )
this.cGp = Reader.GetLong();
if ( Flags & 4 )
this.cGpRule = Reader.GetLong();
if ( Flags & 8 )
this.cSp = Reader.GetLong();
if ( Flags & 16 )
this.mcs = Reader.GetLong();
if ( Flags & 32 )
this.plcHide = Reader.GetBool();
if ( Flags & 64 )
this.rSp = Reader.GetLong();
if ( Flags & 128 )
this.rSpRule = Reader.GetLong()
}
CMathMatrix.prototype.Get_Id = function()
{
......@@ -647,6 +717,41 @@ CEqArray.prototype.Write_ToBinary2 = function( Writer )
Writer.WriteLong( row );
for(var i=0; i<row; i++)
Writer.WriteString2( this.elements[i][0].Id );
this.ctrlPr.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.baseJc )
{
Writer.WriteLong( this.baseJc );
Flags |= 1;
}
if ( undefined != this.maxDist )
{
Writer.WriteBool( this.maxDist );
Flags |= 2;
}
if ( undefined != this.objDist )
{
Writer.WriteBool( this.objDist );
Flags |= 4;
}
if ( undefined != this.rSp )
{
Writer.WriteLong( this.rSp );
Flags |= 8;
}
if ( undefined != this.rSpRule )
{
Writer.WriteLong( this.rSpRule );
Flags |= 16;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CEqArray.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -660,6 +765,20 @@ CEqArray.prototype.Read_FromBinary2 = function( Reader )
if (Element.content.length == 0)
this.fillPlaceholders();
}
this.ctrlPr.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.baseJc = Reader.GetLong();
if ( Flags & 2 )
this.maxDist = Reader.GetBool();
if ( Flags & 4 )
this.objDist = Reader.GetBool();
if ( Flags & 8 )
this.rSp = Reader.GetLong();
if ( Flags & 16 )
this.rSpRule = Reader.GetLong();
}
CEqArray.prototype.Get_Id = function()
{
......
Word/Math/nary.js
View file @ bf997f67
......@@ -272,6 +272,36 @@ CNary.prototype.Write_ToBinary2 = function( Writer )
Writer.WriteLong( historyitem_type_nary );
Writer.WriteString2( this.elements[0][0].Id );
Writer.WriteString2( this.elements[0][1].Id );
this.ctrlPr.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.chr )
{
Writer.WriteLong(this.chr);
Flags |= 1;
}
if ( undefined != this.limLoc )
{
Writer.WriteLong(this.limLoc);
Flags |= 2;
}
if ( undefined != this.subHide )
{
Writer.WriteBool(this.subHide);
Flags |= 4;
}
if ( undefined != this.supHide )
{
Writer.WriteBool(this.supHide);
Flags |= 8;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CNary.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -284,6 +314,18 @@ CNary.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][1] = Element1;
if (Element1.content.length == 0)
this.fillPlaceholders();
this.ctrlPr.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.chr = Reader.GetLong();
if ( Flags & 2 )
this.limLoc = Reader.GetLong();
if ( Flags & 4 )
this.subHide = Reader.GetBool();
if ( Flags & 8 )
this.supHide = Reader.GetBool();
}
CNary.prototype.Get_Id = function()
{
......
Word/Math/operators.js
View file @ bf997f67
......@@ -3850,6 +3850,41 @@ CDelimiter.prototype.Write_ToBinary2 = function( Writer )
{
Writer.WriteLong( historyitem_type_delimiter );
Writer.WriteString2( this.elements[0][0].Id );
this.ctrlPr.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.begChr )
{
Writer.WriteLong(this.begChr);
Flags |= 1;
}
if ( undefined != this.endChr )
{
Writer.WriteLong(this.endChr);
Flags |= 2;
}
if ( undefined != this.grow )
{
Writer.WriteLong(this.grow);
Flags |= 4;
}
if ( undefined != this.sepChr )
{
Writer.WriteLong(this.sepChr);
Flags |= 8;
}
if ( undefined != this.shp )
{
Writer.WriteLong(this.shp);
Flags |= 16;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CDelimiter.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -3858,6 +3893,20 @@ CDelimiter.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][0] = Element;
if (Element.content.length == 0)
this.fillPlaceholders();
this.ctrlPr.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.begChr = Reader.GetLong();
if ( Flags & 2 )
this.endChr = Reader.GetLong();
if ( Flags & 4 )
this.grow = Reader.GetBool();
if ( Flags & 8 )
this.sepChr = Reader.GetLong();
if ( Flags & 16 )
this.shp = Reader.GetLong();
}
CDelimiter.prototype.Get_Id = function()
{
......@@ -4268,6 +4317,31 @@ CGroupCharacter.prototype.Write_ToBinary2 = function( Writer )
{
Writer.WriteLong( historyitem_type_groupChr );
Writer.WriteString2( this.elements[0][0].Id );
this.CtrPrp.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.chr )
{
Writer.WriteLong(this.chr);
Flags |= 1;
}
if ( undefined != this.pos )
{
Writer.WriteLong(this.pos);
Flags |= 2;
}
if ( undefined != this.vertJc )
{
Writer.WriteLong(this.vertJc);
Flags |= 4;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CGroupCharacter.prototype.Read_FromBinary2 = function( Reader )
{
......@@ -4276,6 +4350,16 @@ CGroupCharacter.prototype.Read_FromBinary2 = function( Reader )
this.elements[0][0] = Element;
if (Element.content.length == 0)
this.fillPlaceholders();
this.CtrPrp.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.chr = Reader.GetLong();
if ( Flags & 2 )
this.pos = Reader.GetLong();
if ( Flags & 4 )
this.vertJc = Reader.GetLong();
}
CGroupCharacter.prototype.Get_Id = function()
{
......
Word/Math/radical.js
View file @ bf997f67
......@@ -1239,11 +1239,25 @@ CRadical.prototype.Write_ToBinary2 = function( Writer )
Writer.WriteLong( len );
for(var i=0; i<len; i++)
Writer.WriteString2( this.elements[0][i].Id );
this.ctrlPr.Write_ToBinary(Writer);
var StartPos = Writer.GetCurPosition();
Writer.Skip(4);
var Flags = 0;
if ( undefined != this.degHide )
{
Writer.WriteBool( this.degHide )
Flags |= 1;
}
var EndPos = Writer.GetCurPosition();
Writer.Seek( StartPos );
Writer.WriteLong( Flags );
Writer.Seek( EndPos );
}
CRadical.prototype.Read_FromBinary2 = function( Reader )
{
var len = Reader.GetLong();
var len = Reader.GetLong();
for (var i=0; i<len; i++)
{
var Element = g_oTableId.Get_ById( Reader.GetString2() );
......@@ -1252,6 +1266,12 @@ CRadical.prototype.Read_FromBinary2 = function( Reader )
if (Element.content.length == 0)
this.fillPlaceholders();
}
this.CtrPrp.Read_FromBinary(Reader);
var Flags = Reader.GetLong();
if ( Flags & 1 )
this.degHide = Reader.GetBool();
}
CRadical.prototype.Get_Id = function()
{
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7