Commit 3f9f4dc2 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin

Падения при вставке в презентациях.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59763 954022d7-b5bf-4e40-9824-e11837661b57
parent 1b3f3bbc
......@@ -223,7 +223,7 @@ CChartSpace.prototype.recalculateBounds = function()
CChartSpace.prototype.recalculate = function()
{
if(this.bDeleted)
if(this.bDeleted || !this.parent)
return;
ExecuteNoHistory(function()
{
......
......@@ -313,7 +313,7 @@ CGraphicFrame.prototype =
getHierarchy: CShape.prototype.getHierarchy,
recalculate: function()
{
if(this.bDeleted)
if(this.bDeleted || !this.parent)
return;
ExecuteNoHistory(function(){
if(this.recalcInfo.recalculateTable)
......
......@@ -180,7 +180,7 @@ CGroupShape.prototype.updatePosition = CShape.prototype.updatePosition;
CGroupShape.prototype.setParent2 = CShape.prototype.setParent2;
CGroupShape.prototype.recalculate = function()
{
if(this.bDeleted)
if(this.bDeleted || !this.parent)
return;
ExecuteNoHistory(function()
{
......
......@@ -126,6 +126,8 @@ CImageShape.prototype.getHierarchy = CShape.prototype.getHierarchy;
CImageShape.prototype.getParentObjects = CShape.prototype.getParentObjects;
CImageShape.prototype.recalculate = function ()
{
if(this.bDeleted || !this.parent)
return;
ExecuteNoHistory(function(){
if (this.recalcInfo.recalculateBrush) {
this.recalculateBrush();
......
......@@ -2841,6 +2841,8 @@ CPresentation.prototype =
},
Get_SelectedContent : function()
{
return ExecuteNoHistory(function()
{
var ret = new PresentationSelectedContent(), i;
if(this.Slides.length > 0)
......@@ -2914,6 +2916,7 @@ CPresentation.prototype =
}
}
return ret;
}, this, []);
},
Insert_Content : function(Content)
......
......@@ -406,7 +406,7 @@ CShape.prototype.recalcText = function()
CShape.prototype.recalculate = function ()
{
if(this.bDeleted)
if(this.bDeleted || !this.parent)
return;
var check_slide_placeholder = !this.isPlaceholder() || (this.parent && this.parent.getObjectType() === historyitem_type_Slide);
ExecuteNoHistory(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