Commit 92a6f89d authored by Sergey.Luzyanin's avatar Sergey.Luzyanin

Bug 25018 - Не подгружаются значения Margins в меню Shape Advanced Settings

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56987 954022d7-b5bf-4e40-9824-e11837661b57
parent 7cb69814
...@@ -888,8 +888,17 @@ CShape.prototype = ...@@ -888,8 +888,17 @@ CShape.prototype =
getPaddings: function () { getPaddings: function () {
var paddings = null; var paddings = null;
var shape = this; var shape = this;
if (shape.txBody) { var body_pr;
var body_pr = shape.txBody.bodyPr; if (shape.txBody)
{
body_pr = shape.txBody.bodyPr;
}
else if(shape.textBoxContent)
{
body_pr = shape.bodyPr;
}
if(body_pr)
{
paddings = new CPaddings(); paddings = new CPaddings();
if (typeof body_pr.lIns === "number") if (typeof body_pr.lIns === "number")
paddings.Left = body_pr.lIns; paddings.Left = body_pr.lIns;
...@@ -1875,7 +1884,7 @@ CShape.prototype = ...@@ -1875,7 +1884,7 @@ CShape.prototype =
} }
if(this.txBody) if(this.txBody)
{ {
copy.setTxBody(this.txBody.createDublicate()); copy.setTxBody(this.txBody.createDuplicate());
copy.txBody.setParent(copy); copy.txBody.setParent(copy);
} }
if(this.bodyPr) if(this.bodyPr)
......
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