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

PowerPoint/Editor/Format/Comments.js

@@ -293,9 +293,18 @@ function CComment(Parent, Data)
 
     this.hit = function(x, y)
     {
+        var Flags = 0;
+        if(this.selected)
+        {
+            Flags |= 1;
+        }
+        if(this.Data.m_aReplies.length > 0)
+        {
+            Flags |= 2;
+        }
         var dd = editor.WordControl.m_oDrawingDocument;
-        return x > this.x && x < this.x + dd.GetCommentWidth()
-        && y > this.y && y < this.y + dd.GetCommentHeight();
+        return x > this.x && x < this.x + dd.GetCommentWidth(Flags)
+        && y > this.y && y < this.y + dd.GetCommentHeight(Flags);
     };
 
     this.setPosition = function(x, y)

PowerPoint/Editor/Format/Shape.js

@@ -2880,6 +2880,14 @@ CShape.prototype =
         return true;
     },
 
+    getCurDocumentContent: function()
+    {
+        if(this.txBody)
+        {
+            return this.txBody.content;
+        }
+    },
+
     getSearchResults : function(str, ownNum)//возвращает массив SelectionState'ов
     {
         var documentContentSelectionStates = this.txBody ? this.txBody.getSearchResults(str) : [];

PowerPoint/Editor/GraphicObjects.js

@@ -1910,10 +1910,6 @@ CGraphicObjects.prototype = {
                 }
             }
         }
-        else if(this.State.id == 20)
-        {
-            return null;//TODO: доделать;
-        }
         return null;
     },