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

Bug 28100 - [CoEdit] Лочить все настройки диаграмм при совместное редактировании

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@60316 954022d7-b5bf-4e40-9824-e11837661b57
parent 6f8e547a
...@@ -4974,6 +4974,13 @@ DrawingObjectsController.prototype = ...@@ -4974,6 +4974,13 @@ DrawingObjectsController.prototype =
if(!drawing.group) if(!drawing.group)
{ {
locked = drawing.lockType !== c_oAscLockTypes.kLockTypeNone && drawing.lockType !== c_oAscLockTypes.kLockTypeMine ; locked = drawing.lockType !== c_oAscLockTypes.kLockTypeNone && drawing.lockType !== c_oAscLockTypes.kLockTypeMine ;
if(typeof editor !== "undefined" && isRealObject(editor) && editor.isPresentationEditor)
{
if(drawing.Lock)
{
locked = drawing.Lock.Is_Locked();
}
}
} }
switch(drawing.getObjectType()) switch(drawing.getObjectType())
{ {
......
...@@ -872,6 +872,10 @@ function CreateAscShapePropFromProp(shapeProp) ...@@ -872,6 +872,10 @@ function CreateAscShapePropFromProp(shapeProp)
var obj = new CAscShapeProp(); var obj = new CAscShapeProp();
if(!isRealObject(shapeProp)) if(!isRealObject(shapeProp))
return obj; return obj;
if(isRealBool(shapeProp.locked))
{
obj.Locked = shapeProp.locked;
}
if(typeof shapeProp.type === "string") if(typeof shapeProp.type === "string")
obj.type = shapeProp.type; obj.type = shapeProp.type;
......
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