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

Bug 30261 - [TextArt] [CoEdit] Происходит деформация текста, если один из...

Bug 30261 - [TextArt] [CoEdit] Происходит деформация текста, если один из юзеров осуществил переворот textart

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64754 954022d7-b5bf-4e40-9824-e11837661b57
parent 5eb060ed
...@@ -2853,7 +2853,7 @@ CShape.prototype = ...@@ -2853,7 +2853,7 @@ CShape.prototype =
oDocContent.Set_StartPage(0); oDocContent.Set_StartPage(0);
oDocContent.Reset(0, 0, dMaxWidthRec, 20000); oDocContent.Reset(0, 0, dMaxWidthRec, 20000);
oDocContent.Recalculate_Page(oDocContent.StartPage, true); oDocContent.Recalculate_Page(oDocContent.StartPage, true);
oRet.w = dMaxWidthRec; oRet.w = dMaxWidthRec + 0.001;
oRet.contentH = oDocContent.Get_SummaryHeight(); oRet.contentH = oDocContent.Get_SummaryHeight();
oRet.h = oRet.contentH; oRet.h = oRet.contentH;
if(!(oBodyPr.vert === nVertTTvert || oBodyPr.vert === nVertTTvert270)) if(!(oBodyPr.vert === nVertTTvert || oBodyPr.vert === nVertTTvert270))
...@@ -2879,15 +2879,15 @@ CShape.prototype = ...@@ -2879,15 +2879,15 @@ CShape.prototype =
{ {
if(!(oBodyPr.vert === nVertTTvert || oBodyPr.vert === nVertTTvert270)) if(!(oBodyPr.vert === nVertTTvert || oBodyPr.vert === nVertTTvert270))
{ {
oRet.w = w; oRet.w = w + 0.001;
oRet.h = h; oRet.h = h + 0.001;
oRet.correctW = l_ins + r_ins; oRet.correctW = l_ins + r_ins;
oRet.correctH = t_ins + b_ins; oRet.correctH = t_ins + b_ins;
} }
else else
{ {
oRet.w = h; oRet.w = h + 0.001;
oRet.h = w; oRet.h = w + 0.001;
oRet.correctW = t_ins + b_ins; oRet.correctW = t_ins + b_ins;
oRet.correctH = l_ins + r_ins; oRet.correctH = l_ins + r_ins;
} }
...@@ -2899,15 +2899,15 @@ CShape.prototype = ...@@ -2899,15 +2899,15 @@ CShape.prototype =
{ {
if(!(oBodyPr.vert === nVertTTvert || oBodyPr.vert === nVertTTvert270)) if(!(oBodyPr.vert === nVertTTvert || oBodyPr.vert === nVertTTvert270))
{ {
oRet.w = w; oRet.w = w + 0.001;
oRet.h = h; oRet.h = h + 0.001;
oRet.correctW = l_ins + r_ins; oRet.correctW = l_ins + r_ins;
oRet.correctH = t_ins + b_ins; oRet.correctH = t_ins + b_ins;
} }
else else
{ {
oRet.w = h; oRet.w = h + 0.001;
oRet.h = w; oRet.h = w + 0.001;
oRet.correctW = t_ins + b_ins; oRet.correctW = t_ins + b_ins;
oRet.correctH = l_ins + r_ins; oRet.correctH = l_ins + r_ins;
} }
...@@ -2916,15 +2916,15 @@ CShape.prototype = ...@@ -2916,15 +2916,15 @@ CShape.prototype =
{ {
if(!(oBodyPr.vert === nVertTTvert || oBodyPr.vert === nVertTTvert270)) if(!(oBodyPr.vert === nVertTTvert || oBodyPr.vert === nVertTTvert270))
{ {
oRet.w = h; oRet.w = h + 0.001;
oRet.h = w; oRet.h = w + 0.001;
oRet.correctW = t_ins + b_ins; oRet.correctW = t_ins + b_ins;
oRet.correctH = l_ins + r_ins; oRet.correctH = l_ins + r_ins;
} }
else else
{ {
oRet.w = w; oRet.w = w + 0.001;
oRet.h = h; oRet.h = h + 0.001;
oRet.correctW = l_ins + r_ins; oRet.correctW = l_ins + r_ins;
oRet.correctH = t_ins + b_ins; oRet.correctH = t_ins + b_ins;
} }
...@@ -2964,8 +2964,8 @@ CShape.prototype = ...@@ -2964,8 +2964,8 @@ CShape.prototype =
this.recalcInfo.recalcTitle = oOldRecalcTitle; this.recalcInfo.recalcTitle = oOldRecalcTitle;
this.recalcInfo.bRecalculatedTitle = bOldRecalcTitle; this.recalcInfo.bRecalculatedTitle = bOldRecalcTitle;
CheckSpPrXfrm(this, true); CheckSpPrXfrm(this, true);
this.spPr.xfrm.setExtX(this.extX); this.spPr.xfrm.setExtX(this.extX + 0.001);
this.spPr.xfrm.setExtY(this.extY); this.spPr.xfrm.setExtY(this.extY + 0.001);
if(!this.bWordShape || this.group) if(!this.bWordShape || this.group)
{ {
this.spPr.xfrm.setOffX(this.x); this.spPr.xfrm.setOffX(this.x);
......
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