Переделан алгоритм определения попадания курсора в комментарий (баг 22494).

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

Word/Editor/Document.js

@@ -1875,7 +1875,7 @@ CDocument.prototype =
     // Отрисовка содержимого Документа
     Draw : function(nPageIndex, pGraphics)
     {
-        this.Comments.Reset_CurrentDraw( nPageIndex );
+        this.Comments.Reset_Drawing( nPageIndex );
 
         // Определим секцию
         var Page_StartPos = this.Pages[nPageIndex].Pos;

Word/Editor/Run.js

@@ -2933,6 +2933,8 @@ ParaRun.prototype =
         var Y0 = PDSH.Y0;
         var Y1 = PDSH.Y1;
 
+        var CommentsCount = PDSH.Comments.length;
+        var CommentId     = ( CommentsCount > 0 ? PDSH.Comments[CommentsCount - 1] : null );
         var CommentsFlag  = PDSH.CommentsFlag;
 
         var HighLight = this.Get_CompiledPr(false).HighLight;
@@ -2976,7 +2978,7 @@ ParaRun.prototype =
                         break;
 
                     if ( CommentsFlag != comments_NoComment )
-                        aComm.Add( Y0, Y1, X, X + Item.WidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false } );
+                        aComm.Add( Y0, Y1, X, X + Item.WidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } );
                     else if ( highlight_None != HighLight )
                         aHigh.Add( Y0, Y1, X, X + Item.WidthVisible, 0, HighLight.r, HighLight.g, HighLight.b );
 
@@ -2996,7 +2998,7 @@ ParaRun.prototype =
                     if ( PDSH.Spaces > 0 )
                     {
                         if ( CommentsFlag != comments_NoComment )
-                            aComm.Add( Y0, Y1, X, X + Item.WidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false } );
+                            aComm.Add( Y0, Y1, X, X + Item.WidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } );
                         else if ( highlight_None != HighLight )
                             aHigh.Add( Y0, Y1, X, X + Item.WidthVisible, 0, HighLight.r, HighLight.g, HighLight.b );
 

Word/Editor/Table.js

@@ -607,7 +607,7 @@ function CTable(DrawingDocument, Parent, Inline, PageNum, X, Y, XLimit, YLimit,
 
     this.TableGridNeedRecalc = true;
 
-    this.TableStyle = this.DrawingDocument.m_oLogicDocument.Styles.Get_Default_TableGrid();
+    this.TableStyle = (undefined !== this.DrawingDocument && null !== this.DrawingDocument ? this.DrawingDocument.m_oLogicDocument.Styles.Get_Default_TableGrid() : null);
     this.TableLook  = new CTableLook(true, true, false, false, true, false);
 
     this.TableSumGrid  = []; // данный массив будет заполнен после Internal_RecalculateGrid
@@ -20135,7 +20135,7 @@ function CTableCell(Row, ColW)
     this.Prev = null;
     this.Next = null;
 
-    this.Content = new CDocumentContent(this, this.Row.Table.DrawingDocument, 0, 0, 0, 0, false, false);
+    this.Content = new CDocumentContent(this, (undefined !== this.Row ? this.Row.Table.DrawingDocument : undefined), 0, 0, 0, 0, false, false);
     this.Content.Set_StartPage( ( Row ? this.Row.Table.PageNum : 0 ) );
 
     this.CompiledPr =