fix bug 34417

9b871dfe · GoshaZotov · adbb1434 · 9b871dfe
Commit 9b871dfe authored Mar 21, 2017 by GoshaZotov
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

cell/view/WorksheetView.js cell/view/WorksheetView.js +7 -1

No files found.
--- a/cell/view/WorksheetView.js
+++ b/cell/view/WorksheetView.js
@@ -9968,7 +9968,13 @@
 		//font
 		if(rangeStyle.font && specialPasteProps.font)
 		{
-			range.setFont(rangeStyle.font);
+			var font = rangeStyle.font;
+			//если вставляем форматированную таблицу с параметров values + all formating
+			if(specialPasteProps.format && !specialPasteProps.formatTable && rangeStyle.tableDxf && rangeStyle.tableDxf.font)
+			{
+				font = rangeStyle.tableDxf.font.merge(rangeStyle.font);
+			}
+			range.setFont(font);
 		}