Commit 28becca8 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

поправлен баг 19788

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49142 954022d7-b5bf-4e40-9824-e11837661b57
parent 72707121
......@@ -131,7 +131,7 @@ function Paragraph(DrawingDocument, Parent, PageNum, X, Y, XLimit, YLimit)
// Добавляем данный класс в таблицу Id (обязательно в конце конструктора)
g_oTableId.Add( this, this.Id );
if(isRealObject(DrawingDocument) && isRealObject(Parent))
if(/*isRealObject(DrawingDocument) &&*/ isRealObject(Parent))
{
this.setDrawingDocument(DrawingDocument);
this.setParent(Parent);
......
......@@ -1396,8 +1396,8 @@ CShape.prototype =
var _full_rotate = this.getFullRotate();
var _full_flip = this.getFullFlip();
var _hc = this.absExtX*0.5;
var _vc = this.absExtY*0.5;
var _hc = this.extX*0.5;
var _vc = this.extY*0.5;
var _transformed_shape_xc = this.transform.TransformPointX(_hc, _vc);
var _transformed_shape_yc = this.transform.TransformPointY(_hc, _vc);
......@@ -1518,7 +1518,7 @@ CShape.prototype =
}
global_MatrixTransformer.TranslateAppend(_text_transform, _transformed_text_xc - _content_width*0.5, _transformed_text_yc - content_height2*0.5);
var body_pr = this.bodyPr;
var body_pr = this.txBody.bodyPr;
var l_ins = typeof body_pr.lIns === "number" ? body_pr.lIns : 2.54;
var t_ins = typeof body_pr.tIns === "number" ? body_pr.tIns : 1.27;
var r_ins = typeof body_pr.rIns === "number" ? body_pr.rIns : 2.54;
......@@ -1532,6 +1532,10 @@ CShape.prototype =
}
this.invertTransformText = global_MatrixTransformer.Invert(this.transformText);
},
getFullFlip: function()
{
return {flipH: this.getFullFlipH(), flipV: this.getFullFlipV()};
},
/*calculateAfterResize: function()
{
......@@ -2018,6 +2022,8 @@ CShape.prototype =
return this.group.getFullFlipV() ? !this.flipV : this.flipV;
},
getAspect: function(num)
{
var _tmp_x = this.extX != 0 ? this.extX : 0.1;
......
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