Commit 5dba2ca8 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin

правка бага 21138 - [CoEdit] Ошибка в консоли при передаче ответа на...

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

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51526 954022d7-b5bf-4e40-9824-e11837661b57
parent cb408bca
......@@ -6999,6 +6999,7 @@ CPresentation.prototype =
{
this.DrawingDocument.m_oWordControl.GoToPage(slide_num);
this.Slides[this.CurPage].changeComment( Id, CommentData );
editor.sync_ChangeCommentData( Id, CommentData );
this.Recalculate()
}
else
......
......@@ -3150,7 +3150,7 @@ CGraphicObjects.prototype = {
{
if(comments[i].selected)
{
if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_MoveComment, comments[i].Id ) )
if ( false === editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_MoveComment, comments[i].Id ) )
{
editor.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
editor.WordControl.m_oLogicDocument.Remove_Comment(comments[i].Id, true);
......
......@@ -3458,14 +3458,13 @@ asc_docs_api.prototype.asc_changeComment = function(Id, AscCommentData)
if (null == this.WordControl.m_oLogicDocument)
return;
if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_MoveComment, Id ) )
//if ( false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_MoveComment, Id ) )
{
var CommentData = new CCommentData();
CommentData.Read_FromAscCommentData(AscCommentData);
this.WordControl.m_oLogicDocument.Change_Comment( Id, CommentData );
this.sync_ChangeCommentData( Id, CommentData );
}
}
......
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