Commit 06e12cdf authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51670 954022d7-b5bf-4e40-9824-e11837661b57
parent 82b3d55e
......@@ -1234,9 +1234,9 @@ CChartTitle.prototype =
this.layout.writeToBinary(w);
w.WriteBool(this.overlay);
this.spPr.Write_ToBinary2(w);
w.WriteBool(isRealObject(this.txPr));
if(isRealObject(this.txPr))
this.txPr.writeToBinary(w);
//w.WriteBool(isRealObject(this.txPr));
//if(isRealObject(this.txPr))
// this.txPr.writeToBinary(w);
w.WriteBool(isRealObject(this.txBody));
if(isRealObject(this.txBody))
......@@ -1252,11 +1252,11 @@ CChartTitle.prototype =
}
this.setOverlay(r.GetBool());
this.spPr.Read_FromBinary2(r);
if(r.GetBool())
{
this.txPr = new CTextBody(this);
this.txPr.readFromBinary(r);
}
//if(r.GetBool())
//{
// this.txPr = new CTextBody(this);
// this.txPr.readFromBinary(r);
//}
if(r.GetBool())
{
......
......@@ -1201,6 +1201,7 @@ CUniColor.prototype =
Read_FromBinary2 : function(Reader)
{
var flag = Reader.GetBool();
if(flag)
{
......@@ -1902,14 +1903,14 @@ CSolidFill.prototype =
Write_ToBinary2 : function(Writer)
{
Writer.WriteLong(this.type);
Writer.WriteBool(typeof this.color === "object" && this.color !== null)
//Writer.WriteBool(typeof this.color === "object" && this.color !== null)
if(typeof this.color === "object" && this.color !== null)
this.color.Write_ToBinary2(Writer);
},
Read_FromBinary2 : function(Reader)
{
if(Reader.GetBool())
//if(Reader.GetBool())
{
this.setColor(new CUniColor());
this.color.Read_FromBinary2(Reader);
......
......@@ -1008,9 +1008,9 @@ CChartTitle.prototype =
w.WriteBool(this.overlay);
this.spPr.Write_ToBinary2(w);
w.WriteBool(isRealObject(this.txPr));
if(isRealObject(this.txPr))
this.txPr.writeToBinary(w);
// w.WriteBool(isRealObject(this.txPr));
// if(isRealObject(this.txPr))
// this.txPr.writeToBinary(w);
w.WriteBool(isRealObject(this.txBody));
if(isRealObject(this.txBody))
......@@ -1027,11 +1027,11 @@ CChartTitle.prototype =
}
this.overlay = r.GetBool();
this.spPr.Read_FromBinary2(r);
if(r.GetBool())
{
this.txPr = new CTextBody(this);
this.txPr.readFromBinary(r);
}
// if(r.GetBool())
// {
// this.txPr = new CTextBody(this);
// this.txPr.readFromBinary(r);
// }
if(r.GetBool())
{
......
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