Bug 26254 - У диаграммы типа "point" диапазон значений уменьшается на один...

Bug 26254 - У диаграммы типа "point" диапазон значений уменьшается на один ряд/строку при смена типа "data series. Добавил скрипт Fields.js в html.

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

Common/Drawings/CommonController.js

@@ -1877,11 +1877,11 @@ DrawingObjectsController.prototype =
             }
             if( parsed_formula && ws && new_bbox )
             {
-
-                var b_equal_bbox = chart_space.bbox && chart_space.bbox.seriesBBox.r1 === new_bbox.r1
-                    && chart_space.bbox.seriesBBox.r2 === new_bbox.r2
-                    && chart_space.bbox.seriesBBox.c1 === new_bbox.c1
-                    && chart_space.bbox.seriesBBox.c2 === new_bbox.c2;
+                var oCommonBBox = chart_space.getCommonBBox();
+                var b_equal_bbox = oCommonBBox && oCommonBBox.r1 === new_bbox.r1
+                    && oCommonBBox.r2 === new_bbox.r2
+                    && oCommonBBox.c1 === new_bbox.c1
+                    && oCommonBBox.c2 === new_bbox.c2;
                 var b_equal_ws = chart_space.bbox && chart_space.bbox.worksheet === ws;
                 var b_equal_vert = chart_space.bbox && chartSettings.getInColumns() === !chart_space.bbox.seriesBBox.bVert;
 

Excel/SpreadsheetTestMenu.html

@@ -180,6 +180,7 @@
 <script src="../Word/Editor/Run.js"></script>
 <script src="../Word/Editor/Math.js"></script>
 <script src="../Word/Editor/Hyperlink.js"></script>
+<script src="../Word/Editor/Field.js"></script>
 
 <script src="../Word/Editor/Comments.js"></script>
 <script src="../Word/Editor/FlowObjects.js"></script>

Excel/index.html

@@ -358,6 +358,7 @@
 	<script src="../../../../OfficeWeb/Word/Editor/ParagraphContent.js"></script>
 	<script src="../../../../OfficeWeb/Word/Editor/ParagraphContentBase.js"></script>
 	<script src="../../../../OfficeWeb/Word/Editor/Hyperlink.js"></script>
+	<script src="../../../../OfficeWeb/Word/Editor/Field.js"></script>
 	<script src="../../../../OfficeWeb/Word/Editor/Run.js"></script>
     <script src="../../../../OfficeWeb/Word/Editor/Math.js"></script>
 	<script src="../../../../OfficeWeb/Word/Editor/Paragraph.js"></script>

PowerPoint/PowerPoint.html

@@ -172,6 +172,7 @@
     <script src="../Word/Editor/ParagraphContent.js"></script>
     <script src="../Word/Editor/Run.js"></script>
     <script src="../Word/Editor/Hyperlink.js"></script>
+    <script src="../Word/Editor/Field.js"></script>
 
     <script src="../Word/Editor/FlowObjects.js"></script>
     <script src="../Word/Editor/Paragraph.js"></script>

PowerPoint/index.html

@@ -343,6 +343,7 @@
 <script src="../../../../OfficeWeb/Word/Editor/ParagraphContent.js"></script>
 <script src="../../../../OfficeWeb/Word/Editor/ParagraphContentBase.js"></script>
 <script src="../../../../OfficeWeb/Word/Editor/Hyperlink.js"></script>
+<script src="../../../../OfficeWeb/Word/Editor/Field.js"></script>
 <script src="../../../../OfficeWeb/Word/Editor/Run.js"></script>