Commit 8c257fe3 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@50901 954022d7-b5bf-4e40-9824-e11837661b57
parent ceb82389
......@@ -1523,7 +1523,7 @@ CBlipFill.prototype =
Writer.WriteBool(flag);
if(flag)
{
var string_to_write = getFullImageSrc(this.RasterImageId);
var string_to_write = window["Asc"]["editor"].documentOrigin + getFullImageSrc(this.RasterImageId);
/*if(string_to_write.indexOf(documentOrigin) !== 0
&& string_to_write.indexOf("http:") !== 0
&& string_to_write.indexOf("https:") !== 0
......@@ -1550,6 +1550,17 @@ CBlipFill.prototype =
}
Writer.WriteBool(this.rotWithShape);
var w = Writer;
var bool = isRealObject(this.srcRect) && isRealNumber(this.srcRect.l) && isRealNumber(this.srcRect.t)
&& isRealNumber(this.srcRect.r) && isRealNumber(this.srcRect.b);
w.WriteBool(bool);
if(bool)
{
w.WriteDouble(this.srcRect.l);
w.WriteDouble(this.srcRect.t);
w.WriteDouble(this.srcRect.r);
w.WriteDouble(this.srcRect.b);
}
},
Read_FromBinary2 : function(Reader)
......@@ -1582,6 +1593,14 @@ CBlipFill.prototype =
}
this.rotWithShape = Reader.GetBool();
if(Reader.GetBool())
{
this.srcRect = new CSrcRect();
this.srcRect.l = Reader.GetDouble();
this.srcRect.t = Reader.GetDouble();
this.srcRect.r = Reader.GetDouble();
this.srcRect.b = Reader.GetDouble();
}
},
createDuplicate : 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