Commit db519fca authored by SergeyLuzyanin's avatar SergeyLuzyanin

fix bug 35400; Bug 35399; Bug 35398

parent 631bdf21
......@@ -336,7 +336,7 @@ CCollaborativeEditing.prototype.OnEnd_CheckLock = function()
editor.CoAuthoringApi.askLock( aIds, this.OnCallback_AskLock );
// Ставим глобальный лок, только во время совместного редактирования
if ( true === this.m_bUse )
if ( -1 === this.m_nUseType )
{
this.Set_GlobalLock(true);
}
......
......@@ -698,9 +698,10 @@ RotateState.prototype =
}
else
{
var bNoNeedCheck = true;
var bNoNeedCheck = false;
if(bMoveState)
{
bNoNeedCheck = true;
for(i = 0; i < aNearestPos.length; ++i)
{
if(aNearestPos[i].Paragraph !== aParentParagraphs[i] && aDrawings[i].Locked !== true)
......
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