diff --git a/apps/documenteditor/main/app/controller/PageLayout.js b/apps/documenteditor/main/app/controller/PageLayout.js index 737952852..fde09878b 100644 --- a/apps/documenteditor/main/app/controller/PageLayout.js +++ b/apps/documenteditor/main/app/controller/PageLayout.js @@ -140,10 +140,14 @@ define([ item.setDisabled(notflow); }); - disable.align = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline; - disable.group = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline; - disable.arrange = wrapping == Asc.c_oAscWrapStyle2.Inline; - disable.wrapping = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()); + var control_props = me.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null, + lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked, + content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked; + + disable.align = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked; + disable.group = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked; + disable.arrange = wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked; + disable.wrapping = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked; if ( !disable.group ) { if (me.api.CanGroup() || me.api.CanUnGroup()) { diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index fd8b9fabc..f33f7e4cf 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -126,6 +126,7 @@ define([ var isChart = false; for (i=0; i