restore merge code

common/Drawings/DrawingObjectsHandlers.js

@@ -346,7 +346,7 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
                 }
                 if(drawingObjectsController.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
                 {
-                    if(isRealNumber(drawing.selection.legendEntry))
+                    if(AscFormat.isRealNumber(drawing.selection.legendEntry))
                     {
                         drawing.selection.legendEntry = null;
                         drawingObjectsController.updateSelectionState();
@@ -397,11 +397,11 @@ function handleInternalChart(drawing, drawingObjectsController, e, x, y, group,
         if(drawing.chart.plotArea.chart && drawing.chart.plotArea.chart.series)
         {
             var series = drawing.chart.plotArea.chart.series;
-            var _len = drawing.chart.plotArea.chart.getObjectType() === historyitem_type_PieChart ? 1 : series.length;
+            var _len = drawing.chart.plotArea.chart.getObjectType() === AscDFH.historyitem_type_PieChart ? 1 : series.length;
             for(var i = _len - 1; i > -1; --i)
             {
                 var ser = series[i];
-                var pts = getPtsFromSeries(ser);
+                var pts = AscFormat.getPtsFromSeries(ser);
                 for(var j = 0; j < pts.length; ++j)
                 {
                     if(pts[j].compiledDlb)
@@ -552,47 +552,6 @@ function handleInlineChart(drawing, drawingObjectsController, e, x, y, pageIndex
     if(ret)
     {
         return ret;
-    }
-                else
-                {
-                    return {objectId: drawing.Get_Id(), cursorType: "move", bMarker: false};
-                }
-            }
-            else if(hit_in_text_rect)
-            {
-                if(drawingObjectsController.handleEventMode === HANDLE_EVENT_MODE_HANDLE)
-                {
-                    drawingObjectsController.checkChartTextSelection();
-                    drawingObjectsController.resetSelection();
-                    drawingObjectsController.selectObject(drawing, pageIndex);
-                    drawingObjectsController.selection.chartSelection = drawing;
-                    drawing.selectTitle(title, pageIndex);
-                    drawing.selection.textSelection = title;
-                    title.selectionSetStart(e, x, y, pageIndex);
-                    drawingObjectsController.changeCurrentState(new AscFormat.TextAddState(drawingObjectsController, title, x, y));
-                    if(e.ClickCount <= 1)
-                    {
-                        drawingObjectsController.updateSelectionState();
-                    }
-                    return true;
-                }
-                else
-                {
-                    if(drawingObjectsController.document)
-                    {
-                        var content = title.getDocContent();
-                        var invert_transform_text = title.invertTransformText, tx, ty;
-                        if(content && invert_transform_text)
-                        {
-                            tx = invert_transform_text.TransformPointX(x, y);
-                            ty = invert_transform_text.TransformPointY(x, y);
-                            content.Update_CursorType(tx, ty, 0);
-                        }
-                    }
-                    return {objectId: drawing.Get_Id(), cursorType: "text", title: title};
-                }
-            }
-        }
     }
     return handleInlineShapeImage(drawing, drawingObjectsController, e, x, y, pageIndex);
 }

common/Drawings/Format/ChartFormat.js

@@ -554,9 +554,23 @@ CDLbl.prototype =
             var style = new CStyle("dataLblStyle", null, null, null);
             var text_pr = new CTextPr();
             text_pr.FontSize = 10;
-            if(this.chart && AscFormat.isRealNumber(this.chart.style) && this.chart.style > 40)
+            if(this.chart && AscFormat.isRealNumber(this.chart.style) )
             {
-                text_pr.Unifill = AscFormat.CreateUnfilFromRGB(255, 255, 255);
+
+                if(this.chart.style > 40)
+                {
+                    text_pr.Unifill = AscFormat.CreateUnfilFromRGB(255, 255, 255);
+                }
+                else
+                {
+                    var default_style = AscFormat.CHART_STYLE_MANAGER.getDefaultLineStyleByIndex(this.chart.style);
+                    var oUnifill = default_style.axisAndMajorGridLines.createDuplicate();
+                    if(oUnifill && oUnifill.fill && oUnifill.fill.color && oUnifill.fill.color.Mods)
+                    {
+                        oUnifill.fill.color.Mods.Mods.length = 0;
+                    }
+                    text_pr.Unifill = oUnifill;
+                }
             }
             else
             {
@@ -624,14 +638,14 @@ CDLbl.prototype =
                 && this.legend.txPr.content
                 && this.legend.txPr.content.Content[0]
                 && this.legend.txPr.content.Content[0].Pr)
-            {
+                {
                     this.legend.txPr.content.Content[0].Set_DocumentIndex(0);
-                style.ParaPr.Merge(this.legend.txPr.content.Content[0].Pr);
-                if(this.legend.txPr.content.Content[0].Pr.DefaultRunPr)
-                    style.TextPr.Merge(this.legend.txPr.content.Content[0].Pr.DefaultRunPr);
-            }
+                    style.ParaPr.Merge(this.legend.txPr.content.Content[0].Pr);
+                    if(this.legend.txPr.content.Content[0].Pr.DefaultRunPr)
+                        style.TextPr.Merge(this.legend.txPr.content.Content[0].Pr.DefaultRunPr);
+                }
 
-                if(isRealNumber(this.idx))
+                if(AscFormat.isRealNumber(this.idx))
                 {
                     var aLegendEntries = this.legend.legendEntryes;
                     for(var i = 0; i < aLegendEntries.length; ++i)
@@ -972,7 +986,7 @@ CDLbl.prototype =
         }
         else
         {
-            this.txBody = CreateTextBodyFromString(this.getDefaultTextForTxBody(), this.chart.getDrawingDocument(), this);
+            this.txBody = AscFormat.CreateTextBodyFromString(this.getDefaultTextForTxBody(), this.chart.getDrawingDocument(), this);
         }
     },
 

common/Drawings/Format/Format.js

@@ -356,6 +356,17 @@ var TYPE_KIND = {
     MASTER : 2
 };
 
+var TYPE_TRACK_SHAPE = 0;
+var TYPE_TRACK_GROUP = TYPE_TRACK_SHAPE;
+var TYPE_TRACK_GROUP_PASSIVE = 1;
+var TYPE_TRACK_TEXT = 2;
+var TYPE_TRACK_EMPTY_PH = 3;
+var TYPE_TRACK_CHART = 4;
+
+var SLIDE_KIND = 0;
+var LAYOUT_KIND = 1;
+var MASTER_KIND = 2;
+
 var map_prst_color = {};
 
 map_prst_color["aliceBlue"] = 		0xF0F8FF;
@@ -2158,8 +2169,8 @@ CBlipFill.prototype =
         {
             if(!this.tile.IsIdentical(fill.tile))
             {
-            return false;
-        }
+                return false;
+            }
         }
         else
         {
@@ -2198,7 +2209,7 @@ CBlipFill.prototype =
             if(fill.tile.IsIdentical(this.tile))
             {
                 _ret.tile = this.tile.createDuplicate();
-        }
+            }
             else
             {
                 _ret.tile = new CBlipFillTile();

common/editorscommon.js

@@ -1620,8 +1620,8 @@ parserHelper.prototype.checkDataRange = function (model, wb, dialogType, dataRan
 		} else if (Asc.c_oAscSelectionDialogType.FormatTable === dialogType) {
 			// ToDo убрать эту проверку, заменить на более грамотную после правки функции _searchFilters
 			if (true === wb.getWorksheet().model.autoFilters.isRangeIntersectionTableOrFilter(dataRange))
-				return Asc.c_oAscError.ID.AutoFilterDataRangeError;
-		} else if (c_oAscSelectionDialogType.FormatTableChangeRange === dialogType) {
+				return c_oAscError.ID.AutoFilterDataRangeError;
+		} else if (Asc.c_oAscSelectionDialogType.FormatTableChangeRange === dialogType) {
 			// ToDo убрать эту проверку, заменить на более грамотную после правки функции _searchFilters
 			var checkChangeRange = wb.getWorksheet().af_checkChangeRange(dataRange);
 			if (null !== checkChangeRange)