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

PowerPoint/Drawing/DrawingDocument.js

@@ -1762,6 +1762,20 @@ function CDrawingDocument()
         return { X : x_pix, Y : y_pix, Error: false };
     }
 
+    this.ConvertCoordsToCursorWR_Comment = function(x, y)
+    {
+        var _word_control = this.m_oWordControl;
+        var dKoef = (this.m_oWordControl.m_nZoomValue * g_dKoef_mm_to_pix / 100);
+
+        var x_pix = (this.SlideCurrectRect.left + x * dKoef + _word_control.m_oMainContent.AbsolutePosition.L * g_dKoef_mm_to_pix) >> 0;
+        var y_pix = (this.SlideCurrectRect.top  + y * dKoef + _word_control.m_oMainContent.AbsolutePosition.T * g_dKoef_mm_to_pix) >> 0;
+
+        x_pix += COMMENT_WIDTH;
+        y_pix += ((COMMENT_HEIGHT / 3) >> 0);
+
+        return { X : x_pix, Y : y_pix, Error: false };
+    }
+
     this.ConvertCoordsToCursor = function(x, y)
     {
         var _word_control = this.m_oWordControl;

PowerPoint/Editor/Format/Presentation.js

@@ -6811,7 +6811,7 @@ CPresentation.prototype =
                 {
                     this.Set_CurPage(i);
 
-                    var Coords = this.DrawingDocument.ConvertCoordsToCursorWR(comments[j].x, comments[j].y, i);
+                    var Coords = this.DrawingDocument.ConvertCoordsToCursorWR_Comment(comments[j].x, comments[j].y, i);
                     this.Slides[i].graphicObjects.showComment(Id, Coords.X, Coords.Y);
                     return;
                 }

PowerPoint/Editor/States.js

@@ -887,7 +887,7 @@ function PreMoveCommentState(drawingObjectsController, drawingObjects, startX, s
 
     this.onMouseUp = function(e, x, y)
     {
-        var Coords = editor.WordControl.m_oDrawingDocument.ConvertCoordsToCursorWR( this.drawingObjectsController.arrPreTrackObjects[0].comment.x, this.drawingObjectsController.arrPreTrackObjects[0].comment.y,
+        var Coords = editor.WordControl.m_oDrawingDocument.ConvertCoordsToCursorWR_Comment( this.drawingObjectsController.arrPreTrackObjects[0].comment.x, this.drawingObjectsController.arrPreTrackObjects[0].comment.y,
             this.drawingObjects.num);
         this.drawingObjectsController.showComment(this.drawingObjectsController.arrPreTrackObjects[0].comment.Get_Id(), Coords.X, Coords.Y);
         this.drawingObjectsController.clearPreTrackObjects();