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

Common/Shapes/SerializeWriter.js

@@ -760,7 +760,7 @@ function CBinaryFileWriter()
         this.EndRecord();
 
         var _countAuthors = 0;
-        for (var i in pres.CommentAuthors)
+        for (var i in presentation.CommentAuthors)
             ++_countAuthors;
 
         if (_countAuthors > 0)
@@ -770,9 +770,9 @@ function CBinaryFileWriter()
 
             this.WriteULong(_countAuthors);
 
-            for (var i in pres.CommentAuthors)
+            for (var i in presentation.CommentAuthors)
             {
-                var _author = pres.CommentAuthors[i];
+                var _author = presentation.CommentAuthors[i];
 
                 this.StartRecord(0);
 

PowerPoint/Editor/Format/Presentation.js

@@ -6788,7 +6788,7 @@ CPresentation.prototype =
                 _new_data.x = _comments[i].x;
                 _new_data.y = _comments[i].y;
 
-                _new_data.CalculateInitials();
+                _new_data.Calculate();
                 this.Slides[_sldIdx].writecomments.push(_new_data);
 
                 var _comments2 = _data.m_aReplies;
@@ -6813,14 +6813,14 @@ CPresentation.prototype =
                     _author2.LastId++;
 
                     var _new_data2 = new CWriteCommentData();
-                    _new_data2.Data = _data;
+                    _new_data2.Data = _data2;
                     _new_data2.WriteAuthorId = _author2.Id;
                     _new_data2.WriteCommentId = _author2.LastId;
                     _new_data2.WriteParentAuthorId = _author.Id;
                     _new_data2.WriteParentCommentId = _commId;
                     _new_data2.x = _new_data.x;
                     _new_data2.y = _new_data.y + 136 * (j + 1); // так уж делает микрософт
-                    _new_data2.CalculateInitials();
+                    _new_data2.Calculate();
                     this.Slides[_sldIdx].writecomments.push(_new_data2);
                 }
             }

Word/Drawing/Overlay.js

@@ -1724,7 +1724,7 @@ CAutoshapeTrack.prototype =
 
         var ctx = overlay.m_oContext;
         var _oldAlpha = ctx.globalAlpha;
-        ctx.globalAlpha = 1;
+        ctx.globalAlpha = 0.5;
 
         ctx.setTransform(1,0,0,1,0,0);