fix Bug 21430

09b7eb80 · SergeyLuzyanin · d9e7417f · 09b7eb80
Commit 09b7eb80 authored Sep 02, 2017 by SergeyLuzyanin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

common/Drawings/CommonController.js common/Drawings/CommonController.js +5 -2

No files found.
--- a/common/Drawings/CommonController.js
+++ b/common/Drawings/CommonController.js
@@ -6752,12 +6752,15 @@ DrawingObjectsController.prototype =
                sp_tree = cur_group.spTree;
+                var xc, yc;
                for(j = 0; j < sp_tree.length; ++j)
                {
                    sp = sp_tree[j];
                    sp.spPr.xfrm.setRot(AscFormat.normalizeRotate(sp.rot + cur_group.rot));
-                    sp.spPr.xfrm.setOffX(sp.spPr.xfrm.offX + cur_group.spPr.xfrm.offX);
+                    xc = sp.transform.TransformPointX(sp.extX/2.0, sp.extY/2.0);
-                    sp.spPr.xfrm.setOffY(sp.spPr.xfrm.offY + cur_group.spPr.xfrm.offY);
+                    yc = sp.transform.TransformPointY(sp.extX/2.0, sp.extY/2.0);
+                    sp.spPr.xfrm.setOffX(xc - sp.extX/2.0);
+                    sp.spPr.xfrm.setOffY(yc - sp.extY/2.0);
                    sp.spPr.xfrm.setFlipH(cur_group.spPr.xfrm.flipH === true ? !(sp.spPr.xfrm.flipH === true) : sp.spPr.xfrm.flipH === true);
                    sp.spPr.xfrm.setFlipV(cur_group.spPr.xfrm.flipV === true ? !(sp.spPr.xfrm.flipV === true) : sp.spPr.xfrm.flipV === true);
                    sp.setGroup(null);