Bug #32038 - Диаграмма продолжает отображаться как 3D после смены 3D Pie или...

Bug #32038 - Диаграмма продолжает отображаться как 3D после смены 3D Pie или 3D Line на 2D Column или 2D Bar

common/Drawings/CommonController.js

-/*
- *
- * (c) Copyright Ascensio System Limited 2010-2016
- *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
- *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
- *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
- *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
- *
-*/
+/*
+ *
+ * (c) Copyright Ascensio System Limited 2010-2016
+ *
+ * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
+ * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
+ * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
+ * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
+ *
+ * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
+ * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
+ *
+ * You can contact Ascensio System SIA by email at sales@onlyoffice.com
+ *
+ * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
+ * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
+ *
+ * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
+ * relevant author attributions when distributing the software. If the display of the logo in its graphic 
+ * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
+ * in every copy of the program you distribute. 
+ * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
+ *
+*/
 "use strict";
 
 var asc = window["Asc"] ? window["Asc"] : (window["Asc"] = {});
@@ -840,9 +840,9 @@ DrawingObjectsController.prototype =
     },
 
     drawSelect: function(pageIndex, drawingDocument)
-    {
-		if (undefined !== drawingDocument.BeginDrawTracking)
-            drawingDocument.BeginDrawTracking();
+    {
+		if (undefined !== drawingDocument.BeginDrawTracking)
+            drawingDocument.BeginDrawTracking();
 		
         var i;
         if(this.selection.textSelection)
@@ -1007,10 +1007,10 @@ DrawingObjectsController.prototype =
         {
             drawingDocument.DrawTrackSelectShapes(this.selectionRect.x, this.selectionRect.y, this.selectionRect.w, this.selectionRect.h);
         }
-      
-		if (undefined !== drawingDocument.EndDrawTracking)
-			drawingDocument.EndDrawTracking();
-
+      
+		if (undefined !== drawingDocument.EndDrawTracking)
+			drawingDocument.EndDrawTracking();
+
 		return;
     },
 
@@ -2567,6 +2567,25 @@ DrawingObjectsController.prototype =
                         chart.setDefaultWalls();
                         new_chart_type.set3D(true);
                     }
+                    else
+                    {
+                        if(chart.view3D)
+                        {
+                            chart.setView3D(null);
+                        }
+                        if(chart.floor)
+                        {
+                            chart.setFloor(null);
+                        }
+                        if(chart.sideWall)
+                        {
+                            chart.setSideWall(null);
+                        }
+                        if(chart.backWall)
+                        {
+                            chart.setBackWall(null);
+                        }
+                    }
 
                     axis_by_types = new_chart_type.getAxisByTypes();
                     val_axis = axis_by_types.valAx;
@@ -2701,6 +2720,25 @@ DrawingObjectsController.prototype =
                         chart.setView3D(CreateView3d(15, 20, true, 100));
                         chart.setDefaultWalls();
                     }
+                    else
+                    {
+                        if(chart.view3D)
+                        {
+                            chart.setView3D(null);
+                        }
+                        if(chart.floor)
+                        {
+                            chart.setFloor(null);
+                        }
+                        if(chart.sideWall)
+                        {
+                            chart.setSideWall(null);
+                        }
+                        if(chart.backWall)
+                        {
+                            chart.setBackWall(null);
+                        }
+                    }
                     new_chart_type.setMarker(b_marker);
                     new_chart_type.setGrouping(need_groupping);
                 }
@@ -2719,6 +2757,25 @@ DrawingObjectsController.prototype =
                         chart.setView3D(CreateView3d(30, 0, true, 100));
                         chart.setDefaultWalls();
                     }
+                    else
+                    {
+                        if(chart.view3D)
+                        {
+                            chart.setView3D(null);
+                        }
+                        if(chart.floor)
+                        {
+                            chart.setFloor(null);
+                        }
+                        if(chart.sideWall)
+                        {
+                            chart.setSideWall(null);
+                        }
+                        if(chart.backWall)
+                        {
+                            chart.setBackWall(null);
+                        }
+                    }
                 }
                 else
                 {