http://bugzserver/show_bug.cgi?id=15081 - Копируются свойства Background и...

http://bugzserver/show_bug.cgi?id=15081 - Копируются свойства Background и Font Color в смерженную ячейку

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58527 954022d7-b5bf-4e40-9824-e11837661b57

Excel/view/WorksheetView.js

@@ -9026,7 +9026,9 @@
 									var numStyle = 0;
 									if(skipFormat != null && noSkipVal!= null)
 										numStyle = noSkipVal;
-									if(newVal.getFormula()){
+										
+									//formula	
+									if(newVal.getFormula() && !isOneMerge){
 										var offset = range.getCells()[numFormula].getOffset2(value2[numFormula].sId),
 											assemb,
 											_p_ = new parserFormula(value2[numFormula].sFormula,"",range.worksheet);
@@ -9043,44 +9045,58 @@
 									else
 										range.setValue(value2[numStyle].text);
 
-									range.setBold(value2[numStyle].format.b);
-									range.setItalic(value2[numStyle].format.i);
-									range.setStrikeout(value2[numStyle].format.s);
-									if(!isOneMerge && value2[numStyle].format && null != value2[numStyle].format.c)
-										range.setFontcolor(value2[numStyle].format.c);
-									range.setUnderline(value2[numStyle].format.u);
-									range.setFontname(value2[numStyle].format.fn);
-									range.setFontsize(value2[numStyle].format.fs);
+									if(!isOneMerge)//settings for text
+									{
+										range.setBold(value2[numStyle].format.b);
+										range.setItalic(value2[numStyle].format.i);
+										range.setStrikeout(value2[numStyle].format.s);
+										if(value2[numStyle].format && null != value2[numStyle].format.c)
+											range.setFontcolor(value2[numStyle].format.c);
+										range.setUnderline(value2[numStyle].format.u);
+										range.setFontname(value2[numStyle].format.fn);
+										range.setFontsize(value2[numStyle].format.fs);
+									}
 								}
 								else
 									range.setValue2(value2);
 
-								range.setAlignVertical(newVal.getAlignVertical());
-								if(!isOneMerge)
+								
+								if(!isOneMerge)//settings for cell
+								{
+									//vertical align
+									range.setAlignVertical(newVal.getAlignVertical());
+									
+									//horizontal align
 									range.setAlignHorizontal(newVal.getAlignHorizontal());
-								if(!isOneMerge)
+									//borders
 									range.setBorderSrc(newVal.getBorderFull());
+									
+									//format
+									var numFormat = newVal.getNumFormat();
+									var nameFormat;
+									if(numFormat && numFormat.sFormat)
+										nameFormat = numFormat.sFormat;
+									if(nameFormat)
+										range.setNumFormat(nameFormat);
 
-								var numFormat = newVal.getNumFormat();
-								var nameFormat;
-								if(numFormat && numFormat.sFormat)
-									nameFormat = numFormat.sFormat;
-								if(nameFormat)
-									range.setNumFormat(nameFormat);
-
-								range.setFill(newVal.getFill());
+									//fill
+									range.setFill(newVal.getFill());
 
-								range.setWrap(newVal.getWrap());
+									//wrap
+									range.setWrap(newVal.getWrap());
 
-								var angle = newVal.getAngle();
-								if(angle)
-									range.setAngle(angle);
+									//angle
+									var angle = newVal.getAngle();
+									if(angle)
+										range.setAngle(angle);
 
-								var hyperLink =  newVal.getHyperlink();
-								if(hyperLink != null)
-								{
-									hyperLink.Ref = range;
-									range.setHyperlink(hyperLink);
+									//hyperLink
+									var hyperLink =  newVal.getHyperlink();
+									if(hyperLink != null)
+									{
+										hyperLink.Ref = range;
+										range.setHyperlink(hyperLink);
+									}
 								}
 							}
 						}