Commit 07474183 authored by Igor.Zotov's avatar Igor.Zotov

http://bugzserver/show_bug.cgi?id=31080 - [FastEdit][Copy&Paste[ Закрывается...

http://bugzserver/show_bug.cgi?id=31080 - [FastEdit][Copy&Paste[ Закрывается окно редактирования комментария после его копирования

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@67025 954022d7-b5bf-4e40-9824-e11837661b57
parent 4e7848c7
...@@ -5653,6 +5653,8 @@ function BinaryFileReader(doc, openParams) ...@@ -5653,6 +5653,8 @@ function BinaryFileReader(doc, openParams)
oCommentObj.m_sUserId = comment.UserId; oCommentObj.m_sUserId = comment.UserId;
if(null != comment.Date) if(null != comment.Date)
oCommentObj.m_sTime = comment.Date; oCommentObj.m_sTime = comment.Date;
if(null != comment.m_sQuoteText)
oCommentObj.m_sQuoteText = comment.m_sQuoteText;
if(null != comment.Text) if(null != comment.Text)
oCommentObj.m_sText = comment.Text; oCommentObj.m_sText = comment.Text;
if(null != comment.Solved) if(null != comment.Solved)
...@@ -5675,6 +5677,11 @@ function BinaryFileReader(doc, openParams) ...@@ -5675,6 +5677,11 @@ function BinaryFileReader(doc, openParams)
if(this.oReadResult.oCommentsPlaces && this.oReadResult.oCommentsPlaces[i] && this.oReadResult.oCommentsPlaces[i].Start != null && this.oReadResult.oCommentsPlaces[i].End != null && document && document.Comments && isCopyPaste === true) if(this.oReadResult.oCommentsPlaces && this.oReadResult.oCommentsPlaces[i] && this.oReadResult.oCommentsPlaces[i].Start != null && this.oReadResult.oCommentsPlaces[i].End != null && document && document.Comments && isCopyPaste === true)
{ {
var oOldComment = this.oReadResult.oComments[i]; var oOldComment = this.oReadResult.oComments[i];
var m_sQuoteText = this.oReadResult.oCommentsPlaces[i].QuoteText;
if(m_sQuoteText)
oOldComment.m_sQuoteText = m_sQuoteText;
var oNewComment = new CComment(document.Comments, fInitCommentData(oOldComment)) var oNewComment = new CComment(document.Comments, fInitCommentData(oOldComment))
document.Comments.Add(oNewComment); document.Comments.Add(oNewComment);
oCommentsNewId[oOldComment.Id] = oNewComment; oCommentsNewId[oOldComment.Id] = oNewComment;
...@@ -5689,8 +5696,6 @@ function BinaryFileReader(doc, openParams) ...@@ -5689,8 +5696,6 @@ function BinaryFileReader(doc, openParams)
if(oCommentObj) if(oCommentObj)
{ {
bToDelete = false; bToDelete = false;
if(null != item.QuoteText)
oCommentObj.Data.m_sQuoteText = item.QuoteText;
item.Start.oParaComment.Set_CommentId(oCommentObj.Get_Id()); item.Start.oParaComment.Set_CommentId(oCommentObj.Get_Id());
item.End.oParaComment.Set_CommentId(oCommentObj.Get_Id()); item.End.oParaComment.Set_CommentId(oCommentObj.Get_Id());
} }
......
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