change constant name into c_oSpecialPasteProps

cell/apiDefines.js

@@ -368,18 +368,24 @@ var c_oAscPopUpSelectorType = {
   };
   
   var c_oSpecialPasteProps = {
-    formulas: 0,
-    formulasNumberFormating: 1,
-	keepSourceFormating: 2,
-	noBorders: 3,
-	keepSourceColumnWidths: 4, 
-	transpose: 5,
-	values: 6, 
-	valuesNumberFormating: 7,
-	formating: 8,
-	pasteLink: 9,
-	picture: 10,
-	linkedPicture: 11
+    paste: 0,
+    pasteOnlyFormula: 1,
+	formulaNumberFormat: 2,
+	formulaAllFormatting: 3,
+	formulaWithoutBorders: 4, 
+	formulaColumnWidth: 5,
+	mergeConditionalFormating: 6, 
+	pasteOnlyValues: 7,
+	valueNumberFormat: 8,
+	valueAllFormating: 9,
+	pasteOnlyFormating: 10,
+	transpose: 11,
+	link: 12,
+	picture: 13,
+	linkedPicture: 14,
+	
+	sourceformatting: 15,
+	destinationFormatting: 16
   };
   
   var c_kMaxPrintPages = 1500;

cell/view/WorksheetView.js

@@ -8939,13 +8939,14 @@
 		var sProps = Asc.c_oSpecialPasteProps;
 		if(fromBinary)
 		{
-			allowedSpecialPasteProps = [sProps.formulas, sProps.formulasNumberFormating, sProps.keepSourceFormating, sProps.noBorders, sProps.keepSourceColumnWidths, sProps.transpose, sProps.values, sProps.valuesNumberFormating, sProps.keepSourceFormating, sProps.formating, sProps.pasteLink, sProps.picture, sProps.linkedPicture];
+			allowedSpecialPasteProps = [sProps.paste, sProps.pasteOnlyFormula, sProps.formulaNumberFormat, sProps.formulaAllFormatting, sProps.formulaWithoutBorders, sProps.formulaColumnWidth, sProps.mergeConditionalFormating, sProps.pasteOnlyValues, sProps.valueNumberFormat, sProps.valueAllFormating, sProps.pasteOnlyFormating, sProps.link];
 		}
 		else
 		{
 			//matchDestinationFormatting - пока не добавляю, так как работает как и values
-			allowedSpecialPasteProps = [sProps.keepSourceFormating, sProps.values];
+			allowedSpecialPasteProps = [sProps.sourceformatting, sProps.destinationFormatting];
 		}
+		
 		specialPasteShowOptions.asc_setOptions(allowedSpecialPasteProps);
 		var cellCoord = this.getCellCoord(selectData[0].c2, selectData[0].r2);
 		specialPasteShowOptions.asc_setCellCoord(cellCoord);