git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@61576 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/Qt_build/test_resources/sdk-all.js

@@ -89735,7 +89735,15 @@ DrawingObjectsController.prototype =
 
         if(chart_type.getObjectType() === historyitem_type_LineChart )
         {
-            if(isRealBool(chartSettings.showMarker))
+            if(!isRealBool(chartSettings.showMarker))
+            {
+                chartSettings.showMarker = false;
+            }
+            if(!isRealBool(chartSettings.bLine))
+            {
+                chartSettings.bLine = true;
+            }
+            if(chartSettings.showMarker)
             {
                 //for(var j = 0; j < chart_type.series.length; ++j)
                 //{
@@ -89776,55 +89784,62 @@ DrawingObjectsController.prototype =
                     }
                 }
             }
-            if(isRealBool(chartSettings.bLine))
+
+            if(!chartSettings.bLine)
             {
-                if(!chartSettings.bLine)
+                for(var j = 0; j < chart_type.series.length; ++j)
                 {
-                    for(var j = 0; j < chart_type.series.length; ++j)
+                    removeDPtsFromSeries(chart_type.series[j]);
+                    if(!chart_type.series[j].spPr)
                     {
-                        removeDPtsFromSeries(chart_type.series[j]);
-                        if(!chart_type.series[j].spPr)
-                        {
-                            chart_type.series[j].setSpPr(new CSpPr());
-                        }
-
-                        if(isRealBool(chart_type.series[j].smooth))
-                        {
-                            chart_type.series[j].setSmooth(null);
-                        }
-                        chart_type.series[j].spPr.setLn(CreateNoFillLine());
+                        chart_type.series[j].setSpPr(new CSpPr());
                     }
-                }
-                else
-                {
-                    for(var j = 0; j < chart_type.series.length; ++j)
+
+                    if(isRealBool(chart_type.series[j].smooth))
                     {
-                        removeDPtsFromSeries(chart_type.series[j]);
-                        if(chart_type.series[j].smooth !== (chartSettings.smooth === true))
-                        {
-                            chart_type.series[j].setSmooth(chartSettings.smooth === true);
-                        }
-                        if(chart_type.series[j].spPr && chart_type.series[j].spPr.ln)
-                        {
-                            chart_type.series[j].spPr.setLn(null);
-                        }
+                        chart_type.series[j].setSmooth(null);
                     }
+                    chart_type.series[j].spPr.setLn(CreateNoFillLine());
                 }
-                if(chart_type.smooth !== (chartSettings.smooth === true))
-                {
-                    chart_type.setSmooth(chartSettings.smooth === true);
-                }
+            }
+            else
+            {
                 for(var j = 0; j < chart_type.series.length; ++j)
                 {
+                    removeDPtsFromSeries(chart_type.series[j]);
                     if(chart_type.series[j].smooth !== (chartSettings.smooth === true))
                     {
                         chart_type.series[j].setSmooth(chartSettings.smooth === true);
                     }
+                    if(chart_type.series[j].spPr && chart_type.series[j].spPr.ln)
+                    {
+                        chart_type.series[j].spPr.setLn(null);
+                    }
+                }
+            }
+            if(chart_type.smooth !== (chartSettings.smooth === true))
+            {
+                chart_type.setSmooth(chartSettings.smooth === true);
+            }
+            for(var j = 0; j < chart_type.series.length; ++j)
+            {
+                if(chart_type.series[j].smooth !== (chartSettings.smooth === true))
+                {
+                    chart_type.series[j].setSmooth(chartSettings.smooth === true);
                 }
             }
         }
         if(chart_type.getObjectType() === historyitem_type_ScatterChart)
         {
+            if(!isRealBool(chartSettings.showMarker))
+            {
+                chartSettings.showMarker = true;
+            }
+            if(!isRealBool(chartSettings.bLine))
+            {
+                chartSettings.bLine = false;
+            }
+
             for(var i = 0; i < chart_type.series.length; ++i)
             {
                 if(chart_type.series[i].marker)