проблемы с диагональными бордерами.

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

Excel/model/Workbook.js

@@ -5430,6 +5430,7 @@ Range.prototype._setBorderMerge=function(bLeft, bTop, bRight, bBottom, oNewBorde
 		oTargetBorder.b = oNewBorder.b;
 	else
 		oTargetBorder.b = oNewBorder.ih;
+	oTargetBorder.d = oNewBorder.d;
 	oTargetBorder.dd = oNewBorder.dd;
 	oTargetBorder.du = oNewBorder.du;
 	var oRes = null;

Excel/model/WorkbookElems.js

@@ -933,9 +933,9 @@ Border.prototype =
             if(border.iv)
                 this.iv.merge(border.iv);
             if(null != border.dd)
-                this.dd = border.dd;
+                this.dd = this.dd || border.dd;
             if(null != border.du)
-                this.du = border.du;
+                this.du = this.du || border.du;
         }
     },
 	getType : function()