corner рисуем через fill (Цвет поменял на CColor)

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

Excel/graphics/DrawingContext.js

@@ -16,10 +16,9 @@ var asc_floor = asc.floor;
 
 function colorObjToAscColor(color) {
 	var oRes = null;
-	var n = color.getRgb();
-	var r = (n >> 16) & 0xff;
-	var g = (n >> 8) & 0xff;
-	var b = n & 0xff;
+	var r = color.getR();
+	var g = color.getG();
+	var b = color.getB();
 	var bTheme = false;
 	if(color instanceof ThemeColor && null != color.theme)
 	{
@@ -103,10 +102,6 @@ function calcNearestPt(origPt, ppi, pxAddon) {
 	return (y + p + a) / ppi * 72;
 }
 
-function getOption(opt, name, def) {
-	return opt !== undefined && opt[name] !== undefined ? opt[name] : def;
-}
-
 function deg2rad(deg){
 	return deg * Math.PI / 180.0;
 }

Excel/view/WorksheetView.js

@@ -179,7 +179,7 @@
 					color: new CColor(54, 54, 54)
 				}
 				],
-				cornerColor: "#C1C1C1"
+				cornerColor: new CColor(193, 193, 193)
 			};
 			this.cells = {
 				fontName: "Calibri",
@@ -1856,7 +1856,7 @@
 						.lineTo(x2 - dx, y2 - dy)
 						.lineTo(x1 + dx, y2 - dy)
 						.lineTo(x2 - dx, y1 + dy)
-						.setFillPattern(this.settings.header.cornerColor)
+						.setFillStyle(this.settings.header.cornerColor)
 						.fill();
 			},