баги с биржевыми диаграммами

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

Common/Drawings/CommonController.js

@@ -2999,9 +2999,9 @@ DrawingObjectsController.prototype =
         }
         else
         {
-            Cat = { Formula: "Sheet1!A2:A5", NumCache: [createItem2(38719, "d\-mmm\-yy"), createItem2(38720, "d\-mmm\-yy"), createItem2(38721, "d\-mmm\-yy"), createItem2(38722, "d\-mmm\-yy"), createItem2(38723, "d\-mmm\-yy")], formatCode: "d\-mmm\-yy" };
+            Cat = { Formula: "Sheet1!A2:A6", NumCache: [createItem2(38719, "d\-mmm\-yy"), createItem2(38720, "d\-mmm\-yy"), createItem2(38721, "d\-mmm\-yy"), createItem2(38722, "d\-mmm\-yy"), createItem2(38723, "d\-mmm\-yy")], formatCode: "d\-mmm\-yy" };
             seria = new asc_CChartSeria();
-            seria.Val.Formula = "Sheet1!B2:B5";
+            seria.Val.Formula = "Sheet1!B2:B6";
             seria.Val.NumCache = [ createItem(40), createItem(21), createItem(37), createItem(49), createItem(32)];
             seria.TxCache.Formula = "Sheet1!B1";
             seria.TxCache.Tx = "Open";
@@ -3009,7 +3009,7 @@ DrawingObjectsController.prototype =
             series.push(seria);
 
             seria = new asc_CChartSeria();
-            seria.Val.Formula = "Sheet1!C2:C5";
+            seria.Val.Formula = "Sheet1!C2:C6";
             seria.Val.NumCache = [ createItem(57), createItem(54), createItem(52), createItem(59), createItem(34)];
             seria.TxCache.Formula = "Sheet1!C1";
             seria.TxCache.Tx = "High";
@@ -3017,7 +3017,7 @@ DrawingObjectsController.prototype =
             series.push(seria);
 
             seria = new asc_CChartSeria();
-            seria.Val.Formula = "Sheet1!D2:D5";
+            seria.Val.Formula = "Sheet1!D2:D6";
             seria.Val.NumCache = [ createItem(10), createItem(14), createItem(14), createItem(12), createItem(6)];
             seria.TxCache.Formula = "Sheet1!D1";
             seria.TxCache.Tx = "Low";
@@ -3025,7 +3025,7 @@ DrawingObjectsController.prototype =
             series.push(seria);
 
             seria = new asc_CChartSeria();
-            seria.Val.Formula = "Sheet1!E2:E5";
+            seria.Val.Formula = "Sheet1!E2:E6";
             seria.Val.NumCache = [ createItem(24), createItem(35), createItem(48), createItem(35), createItem(15)];
             seria.TxCache.Formula = "Sheet1!E1";
             seria.TxCache.Tx = "Close";

Common/Drawings/Format/ChartSpace.js

@@ -829,7 +829,7 @@ CChartSpace.prototype =
         {
             if(val.numRef.numCache)
             {
-                val.numRef.setNumCache(null);
+                removePtsFromLit(val.numRef.numCache);
             }
         }
         if(val.strRef)
@@ -2165,8 +2165,17 @@ CChartSpace.prototype =
                 }
                 var f1 = val.numRef.f.slice(first_slice, last_slice);
                 var arr_f = f1.split(",");
-                var num_cache = new CNumLit();
-                num_cache.setFormatCode("General");
+
+                var num_cache;
+                if(!val.numRef.numCache )
+                {
+                    num_cache = new CNumLit();
+                    num_cache.setFormatCode("General");
+                }
+                else
+                {
+                    num_cache = val.numRef.numCache;
+                }
                 var pt_index = 0, i, j, cell, pt, worksheet_id, hidden = true;
                 for(i = 0; i < arr_f.length; ++i)
                 {
@@ -2342,6 +2351,7 @@ CChartSpace.prototype =
                     //cat
                     checkValByNumRef(this, ser, ser.cat);
                     checkCatByNumRef(this, ser, ser.cat);
+                    checkValByNumRef(this, ser, ser.cat);
                     //tx
                     checkCatByNumRef(this, ser, ser.tx);