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

Bug 25598 - [CoEdit] Ошибка в консоли при копировании диаграммы через ctrl,...

Bug 25598 - [CoEdit] Ошибка в консоли при копировании диаграммы через ctrl, если в заголовок была скопирована ссылка

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57404 954022d7-b5bf-4e40-9824-e11837661b57
parent 30c6c8bf
...@@ -611,7 +611,15 @@ CDLbl.prototype = ...@@ -611,7 +611,15 @@ CDLbl.prototype =
var text_pr = new CTextPr(); var text_pr = new CTextPr();
text_pr.FontSize = 10; text_pr.FontSize = 10;
text_pr.Unifill = CreateUnfilFromRGB(0,0,0); text_pr.Unifill = CreateUnfilFromRGB(0,0,0);
var parent_objects = this.chart.getParentObjects(); var parent_objects;
if(this.chart)
{
parent_objects = this.chart.getParentObjects();
}
else if(this.parent)
{
parent_objects = this.parent.getParentObjects();
}
var theme = parent_objects.theme; var theme = parent_objects.theme;
var para_pr = new CParaPr(); var para_pr = new CParaPr();
...@@ -649,7 +657,7 @@ CDLbl.prototype = ...@@ -649,7 +657,7 @@ CDLbl.prototype =
var chart_text_pr; var chart_text_pr;
if(this.chart.txPr if(this.chart && this.chart.txPr
&& this.chart.txPr.content && this.chart.txPr.content
&& this.chart.txPr.content.Content[0] && this.chart.txPr.content.Content[0]
&& this.chart.txPr.content.Content[0].Pr) && this.chart.txPr.content.Content[0].Pr)
...@@ -662,10 +670,10 @@ CDLbl.prototype = ...@@ -662,10 +670,10 @@ CDLbl.prototype =
} }
} }
if(this instanceof CTitle) if(this instanceof CTitle || this.parent instanceof CTitle)
{ {
style.TextPr.Bold = true; style.TextPr.Bold = true;
if(this.parent instanceof CChart) if(this.parent instanceof CChart || (this.parent && (this.parent.parent instanceof CChart)))
{ {
if(chart_text_pr && typeof chart_text_pr.FontSize === "number") if(chart_text_pr && typeof chart_text_pr.FontSize === "number")
style.TextPr.FontSize = (chart_text_pr.FontSize*1.2) >> 0; style.TextPr.FontSize = (chart_text_pr.FontSize*1.2) >> 0;
...@@ -4385,6 +4393,12 @@ CCatAx.prototype = ...@@ -4385,6 +4393,12 @@ CCatAx.prototype =
this.parent.parent.parent.handleUpdateInternalChart(); this.parent.parent.parent.handleUpdateInternalChart();
} }
}, },
getParentObjects: function()
{
return this.parent && this.parent.getParentObjects();
},
setTxPr: function(pr) setTxPr: function(pr)
{ {
History.Add(this, {Type: historyitem_CatAxSetTxPr, oldPr: this.txPr, newPr:pr}); History.Add(this, {Type: historyitem_CatAxSetTxPr, oldPr: this.txPr, newPr:pr});
...@@ -5473,6 +5487,12 @@ CDateAx.prototype = ...@@ -5473,6 +5487,12 @@ CDateAx.prototype =
this.parent.parent.parent.handleUpdateInternalChart(); this.parent.parent.parent.handleUpdateInternalChart();
} }
}, },
getParentObjects: function()
{
return this.parent && this.parent.getParentObjects();
},
setTxPr: function(pr) setTxPr: function(pr)
{ {
History.Add(this, {Type:historyitem_DateAxTxPr, oldPr: this.txPr, newPr: pr}); History.Add(this, {Type:historyitem_DateAxTxPr, oldPr: this.txPr, newPr: pr});
...@@ -6539,6 +6559,12 @@ CSerAx.prototype = ...@@ -6539,6 +6559,12 @@ CSerAx.prototype =
this.parent.parent.parent.handleUpdateInternalChart(); this.parent.parent.parent.handleUpdateInternalChart();
} }
}, },
getParentObjects: function()
{
return this.parent && this.parent.getParentObjects();
},
setTxPr: function(pr) setTxPr: function(pr)
{ {
History.Add(this, {Type: historyitem_SerAxSetTxPr, oldPr: this.txPr, newPr: pr}); History.Add(this, {Type: historyitem_SerAxSetTxPr, oldPr: this.txPr, newPr: pr});
...@@ -7491,6 +7517,12 @@ CValAx.prototype = ...@@ -7491,6 +7517,12 @@ CValAx.prototype =
this.parent.parent.parent.handleUpdateInternalChart(); this.parent.parent.parent.handleUpdateInternalChart();
} }
}, },
getParentObjects: function()
{
return this.parent && this.parent.getParentObjects();
},
setTxPr: function(pr) setTxPr: function(pr)
{ {
History.Add(this, {Type: historyitem_ValAxSetTxPr, oldPr: this.txPr, newPr: pr}); History.Add(this, {Type: historyitem_ValAxSetTxPr, oldPr: this.txPr, newPr: pr});
...@@ -21912,8 +21944,16 @@ CTitle.prototype = ...@@ -21912,8 +21944,16 @@ CTitle.prototype =
}, },
getParentObjects: function() getParentObjects: function()
{
if(this.chart)
{ {
return this.chart.getParentObjects(); return this.chart.getParentObjects();
}
else if(this.parent)
{
return this.parent.getParentObjects();
}
return null;
}, },
getDefaultTextForTxBody: function() getDefaultTextForTxBody: function()
...@@ -23042,6 +23082,11 @@ CChart.prototype = ...@@ -23042,6 +23082,11 @@ CChart.prototype =
return historyitem_type_Chart; return historyitem_type_Chart;
}, },
getParentObjects: function()
{
return this.parent && this.parent.getParentObjects();
},
createDuplicate: function() createDuplicate: function()
{ {
var c = new CChart(); var c = new CChart();
...@@ -23187,6 +23232,7 @@ CChart.prototype = ...@@ -23187,6 +23232,7 @@ CChart.prototype =
this.parent.handleUpdateInternalChart(); this.parent.handleUpdateInternalChart();
} }
}, },
setView3D: function(view3D) setView3D: function(view3D)
{ {
History.Add(this, {Type: historyitem_Chart_SetView3D, oldView3D: this.view3D, newView3D: view3D}); History.Add(this, {Type: historyitem_Chart_SetView3D, oldView3D: this.view3D, newView3D: view3D});
......
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