Bug 26919 - [CoEdit] У юзера остается lock слайдов, после undo их удаления другим юзером

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59772 954022d7-b5bf-4e40-9824-e11837661b57

PowerPoint/Editor/CollaborativeEditing.js

@@ -798,6 +798,14 @@ function CCollaborativeEditing()
             {
                 editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(Class.num);
             }
+            if(Class instanceof PropLocker)
+            {
+                var Class2 = g_oTableId.Get_ById(Class.objectId);
+                if(Class2.getObjectType && Class2.getObjectType() === historyitem_type_Slide && Class2.deleteLock === Class)
+                {
+                    editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(Class2.num);
+                }
+            }
 
             var check_obj = null;
             if(Class.getObjectType)

PowerPoint/api.js

@@ -429,9 +429,9 @@ asc_docs_api.prototype._coAuthoringInit = function () {
                         if(object instanceof Slide && Class === object.deleteLock)
                         {
                             if(NewType !== locktype_Mine && NewType !== locktype_None)
-                                editor.WordControl.m_oLogicDocument.DrawingDocument.LockSlide(Class.num);
+                                editor.WordControl.m_oLogicDocument.DrawingDocument.LockSlide(object.num);
                             else
-                                editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(Class.num);
+                                editor.WordControl.m_oLogicDocument.DrawingDocument.UnLockSlide(object.num);
                         }
                         if(object instanceof CPresentation)
                         {