Fixed bug #34101.

word/Editor/Comments.js

@@ -774,15 +774,19 @@ ParaComment.prototype =
                 Page = HdrFtr.RecalcInfo.CurPage;
         }
 
-        if ( true === this.Start )
-        {
-            Comment.Set_StartId( Para.Get_Id() );
-            Comment.Set_StartInfo( Page, X, Y, H );
-        }
-        else
-        {
-            Comment.Set_EndId( Para.Get_Id() );
-        }                
+		if (Para && Para === AscCommon.g_oTableId.Get_ById(Para.Get_Id()))
+		{
+			// Заглушка для повторяющегося заголовка в таблицах
+			if (true === this.Start)
+			{
+				Comment.Set_StartId(Para.Get_Id());
+				Comment.Set_StartInfo(Page, X, Y, H);
+			}
+			else
+			{
+				Comment.Set_EndId(Para.Get_Id());
+			}
+		}
     },
 
     Recalculate_PageEndInfo : function(PRSI, _CurLine, _CurRange)

word/Editor/Document.js

@@ -7206,15 +7206,24 @@ CDocument.prototype.OnMouseUp = function(e, X, Y, PageIndex)
 				var Comment_X       = this.Get_PageLimits(PageIndex).XLimit;
 				var Para            = g_oTableId.Get_ById(Comment.StartId);
 
-				var TextTransform = Para.Get_ParentTextTransform();
-				if (TextTransform)
+				if (!Para)
 				{
-					Comment_Y = TextTransform.TransformPointY(Comment.m_oStartInfo.X, Comment.m_oStartInfo.Y);
+					// Такое может быть, если комментарий добавлен к заголовку таблицы
+					this.Select_Comment(null, false);
+					editor.sync_HideComment();
 				}
+				else
+				{
+					var TextTransform = Para.Get_ParentTextTransform();
+					if (TextTransform)
+					{
+						Comment_Y = TextTransform.TransformPointY(Comment.m_oStartInfo.X, Comment.m_oStartInfo.Y);
+					}
 
-				var Coords = this.DrawingDocument.ConvertCoordsToCursorWR(Comment_X, Comment_Y, Comment_PageNum);
-				this.Select_Comment(Comment.Get_Id(), false);
-				editor.sync_ShowComment(Comment.Get_Id(), Coords.X, Coords.Y);
+					var Coords = this.DrawingDocument.ConvertCoordsToCursorWR(Comment_X, Comment_Y, Comment_PageNum);
+					this.Select_Comment(Comment.Get_Id(), false);
+					editor.sync_ShowComment(Comment.Get_Id(), Coords.X, Coords.Y);
+				}
 			}
 			else
 			{