Commit 90aed9c9 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

правка бага 20747 - Не изменяется автофигура slide (sub)title при смене автофигуры

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50785 954022d7-b5bf-4e40-9824-e11837661b57
parent 03b54d83
...@@ -3544,7 +3544,23 @@ CShape.prototype = ...@@ -3544,7 +3544,23 @@ CShape.prototype =
this.spPr.geometry = null; this.spPr.geometry = null;
} }
var new_geometry = isRealObject(this.spPr.geometry) ? this.spPr.geometry : null; var new_geometry = isRealObject(this.spPr.geometry) ? this.spPr.geometry : null;
this.setLine(_new_line); if((!this.brush || !this.brush.fill) && (!this.pen || !this.pen.Fill || !this.pen.Fill.fill))
{
var new_line2 = new CLn();
new_line2.Fill = new CUniFill();
new_line2.Fill.fill = new CSolidFill();
new_line2.Fill.fill.color = new CUniColor();
new_line2.Fill.fill.color.color = new CSchemeColor();
new_line2.Fill.fill.color.color.id = 0;
if(isRealObject(_new_line))
{
new_line2.merge(_new_line);
}
this.setLine(new_line2);
}
else
this.setLine(_new_line);
History.Add(this, {Type: historyitem_SetShapeSetGeometry, oldGeometry: old_geometry, newGeometry: new_geometry}); History.Add(this, {Type: historyitem_SetShapeSetGeometry, oldGeometry: old_geometry, newGeometry: new_geometry});
this.recalcInfo.recalculateGeometry = true; this.recalcInfo.recalculateGeometry = true;
editor.WordControl.m_oLogicDocument.recalcMap[this.Id] = this; editor.WordControl.m_oLogicDocument.recalcMap[this.Id] = this;
......
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