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

PowerPoint/Editor/Format/Chart.js

@@ -2178,6 +2178,10 @@ CChartAsGroup.prototype =
     copy: function(parent, group)
     {
         var _group = isRealObject(group) ? group : null;
+        if(isRealObject(_group))
+        {
+            this.setGroup(_group);
+        }
         var c = new CChartAsGroup(parent, editor.WordControl.m_oLogicDocument, editor.WordControl.m_oDrawingDocument, _group);
         c.setChartBinary(this.getChartBinary());
         return c;

PowerPoint/Editor/Format/CollaborativeEditing.js

@@ -707,10 +707,10 @@ function CCollaborativeEditing()
                 editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(Class.num);
 
             var check_obj = null;
-            if(Class instanceof CShape
+            if((Class instanceof CShape
                 || Class instanceof CImageShape
                 || Class instanceof CGroupShape
-                || Class instanceof CGraphicFrame)
+                || Class instanceof CGraphicFrame) && isRealObject(Class.parent))
             {
                 check_obj =
                 {

PowerPoint/Editor/Format/Paragraph.js

@@ -320,15 +320,10 @@ Paragraph.prototype =
         if ( "undefined" != typeof(OtherParagraph.NumPr) )
             OtherParagraph.Numbering_Remove();
 
-        var NumPr = this.Numbering_Get();
-        if ( undefined != NumPr  )
-        {
-            OtherParagraph.Numbering_Set( NumPr.NumId, NumPr.Lvl );
-        }
 
-        var Bullet = this.Get_PresentationNumbering();
-        if ( numbering_presentationnumfrmt_None != Bullet.Get_Type() )
-            OtherParagraph.Add_PresentationNumbering( Bullet.Copy() );
+        //var Bullet = this.Get_PresentationNumbering();
+        //if ( numbering_presentationnumfrmt_None != Bullet.Get_Type() )
+        //    OtherParagraph.Add_PresentationNumbering( Bullet.Copy() );
 
         OtherParagraph.Set_PresentationLevel( this.PresentationPr.Level );
 
@@ -10638,7 +10633,7 @@ Paragraph.prototype =
 
         // Убираем нумерацию, если она была у следующего параграфа
         Para.Numbering_Remove();
-        Para.Remove_PresentationNumbering();
+        Para.Remove_PresentationNumbering(true);
 
         this.Internal_Content_Concat( Para.Content );
 

PowerPoint/Editor/Format/Presentation.js

@@ -3695,9 +3695,9 @@ CPresentation.prototype =
         {
             if ( false === this.Document_Is_SelectionLocked(changestype_Drawing_Props) )
             {
-                this.Create_NewHistoryPoint();
                 if ( true === e.ShiftKey ) // Ctrl + Shift + V - вставляем по образцу
                 {
+                    this.Create_NewHistoryPoint();
                     this.Document_Format_Paste();
                     bRetValue = true;
                 }

PowerPoint/Editor/States.js

@@ -2528,7 +2528,7 @@ function MoveState(drawingObjectsController, drawingObjects, startX, startY, rec
                 if(t_o[i].originalObject.copy)
                 {
                     t_o[i].originalObject.deselect(this.drawingObjectsController);
-                    var copy = t_o[i].originalObject.copy();
+                    var copy = t_o[i].originalObject.copy(this.drawingObjects);
                     copy.setParent(this.drawingObjects);
                     copy.setXfrm(t_o[i].x, t_o[i].y, null, null, null, null, null);
                     this.drawingObjects.addToSpTreeToPos(this.drawingObjects.cSld.spTree.length, copy);