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

Bug 24868 - При быстром закрытии и повторном открытии окна фрейма, в нем присутствуют 2 диаграммы

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56812 954022d7-b5bf-4e40-9824-e11837661b57
parent 913c974e
......@@ -4126,6 +4126,7 @@ function DrawingObjects() {
else if ( isObject(chart) && chart["binary"] )
{
History.TurnOff();
aObjects.length = 0;
var listRange = new Range(worksheet.model, 0, 0, worksheet.nRowsCount - 1, worksheet.nColsCount - 1);
listRange.cleanAll();
if ( worksheet.isChartAreaEditMode ) {
......
......@@ -13882,7 +13882,7 @@ CLineChart.prototype =
{
History.Add(this, {Type: historyitem_LineChart_SetUpDownBars, oldPr: this.upDownBars, newPr: pr});
this.upDownBars = pr;
if(pr)
if(pr && pr.setParent)
{
pr.setParent(this);
}
......@@ -20003,7 +20003,7 @@ CStockChart.prototype =
{
History.Add(this, {Type: historyitem_StockChart_SetUpDownBars, oldPr: this.upDownBars, newPr: pr});
this.upDownBars = pr;
if(pr)
if(pr && pr.setParent)
{
pr.setParent(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