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

Bug #31858 - [Copy&Paste] JS ошибка после вставки текста с комментарием из DE

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68716 954022d7-b5bf-4e40-9824-e11837661b57
parent a4e851fd
...@@ -246,7 +246,7 @@ function CopyRunToPPTX(Run, Paragraph, bHyper) ...@@ -246,7 +246,7 @@ function CopyRunToPPTX(Run, Paragraph, bHyper)
for ( var CurPos = 0; CurPos < Run.Content.length; CurPos++ ) for ( var CurPos = 0; CurPos < Run.Content.length; CurPos++ )
{ {
var Item = Run.Content[CurPos]; var Item = Run.Content[CurPos];
if ( para_End !== Item.Type && Item.Type !== para_Drawing) if ( para_End !== Item.Type && Item.Type !== para_Drawing && Item.Type !== para_Comment)
{ {
NewRun.Add_ToContent( PosToAdd, Item.Copy(), false ); NewRun.Add_ToContent( PosToAdd, Item.Copy(), false );
++PosToAdd; ++PosToAdd;
......
This diff is collapsed.
...@@ -723,7 +723,7 @@ Paragraph.prototype = ...@@ -723,7 +723,7 @@ Paragraph.prototype =
Internal_Content_Remove2 : function(Pos, Count) Internal_Content_Remove2 : function(Pos, Count)
{ {
var CommentsToDelete = []; var CommentsToDelete = [];
if ( true === this.DeleteCommentOnRemove && null !== this.LogicDocument ) if ( true === this.DeleteCommentOnRemove && null !== this.LogicDocument && null != this.LogicDocument.Comments)
{ {
var DocumentComments = this.LogicDocument.Comments; var DocumentComments = this.LogicDocument.Comments;
for ( var Index = Pos; Index < Pos + Count; Index++ ) for ( var Index = Pos; Index < Pos + Count; Index++ )
......
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