Commit e560abee authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 34385

parent 7b5c948c
...@@ -6462,6 +6462,7 @@ DrawingObjectsController.prototype = ...@@ -6462,6 +6462,7 @@ DrawingObjectsController.prototype =
sp.checkDrawingBaseCoords(); sp.checkDrawingBaseCoords();
this.selectObject(sp, 0); this.selectObject(sp, 0);
} }
cur_group.setBDeleted(true);
cur_group.deleteDrawingBase(); cur_group.deleteDrawingBase();
} }
} }
......
...@@ -413,14 +413,26 @@ ...@@ -413,14 +413,26 @@
return; return;
for (var nIndex = 0, nCount = this.Items.length; nIndex < nCount; ++nIndex){ for (var nIndex = 0, nCount = this.Items.length; nIndex < nCount; ++nIndex){
var Pos = this.Class.m_oContentChanges.Check(AscCommon.contentchanges_Add, true !== this.UseArray ? this.Pos + nIndex : this.PosArray[nIndex]); var Pos = this.Class.m_oContentChanges.Check(AscCommon.contentchanges_Add, true !== this.UseArray ? this.Pos + nIndex : this.PosArray[nIndex]);
if(Pos === false){
continue;
}
var Element = this.Items[nIndex]; var Element = this.Items[nIndex];
Pos = Math.min(Pos, aContent.length); Pos = Math.min(Pos, aContent.length);
aContent.splice(Pos, 0, Element); aContent.splice(Pos, 0, Element);
} }
} }
else{ else{
for (var nIndex = 0, nCount = this.Items.length; nIndex < nCount; ++nIndex) { for (var nIndex = 0, nCount = this.Items.length; nIndex < nCount; ++nIndex) {
for(var j = 0; j < aContent.length; ++j){ var Pos = this.Class.m_oContentChanges.Check(AscCommon.contentchanges_Remove, true !== this.UseArray ? this.Pos + nIndex : this.PosArray[nIndex]);
if (false === Pos){
continue;
}
if(aContent[Pos] === this.Items[nIndex]){
aContent.splice(Pos, 1);
break;
}
for(var j = aContent.length - 1; j > -1 ; --j){
if(aContent[j] === this.Items[nIndex]){ if(aContent[j] === this.Items[nIndex]){
aContent.splice(j, 1); aContent.splice(j, 1);
break; break;
......
...@@ -2627,6 +2627,7 @@ CGraphicObjects.prototype = ...@@ -2627,6 +2627,7 @@ CGraphicObjects.prototype =
this.selectObject(sp, page_num); this.selectObject(sp, page_num);
} }
cur_group.parent.Remove_FromDocument(false); cur_group.parent.Remove_FromDocument(false);
cur_group.setBDeleted(true);
} }
for(i = 0; i < a_objects.length; ++i) for(i = 0; i < a_objects.length; ++i)
{ {
......
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