Bug 28091 - [CoEdit] Ошибка в консоли при клике в залоченную таблицу в момент...

Bug 28091 - [CoEdit] Ошибка в консоли при клике в залоченную таблицу в момент принятия изменений после удаления ее строк другим пользователем

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

Common/Drawings/CommonController.js

@@ -4397,7 +4397,7 @@ DrawingObjectsController.prototype =
     },
 
 
-    checkChartTextSelection: function()
+    checkChartTextSelection: function(bNoRedraw)
     {
         if(this.bNoCheckChartTextSelection === true)
             return;
@@ -4468,8 +4468,11 @@ DrawingObjectsController.prototype =
                 else if(this.drawingObjects.cSld)
                 {
                     chart_selection.recalculate();
-                    editor.WordControl.m_oDrawingDocument.OnRecalculatePage( this.drawingObjects.num, this.drawingObjects );
-                    editor.WordControl.m_oDrawingDocument.OnEndRecalculate( false, true );
+                    if(!(bNoRedraw === true))
+                    {
+                        editor.WordControl.m_oDrawingDocument.OnRecalculatePage( this.drawingObjects.num, this.drawingObjects );
+                        editor.WordControl.m_oDrawingDocument.OnEndRecalculate( false, true );
+                    }
                 }
                 else
                 {

PowerPoint/Editor/CollaborativeEditing.js

@@ -737,7 +737,7 @@ function CCollaborativeEditing()
 
             if(LogicDocument.Slides[LogicDocument.CurPage])
             {
-                LogicDocument.Slides[LogicDocument.CurPage].graphicObjects.resetSelection();
+                LogicDocument.Slides[LogicDocument.CurPage].graphicObjects.resetSelect();
             }
             this.Clear_NewImages();
             this.Apply_OtherChanges();

PowerPoint/Editor/DrawingObjectsController.js

@@ -96,6 +96,19 @@ DrawingObjectsController.prototype.convertPixToMM = function(pix)
 {
     return editor.WordControl.m_oDrawingDocument.GetMMPerDot(pix);
 };
+
+
+DrawingObjectsController.prototype.resetSelect = function()
+{
+    this.checkChartTextSelection(true);
+    this.resetSelection();
+    this.clearPreTrackObjects();
+    this.clearTrackObjects();
+    this.changeCurrentState(new NullState(this));
+};
+
+
+
 DrawingObjectsController.prototype.checkSelectedObjectsAndFireCallback  =  DrawingObjectsController.prototype.checkSelectedObjectsAndCallback;
 DrawingObjectsController.prototype.showChartSettings  =  function()
 {