git-svn-id:...

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

Excel/model/DrawingObjects/DrawingObjectsController.js

@@ -1065,7 +1065,7 @@ DrawingObjectsController.prototype =
                     state.id = STATES_ID_GROUP;
                     state.groupId = this.curState.group.Get_Id();
                     state.selectedObjects = [];
-                    for(var i = 0; i < this.curState.group.selectedObjects; ++i)
+                    for(var i = 0; i < this.curState.group.selectedObjects.length; ++i)
                     {
                         state.selectedObjects.push(this.curState.group.selectedObjects[i].Get_Id());
                     }

Excel/model/DrawingObjects/Format/Chart.js

@@ -1669,7 +1669,10 @@ CChartAsGroup.prototype =
                     if ( api.wb )
                     {
                         var ws = api.wb.getWorksheetById(data.oldValue);
-                        this.drawingObjects = ws.objectRender;
+                        if(isRealObject(ws))
+                            this.drawingObjects = ws.objectRender;
+                        else
+                            this.drawingObjects = null;
                     }
                 }
                 break;
@@ -1734,7 +1737,10 @@ CChartAsGroup.prototype =
                     if ( api.wb )
                     {
                         var ws = api.wb.getWorksheetById(data.newValue);
-                        this.drawingObjects = ws.objectRender;
+                        if(isRealObject(ws))
+                            this.drawingObjects = ws.objectRender;
+                        else
+                            this.drawingObjects = null;
                     }
                 }
                 break;

Excel/model/DrawingObjects/Format/GroupShape.js

@@ -1586,7 +1586,10 @@ CGroupShape.prototype =
                     if ( api.wb )
                     {
                         var ws = api.wb.getWorksheetById(data.oldValue);
-                        this.drawingObjects = ws.objectRender;
+                        if(isRealObject(ws))
+                            this.drawingObjects = ws.objectRender;
+                        else
+                            this.drawingObjects = null;
                     }
                 }
                 break;
@@ -1643,7 +1646,10 @@ CGroupShape.prototype =
                     if ( api.wb )
                     {
                         var ws = api.wb.getWorksheetById(data.newValue);
-                        this.drawingObjects = ws.objectRender;
+                        if(isRealObject(ws))
+                            this.drawingObjects = ws.objectRender;
+                        else
+                            this.drawingObjects = null;
                     }
                 }
                 break;

Excel/model/DrawingObjects/Format/Image.js

@@ -1146,7 +1146,10 @@ CImageShape.prototype =
                     if ( api.wb )
                     {
                         var ws = api.wb.getWorksheetById(data.oldValue);
-                        this.drawingObjects = ws.objectRender;
+                        if(isRealObject(ws))
+                            this.drawingObjects = ws.objectRender;
+                        else
+                            this.drawingObjects = null;
                     }
                 }
                 break;
@@ -1190,7 +1193,10 @@ CImageShape.prototype =
                     if ( api.wb )
                     {
                         var ws = api.wb.getWorksheetById(data.newValue);
-                        this.drawingObjects = ws.objectRender;
+                        if(isRealObject(ws))
+                            this.drawingObjects = ws.objectRender;
+                        else
+                            this.drawingObjects = null;
                     }
                 }
                 break;

Excel/model/DrawingObjects/Format/Shape.js

@@ -2961,7 +2961,10 @@ CShape.prototype =
                     if ( api.wb )
                     {
                         var ws = api.wb.getWorksheetById(data.oldValue);
-                        this.drawingObjects = ws.objectRender;
+                        if(isRealObject(ws))
+                            this.drawingObjects = ws.objectRender;
+                        else
+                            this.drawingObjects = null;
                     }
                 }
                 break;
@@ -3099,7 +3102,10 @@ CShape.prototype =
                     if ( api.wb )
                     {
                         var ws = api.wb.getWorksheetById(data.newValue);
-                        this.drawingObjects = ws.objectRender;
+                        if(isRealObject(ws))
+                            this.drawingObjects = ws.objectRender;
+                        else
+                            this.drawingObjects = null;
                     }
                 }
                 break;