git-svn-id:...

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

PowerPoint/Editor/Format/Presentation.js

@@ -6863,6 +6863,7 @@ CPresentation.prototype =
         {
             History.Create_NewPoint();
             var Comment = new CComment( this.Comments, CommentData );
+            Comment.selected = true;
             Comment.setPosition(this.Slides[this.CurPage].commentX, this.Slides[this.CurPage].commentY);
             this.Slides[this.CurPage].commentX += COMMENT_WIDTH;
             this.Slides[this.CurPage].commentY += COMMENT_HEIGHT;
@@ -6879,6 +6880,7 @@ CPresentation.prototype =
         {
             History.Create_NewPoint();
             this.Slides[this.CurPage].changeComment( Id, CommentData );
+            this.Recalculate()
         }
 
     },

PowerPoint/Editor/States.js

@@ -64,6 +64,8 @@ function NullState(drawingObjectsController, drawingObjects)
                 drawingObjects.comments[i].selected = true;
                 this.drawingObjectsController.addPreTrackObject(new MoveComment(drawingObjects.comments[i]));
                 this.drawingObjectsController.changeCurrentState(new PreMoveCommentState(this.drawingObjectsController, this.drawingObjects, x, y));
+                editor.WordControl.m_oDrawingDocument.OnRecalculatePage(this.drawingObjects.num, this.drawingObjects);
+                editor.WordControl.m_oDrawingDocument.OnEndRecalculate();
                 return;
             }
         }

PowerPoint/Editor/TrackObjects/MoveTracks.js

@@ -306,8 +306,14 @@ function MoveComment(comment)
     this.draw = function(overlay)
     {
 
+        var Flags = 0;
+        Flags |= 1;
+        if(this.comment.Data.m_aReplies.length > 0)
+        {
+            Flags |= 2;
+        }
         var dd = editor.WordControl.m_oDrawingDocument;
-        overlay.DrawPresentationComment(0, this.x, this.y, dd.GetCommentWidth(), dd.GetCommentHeight())
+        overlay.DrawPresentationComment(Flags, this.x, this.y, dd.GetCommentWidth(Flags), dd.GetCommentHeight(Flags))
     };
 
     this.trackEnd = function()