Commit 9c8bab18 authored by Sergey Luzyanin's avatar Sergey Luzyanin

Баги с аспектом

parent 9f983e4f
...@@ -9231,7 +9231,7 @@ CChartSpace.prototype.Save_Changes = function(data, w) ...@@ -9231,7 +9231,7 @@ CChartSpace.prototype.Save_Changes = function(data, w)
{ {
case AscDFH.historyitem_AutoShapes_SetLocks: case AscDFH.historyitem_AutoShapes_SetLocks:
{ {
w.Write_Long(data.newPr); w.WriteLong(data.newPr);
break; break;
} }
case AscDFH.historyitem_AutoShapes_SetBFromSerialize: case AscDFH.historyitem_AutoShapes_SetBFromSerialize:
......
...@@ -3756,7 +3756,7 @@ asc_docs_api.prototype.AddImageUrlActionCallback = function(_image) ...@@ -3756,7 +3756,7 @@ asc_docs_api.prototype.AddImageUrlActionCallback = function(_image)
asc_docs_api.prototype.ImgApply = function(obj) asc_docs_api.prototype.ImgApply = function(obj)
{ {
var ImagePr = {}; var ImagePr = {};
ImagePr.lockAspect = obj.lockAspect;
ImagePr.Width = null === obj.Width ? null : parseFloat(obj.Width); ImagePr.Width = null === obj.Width ? null : parseFloat(obj.Width);
ImagePr.Height = null === obj.Height ? null : parseFloat(obj.Height); ImagePr.Height = null === obj.Height ? null : parseFloat(obj.Height);
...@@ -6719,8 +6719,8 @@ CAscChartProp.prototype['getType'] = CAscChartProp.prototype.getType; ...@@ -6719,8 +6719,8 @@ CAscChartProp.prototype['getType'] = CAscChartProp.prototype.getType;
CAscChartProp.prototype['putType'] = CAscChartProp.prototype.putType; CAscChartProp.prototype['putType'] = CAscChartProp.prototype.putType;
CAscChartProp.prototype['getStyle'] = CAscChartProp.prototype.getStyle; CAscChartProp.prototype['getStyle'] = CAscChartProp.prototype.getStyle;
CAscChartProp.prototype['putStyle'] = CAscChartProp.prototype.putStyle; CAscChartProp.prototype['putStyle'] = CAscChartProp.prototype.putStyle;
CAscChartProp.prototype['putLockAspect'] = CAscChartProp.prototype.putLockAspect; CAscChartProp.prototype['putLockAspect'] = CAscChartProp.prototype['asc_putLockAspect'] = CAscChartProp.prototype.putLockAspect;
CAscChartProp.prototype['getLockAspect'] = CAscChartProp.prototype.getLockAspect; CAscChartProp.prototype['getLockAspect'] = CAscChartProp.prototype['asc_getLockAspect'] = CAscChartProp.prototype.getLockAspect;
CAscChartProp.prototype['changeType'] = CAscChartProp.prototype.changeType; CAscChartProp.prototype['changeType'] = CAscChartProp.prototype.changeType;
CDocInfoProp.prototype['get_PageCount'] = CDocInfoProp.prototype.get_PageCount; CDocInfoProp.prototype['get_PageCount'] = CDocInfoProp.prototype.get_PageCount;
CDocInfoProp.prototype['put_PageCount'] = CDocInfoProp.prototype.put_PageCount; CDocInfoProp.prototype['put_PageCount'] = CDocInfoProp.prototype.put_PageCount;
......
...@@ -535,6 +535,10 @@ CGraphicObjects.prototype = ...@@ -535,6 +535,10 @@ CGraphicObjects.prototype =
else else
{ {
oApplyProps = oProps.ShapeProperties ? oProps.ShapeProperties : oProps; oApplyProps = oProps.ShapeProperties ? oProps.ShapeProperties : oProps;
if(AscFormat.isRealBool(oProps.lockAspect))
{
oApplyProps.lockAspect = oProps.lockAspect;
}
} }
this.applyDrawingProps(oApplyProps); this.applyDrawingProps(oApplyProps);
if(AscFormat.isRealNumber(oApplyProps.Width) || AscFormat.isRealNumber(oApplyProps.Height)) if(AscFormat.isRealNumber(oApplyProps.Width) || AscFormat.isRealNumber(oApplyProps.Height))
......
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