Commit 316cc020 authored by Sergey Luzyanin's avatar Sergey Luzyanin

Новые размеры ватермарка

parent a67a6133
...@@ -807,7 +807,7 @@ DrawingObjectsController.prototype = ...@@ -807,7 +807,7 @@ DrawingObjectsController.prototype =
createWatermarkImage: function(sImageUrl) createWatermarkImage: function(sImageUrl)
{ {
return ExecuteNoHistory(function(){ return ExecuteNoHistory(function(){
return this.createImage(sImageUrl, 0, 0, 101.6, 45.6); return this.createImage(sImageUrl, 0, 0, 110, 61.875);
}, this, []); }, this, []);
}, },
......
...@@ -2142,9 +2142,9 @@ CTableId.prototype.Load_Changes = function(Reader, Reader2) ...@@ -2142,9 +2142,9 @@ CTableId.prototype.Load_Changes = function(Reader, Reader2)
{ {
var objectRender = new DrawingObjects(); var objectRender = new DrawingObjects();
var oNewDrawing = objectRender.createDrawingObject(c_oAscCellAnchorType.cellanchorAbsolute); var oNewDrawing = objectRender.createDrawingObject(c_oAscCellAnchorType.cellanchorAbsolute);
oNewDrawing.ext.cx = 101.6;
oNewDrawing.ext.cy = 45.6;
var oImage = DrawingObjectsController.prototype.createWatermarkImage(sUrl); var oImage = DrawingObjectsController.prototype.createWatermarkImage(sUrl);
oNewDrawing.ext.cx = oImage.spPr.xfrm.extX;
oNewDrawing.ext.cy = oImage.spPr.xfrm.extY;
oNewDrawing.graphicObject = oImage; oNewDrawing.graphicObject = oImage;
oWsModel.Drawings.push(oNewDrawing); oWsModel.Drawings.push(oNewDrawing);
} }
......
...@@ -332,9 +332,9 @@ CGraphicObjects.prototype = ...@@ -332,9 +332,9 @@ CGraphicObjects.prototype =
oParaDrawing.Set_BehindDoc( false ); oParaDrawing.Set_BehindDoc( false );
oParaDrawing.Set_Distance( 3.2, 0, 3.2, 0 ); oParaDrawing.Set_Distance( 3.2, 0, 3.2, 0 );
oParaDrawing.Set_DrawingType(drawing_Anchor); oParaDrawing.Set_DrawingType(drawing_Anchor);
oParaDrawing.Extent.W = 101.6;
oParaDrawing.Extent.H = 45.6;
var oShape = this.createWatermarkImage(sImageUrl); var oShape = this.createWatermarkImage(sImageUrl);
oParaDrawing.Extent.W = oShape.spPr.xfrm.extX;
oParaDrawing.Extent.H = oShape.spPr.xfrm.extY;
oShape.setParent(oParaDrawing); oShape.setParent(oParaDrawing);
oParaDrawing.Set_GraphicObject(oShape); oParaDrawing.Set_GraphicObject(oShape);
return oParaDrawing; return oParaDrawing;
......
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