git-svn-id:...

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

PowerPoint/Editor/Format/Presentation.js

@@ -5913,6 +5913,7 @@ CPresentation.prototype =
         if(this.Document_Is_SelectionLocked(changestype_RemoveSlide, null) === false)
         {
             History.Create_NewPoint();
+            var oldLen = this.Slides.length;
             array.sort(function(a, b){return a - b;});
             for(var i = array.length -1; i > - 1; --i)
             {
@@ -5922,7 +5923,14 @@ CPresentation.prototype =
             {
                 this.Slides[i].changeNum(i);
             }
-
+            if(array[array.length-1] != oldLen-1)
+            {
+                this.Set_CurPage(array[array.length-1]+1 - array.length);
+            }
+            else
+            {
+                this.Set_CurPage(this.Slides.length -1);
+            }
             this.Document_UpdateUndoRedoState();
             this.DrawingDocument.OnEndRecalculate();
             this.DrawingDocument.UpdateThumbnailsAttack();

PowerPoint/Editor/History.js

@@ -609,25 +609,12 @@ CHistory.prototype =
 
         this.Points[this.Index].Items.push( Item );
 
-        if ( ( Class instanceof CPresentation        && ( historyitem_Presenattion_AddSlide      === Data.Type || historyitem_Presenattion_RemoveSlide === Data.Type ) ) ||
-            ( Class instanceof CDocumentContent && ( historyitem_DocumentContent_AddItem === Data.Type || historyitem_DocumentContent_RemoveItem === Data.Type ) ) ||
-            ( Class instanceof CTable           && ( historyitem_Table_AddRow            === Data.Type || historyitem_Table_RemoveRow            === Data.Type ) ) ||
-            ( Class instanceof CTableRow        && ( historyitem_TableRow_AddCell        === Data.Type || historyitem_TableRow_RemoveCell        === Data.Type ) ) ||
-            ( Class instanceof Paragraph        && ( historyitem_Paragraph_AddItem       === Data.Type || historyitem_Paragraph_RemoveItem       === Data.Type ) ) )
-        {
-            var bAdd = ( ( Class instanceof CPresentation        && historyitem_Presenattion_AddSlide  === Data.Type ) ||
-                ( Class instanceof CDocumentContent && historyitem_DocumentContent_AddItem === Data.Type ) ||
-                ( Class instanceof CTable           && historyitem_Table_AddRow            === Data.Type ) ||
-                ( Class instanceof CTableRow        && historyitem_TableRow_AddCell        === Data.Type ) ||
-                ( Class instanceof Paragraph        && historyitem_Paragraph_AddItem       === Data.Type )
-                ) ? true : false;
+        if ( ( Class instanceof CPresentation        && ( historyitem_Presenattion_AddSlide      === Data.Type || historyitem_Presenattion_RemoveSlide === Data.Type ) ) )
+        {
+            var bAdd = ( ( Class instanceof CPresentation && historyitem_Presenattion_AddSlide  === Data.Type )) ? true : false;
 
             var Count = 1;
 
-            if ( ( Class instanceof Paragraph )                                                                ||
-                ( Class instanceof CDocumentContent && historyitem_DocumentContent_RemoveItem === Data.Type ) )
-                Count = Data.Items.length;
-
             var ContentChanges = new CContentChangesElement( ( bAdd == true ? contentchanges_Add : contentchanges_Remove ), Data.Pos, Count, Item );
             Class.Add_ContentChanges( ContentChanges );
             CollaborativeEditing.Add_NewDC( Class );

PowerPoint/Editor/States.js

@@ -2263,23 +2263,25 @@ function TrackNewShapeState(drawingObjectsController, drawingObjects, presetGeom
         this.drawingObjectsController.resetSelection();
 
 
-        if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_AddSp) === false)
-        {
         History.Create_NewPoint();
-            this.drawingObjectsController.trackEnd();
+        var shape = this.drawingObjectsController.arrTrackObjects[0].trackEnd();
+        if(editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_AddShape, shape) === false)
+        {
+            this.drawingObjects.shapeAdd(this.drawingObjects.cSld.spTree.length, shape);
             if(this.presetGeom != "textRect")
             {
                 this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));
             }
-            else if(isRealObject(this.resultObject))
+            else
             {
-                this.drawingObjectsController.changeCurrentState(new TextAddState(this.drawingObjectsController, this.drawingObjects, this.resultObject));
+                this.drawingObjectsController.changeCurrentState(new TextAddState(this.drawingObjectsController, this.drawingObjects, shape));
             }
             this.drawingObjects.presentation.Recalculate();
             this.drawingObjects.presentation.DrawingDocument.OnRecalculatePage(this.drawingObjects.num, this.drawingObjects);
         }
         else
         {
+            editor.WordControl.m_oLogicDocument.Document_Undo();
             this.drawingObjectsController.changeCurrentState(new NullState(this.drawingObjectsController, this.drawingObjects));
         }
         editor.sync_EndAddShape();

PowerPoint/Editor/TrackObjects/NewShapeTracks.js

@@ -285,6 +285,7 @@ function NewShapeTrack(drawingObjects, presetGeom, startX, startY)
             shape.initDefault(this.x, this.y, this.extX, this.extY, false, false, this.presetGeom, this.arrowsCount);
         else
             shape.initDefaultTextRect(this.x, this.y, this.extX, this.extY, false, false);
+        return shape;
         shape.select(this.drawingObjects.graphicObjects);
         drawingObjects.shapeAdd(drawingObjects.cSld.spTree.length, shape);
         this.drawingObjects.graphicObjects.State.resultObject = shape;