Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

* 'develop' of https://github.com/ONLYOFFICE/sdkjs:
  fix send onFilterInfo if undo/redo(apply changes) on filter
  fix bug 34359
  send onFilterInfo if undo/redo(apply changes) on filter
  fix Bug 32415

cell/model/Workbook.js

@@ -1379,6 +1379,8 @@
 			},
 			"deleteColumnTablePart": function(tableName, deleted) {
 				self.dependencyFormulas.delColumnTable(tableName, deleted);
+			}, 'onFilterInfo' : function () {
+				self.handlers.trigger("asc_onFilterInfo");
 			}
 		} );
 		for(var i = 0, length = tableCustomFunc.length; i < length; ++i) {

cell/model/autofilters.js

@@ -973,6 +973,7 @@
 						break;
 					case AscCH.historyitem_AutoFilter_ApplyMF:
 						this.applyAutoFilter(data.autoFiltersObject, data.activeCells);
+						this.worksheet.handlers.trigger('onFilterInfo');
 						break;
 					case AscCH.historyitem_AutoFilter_Move:
 						this._moveAutoFilters(data.moveTo, data.moveFrom);
@@ -1180,6 +1181,9 @@
 							}
 						}
 					}
+					if (AscCH.historyitem_AutoFilter_ApplyMF === type) {
+						this.worksheet.handlers.trigger('onFilterInfo');
+					}
 				}
 				else if(cloneData.Ref) //удаление таблиц / автофильтров
 				{

cell/view/EventsController.js

@@ -1023,9 +1023,11 @@
 					}
 
 					if (event.altKey) {
-						t.handlers.trigger('addFunction', 'SUM', Asc.c_oAscPopUpSelectorType.Func, true);
+						this.handlers.trigger('addFunction',
+							AscCommonExcel.cFormulaFunctionToLocale ? AscCommonExcel.cFormulaFunctionToLocale['SUM'] :
+								'SUM', Asc.c_oAscPopUpSelectorType.Func, true);
 					} else {
-						t.skipKeyPress = false;
+						this.skipKeyPress = false;
 					}
 					return true;
 
@@ -1035,7 +1037,7 @@
 					return result;
 
 				default:
-					t.skipKeyPress = false;
+					this.skipKeyPress = false;
 					return true;
 
 			} // end of switch

common/Drawings/Format/Image.js

@@ -87,7 +87,7 @@ function CImageShape()
     AscCommon.g_oTableId.Add( this, this.Id );
 }
 
-	CImageShape.prototype = Object.create(AscFormat.CGraphicObjectBase.prototype);
+	CImageShape.prototype = Object.create(AscFormat.CGraphicObjectBase.prototype);
 	CImageShape.prototype.constructor = CImageShape;
 
 CImageShape.prototype.getObjectType = function()
@@ -363,9 +363,14 @@ CImageShape.prototype.recalculateBrush = CShape.prototype.recalculateBrush;
 CImageShape.prototype.recalculatePen = function()
 {
     CShape.prototype.recalculatePen.call(this);
-    if(this.pen && AscFormat.isRealNumber(this.pen.w))
+    if(this.pen)
     {
-        this.pen.w *= 2;
+        if(AscFormat.isRealNumber(this.pen.w)){
+            this.pen.w *= 2;
+        }
+       // if(!this.pen.Fill){
+       //     this.pen = null;
+       // }
     }
 };
 

word/Editor/Paragraph/ParaDrawing.js

@@ -865,7 +865,7 @@ ParaDrawing.prototype.CheckWH = function()
 	var yc          = this.GraphicObj.localTransform.TransformPointY(this.GraphicObj.extX / 2, this.GraphicObj.extY / 2);
 	var oBounds     = this.GraphicObj.bounds;
 	var LineCorrect = 0;
-	if (this.GraphicObj.pen)
+	if (this.GraphicObj.pen && this.GraphicObj.pen.Fill && this.GraphicObj.pen.Fill.fill)
 	{
 		LineCorrect = (this.GraphicObj.pen.w == null) ? 12700 : parseInt(this.GraphicObj.pen.w);
 		LineCorrect /= 72000.0;