git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50443 954022d7-b5bf-4e40-9824-e11837661b57

da829291 · Sergey.Luzyanin · Alexander.Trofimov · 26359f10 · da829291
Commit da829291 authored Oct 04, 2013 by Sergey.Luzyanin Committed by Alexander.Trofimov May 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

PowerPoint/Editor/GraphicObjects.js PowerPoint/Editor/GraphicObjects.js +3 -3

No files found.
--- a/PowerPoint/Editor/GraphicObjects.js
+++ b/PowerPoint/Editor/GraphicObjects.js
@@ -1435,7 +1435,7 @@ CGraphicObjects.prototype = {
            case STATES_ID_TEXT_ADD:
            case STATES_ID_TEXT_ADD_IN_GROUP:
            {
-                if(this.State.textObject && this.State.textObject)
+                if(this.State.textObject && this.State.textObject && this.State.textObject instanceof CShape)
                {
                    if(this.State.textObject.txBody && this.State.textObject.txBody.compiledBodyPr && typeof (this.State.textObject.txBody.compiledBodyPr.anchor) == "number")
                    {
@@ -1444,11 +1444,11 @@ CGraphicObjects.prototype = {
                }
                return null;
            }
-            case STATES_ID_NULL:
+            default :
            {
                var _result_align = null;
                var _cur_align;
-                var _shapes = this.selectedObjects;
+                var _shapes = this.State.group ? this.State.group.selectedObjects : this.selectedObjects;
                var _shape_index;
                var _shape;
                for(_shape_index = 0; _shape_index < _shapes.length; ++_shape_index)