Bug 26599 - Не сохраняется параметр "тип соединения" у автофигур категории "lines"

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

Common/Drawings/CommonController.js

@@ -6514,8 +6514,8 @@ function CreateAscStrokeEx(ln, _canChangeArrows) {
     if (ln.cap != null)
         ret.asc_putLinecap(ln.cap);
 
-    if (ln.LineJoin != null)
-        ret.asc_putLinejoin(ln.LineJoin.type);
+    if (ln.Join != null)
+        ret.asc_putLinejoin(ln.Join.type);
 
     if (ln.headEnd != null)
     {
@@ -6584,8 +6584,8 @@ function CorrectUniStrokeEx(asc_stroke, unistroke) {
     var _join = asc_stroke.asc_getLinejoin();
     if (null != _join)
     {
-        ret.LineJoin = new LineJoin();
-        ret.LineJoin.type = _join;
+        ret.Join = new LineJoin();
+        ret.Join.type = _join;
     }
 
     var _cap = asc_stroke.asc_getLinecap();

Common/Drawings/Format/Constants.js

@@ -166,6 +166,7 @@ var historyitem_Scaling_SetLogBase     = 2173;
 var historyitem_Scaling_SetMax         = 2174;
 var historyitem_Scaling_SetMin         = 2175;
 var historyitem_Scaling_SetOrientation = 2176;
+var historyitem_Scaling_SetParent      = 2177;
 var historyitem_DTable_SetShowHorzBorder = 2177;
 var historyitem_DTable_SetShowKeys       = 2178;
 var historyitem_DTable_SetShowOutline    = 2179;
@@ -537,6 +538,7 @@ var historyitem_ShapeSetWordShape             = 2527;
 var historyitem_DispUnitsSetBuiltInUnit       = 2526;
 var historyitem_DispUnitsSetCustUnit          = 2527;
 var historyitem_DispUnitsSetDispUnitsLbl      = 2528;
+var historyitem_DispUnitsSetParent      = 2529;
 var historyitem_GroupShapeSetNvGrpSpPr        = 2529;
 var historyitem_GroupShapeSetSpPr             = 2530;
 var historyitem_GroupShapeAddToSpTree           = 2531;

Common/apiCommon.js

@@ -490,6 +490,17 @@
                         }
                         this.putHorGridLines(c_oAscGridLinesSettings.major);
                         this.putVertGridLines(c_oAscGridLinesSettings.none);
+                        if( type === c_oAscChartTypeSettings.lineNormal          ||
+                            type === c_oAscChartTypeSettings.lineStacked                  ||
+                            type === c_oAscChartTypeSettings.lineStackedPer               ||
+                            type === c_oAscChartTypeSettings.lineNormalMarker             ||
+                            type === c_oAscChartTypeSettings.lineStackedMarker            ||
+                            type === c_oAscChartTypeSettings.lineStackedPerMarker      )
+                        {
+                            this.putShowMarker(false);
+                            this.putSmooth(null);
+                            this.putLine(true);
+                        }
                         break;
                     }
                     case c_oAscChartTypeSettings.hBarNormal          :

Word/apiCommon.js

@@ -663,8 +663,8 @@ function CreateAscStroke(ln, _canChangeArrows)
     if (ln.cap != null)
         ret.put_linecap(ln.cap);
 
-    if (ln.LineJoin != null)
-        ret.put_linejoin(ln.LineJoin.type);
+    if (ln.Join != null)
+        ret.put_linejoin(ln.Join.type);
 
     if (ln.headEnd != null)
     {
@@ -735,8 +735,8 @@ function CorrectUniStroke(asc_stroke, unistroke)
     var _join = asc_stroke.LineJoin;
     if (null != _join)
     {
-        ret.LineJoin = new LineJoin();
-        ret.LineJoin.type = _join;
+        ret.Join = new LineJoin();
+        ret.Join.type = _join;
     }
 
     var _cap = asc_stroke.LineCap;