Проверка значения в ячейке.

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

Common/Drawings/Format/ChartSpace.js

@@ -1002,9 +1002,9 @@ CChartSpace.prototype =
         return {type: type, subtype: subtype};
     },
 
-    clearFormatting: function()
+    clearFormatting: function(bNoClearShapeProps)
     {
-        if(this.spPr)
+        if(this.spPr && !(bNoClearShapeProps === true))
         {
             this.spPr.Fill && this.spPr.setFill(null);
             this.spPr.ln && this.spPr.setLn(null);
@@ -2246,8 +2246,10 @@ CChartSpace.prototype =
                                         {
                                             if(!source_worksheet.getColHidden(j))
                                             {
-                                                hidden = false;
                                                 cell = source_worksheet.getCell3(range.r1, j);
+                                                if(typeof cell.getValueWithFormat() === "string" && cell.getValueWithFormat().length > 0)
+                                                {
+                                                    hidden = false;
                                                     pt = new CNumericPoint();
                                                     pt.setIdx(pt_index++);
                                                     pt.setVal(parseFloat(cell.getValue()));
@@ -2261,6 +2263,7 @@ CChartSpace.prototype =
                                             }
                                         }
                                     }
+                                }
                                 else
                                 {
                                     if(!source_worksheet.getColHidden(range.c1))
@@ -2269,8 +2272,10 @@ CChartSpace.prototype =
                                         {
                                             if(!source_worksheet.getRowHidden(j))
                                             {
-                                                hidden = false;
                                                 cell = source_worksheet.getCell3(j, range.c1);
+                                                if(typeof cell.getValueWithFormat() === "string" && cell.getValueWithFormat().length > 0)
+                                                {
+                                                    hidden = false;
                                                     pt = new CNumericPoint();
                                                     pt.setIdx(pt_index++);
                                                     pt.setVal(parseFloat(cell.getValue()));
@@ -2288,6 +2293,7 @@ CChartSpace.prototype =
                             }
                         }
                     }
+                }
                 num_cache.setPtCount(pt_index);
                 val.numRef.setNumCache(num_cache);
                 ser.isHidden = hidden;
@@ -2315,7 +2321,7 @@ CChartSpace.prototype =
                 var arr_f = f1.split(",");
                 var str_cache = new CStrCache();
                 //str_cache.setFormatCode("General");
-                var pt_index = 0, i, j, cell, pt;
+                var pt_index = 0, i, j, cell, pt, value_width_format;
                 for(i = 0; i < arr_f.length; ++i)
                 {
                     var parsed_ref = parserHelp.parse3DRef(arr_f[i]);
@@ -2337,9 +2343,12 @@ CChartSpace.prototype =
                                             if(!source_worksheet.getColHidden(j))
                                             {
                                                 cell = source_worksheet.getCell3(range.r1, j);
+                                                value_width_format = cell.getValueWithFormat();
+                                                if(typeof value_width_format === "string" && value_width_format.length > 0)
+                                                {
                                                     pt = new CStringPoint();
                                                     pt.setIdx(pt_index++);
-                                                pt.setVal(cell.getValueWithFormat());
+                                                    pt.setVal(value_width_format);
 
                                                     str_cache.addPt(pt);
                                                     addPointToMap(oThis.pointsMap, source_worksheet, range.r1, j, pt);
@@ -2347,6 +2356,7 @@ CChartSpace.prototype =
                                             }
                                         }
                                     }
+                                }
                                 else
                                 {
                                     if(!source_worksheet.getColHidden(range.c1))
@@ -2356,10 +2366,12 @@ CChartSpace.prototype =
                                             if(!source_worksheet.getRowHidden(j))
                                             {
                                                 cell = source_worksheet.getCell3(j, range.c1);
+                                                value_width_format = cell.getValueWithFormat();
+                                                if(typeof value_width_format === "string" && value_width_format.length > 0)
+                                                {
                                                     pt = new CStringPoint();
                                                     pt.setIdx(pt_index++);
                                                     pt.setVal(cell.getValueWithFormat());
-
                                                     str_cache.addPt(pt);
                                                     addPointToMap(oThis.pointsMap, source_worksheet, j, range.c1,  pt);
                                                 }
@@ -2370,6 +2382,7 @@ CChartSpace.prototype =
                             }
                         }
                     }
+                }
                 str_cache.setPtCount(pt_index);
                 cat.strRef.setStrCache(str_cache);
             }