Commit f28bd0db authored by SergeyLuzyanin's avatar SergeyLuzyanin

fix Bug 34637; copy locks

parent 0342066a
...@@ -284,6 +284,7 @@ function CGroupShape() ...@@ -284,6 +284,7 @@ function CGroupShape()
copy.cachedImage = this.getBase64Img(); copy.cachedImage = this.getBase64Img();
copy.cachedPixH = this.cachedPixH; copy.cachedPixH = this.cachedPixH;
copy.cachedPixW = this.cachedPixW; copy.cachedPixW = this.cachedPixW;
copy.setLocks(this.locks);
if(this.fromSerialize) if(this.fromSerialize)
{ {
copy.setBFromSerialize(true); copy.setBFromSerialize(true);
......
...@@ -160,6 +160,7 @@ CImageShape.prototype.copy = function() ...@@ -160,6 +160,7 @@ CImageShape.prototype.copy = function()
copy.cachedImage = this.getBase64Img(); copy.cachedImage = this.getBase64Img();
copy.cachedPixH = this.cachedPixH; copy.cachedPixH = this.cachedPixH;
copy.cachedPixW = this.cachedPixW; copy.cachedPixW = this.cachedPixW;
copy.setLocks(this.locks);
return copy; return copy;
}; };
......
...@@ -2277,6 +2277,7 @@ CShape.prototype.copy = function () { ...@@ -2277,6 +2277,7 @@ CShape.prototype.copy = function () {
{ {
copy.setBFromSerialize(true); copy.setBFromSerialize(true);
} }
copy.setLocks(this.locks);
copy.cachedImage = this.getBase64Img(); copy.cachedImage = this.getBase64Img();
copy.cachedPixH = this.cachedPixH; copy.cachedPixH = this.cachedPixH;
copy.cachedPixW = this.cachedPixW; copy.cachedPixW = this.cachedPixW;
......
...@@ -535,6 +535,7 @@ CGraphicObjects.prototype = ...@@ -535,6 +535,7 @@ CGraphicObjects.prototype =
chart_props.severalCharts = props_by_types.chartProps.severalCharts; chart_props.severalCharts = props_by_types.chartProps.severalCharts;
chart_props.severalChartStyles = props_by_types.chartProps.severalChartStyles; chart_props.severalChartStyles = props_by_types.chartProps.severalChartStyles;
chart_props.severalChartTypes = props_by_types.chartProps.severalChartTypes; chart_props.severalChartTypes = props_by_types.chartProps.severalChartTypes;
chart_props.lockAspect = props_by_types.chartProps.lockAspect;
if(this.selection.group){ if(this.selection.group){
chart_props.description = props_by_types.chartProps.description; chart_props.description = props_by_types.chartProps.description;
chart_props.title = props_by_types.chartProps.title; chart_props.title = props_by_types.chartProps.title;
......
...@@ -1394,8 +1394,9 @@ ParaDrawing.prototype.OnEnd_MoveInline = function(NearPos) ...@@ -1394,8 +1394,9 @@ ParaDrawing.prototype.OnEnd_MoveInline = function(NearPos)
// При переносе всегда создаем копию, чтобы в совместном редактировании не было проблем // При переносе всегда создаем копию, чтобы в совместном редактировании не было проблем
var NewParaDrawing = this.Copy(); var NewParaDrawing = this.Copy();
NewParaDrawing.Add_ToDocument(NearPos, true, RunPr);
this.DocumentContent.Select_DrawingObject(NewParaDrawing.Get_Id()); this.DocumentContent.Select_DrawingObject(NewParaDrawing.Get_Id());
NewParaDrawing.Add_ToDocument(NearPos, true, RunPr);
}; };
ParaDrawing.prototype.Get_ParentTextTransform = function() ParaDrawing.prototype.Get_ParentTextTransform = function()
{ {
......
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