Commit f6aacbd9 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Правка бага с дублирование контента при вставке после принятия изменений вторым пользователем.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57031 954022d7-b5bf-4e40-9824-e11837661b57
parent 025c8e4f
......@@ -328,7 +328,8 @@ DrawingObjectsController.prototype.createGroup = function()
};
DrawingObjectsController.prototype.handleChartDoubleClick = function()
{
this.drawingObjects.showChartSettings();
var drawingObjects = this.drawingObjects;
this.checkSelectedObjectsAndFireCallback(function(){this.drawingObjects.showChartSettings();}, []);
};
DrawingObjectsController.prototype.addChartDrawingObject = function(asc_chart, options)
......
......@@ -6801,6 +6801,8 @@ ParaRun.prototype =
Writer.WriteString2( null !== this.Paragraph && undefined !== this.Paragraph ? this.Paragraph.Get_Id() : "" );
this.Pr.Write_ToBinary( Writer );
if(undefined !== editor && true === editor.isDocumentEditor)
{
var Count = this.Content.length;
Writer.WriteLong( Count );
for ( var Index = 0; Index < Count; Index++ )
......@@ -6808,6 +6810,7 @@ ParaRun.prototype =
var Item = this.Content[Index];
Item.Write_ToBinary( Writer );
}
}
},
Read_FromBinary2 : function(Reader)
......@@ -6823,6 +6826,8 @@ ParaRun.prototype =
this.Pr = new CTextPr();
this.Pr.Read_FromBinary( Reader );
if(undefined !== editor && true === editor.isDocumentEditor)
{
var Count = Reader.GetLong();
this.Content = [];
for ( var Index = 0; Index < Count; Index++ )
......@@ -6831,6 +6836,7 @@ ParaRun.prototype =
if ( null !== Element )
this.Content.push( Element );
}
}
},
Clear_CollaborativeMarks : function()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment