Bug 25314 - Теряется диаграмма, скопированная вместе с листом после 2х автосохранений

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57295 954022d7-b5bf-4e40-9824-e11837661b57

Common/Charts/DrawingObjects.js

@@ -1708,20 +1708,17 @@ function DrawingObjects() {
             }
             var metrics = drawingObject.getGraphicObjectMetrics();
             CheckSpPrXfrm(drawingObject.graphicObject);
-            if(!api.wbModel.bCollaborativeChanges)
+            if(!api.wbModel.bCollaborativeChanges && drawingObject.graphicObject.fromSerialize)
             {
                 drawingObject.graphicObject.spPr.xfrm.setOffX(metrics.x);
                 drawingObject.graphicObject.spPr.xfrm.setOffY(metrics.y);
             }
-            if(drawingObject.graphicObject.getObjectType() !== historyitem_type_GroupShape && !api.wbModel.bCollaborativeChanges)
+            if(drawingObject.graphicObject.getObjectType() !== historyitem_type_GroupShape && !api.wbModel.bCollaborativeChanges && drawingObject.graphicObject.fromSerialize)
             {
                 drawingObject.graphicObject.spPr.xfrm.setExtX(metrics.extX);
                 drawingObject.graphicObject.spPr.xfrm.setExtY(metrics.extY);
-                //drawingObject.graphicObject.spPr.xfrm.setChOffX(0);
-                //drawingObject.graphicObject.spPr.xfrm.setChOffY(0);
-                //drawingObject.graphicObject.spPr.xfrm.setChExtX(metrics.extX);
-                //drawingObject.graphicObject.spPr.xfrm.setChExtY(metrics.extY);
             }
+            delete drawingObject.graphicObject.fromSerialize;
 
             drawingObject.graphicObject.drawingBase = aObjects[i];
             drawingObject.graphicObject.drawingObjects = _this;

Excel/model/Serialize.js

@@ -5695,6 +5695,7 @@
                 });
                 if(null != oNewDrawing.graphicObject)
                 {
+                    oNewDrawing.graphicObject.fromSerialize = true;
                     if(false != oFlags.from && false != oFlags.to)
                         oNewDrawing.Type = ECellAnchorType.cellanchorTwoCell;
                     else if(false != oFlags.from && false != oFlags.ext)