Commit 47617874 authored by Sergey Luzyanin's avatar Sergey Luzyanin

drawing locks

parent df5ad313
...@@ -9986,8 +9986,14 @@ CChartSpace.prototype.draw = function(graphics) ...@@ -9986,8 +9986,14 @@ CChartSpace.prototype.draw = function(graphics)
if(oLock && AscCommon.locktype_None != oLock.Get_Type()) if(oLock && AscCommon.locktype_None != oLock.Get_Type())
{ {
graphics.SaveGrState(); graphics.SaveGrState();
graphics.transform3(this.transform); var bCoMarksDraw = true;
graphics.DrawLockObjectRect(oLock.Get_Type(), 0, 0, this.extX, this.extY); if(typeof editor !== "undefined" && editor && AscFormat.isRealBool(editor.isCoMarksDraw)){
bCoMarksDraw = editor.isCoMarksDraw;
}
if(bCoMarksDraw){
graphics.transform3(this.transform);
graphics.DrawLockObjectRect(oLock.Get_Type(), 0, 0, this.extX, this.extY);
}
graphics.RestoreGrState(); graphics.RestoreGrState();
} }
} }
...@@ -13908,4 +13914,7 @@ function checkBlipFillRasterImages(sp) ...@@ -13908,4 +13914,7 @@ function checkBlipFillRasterImages(sp)
window['AscFormat'].CHART_STYLE_MANAGER = CHART_STYLE_MANAGER; window['AscFormat'].CHART_STYLE_MANAGER = CHART_STYLE_MANAGER;
window['AscFormat'].CheckParagraphTextPr = CheckParagraphTextPr; window['AscFormat'].CheckParagraphTextPr = CheckParagraphTextPr;
window['AscFormat'].CheckObjectTextPr = CheckObjectTextPr; window['AscFormat'].CheckObjectTextPr = CheckObjectTextPr;
window['AscFormat'].CreateColorMapByIndex = CreateColorMapByIndex;
window['AscFormat'].getArrayFillsFromBase = getArrayFillsFromBase;
window['AscFormat'].getMaxIdx = getMaxIdx;
})(window); })(window);
...@@ -400,8 +400,14 @@ AscCommon.extendClass(CGroupShape, AscFormat.CGraphicObjectBase); ...@@ -400,8 +400,14 @@ AscCommon.extendClass(CGroupShape, AscFormat.CGraphicObjectBase);
} }
if(oLock && AscCommon.locktype_None != oLock.Get_Type()) if(oLock && AscCommon.locktype_None != oLock.Get_Type())
{ {
graphics.transform3(this.transform); var bCoMarksDraw = true;
graphics.DrawLockObjectRect(oLock.Get_Type(), 0, 0, this.extX, this.extY); if(typeof editor !== "undefined" && editor && AscFormat.isRealBool(editor.isCoMarksDraw)){
bCoMarksDraw = editor.isCoMarksDraw;
}
if(bCoMarksDraw){
graphics.transform3(this.transform);
graphics.DrawLockObjectRect(oLock.Get_Type(), 0, 0, this.extX, this.extY);
}
} }
} }
graphics.reset(); graphics.reset();
......
...@@ -606,8 +606,14 @@ CImageShape.prototype.draw = function(graphics, transform) ...@@ -606,8 +606,14 @@ CImageShape.prototype.draw = function(graphics, transform)
} }
if(oLock && AscCommon.locktype_None != oLock.Get_Type()) if(oLock && AscCommon.locktype_None != oLock.Get_Type())
{ {
graphics.transform3(_transform); var bCoMarksDraw = true;
graphics.DrawLockObjectRect(oLock.Get_Type(), 0, 0, this.extX, this.extY); if(typeof editor !== "undefined" && editor && AscFormat.isRealBool(editor.isCoMarksDraw)){
bCoMarksDraw = editor.isCoMarksDraw;
}
if(bCoMarksDraw){
graphics.transform3(_transform);
graphics.DrawLockObjectRect(oLock.Get_Type(), 0, 0, this.extX, this.extY);
}
} }
} }
graphics.reset(); graphics.reset();
......
...@@ -4279,8 +4279,14 @@ CShape.prototype.draw = function (graphics, transform, transformText, pageIndex) ...@@ -4279,8 +4279,14 @@ CShape.prototype.draw = function (graphics, transform, transformText, pageIndex)
} }
if(oLock && AscCommon.locktype_None != oLock.Get_Type()) if(oLock && AscCommon.locktype_None != oLock.Get_Type())
{ {
graphics.transform3(_transform); var bCoMarksDraw = true;
graphics.DrawLockObjectRect(oLock.Get_Type(), 0, 0, this.extX, this.extY); if(typeof editor !== "undefined" && editor && AscFormat.isRealBool(editor.isCoMarksDraw)){
bCoMarksDraw = editor.isCoMarksDraw;
}
if(bCoMarksDraw){
graphics.transform3(_transform);
graphics.DrawLockObjectRect(oLock.Get_Type(), 0, 0, this.extX, this.extY);
}
} }
} }
graphics.SetIntegerGrid(true); graphics.SetIntegerGrid(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