Исправлен баг, связанный с пересылкой комментариев (баг 18982).

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

Word/Editor/CollaborativeEditing.js

@@ -301,16 +301,6 @@ function CCollaborativeChanges()
         {
             Class = editor.WordControl.m_oLogicDocument.HdrFtr;
         }
-        else if ( historyitem_type_FlowObjects === Type )
-        {
-            var SubType  = LoadData.Reader.GetLong();
-            var ParentId = LoadData.Reader.GetString2();
-            var PageNum  = LoadData.Reader.GetLong();
-
-            var Parent = g_oTableId.Get_ById( ParentId );
-
-            Class = Parent.Pages[PageNum].FlowObjects;
-        }
         else
             Class = g_oTableId.Get_ById( this.m_sId );
 
@@ -728,18 +718,6 @@ function CCollaborativeEditing()
         if ( null != HdrFtr_Content.Footer.Odd )
             RecalculateData.HdrFtr.push( HdrFtr_Content.Footer.Odd );
 
-        for ( var PageIndex in LogicDocument.Pages )
-        {
-            var FlowObjects = LogicDocument.Pages[PageIndex].FlowObjects;
-            var Count = FlowObjects.Get_Count();
-            for ( var Index = 0; Index < Count; Index++ )
-            {
-                var FlowObject = FlowObjects.Get_ByIndex( Index );
-                if ( flowobject_Table === FlowObject.Get_Type() && 0 === FlowObject.PageController )
-                    RecalculateData.Flow.push( FlowObject );
-            }
-        }
-
         LogicDocument.Recalculate( false, false, RecalculateData );
         LogicDocument.Document_UpdateSelectionState();
         LogicDocument.Document_UpdateInterfaceState();

Word/Editor/Document.js

@@ -83,7 +83,6 @@ function CDocumentPage()
     };
 
     this.Bounds = new CDocumentBounds(0,0,0,0);
-    this.FlowObjects = new FlowObjects(editor.WordControl.m_oLogicDocument, 0); // Используем данный объект только для хранения ссылок на Flow-таблицы
     this.Pos    = 0;
     this.EndPos = 0;
 

Word/Editor/Paragraph.js

@@ -3162,6 +3162,31 @@ Paragraph.prototype =
                     X += Item.WidthVisible;
                     break;
                 }
+
+                case para_CommentStart:
+                {
+                    var DocumentComments = editor.WordControl.m_oLogicDocument.Comments;
+
+                    var CommentId = Item.Id;
+                    var CommentY  = this.Pages[CurPage].Y + this.Lines[CurLine].Top;
+                    var CommentH  = this.Lines[CurLine].Bottom - this.Lines[CurLine].Top;
+
+                    DocumentComments.Set_StartInfo( CommentId, this.Get_StartPage_Absolute() + CurPage, X, CommentY, CommentH, this.Id );
+
+                    break;
+                }
+
+                case para_CommentEnd:
+                {
+                    var DocumentComments = editor.WordControl.m_oLogicDocument.Comments;
+
+                    var CommentId = Item.Id;
+                    var CommentY  = this.Pages[CurPage].Y + this.Lines[CurLine].Top;
+                    var CommentH  = this.Lines[CurLine].Bottom - this.Lines[CurLine].Top;
+
+                    DocumentComments.Set_EndInfo( CommentId, this.Get_StartPage_Absolute() + CurPage, X, CommentY, CommentH, this.Id );
+                    break;
+                }
             }
         }
 
@@ -11610,13 +11635,13 @@ Paragraph.prototype =
                         {
                             var Comment = g_oTableId.Get_ById( Element.Id );
                             if ( null != Comment )
-                                Comment.Set_StartInfo( this.Internal_GetPage( Pos ), 0, 0, 0, this.Get_Id() );
+                                Comment.Set_StartInfo( 0, 0, 0, 0, this.Get_Id() );
                         }
                         else if ( Element instanceof ParaCommentEnd )
                         {
                             var Comment = g_oTableId.Get_ById( Element.Id );
                             if ( null != Comment )
-                                Comment.Set_EndInfo( this.Internal_GetPage( Pos ), 0, 0, 0, this.Get_Id() );
+                                Comment.Set_EndInfo( 0, 0, 0, 0, this.Get_Id() );
                         }
 
                         // TODO: Подумать над тем как по минимуму вставлять отметки совместного редактирования