Bug 27042 - [CoEdit] Сбрасывать lock с автофигур, если они объединяются в группу

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

Common/Drawings/Format/ChartSpace.js

@@ -7533,7 +7533,7 @@ CChartSpace.prototype =
 
 		graphics.RestoreGrState();
 		
-		if (this.Lock && locktype_None != this.Lock.Get_Type())
+		if (this.Lock && locktype_None != this.Lock.Get_Type() && !this.group)
         {
 			graphics.SaveGrState();
             graphics.transform3(this.transform);

Common/Drawings/Format/GroupShape.js

@@ -387,14 +387,13 @@ CGroupShape.prototype =
             this.spTree[i].draw(graphics);
 
 
-        if(locktype_None != this.Lock.Get_Type())
+        if(locktype_None != this.Lock.Get_Type() && !this.group)
         {
             graphics.transform3(this.transform);
 
             graphics.SetIntegerGrid(false);
 
-            if(locktype_None != this.Lock.Get_Type())
-                graphics.DrawLockObjectRect(this.Lock.Get_Type() , 0, 0, this.extX, this.extY);
+            graphics.DrawLockObjectRect(this.Lock.Get_Type() , 0, 0, this.extX, this.extY);
 
             graphics.reset();
             graphics.SetIntegerGrid(true);

Common/Drawings/Format/Image.js

@@ -604,10 +604,9 @@ CImageShape.prototype =
         var shape_drawer = new CShapeDrawer();
         shape_drawer.fromShape2(this, graphics, this.spPr.geometry);
         shape_drawer.draw(this.spPr.geometry);
-        if(locktype_None != this.Lock.Get_Type())
+        if(locktype_None != this.Lock.Get_Type()  && !this.group)
         {
-            if(locktype_None != this.Lock.Get_Type())
-                graphics.DrawLockObjectRect(this.Lock.Get_Type() , 0, 0, this.extX, this.extY);
+            graphics.DrawLockObjectRect(this.Lock.Get_Type() , 0, 0, this.extX, this.extY);
         }
         graphics.reset();
         graphics.SetIntegerGrid(true);

Common/Drawings/Format/Shape.js

@@ -2887,7 +2887,7 @@ CShape.prototype =
         }
 
 
-        if (this.Lock && locktype_None != this.Lock.Get_Type())
+        if (this.Lock && locktype_None != this.Lock.Get_Type() && !this.group)
         {
             graphics.transform3(_transform);
             graphics.DrawLockObjectRect(this.Lock.Get_Type(), 0, 0, this.extX, this.extY);

PowerPoint/Editor/Format/GraphicFrame.js

@@ -744,7 +744,7 @@ CGraphicFrame.prototype =
             graphics.transform3(this.transform);
             graphics.SetIntegerGrid(true);
             this.graphicObject.Draw(0, graphics);
-            if(locktype_None != this.Lock.Get_Type())
+            if(locktype_None != this.Lock.Get_Type() && !this.group)
                 graphics.DrawLockObjectRect(this.Lock.Get_Type() , 0, 0, this.extX, this.extY);
             graphics.reset();
             graphics.SetIntegerGrid(true);