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() ...@@ -328,7 +328,8 @@ DrawingObjectsController.prototype.createGroup = function()
}; };
DrawingObjectsController.prototype.handleChartDoubleClick = 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) DrawingObjectsController.prototype.addChartDrawingObject = function(asc_chart, options)
......
...@@ -6801,12 +6801,15 @@ ParaRun.prototype = ...@@ -6801,12 +6801,15 @@ ParaRun.prototype =
Writer.WriteString2( null !== this.Paragraph && undefined !== this.Paragraph ? this.Paragraph.Get_Id() : "" ); Writer.WriteString2( null !== this.Paragraph && undefined !== this.Paragraph ? this.Paragraph.Get_Id() : "" );
this.Pr.Write_ToBinary( Writer ); this.Pr.Write_ToBinary( Writer );
var Count = this.Content.length; if(undefined !== editor && true === editor.isDocumentEditor)
Writer.WriteLong( Count );
for ( var Index = 0; Index < Count; Index++ )
{ {
var Item = this.Content[Index]; var Count = this.Content.length;
Item.Write_ToBinary( Writer ); Writer.WriteLong( Count );
for ( var Index = 0; Index < Count; Index++ )
{
var Item = this.Content[Index];
Item.Write_ToBinary( Writer );
}
} }
}, },
...@@ -6823,13 +6826,16 @@ ParaRun.prototype = ...@@ -6823,13 +6826,16 @@ ParaRun.prototype =
this.Pr = new CTextPr(); this.Pr = new CTextPr();
this.Pr.Read_FromBinary( Reader ); this.Pr.Read_FromBinary( Reader );
var Count = Reader.GetLong(); if(undefined !== editor && true === editor.isDocumentEditor)
this.Content = [];
for ( var Index = 0; Index < Count; Index++ )
{ {
var Element = ParagraphContent_Read_FromBinary( Reader ); var Count = Reader.GetLong();
if ( null !== Element ) this.Content = [];
this.Content.push( Element ); for ( var Index = 0; Index < Count; Index++ )
{
var Element = ParagraphContent_Read_FromBinary( Reader );
if ( null !== Element )
this.Content.push( Element );
}
} }
}, },
......
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