Bug 23957 - Ошибка в консоли "Font is not defined " при открытии docx документа.

add CellFormat.formatToChart для преобразования в строку.

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

Common/Drawings/Format/ChartFormat.js

@@ -736,7 +736,7 @@ CDLbl.prototype =
             if(compiled_string.length > 0)
                 compiled_string += separator;
             var num_format = oNumFormatCache.get(this.series.getFormatCode());
-            compiled_string += num_format.format(this.series.getValByIndex(this.pt.idx), CellValueType.Number, gc_nMaxDigCount, null, true)[0].text;
+            compiled_string += num_format.formatToChart(this.series.getValByIndex(this.pt.idx));
         }
         if(this.showPercent)
         {

Common/Drawings/Format/ChartSpace.js

@@ -848,8 +848,8 @@ CChartSpace.prototype =
                         for(i = 0; i < arr_val.length; ++i)
                         {
                             var calc_value = arr_val[i]*multiplier;
-                            var rich_value = num_format.format(calc_value, CellValueType.Number, gc_nMaxDigCount, null, true);
-                            arr_strings.push(rich_value[0].text);
+                            var rich_value = num_format.formatToChart(calc_value);
+                            arr_strings.push(rich_value);
                         }
                     }
                     else
@@ -898,8 +898,8 @@ CChartSpace.prototype =
                         for(i = 0; i < arr_x_val.length; ++i)
                         {
                             var calc_value = arr_x_val[i]*multiplier;
-                            var rich_value = num_format.format(calc_value, CellValueType.number, gc_nMaxDigCount, null, true);
-                            string_pts.push({val:rich_value[0].text});
+                            var rich_value = num_format.formatToChart(calc_value);
+                            string_pts.push({val:rich_value});
                         }
                     }
                     else
@@ -1496,8 +1496,8 @@ CChartSpace.prototype =
                         for(i = 0; i < arr_val.length; ++i)
                         {
                             var calc_value = arr_val[i]*multiplier;
-                            var rich_value = num_format.format(calc_value, CellValueType.Number, gc_nMaxDigCount, null, true);
-                            arr_strings.push(rich_value[0].text);
+                            var rich_value = num_format.formatToChart(calc_value);
+                            arr_strings.push(rich_value);
                         }
                     }
                     else
@@ -2519,8 +2519,8 @@ CChartSpace.prototype =
                         for(i = 0; i < arr_val.length; ++i)
                         {
                             var calc_value = arr_val[i]*multiplier;
-                            var rich_value = num_format.format(calc_value, CellValueType.number, gc_nMaxDigCount, null, true);
-                            arr_strings.push(rich_value[0].text);
+                            var rich_value = num_format.formatToChart(calc_value);
+                            arr_strings.push(rich_value);
                         }
                     }
                     else
@@ -4504,8 +4504,8 @@ CChartSpace.prototype =
                         for(i = 0; i < arr_val.length; ++i)
                         {
                             var calc_value = arr_val[i]*multiplier;
-                            var rich_value = num_format.format(calc_value, CellValueType.number, gc_nMaxDigCount, null, true);
-                            arr_strings.push(rich_value[0].text);
+                            var rich_value = num_format.formatToChart(calc_value);
+                            arr_strings.push(rich_value);
                         }
                     }
                     else

Common/NumFormat.js

@@ -2291,9 +2291,17 @@ CellFormat.prototype =
         return bRes;
     },
 	formatToMathInfo : function(number, nValType, dDigitsCount)
+	{
+		return this._formatToText(number, nValType, dDigitsCount, false);
+	},
+	formatToChart : function(number)
+	{
+		return this._formatToText(number, CellValueType.Number, gc_nMaxDigCount, true);
+	},
+	_formatToText : function(number, nValType, dDigitsCount, bChart)
 	{
 		var result = "";
-		var arrFormat = this.format(number, nValType, dDigitsCount, null, false);
+		var arrFormat = this.format(number, nValType, dDigitsCount, null, bChart);
 		for (var i = 0, item; i < arrFormat.length; ++i) {
 			item = arrFormat[i];
 			if (item.format) {