git-svn-id:...

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

PowerPoint/Editor/Format/Presentation.js

@@ -5498,7 +5498,8 @@ CPresentation.prototype =
                 {
                     this.Slides[i].changeSize(kw, kh);
                 }
-                editor.sync_DocSizeCallback(this.Width, this.Height);
+                editor.asc_fireCallback("asc_onPresentationSize", this.Width, this.Height);
+
                 if(b_is_on)
                 {
                     History.TurnOn();
@@ -5568,7 +5569,8 @@ CPresentation.prototype =
                 {
                     this.Slides[i].changeSize(kw, kh);
                 }
-                editor.sync_DocSizeCallback(this.Width, this.Height);
+                editor.asc_fireCallback("asc_onPresentationSize", this.Width, this.Height);
+
                 if(b_is_on)
                 {
                     History.TurnOn();
@@ -6200,7 +6202,9 @@ CPresentation.prototype =
                 History.TurnOn();
             }
             this.Recalculate();
-            editor.sync_DocSizeCallback(this.Width, this.Height);
+            editor.asc_fireCallback("asc_onPresentationSize", this.Width, this.Height);
+
+            //editor.sync_DocSizeCallback(this.Width, this.Height);
         }
     },
 
@@ -6767,7 +6771,8 @@ CPresentation.prototype =
                 {
                     this.Slides[i].changeSize(kw, kh);
                 }
-                editor.sync_DocSizeCallback(this.Width, this.Height);
+                //editor.sync_DocSizeCallback(this.Width, this.Height);
+                editor.asc_fireCallback("asc_onPresentationSize", this.Width, this.Height);
                 if(b_is_on)
                 {
                     History.TurnOn();

PowerPoint/api.js

@@ -50,6 +50,7 @@ function asc_docs_api(name)
     this.DocumentUrl = "";
     this.DocumentName = "";
 	this.DocInfo = null;
+    this.bNoSendComments = false;
 
     this.IsSupportEmptyPresentation = true;
         
@@ -815,7 +816,7 @@ asc_docs_api.prototype.LoadDocument = function(c_DocInfo)
         this.DocInfo.put_OfflineApp(true);
 
         // For test create unique id
-        documentId = "safsfsdfsdfsdasdasdasdfsdf3";
+        documentId = "safsasdasdfsdfsdfsdasdasdasdfsdf3";
         this.OfflineAppDocumentStartLoad();
 
         this.sync_zoomChangeCallback(this.WordControl.m_nZoomValue, this.WordControl.m_nZoomType);
@@ -3496,8 +3497,11 @@ asc_docs_api.prototype.sync_RemoveComment = function(Id)
 
 asc_docs_api.prototype.sync_AddComment = function(Id, CommentData)
 {
-    var AscCommentData = new asc_CCommentData(CommentData);
-    this.asc_fireCallback("asc_onAddComment", Id, AscCommentData);
+    if(this.bNoSendComments === false)
+    {
+        var AscCommentData = new asc_CCommentData(CommentData);
+        this.asc_fireCallback("asc_onAddComment", Id, AscCommentData);
+    }
 }
 
 asc_docs_api.prototype.sync_ShowComment = function(Id, X, Y)
@@ -3729,8 +3733,10 @@ asc_docs_api.prototype.OpenDocumentEndCallback = function()
 
             if(this.LoadedObject === 1)
             {
+                this.bNoSendComments = true;
                 CollaborativeEditing.Apply_Changes();
                 CollaborativeEditing.Release_Locks();
+                this.bNoSendComments = false;
             }
             this.WordControl.m_oLogicDocument.RecalculateAfterOpen();
             var presentation = this.WordControl.m_oLogicDocument;