Merge remote-tracking branch 'origin/develop' into HEAD

cell/model/WorkbookElems.js

@@ -2911,9 +2911,9 @@ CCellValue.prototype =
 			for(var i = 0, length = this.textValueForEdit2.length; i < length; ++i)
 				this.textValueForEdit += this.textValueForEdit2[i].text;
 		}
-		if( CellValueType.Error == this.type ){
-			return this._getValueTypeError(this.textValueForEdit);
-		}
+//		if( CellValueType.Error == this.type ){
+//			return this._getValueTypeError(this.textValueForEdit);
+//		}
 		return this.textValueForEdit;
 	},
 	getValue2 : function(cell, dDigitsCount, fIsFitMeasurer)

cell/model/clipboard.js

@@ -2187,6 +2187,33 @@
 			{
 				//TODO сделать вставку текста всегда через эту функцию
 				this.activeRange = worksheet.activeRange.clone(true);
+				
+				//если находимся внутри шейпа
+				var isIntoShape = worksheet.objectRender.controller.getTargetDocContent();
+				if(isIntoShape)
+				{
+					var callback = function(isSuccess)
+					{
+						if(isSuccess === false)
+						{
+							return false;
+						}
+						
+						var Count = text.length;
+						for ( var Index = 0; Index < Count; Index++ )
+						{
+							var _char = text.charAt(Index);
+							if (" " == _char)
+								isIntoShape.Paragraph_Add(new ParaSpace());
+							else
+								isIntoShape.Paragraph_Add(new ParaText(_char));
+						}
+					};
+					
+					worksheet.objectRender.controller.checkSelectedObjectsAndCallback2(callback);
+					return;
+				}
+				
 				var aResult = [];
 				aResult[this.activeRange.r1] = [];
 				

common/Charts/ChartsDrawer.js

@@ -233,9 +233,16 @@ CChartsDrawer.prototype =
 			
 			if(this.nDimensionCount !== 3)
 			{
-				this.cShapeDrawer.bIsNoSmartAttack = true;
-				this.chart.draw(this);
-				this.cShapeDrawer.bIsNoSmartAttack = false;
+				if(this.calcProp.type === "Line" && this.calcProp.type === "Scatter")
+				{
+					this.cShapeDrawer.bIsNoSmartAttack = true;
+					this.chart.draw(this);
+					this.cShapeDrawer.bIsNoSmartAttack = false;
+				}
+				else
+				{
+					this.chart.draw(this);
+				}
 			}
 		}
 	},

word/Editor/Document.js

@@ -2517,11 +2517,20 @@ CDocument.prototype =
 
         if (true === this.RecalcInfo.Can_RecalcObject())
         {
-            Element.Set_DocumentIndex(Index);
-            Element.Reset(X, Y, XLimit, YLimit, PageIndex, ColumnIndex, ColumnsCount);
+            var ElementPageIndex = 0;
+            if ((0 === Index && 0 === PageIndex) || Index != StartIndex || (Index === StartIndex && true === bResetStartElement))
+            {
+                Element.Set_DocumentIndex(Index);
+                Element.Reset(X, Y, XLimit, YLimit, PageIndex, ColumnIndex, ColumnsCount);
+                ElementPageIndex = 0;
+            }
+            else
+            {
+                ElementPageIndex = PageIndex - Element.PageNum;
+            }
 
-            var TempRecalcResult = Element.Recalculate_Page(0);
-            this.RecalcInfo.Set_FlowObject(Element, 0, TempRecalcResult, -1, {X : X, Y : Y, XLimit: XLimit, YLimit : YLimit});
+            var TempRecalcResult = Element.Recalculate_Page(ElementPageIndex);
+            this.RecalcInfo.Set_FlowObject(Element, ElementPageIndex, TempRecalcResult, -1, {X : X, Y : Y, XLimit: XLimit, YLimit : YLimit});
 
             if (((0 === Index && 0 === PageIndex) || Index != StartIndex) && true != Element.Is_ContentOnFirstPage() && true !== isColumns)
             {