for bug 34597

common/CollaborativeEditingBase.js

@@ -1041,6 +1041,11 @@ CCollaborativeEditingBase.prototype.private_RestoreDocumentState = function(DocS
                     mapDrawings[oShape.parent.Get_Id()] = oShape.parent;
                 }
             }
+            else{
+                if(oShape.resetGroups){
+                    oShape.resetGroups();
+                }
+            }
         }
         var oDrawing;
         for (var sId in mapDrawings)

common/Drawings/Format/ChartFormat.js

@@ -2664,6 +2664,9 @@ CBarChart.prototype =
         c.setGapWidth(this.gapWidth);
         c.setGrouping(this.grouping);
         c.setOverlap(this.overlap);
+        c.setGapDepth(this.gapDepth);
+        c.setShape(this.shape);
+
         for(var i = 0; i < this.series.length; ++i)
         {
             c.addSer(this.series[i].createDuplicate());

common/Drawings/Format/GroupShape.js

@@ -1811,6 +1811,19 @@ function CGroupShape()
         return true;
     };
 
+    CGroupShape.prototype.resetGroups = function()
+    {
+        for(var i = 0; i < this.spTree.length; ++i)
+        {
+            if(this.spTree[i].resetGroups){
+                this.spTree[i].resetGroups();
+            }
+            if(this.spTree[i].group !== this){
+                this.spTree[i].setGroup(this);
+            }
+        }
+    };
+
     //--------------------------------------------------------export----------------------------------------------------
     window['AscFormat'] = window['AscFormat'] || {};
     window['AscFormat'].CGroupShape = CGroupShape;

common/SerializeChart.js

@@ -3744,16 +3744,16 @@ BinaryChartWriter.prototype.WriteCT_Bar3DChart = function (oVal) {
             oThis.WriteCT_GapAmount(oVal.gapWidth);
         });
     }
-    // if (null != oVal.gapDepth) {
-    // this.bs.WriteItem(c_oserct_bar3dchartGAPDEPTH, function () {
-    // oThis.WriteCT_GapAmount(oVal.gapDepth);
-    // });
-    // }
-    // if (null != oVal.shape) {
-    // this.bs.WriteItem(c_oserct_bar3dchartSHAPE, function () {
-    // oThis.WriteCT_Shape(oVal.shape);
-    // });
-    // }
+    if (null != oVal.gapDepth) {
+        this.bs.WriteItem(c_oserct_bar3dchartGAPDEPTH, function () {
+            oThis.WriteCT_GapAmount(oVal.gapDepth);
+    });
+    }
+    if (null != oVal.shape) {
+        this.bs.WriteItem(c_oserct_bar3dchartSHAPE, function () {
+            oThis.WriteCT_Shape(oVal.shape);
+        });
+    }
     if (null != oVal.axId) {
         for (var i = 0, length = oVal.axId.length; i < length; ++i) {
             var oCurVal = oVal.axId[i];

word/Editor/GraphicObjects/GraphicObjects.js

@@ -2538,12 +2538,17 @@ CGraphicObjects.prototype =
         var nearest_pos = this.document.Get_NearestPos(objects_for_grouping[0].parent.pageIndex, common_bounds.minX, common_bounds.minY, true, para_drawing);
 
         nearest_pos.Paragraph.Check_NearestPos(nearest_pos);
+
+        var nPageIndex = objects_for_grouping[0].parent.pageIndex;
         for(i = 0; i < objects_for_grouping.length; ++i)
         {
             objects_for_grouping[i].parent.Remove_FromDocument(false);
             objects_for_grouping[i].parent.Set_GraphicObject(null);//for Bug 34548
+            if(objects_for_grouping[i].setParent){
+                objects_for_grouping[i].setParent(null);
+            }
         }
-        para_drawing.Set_XYForAdd( common_bounds.minX,  common_bounds.minY, nearest_pos, objects_for_grouping[0].parent.pageIndex);
+        para_drawing.Set_XYForAdd( common_bounds.minX,  common_bounds.minY, nearest_pos, nPageIndex);
         para_drawing.Set_Props(new asc_CImgProperty(
             {
                 PositionH: