diff --git a/ClosedXML/ClosedXML/ClosedXML/ClosedXML.csproj b/ClosedXML/ClosedXML/ClosedXML/ClosedXML.csproj index ae2ddb4..7e6cd49 100644 --- a/ClosedXML/ClosedXML/ClosedXML/ClosedXML.csproj +++ b/ClosedXML/ClosedXML/ClosedXML/ClosedXML.csproj @@ -53,10 +53,15 @@ + + + + + @@ -74,6 +79,7 @@ + diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLTheme.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLTheme.cs new file mode 100644 index 0000000..a65ba76 --- /dev/null +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLTheme.cs @@ -0,0 +1,23 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Drawing; + +namespace ClosedXML.Excel +{ + public interface IXLTheme + { + IXLColor Background1 { get; set; } + IXLColor Text1 { get; set; } + IXLColor Background2 { get; set; } + IXLColor Text2 { get; set; } + IXLColor Accent1 { get; set; } + IXLColor Accent2 { get; set; } + IXLColor Accent3 { get; set; } + IXLColor Accent4 { get; set; } + IXLColor Accent5 { get; set; } + IXLColor Accent6 { get; set; } + + } +} diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheet.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheet.cs index 6b7236c..d0efd04 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheet.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/IXLWorksheet.cs @@ -50,6 +50,7 @@ void ExpandColumns(Int32 outlineLevel); void Delete(); + void Clear(); IXLNamedRanges NamedRanges { get; } } diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFItem.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFItem.cs index f84aaae..5c56763 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFItem.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/PageSetup/XLHFItem.cs @@ -114,7 +114,7 @@ retVal += xlFont.VerticalAlignment == XLFontVerticalTextAlignmentValues.Superscript ? "&X" : ""; retVal += xlFont.Underline== XLFontUnderlineValues.Single ? "&U" : ""; retVal += xlFont.Underline == XLFontUnderlineValues.Double ? "&E" : ""; - retVal += "&K" + xlFont.FontColor.ToHex().Substring(2); + retVal += "&K" + xlFont.FontColor.Color.ToHex().Substring(2); retVal += text; diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/IXLColor.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/IXLColor.cs new file mode 100644 index 0000000..6a16ad9 --- /dev/null +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/IXLColor.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Drawing; + +namespace ClosedXML.Excel +{ + public enum XLColorType { Color, Theme, Indexed } + public enum XLThemeColor + { + Background1, + Text1, + Background2, + Text2, + Accent1, + Accent2, + Accent3, + Accent4, + Accent5, + Accent6 + } + public interface IXLColor: IEquatable + { + XLColorType ColorType { get; } + Color Color { get; } + Int32 Indexed { get; } + XLThemeColor ThemeColor { get; } + Double ThemeTint { get; } + } +} diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Internal.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Internal.cs new file mode 100644 index 0000000..f8339bd --- /dev/null +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Internal.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Drawing; + +namespace ClosedXML.Excel +{ + public partial class XLColor + { + internal Boolean HasValue { get; private set; } + internal XLColor(XLColor defaultColor) + { + if (defaultColor.ColorType == XLColorType.Theme) + { + this.ThemeColor = defaultColor.ThemeColor; + this.ThemeTint = defaultColor.ThemeTint; + } + else if (defaultColor.ColorType == XLColorType.Indexed) + { + this.Indexed = defaultColor.Indexed; + } + else + { + this.Color = defaultColor.Color; + } + } + } +} diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs new file mode 100644 index 0000000..60d23df --- /dev/null +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs @@ -0,0 +1,194 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Drawing; + +namespace ClosedXML.Excel +{ + public partial class XLColor: IXLColor + { + public XLColor() + { + HasValue = false; + } + + public XLColor(Color color) + { + Color = color; + HasValue = true; + } + public XLColor(Int32 index) + { + Indexed = index; + HasValue = true; + } + public XLColor(XLThemeColor themeColor) + { + ThemeColor = themeColor; + ThemeTint = 1; + HasValue = true; + } + public XLColor(XLThemeColor themeColor, Double themeTint) + { + ThemeColor = themeColor; + ThemeTint = themeTint; + HasValue = true; + } + public XLColorType ColorType { get; private set; } + private Color color; + public Color Color + { + get + { + if (ColorType == XLColorType.Theme) + { + //if (workbook == null) + throw new Exception("Cannot convert theme color to Color."); + //else + // return workbook.GetXLColor(themeColor).Color; + } + else if (ColorType == XLColorType.Indexed) + { + return IndexedColors[indexed].Color; + } + else + { + return color; + } + } + private set + { + color = value; + ColorType = XLColorType.Color; + } + } + + private Int32 indexed; + public Int32 Indexed + { + get + { + if (ColorType == XLColorType.Theme) + { + throw new Exception("Cannot convert theme color to indexed color."); + } + else if (ColorType == XLColorType.Indexed) + { + return indexed; + } + else // ColorType == Color + { + throw new Exception("Cannot convert Color to indexed color."); + } + } + private set + { + indexed = value; + ColorType = XLColorType.Indexed; + } + } + + private XLThemeColor themeColor; + public XLThemeColor ThemeColor + { + get + { + if (ColorType == XLColorType.Theme) + { + return themeColor; + } + else if (ColorType == XLColorType.Indexed) + { + throw new Exception("Cannot convert indexed color to theme color."); + } + else // ColorType == Color + { + throw new Exception("Cannot convert Color to theme color."); + } + } + private set + { + themeColor = value; + if (themeTint == 0) + themeTint = 1; + ColorType = XLColorType.Theme; + } + } + + private Double themeTint; + public Double ThemeTint + { + get + { + if (ColorType == XLColorType.Theme) + { + return themeTint; + } + else if (ColorType == XLColorType.Indexed) + { + throw new Exception("Cannot extract theme tint from an indexed color."); + } + else // ColorType == Color + { + return (Double)color.A / 255.0; + } + } + private set + { + themeTint = value; + ColorType = XLColorType.Theme; + } + } + + public bool Equals(IXLColor other) + { + if (ColorType != other.ColorType) + { + return false; + } + else + { + if (ColorType == XLColorType.Theme) + { + return this.ThemeColor.Equals(other.ThemeColor) + && this.ThemeTint.Equals(other.ThemeTint); + } + else if (ColorType == XLColorType.Indexed) + { + return this.Indexed.Equals(other.Indexed); + } + else + { + return this.Color.Equals(other.Color); + } + } + } + public override bool Equals(object obj) + { + return this.Equals((XLColor)obj); + } + + public override int GetHashCode() + { + unchecked // Overflow is fine, just wrap + { + if (ColorType == XLColorType.Theme) + { + int hash = 17; + hash = hash * 23 + ThemeColor.GetHashCode(); + hash = hash * 23 + ThemeTint.GetHashCode(); + return hash; + } + else if (ColorType == XLColorType.Indexed) + { + return Indexed; + } + else + { + return Color.GetHashCode(); + } + } + } + } +} diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Static.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Static.cs new file mode 100644 index 0000000..8ba702b --- /dev/null +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Static.cs @@ -0,0 +1,865 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Drawing; + +namespace ClosedXML.Excel +{ + public partial class XLColor + { + public static XLColor FromColor(Color color) + { + return new XLColor(color); + } + public static XLColor FromArgb(Int32 argb) + { + return new XLColor(Color.FromArgb(argb)); + } + public static XLColor FromArgb(Int32 r, Int32 g, Int32 b) + { + return new XLColor(Color.FromArgb(r, g, b)); + } + public static XLColor FromArgb(Int32 a, Int32 r, Int32 g, Int32 b) + { + return new XLColor(Color.FromArgb(a, r, g, b)); + } + public static XLColor FromKnownColor(KnownColor color) + { + return new XLColor(Color.FromKnownColor(color)); + } + public static XLColor FromName(String name) + { + return new XLColor(Color.FromName(name)); + } + public static XLColor FromHtml(String htmlColor) + { + return new XLColor(ColorTranslator.FromHtml(htmlColor)); + } + public static XLColor FromIndex(Int32 index) + { + return new XLColor(index); + } + public static XLColor FromTheme(XLThemeColor themeColor) + { + return new XLColor(themeColor); + } + public static XLColor FromTheme(XLThemeColor themeColor, Double themeTint) + { + return new XLColor(themeColor, themeTint); + } + + private static Dictionary indexedColors; + public static Dictionary IndexedColors + { + get + { + if (indexedColors == null) + { + Dictionary retVal = new Dictionary(); + retVal.Add(0, XLColor.FromHtml("#FF000000")); + retVal.Add(1, XLColor.FromHtml("#FFFFFFFF")); + retVal.Add(2, XLColor.FromHtml("#FFFF0000")); + retVal.Add(3, XLColor.FromHtml("#FF00FF00")); + retVal.Add(4, XLColor.FromHtml("#FF0000FF")); + retVal.Add(5, XLColor.FromHtml("#FFFFFF00")); + retVal.Add(6, XLColor.FromHtml("#FFFF00FF")); + retVal.Add(7, XLColor.FromHtml("#FF00FFFF")); + retVal.Add(8, XLColor.FromHtml("#FF000000")); + retVal.Add(9, XLColor.FromHtml("#FFFFFFFF")); + retVal.Add(10, XLColor.FromHtml("#FFFF0000")); + retVal.Add(11, XLColor.FromHtml("#FF00FF00")); + retVal.Add(12, XLColor.FromHtml("#FF0000FF")); + retVal.Add(13, XLColor.FromHtml("#FFFFFF00")); + retVal.Add(14, XLColor.FromHtml("#FFFF00FF")); + retVal.Add(15, XLColor.FromHtml("#FF00FFFF")); + retVal.Add(16, XLColor.FromHtml("#FF800000")); + retVal.Add(17, XLColor.FromHtml("#FF008000")); + retVal.Add(18, XLColor.FromHtml("#FF000080")); + retVal.Add(19, XLColor.FromHtml("#FF808000")); + retVal.Add(20, XLColor.FromHtml("#FF800080")); + retVal.Add(21, XLColor.FromHtml("#FF008080")); + retVal.Add(22, XLColor.FromHtml("#FFC0C0C0")); + retVal.Add(23, XLColor.FromHtml("#FF808080")); + retVal.Add(24, XLColor.FromHtml("#FF9999FF")); + retVal.Add(25, XLColor.FromHtml("#FF993366")); + retVal.Add(26, XLColor.FromHtml("#FFFFFFCC")); + retVal.Add(27, XLColor.FromHtml("#FFCCFFFF")); + retVal.Add(28, XLColor.FromHtml("#FF660066")); + retVal.Add(29, XLColor.FromHtml("#FFFF8080")); + retVal.Add(30, XLColor.FromHtml("#FF0066CC")); + retVal.Add(31, XLColor.FromHtml("#FFCCCCFF")); + retVal.Add(32, XLColor.FromHtml("#FF000080")); + retVal.Add(33, XLColor.FromHtml("#FFFF00FF")); + retVal.Add(34, XLColor.FromHtml("#FFFFFF00")); + retVal.Add(35, XLColor.FromHtml("#FF00FFFF")); + retVal.Add(36, XLColor.FromHtml("#FF800080")); + retVal.Add(37, XLColor.FromHtml("#FF800000")); + retVal.Add(38, XLColor.FromHtml("#FF008080")); + retVal.Add(39, XLColor.FromHtml("#FF0000FF")); + retVal.Add(40, XLColor.FromHtml("#FF00CCFF")); + retVal.Add(41, XLColor.FromHtml("#FFCCFFFF")); + retVal.Add(42, XLColor.FromHtml("#FFCCFFCC")); + retVal.Add(43, XLColor.FromHtml("#FFFFFF99")); + retVal.Add(44, XLColor.FromHtml("#FF99CCFF")); + retVal.Add(45, XLColor.FromHtml("#FFFF99CC")); + retVal.Add(46, XLColor.FromHtml("#FFCC99FF")); + retVal.Add(47, XLColor.FromHtml("#FFFFCC99")); + retVal.Add(48, XLColor.FromHtml("#FF3366FF")); + retVal.Add(49, XLColor.FromHtml("#FF33CCCC")); + retVal.Add(50, XLColor.FromHtml("#FF003300")); + retVal.Add(51, XLColor.FromHtml("#FF99CC00")); + retVal.Add(52, XLColor.FromHtml("#FFFFCC00")); + retVal.Add(53, XLColor.FromHtml("#FFFF9900")); + retVal.Add(54, XLColor.FromHtml("#FFFF6600")); + retVal.Add(55, XLColor.FromHtml("#FF666699")); + retVal.Add(56, XLColor.FromHtml("#FF969696")); + retVal.Add(57, XLColor.FromHtml("#FF003366")); + retVal.Add(58, XLColor.FromHtml("#FF339966")); + retVal.Add(59, XLColor.FromHtml("#FF333300")); + retVal.Add(60, XLColor.FromHtml("#FF993300")); + retVal.Add(61, XLColor.FromHtml("#FF993366")); + retVal.Add(62, XLColor.FromHtml("#FF333399")); + retVal.Add(63, XLColor.FromHtml("#FF333333")); + indexedColors = retVal; + } + return indexedColors; + } + } + + public static XLColor AliceBlue { get { return FromColor(Color.AliceBlue); } } + public static XLColor AntiqueWhite { get { return FromColor(Color.AntiqueWhite); } } + public static XLColor Aqua { get { return FromColor(Color.Aqua); } } + public static XLColor Aquamarine { get { return FromColor(Color.Aquamarine); } } + public static XLColor Azure { get { return FromColor(Color.Azure); } } + public static XLColor Beige { get { return FromColor(Color.Beige); } } + public static XLColor Bisque { get { return FromColor(Color.Bisque); } } + public static XLColor Black { get { return FromColor(Color.Black); } } + public static XLColor BlanchedAlmond { get { return FromColor(Color.BlanchedAlmond); } } + public static XLColor Blue { get { return FromColor(Color.Blue); } } + public static XLColor BlueViolet { get { return FromColor(Color.BlueViolet); } } + public static XLColor Brown { get { return FromColor(Color.Brown); } } + public static XLColor BurlyWood { get { return FromColor(Color.BurlyWood); } } + public static XLColor CadetBlue { get { return FromColor(Color.CadetBlue); } } + public static XLColor Chartreuse { get { return FromColor(Color.Chartreuse); } } + public static XLColor Chocolate { get { return FromColor(Color.Chocolate); } } + public static XLColor Coral { get { return FromColor(Color.Coral); } } + public static XLColor CornflowerBlue { get { return FromColor(Color.CornflowerBlue); } } + public static XLColor Cornsilk { get { return FromColor(Color.Cornsilk); } } + public static XLColor Crimson { get { return FromColor(Color.Crimson); } } + public static XLColor Cyan { get { return FromColor(Color.Cyan); } } + public static XLColor DarkBlue { get { return FromColor(Color.DarkBlue); } } + public static XLColor DarkCyan { get { return FromColor(Color.DarkCyan); } } + public static XLColor DarkGoldenrod { get { return FromColor(Color.DarkGoldenrod); } } + public static XLColor DarkGray { get { return FromColor(Color.DarkGray); } } + public static XLColor DarkGreen { get { return FromColor(Color.DarkGreen); } } + public static XLColor DarkKhaki { get { return FromColor(Color.DarkKhaki); } } + public static XLColor DarkMagenta { get { return FromColor(Color.DarkMagenta); } } + public static XLColor DarkOliveGreen { get { return FromColor(Color.DarkOliveGreen); } } + public static XLColor DarkOrange { get { return FromColor(Color.DarkOrange); } } + public static XLColor DarkOrchid { get { return FromColor(Color.DarkOrchid); } } + public static XLColor DarkRed { get { return FromColor(Color.DarkRed); } } + public static XLColor DarkSalmon { get { return FromColor(Color.DarkSalmon); } } + public static XLColor DarkSeaGreen { get { return FromColor(Color.DarkSeaGreen); } } + public static XLColor DarkSlateBlue { get { return FromColor(Color.DarkSlateBlue); } } + public static XLColor DarkSlateGray { get { return FromColor(Color.DarkSlateGray); } } + public static XLColor DarkTurquoise { get { return FromColor(Color.DarkTurquoise); } } + public static XLColor DarkViolet { get { return FromColor(Color.DarkViolet); } } + public static XLColor DeepPink { get { return FromColor(Color.DeepPink); } } + public static XLColor DeepSkyBlue { get { return FromColor(Color.DeepSkyBlue); } } + public static XLColor DimGray { get { return FromColor(Color.DimGray); } } + public static XLColor DodgerBlue { get { return FromColor(Color.DodgerBlue); } } + public static XLColor Firebrick { get { return FromColor(Color.Firebrick); } } + public static XLColor FloralWhite { get { return FromColor(Color.FloralWhite); } } + public static XLColor ForestGreen { get { return FromColor(Color.ForestGreen); } } + public static XLColor Fuchsia { get { return FromColor(Color.Fuchsia); } } + public static XLColor Gainsboro { get { return FromColor(Color.Gainsboro); } } + public static XLColor GhostWhite { get { return FromColor(Color.GhostWhite); } } + public static XLColor Gold { get { return FromColor(Color.Gold); } } + public static XLColor Goldenrod { get { return FromColor(Color.Goldenrod); } } + public static XLColor Gray { get { return FromColor(Color.Gray); } } + public static XLColor Green { get { return FromColor(Color.Green); } } + public static XLColor GreenYellow { get { return FromColor(Color.GreenYellow); } } + public static XLColor Honeydew { get { return FromColor(Color.Honeydew); } } + public static XLColor HotPink { get { return FromColor(Color.HotPink); } } + public static XLColor IndianRed { get { return FromColor(Color.IndianRed); } } + public static XLColor Indigo { get { return FromColor(Color.Indigo); } } + public static XLColor Ivory { get { return FromColor(Color.Ivory); } } + public static XLColor Khaki { get { return FromColor(Color.Khaki); } } + public static XLColor Lavender { get { return FromColor(Color.Lavender); } } + public static XLColor LavenderBlush { get { return FromColor(Color.LavenderBlush); } } + public static XLColor LawnGreen { get { return FromColor(Color.LawnGreen); } } + public static XLColor LemonChiffon { get { return FromColor(Color.LemonChiffon); } } + public static XLColor LightBlue { get { return FromColor(Color.LightBlue); } } + public static XLColor LightCoral { get { return FromColor(Color.LightCoral); } } + public static XLColor LightCyan { get { return FromColor(Color.LightCyan); } } + public static XLColor LightGoldenrodYellow { get { return FromColor(Color.LightGoldenrodYellow); } } + public static XLColor LightGray { get { return FromColor(Color.LightGray); } } + public static XLColor LightGreen { get { return FromColor(Color.LightGreen); } } + public static XLColor LightPink { get { return FromColor(Color.LightPink); } } + public static XLColor LightSalmon { get { return FromColor(Color.LightSalmon); } } + public static XLColor LightSeaGreen { get { return FromColor(Color.LightSeaGreen); } } + public static XLColor LightSkyBlue { get { return FromColor(Color.LightSkyBlue); } } + public static XLColor LightSlateGray { get { return FromColor(Color.LightSlateGray); } } + public static XLColor LightSteelBlue { get { return FromColor(Color.LightSteelBlue); } } + public static XLColor LightYellow { get { return FromColor(Color.LightYellow); } } + public static XLColor Lime { get { return FromColor(Color.Lime); } } + public static XLColor LimeGreen { get { return FromColor(Color.LimeGreen); } } + public static XLColor Linen { get { return FromColor(Color.Linen); } } + public static XLColor Magenta { get { return FromColor(Color.Magenta); } } + public static XLColor Maroon { get { return FromColor(Color.Maroon); } } + public static XLColor MediumAquamarine { get { return FromColor(Color.MediumAquamarine); } } + public static XLColor MediumBlue { get { return FromColor(Color.MediumBlue); } } + public static XLColor MediumOrchid { get { return FromColor(Color.MediumOrchid); } } + public static XLColor MediumPurple { get { return FromColor(Color.MediumPurple); } } + public static XLColor MediumSeaGreen { get { return FromColor(Color.MediumSeaGreen); } } + public static XLColor MediumSlateBlue { get { return FromColor(Color.MediumSlateBlue); } } + public static XLColor MediumSpringGreen { get { return FromColor(Color.MediumSpringGreen); } } + public static XLColor MediumTurquoise { get { return FromColor(Color.MediumTurquoise); } } + public static XLColor MediumVioletRed { get { return FromColor(Color.MediumVioletRed); } } + public static XLColor MidnightBlue { get { return FromColor(Color.MidnightBlue); } } + public static XLColor MintCream { get { return FromColor(Color.MintCream); } } + public static XLColor MistyRose { get { return FromColor(Color.MistyRose); } } + public static XLColor Moccasin { get { return FromColor(Color.Moccasin); } } + public static XLColor NavajoWhite { get { return FromColor(Color.NavajoWhite); } } + public static XLColor Navy { get { return FromColor(Color.Navy); } } + public static XLColor OldLace { get { return FromColor(Color.OldLace); } } + public static XLColor Olive { get { return FromColor(Color.Olive); } } + public static XLColor OliveDrab { get { return FromColor(Color.OliveDrab); } } + public static XLColor Orange { get { return FromColor(Color.Orange); } } + public static XLColor OrangeRed { get { return FromColor(Color.OrangeRed); } } + public static XLColor Orchid { get { return FromColor(Color.Orchid); } } + public static XLColor PaleGoldenrod { get { return FromColor(Color.PaleGoldenrod); } } + public static XLColor PaleGreen { get { return FromColor(Color.PaleGreen); } } + public static XLColor PaleTurquoise { get { return FromColor(Color.PaleTurquoise); } } + public static XLColor PaleVioletRed { get { return FromColor(Color.PaleVioletRed); } } + public static XLColor PapayaWhip { get { return FromColor(Color.PapayaWhip); } } + public static XLColor PeachPuff { get { return FromColor(Color.PeachPuff); } } + public static XLColor Peru { get { return FromColor(Color.Peru); } } + public static XLColor Pink { get { return FromColor(Color.Pink); } } + public static XLColor Plum { get { return FromColor(Color.Plum); } } + public static XLColor PowderBlue { get { return FromColor(Color.PowderBlue); } } + public static XLColor Purple { get { return FromColor(Color.Purple); } } + public static XLColor Red { get { return FromColor(Color.Red); } } + public static XLColor RosyBrown { get { return FromColor(Color.RosyBrown); } } + public static XLColor RoyalBlue { get { return FromColor(Color.RoyalBlue); } } + public static XLColor SaddleBrown { get { return FromColor(Color.SaddleBrown); } } + public static XLColor Salmon { get { return FromColor(Color.Salmon); } } + public static XLColor SandyBrown { get { return FromColor(Color.SandyBrown); } } + public static XLColor SeaGreen { get { return FromColor(Color.SeaGreen); } } + public static XLColor SeaShell { get { return FromColor(Color.SeaShell); } } + public static XLColor Sienna { get { return FromColor(Color.Sienna); } } + public static XLColor Silver { get { return FromColor(Color.Silver); } } + public static XLColor SkyBlue { get { return FromColor(Color.SkyBlue); } } + public static XLColor SlateBlue { get { return FromColor(Color.SlateBlue); } } + public static XLColor SlateGray { get { return FromColor(Color.SlateGray); } } + public static XLColor Snow { get { return FromColor(Color.Snow); } } + public static XLColor SpringGreen { get { return FromColor(Color.SpringGreen); } } + public static XLColor SteelBlue { get { return FromColor(Color.SteelBlue); } } + public static XLColor Tan { get { return FromColor(Color.Tan); } } + public static XLColor Teal { get { return FromColor(Color.Teal); } } + public static XLColor Thistle { get { return FromColor(Color.Thistle); } } + public static XLColor Tomato { get { return FromColor(Color.Tomato); } } + public static XLColor Turquoise { get { return FromColor(Color.Turquoise); } } + public static XLColor Violet { get { return FromColor(Color.Violet); } } + public static XLColor Wheat { get { return FromColor(Color.Wheat); } } + public static XLColor White { get { return FromColor(Color.White); } } + public static XLColor WhiteSmoke { get { return FromColor(Color.WhiteSmoke); } } + public static XLColor Yellow { get { return FromColor(Color.Yellow); } } + public static XLColor YellowGreen { get { return FromColor(Color.YellowGreen); } } + public static XLColor AirForceBlue { get { return FromHtml("#FF5D8AA8"); } } + public static XLColor Alizarin { get { return FromHtml("#FFE32636"); } } + public static XLColor Almond { get { return FromHtml("#FFEFDECD"); } } + public static XLColor Amaranth { get { return FromHtml("#FFE52B50"); } } + public static XLColor Amber { get { return FromHtml("#FFFFBF00"); } } + public static XLColor AmberSaeEce { get { return FromHtml("#FFFF7E00"); } } + public static XLColor AmericanRose { get { return FromHtml("#FFFF033E"); } } + public static XLColor Amethyst { get { return FromHtml("#FF9966CC"); } } + public static XLColor AntiFlashWhite { get { return FromHtml("#FFF2F3F4"); } } + public static XLColor AntiqueBrass { get { return FromHtml("#FFCD9575"); } } + public static XLColor AntiqueFuchsia { get { return FromHtml("#FF915C83"); } } + public static XLColor AppleGreen { get { return FromHtml("#FF8DB600"); } } + public static XLColor Apricot { get { return FromHtml("#FFFBCEB1"); } } + public static XLColor Aquamarine1 { get { return FromHtml("#FF7FFFD0"); } } + public static XLColor ArmyGreen { get { return FromHtml("#FF4B5320"); } } + public static XLColor Arsenic { get { return FromHtml("#FF3B444B"); } } + public static XLColor ArylideYellow { get { return FromHtml("#FFE9D66B"); } } + public static XLColor AshGrey { get { return FromHtml("#FFB2BEB5"); } } + public static XLColor Asparagus { get { return FromHtml("#FF87A96B"); } } + public static XLColor AtomicTangerine { get { return FromHtml("#FFFF9966"); } } + public static XLColor Auburn { get { return FromHtml("#FF6D351A"); } } + public static XLColor Aureolin { get { return FromHtml("#FFFDEE00"); } } + public static XLColor Aurometalsaurus { get { return FromHtml("#FF6E7F80"); } } + public static XLColor Awesome { get { return FromHtml("#FFFF2052"); } } + public static XLColor AzureColorWheel { get { return FromHtml("#FF007FFF"); } } + public static XLColor BabyBlue { get { return FromHtml("#FF89CFF0"); } } + public static XLColor BabyBlueEyes { get { return FromHtml("#FFA1CAF1"); } } + public static XLColor BabyPink { get { return FromHtml("#FFF4C2C2"); } } + public static XLColor BallBlue { get { return FromHtml("#FF21ABCD"); } } + public static XLColor BananaMania { get { return FromHtml("#FFFAE7B5"); } } + public static XLColor BattleshipGrey { get { return FromHtml("#FF848482"); } } + public static XLColor Bazaar { get { return FromHtml("#FF98777B"); } } + public static XLColor BeauBlue { get { return FromHtml("#FFBCD4E6"); } } + public static XLColor Beaver { get { return FromHtml("#FF9F8170"); } } + public static XLColor Bistre { get { return FromHtml("#FF3D2B1F"); } } + public static XLColor Bittersweet { get { return FromHtml("#FFFE6F5E"); } } + public static XLColor BleuDeFrance { get { return FromHtml("#FF318CE7"); } } + public static XLColor BlizzardBlue { get { return FromHtml("#FFACE5EE"); } } + public static XLColor Blond { get { return FromHtml("#FFFAF0BE"); } } + public static XLColor BlueBell { get { return FromHtml("#FFA2A2D0"); } } + public static XLColor BlueGray { get { return FromHtml("#FF6699CC"); } } + public static XLColor BlueGreen { get { return FromHtml("#FF00DDDD"); } } + public static XLColor BluePigment { get { return FromHtml("#FF333399"); } } + public static XLColor BlueRyb { get { return FromHtml("#FF0247FE"); } } + public static XLColor Blush { get { return FromHtml("#FFDE5D83"); } } + public static XLColor Bole { get { return FromHtml("#FF79443B"); } } + public static XLColor BondiBlue { get { return FromHtml("#FF0095B6"); } } + public static XLColor BostonUniversityRed { get { return FromHtml("#FFCC0000"); } } + public static XLColor BrandeisBlue { get { return FromHtml("#FF0070FF"); } } + public static XLColor Brass { get { return FromHtml("#FFB5A642"); } } + public static XLColor BrickRed { get { return FromHtml("#FFCB4154"); } } + public static XLColor BrightCerulean { get { return FromHtml("#FF1DACD6"); } } + public static XLColor BrightGreen { get { return FromHtml("#FF66FF00"); } } + public static XLColor BrightLavender { get { return FromHtml("#FFBF94E4"); } } + public static XLColor BrightMaroon { get { return FromHtml("#FFC32148"); } } + public static XLColor BrightPink { get { return FromHtml("#FFFF007F"); } } + public static XLColor BrightTurquoise { get { return FromHtml("#FF08E8DE"); } } + public static XLColor BrightUbe { get { return FromHtml("#FFD19FE8"); } } + public static XLColor BrilliantLavender { get { return FromHtml("#FFF4BBFF"); } } + public static XLColor BrilliantRose { get { return FromHtml("#FFFF55A3"); } } + public static XLColor BrinkPink { get { return FromHtml("#FFFB607F"); } } + public static XLColor BritishRacingGreen { get { return FromHtml("#FF004225"); } } + public static XLColor Bronze { get { return FromHtml("#FFCD7F32"); } } + public static XLColor BrownTraditional { get { return FromHtml("#FF964B00"); } } + public static XLColor BubbleGum { get { return FromHtml("#FFFFC1CC"); } } + public static XLColor Bubbles { get { return FromHtml("#FFE7FEFF"); } } + public static XLColor Buff { get { return FromHtml("#FFF0DC82"); } } + public static XLColor BulgarianRose { get { return FromHtml("#FF480607"); } } + public static XLColor Burgundy { get { return FromHtml("#FF800020"); } } + public static XLColor BurntOrange { get { return FromHtml("#FFCC5500"); } } + public static XLColor BurntSienna { get { return FromHtml("#FFE97451"); } } + public static XLColor BurntUmber { get { return FromHtml("#FF8A3324"); } } + public static XLColor Byzantine { get { return FromHtml("#FFBD33A4"); } } + public static XLColor Byzantium { get { return FromHtml("#FF702963"); } } + public static XLColor Cadet { get { return FromHtml("#FF536872"); } } + public static XLColor CadetGrey { get { return FromHtml("#FF91A3B0"); } } + public static XLColor CadmiumGreen { get { return FromHtml("#FF006B3C"); } } + public static XLColor CadmiumOrange { get { return FromHtml("#FFED872D"); } } + public static XLColor CadmiumRed { get { return FromHtml("#FFE30022"); } } + public static XLColor CadmiumYellow { get { return FromHtml("#FFFFF600"); } } + public static XLColor CalPolyPomonaGreen { get { return FromHtml("#FF1E4D2B"); } } + public static XLColor CambridgeBlue { get { return FromHtml("#FFA3C1AD"); } } + public static XLColor Camel { get { return FromHtml("#FFC19A6B"); } } + public static XLColor CamouflageGreen { get { return FromHtml("#FF78866B"); } } + public static XLColor CanaryYellow { get { return FromHtml("#FFFFEF00"); } } + public static XLColor CandyAppleRed { get { return FromHtml("#FFFF0800"); } } + public static XLColor CandyPink { get { return FromHtml("#FFE4717A"); } } + public static XLColor CaputMortuum { get { return FromHtml("#FF592720"); } } + public static XLColor Cardinal { get { return FromHtml("#FFC41E3A"); } } + public static XLColor CaribbeanGreen { get { return FromHtml("#FF00CC99"); } } + public static XLColor Carmine { get { return FromHtml("#FF960018"); } } + public static XLColor CarminePink { get { return FromHtml("#FFEB4C42"); } } + public static XLColor CarmineRed { get { return FromHtml("#FFFF0038"); } } + public static XLColor CarnationPink { get { return FromHtml("#FFFFA6C9"); } } + public static XLColor Carnelian { get { return FromHtml("#FFB31B1B"); } } + public static XLColor CarolinaBlue { get { return FromHtml("#FF99BADD"); } } + public static XLColor CarrotOrange { get { return FromHtml("#FFED9121"); } } + public static XLColor Ceil { get { return FromHtml("#FF92A1CF"); } } + public static XLColor Celadon { get { return FromHtml("#FFACE1AF"); } } + public static XLColor CelestialBlue { get { return FromHtml("#FF4997D0"); } } + public static XLColor Cerise { get { return FromHtml("#FFDE3163"); } } + public static XLColor CerisePink { get { return FromHtml("#FFEC3B83"); } } + public static XLColor Cerulean { get { return FromHtml("#FF007BA7"); } } + public static XLColor CeruleanBlue { get { return FromHtml("#FF2A52BE"); } } + public static XLColor Chamoisee { get { return FromHtml("#FFA0785A"); } } + public static XLColor Champagne { get { return FromHtml("#FFF7E7CE"); } } + public static XLColor Charcoal { get { return FromHtml("#FF36454F"); } } + public static XLColor ChartreuseTraditional { get { return FromHtml("#FFDFFF00"); } } + public static XLColor CherryBlossomPink { get { return FromHtml("#FFFFB7C5"); } } + public static XLColor Chocolate1 { get { return FromHtml("#FF7B3F00"); } } + public static XLColor ChromeYellow { get { return FromHtml("#FFFFA700"); } } + public static XLColor Cinereous { get { return FromHtml("#FF98817B"); } } + public static XLColor Cinnabar { get { return FromHtml("#FFE34234"); } } + public static XLColor Citrine { get { return FromHtml("#FFE4D00A"); } } + public static XLColor ClassicRose { get { return FromHtml("#FFFBCCE7"); } } + public static XLColor Cobalt { get { return FromHtml("#FF0047AB"); } } + public static XLColor ColumbiaBlue { get { return FromHtml("#FF9BDDFF"); } } + public static XLColor CoolBlack { get { return FromHtml("#FF002E63"); } } + public static XLColor CoolGrey { get { return FromHtml("#FF8C92AC"); } } + public static XLColor Copper { get { return FromHtml("#FFB87333"); } } + public static XLColor CopperRose { get { return FromHtml("#FF996666"); } } + public static XLColor Coquelicot { get { return FromHtml("#FFFF3800"); } } + public static XLColor CoralPink { get { return FromHtml("#FFF88379"); } } + public static XLColor CoralRed { get { return FromHtml("#FFFF4040"); } } + public static XLColor Cordovan { get { return FromHtml("#FF893F45"); } } + public static XLColor Corn { get { return FromHtml("#FFFBEC5D"); } } + public static XLColor CornellRed { get { return FromHtml("#FFB31B1B"); } } + public static XLColor CosmicLatte { get { return FromHtml("#FFFFF8E7"); } } + public static XLColor CottonCandy { get { return FromHtml("#FFFFBCD9"); } } + public static XLColor Cream { get { return FromHtml("#FFFFFDD0"); } } + public static XLColor CrimsonGlory { get { return FromHtml("#FFBE0032"); } } + public static XLColor CyanProcess { get { return FromHtml("#FF00B7EB"); } } + public static XLColor Daffodil { get { return FromHtml("#FFFFFF31"); } } + public static XLColor Dandelion { get { return FromHtml("#FFF0E130"); } } + public static XLColor DarkBrown { get { return FromHtml("#FF654321"); } } + public static XLColor DarkByzantium { get { return FromHtml("#FF5D3954"); } } + public static XLColor DarkCandyAppleRed { get { return FromHtml("#FFA40000"); } } + public static XLColor DarkCerulean { get { return FromHtml("#FF08457E"); } } + public static XLColor DarkChampagne { get { return FromHtml("#FFC2B280"); } } + public static XLColor DarkChestnut { get { return FromHtml("#FF986960"); } } + public static XLColor DarkCoral { get { return FromHtml("#FFCD5B45"); } } + public static XLColor DarkElectricBlue { get { return FromHtml("#FF536878"); } } + public static XLColor DarkGreen1 { get { return FromHtml("#FF013220"); } } + public static XLColor DarkJungleGreen { get { return FromHtml("#FF1A2421"); } } + public static XLColor DarkLava { get { return FromHtml("#FF483C32"); } } + public static XLColor DarkLavender { get { return FromHtml("#FF734F96"); } } + public static XLColor DarkMidnightBlue { get { return FromHtml("#FF003366"); } } + public static XLColor DarkPastelBlue { get { return FromHtml("#FF779ECB"); } } + public static XLColor DarkPastelGreen { get { return FromHtml("#FF03C03C"); } } + public static XLColor DarkPastelPurple { get { return FromHtml("#FF966FD6"); } } + public static XLColor DarkPastelRed { get { return FromHtml("#FFC23B22"); } } + public static XLColor DarkPink { get { return FromHtml("#FFE75480"); } } + public static XLColor DarkPowderBlue { get { return FromHtml("#FF003399"); } } + public static XLColor DarkRaspberry { get { return FromHtml("#FF872657"); } } + public static XLColor DarkScarlet { get { return FromHtml("#FF560319"); } } + public static XLColor DarkSienna { get { return FromHtml("#FF3C1414"); } } + public static XLColor DarkSpringGreen { get { return FromHtml("#FF177245"); } } + public static XLColor DarkTan { get { return FromHtml("#FF918151"); } } + public static XLColor DarkTangerine { get { return FromHtml("#FFFFA812"); } } + public static XLColor DarkTaupe { get { return FromHtml("#FF483C32"); } } + public static XLColor DarkTerraCotta { get { return FromHtml("#FFCC4E5C"); } } + public static XLColor DartmouthGreen { get { return FromHtml("#FF00693E"); } } + public static XLColor DavysGrey { get { return FromHtml("#FF555555"); } } + public static XLColor DebianRed { get { return FromHtml("#FFD70A53"); } } + public static XLColor DeepCarmine { get { return FromHtml("#FFA9203E"); } } + public static XLColor DeepCarminePink { get { return FromHtml("#FFEF3038"); } } + public static XLColor DeepCarrotOrange { get { return FromHtml("#FFE9692C"); } } + public static XLColor DeepCerise { get { return FromHtml("#FFDA3287"); } } + public static XLColor DeepChampagne { get { return FromHtml("#FFFAD6A5"); } } + public static XLColor DeepChestnut { get { return FromHtml("#FFB94E48"); } } + public static XLColor DeepFuchsia { get { return FromHtml("#FFC154C1"); } } + public static XLColor DeepJungleGreen { get { return FromHtml("#FF004B49"); } } + public static XLColor DeepLilac { get { return FromHtml("#FF9955BB"); } } + public static XLColor DeepMagenta { get { return FromHtml("#FFCC00CC"); } } + public static XLColor DeepPeach { get { return FromHtml("#FFFFCBA4"); } } + public static XLColor DeepSaffron { get { return FromHtml("#FFFF9933"); } } + public static XLColor Denim { get { return FromHtml("#FF1560BD"); } } + public static XLColor Desert { get { return FromHtml("#FFC19A6B"); } } + public static XLColor DesertSand { get { return FromHtml("#FFEDC9AF"); } } + public static XLColor DogwoodRose { get { return FromHtml("#FFD71868"); } } + public static XLColor DollarBill { get { return FromHtml("#FF85BB65"); } } + public static XLColor Drab { get { return FromHtml("#FF967117"); } } + public static XLColor DukeBlue { get { return FromHtml("#FF00009C"); } } + public static XLColor EarthYellow { get { return FromHtml("#FFE1A95F"); } } + public static XLColor Ecru { get { return FromHtml("#FFC2B280"); } } + public static XLColor Eggplant { get { return FromHtml("#FF614051"); } } + public static XLColor Eggshell { get { return FromHtml("#FFF0EAD6"); } } + public static XLColor EgyptianBlue { get { return FromHtml("#FF1034A6"); } } + public static XLColor ElectricBlue { get { return FromHtml("#FF7DF9FF"); } } + public static XLColor ElectricCrimson { get { return FromHtml("#FFFF003F"); } } + public static XLColor ElectricIndigo { get { return FromHtml("#FF6F00FF"); } } + public static XLColor ElectricLavender { get { return FromHtml("#FFF4BBFF"); } } + public static XLColor ElectricLime { get { return FromHtml("#FFCCFF00"); } } + public static XLColor ElectricPurple { get { return FromHtml("#FFBF00FF"); } } + public static XLColor ElectricUltramarine { get { return FromHtml("#FF3F00FF"); } } + public static XLColor ElectricViolet { get { return FromHtml("#FF8F00FF"); } } + public static XLColor Emerald { get { return FromHtml("#FF50C878"); } } + public static XLColor EtonBlue { get { return FromHtml("#FF96C8A2"); } } + public static XLColor Fallow { get { return FromHtml("#FFC19A6B"); } } + public static XLColor FaluRed { get { return FromHtml("#FF801818"); } } + public static XLColor Fandango { get { return FromHtml("#FFB53389"); } } + public static XLColor FashionFuchsia { get { return FromHtml("#FFF400A1"); } } + public static XLColor Fawn { get { return FromHtml("#FFE5AA70"); } } + public static XLColor Feldgrau { get { return FromHtml("#FF4D5D53"); } } + public static XLColor FernGreen { get { return FromHtml("#FF4F7942"); } } + public static XLColor FerrariRed { get { return FromHtml("#FFFF2800"); } } + public static XLColor FieldDrab { get { return FromHtml("#FF6C541E"); } } + public static XLColor FireEngineRed { get { return FromHtml("#FFCE2029"); } } + public static XLColor Flame { get { return FromHtml("#FFE25822"); } } + public static XLColor FlamingoPink { get { return FromHtml("#FFFC8EAC"); } } + public static XLColor Flavescent { get { return FromHtml("#FFF7E98E"); } } + public static XLColor Flax { get { return FromHtml("#FFEEDC82"); } } + public static XLColor FluorescentOrange { get { return FromHtml("#FFFFBF00"); } } + public static XLColor FluorescentYellow { get { return FromHtml("#FFCCFF00"); } } + public static XLColor Folly { get { return FromHtml("#FFFF004F"); } } + public static XLColor ForestGreenTraditional { get { return FromHtml("#FF014421"); } } + public static XLColor FrenchBeige { get { return FromHtml("#FFA67B5B"); } } + public static XLColor FrenchBlue { get { return FromHtml("#FF0072BB"); } } + public static XLColor FrenchLilac { get { return FromHtml("#FF86608E"); } } + public static XLColor FrenchRose { get { return FromHtml("#FFF64A8A"); } } + public static XLColor FuchsiaPink { get { return FromHtml("#FFFF77FF"); } } + public static XLColor Fulvous { get { return FromHtml("#FFE48400"); } } + public static XLColor FuzzyWuzzy { get { return FromHtml("#FFCC6666"); } } + public static XLColor Gamboge { get { return FromHtml("#FFE49B0F"); } } + public static XLColor Ginger { get { return FromHtml("#FFF9F9FF"); } } + public static XLColor Glaucous { get { return FromHtml("#FF6082B6"); } } + public static XLColor GoldenBrown { get { return FromHtml("#FF996515"); } } + public static XLColor GoldenPoppy { get { return FromHtml("#FFFCC200"); } } + public static XLColor GoldenYellow { get { return FromHtml("#FFFFDF00"); } } + public static XLColor GoldMetallic { get { return FromHtml("#FFD4AF37"); } } + public static XLColor GrannySmithApple { get { return FromHtml("#FFA8E4A0"); } } + public static XLColor GrayAsparagus { get { return FromHtml("#FF465945"); } } + public static XLColor GreenPigment { get { return FromHtml("#FF00A550"); } } + public static XLColor GreenRyb { get { return FromHtml("#FF66B032"); } } + public static XLColor Grullo { get { return FromHtml("#FFA99A86"); } } + public static XLColor HalayaUbe { get { return FromHtml("#FF663854"); } } + public static XLColor HanBlue { get { return FromHtml("#FF446CCF"); } } + public static XLColor HanPurple { get { return FromHtml("#FF5218FA"); } } + public static XLColor HansaYellow { get { return FromHtml("#FFE9D66B"); } } + public static XLColor Harlequin { get { return FromHtml("#FF3FFF00"); } } + public static XLColor HarvardCrimson { get { return FromHtml("#FFC90016"); } } + public static XLColor HarvestGold { get { return FromHtml("#FFDA9100"); } } + public static XLColor Heliotrope { get { return FromHtml("#FFDF73FF"); } } + public static XLColor HollywoodCerise { get { return FromHtml("#FFF400A1"); } } + public static XLColor HookersGreen { get { return FromHtml("#FF007000"); } } + public static XLColor HotMagenta { get { return FromHtml("#FFFF1DCE"); } } + public static XLColor HunterGreen { get { return FromHtml("#FF355E3B"); } } + public static XLColor Iceberg { get { return FromHtml("#FF71A6D2"); } } + public static XLColor Icterine { get { return FromHtml("#FFFCF75E"); } } + public static XLColor Inchworm { get { return FromHtml("#FFB2EC5D"); } } + public static XLColor IndiaGreen { get { return FromHtml("#FF138808"); } } + public static XLColor IndianYellow { get { return FromHtml("#FFE3A857"); } } + public static XLColor IndigoDye { get { return FromHtml("#FF00416A"); } } + public static XLColor InternationalKleinBlue { get { return FromHtml("#FF002FA7"); } } + public static XLColor InternationalOrange { get { return FromHtml("#FFFF4F00"); } } + public static XLColor Iris { get { return FromHtml("#FF5A4FCF"); } } + public static XLColor Isabelline { get { return FromHtml("#FFF4F0EC"); } } + public static XLColor IslamicGreen { get { return FromHtml("#FF009000"); } } + public static XLColor Jade { get { return FromHtml("#FF00A86B"); } } + public static XLColor Jasper { get { return FromHtml("#FFD73B3E"); } } + public static XLColor JazzberryJam { get { return FromHtml("#FFA50B5E"); } } + public static XLColor Jonquil { get { return FromHtml("#FFFADA5E"); } } + public static XLColor JuneBud { get { return FromHtml("#FFBDDA57"); } } + public static XLColor JungleGreen { get { return FromHtml("#FF29AB87"); } } + public static XLColor KellyGreen { get { return FromHtml("#FF4CBB17"); } } + public static XLColor KhakiHtmlCssKhaki { get { return FromHtml("#FFC3B091"); } } + public static XLColor LanguidLavender { get { return FromHtml("#FFD6CADD"); } } + public static XLColor LapisLazuli { get { return FromHtml("#FF26619C"); } } + public static XLColor LaSalleGreen { get { return FromHtml("#FF087830"); } } + public static XLColor LaserLemon { get { return FromHtml("#FFFEFE22"); } } + public static XLColor Lava { get { return FromHtml("#FFCF1020"); } } + public static XLColor LavenderBlue { get { return FromHtml("#FFCCCCFF"); } } + public static XLColor LavenderFloral { get { return FromHtml("#FFB57EDC"); } } + public static XLColor LavenderGray { get { return FromHtml("#FFC4C3D0"); } } + public static XLColor LavenderIndigo { get { return FromHtml("#FF9457EB"); } } + public static XLColor LavenderPink { get { return FromHtml("#FFFBAED2"); } } + public static XLColor LavenderPurple { get { return FromHtml("#FF967BB6"); } } + public static XLColor LavenderRose { get { return FromHtml("#FFFBA0E3"); } } + public static XLColor Lemon { get { return FromHtml("#FFFFF700"); } } + public static XLColor LightApricot { get { return FromHtml("#FFFDD5B1"); } } + public static XLColor LightBrown { get { return FromHtml("#FFB5651D"); } } + public static XLColor LightCarminePink { get { return FromHtml("#FFE66771"); } } + public static XLColor LightCornflowerBlue { get { return FromHtml("#FF93CCEA"); } } + public static XLColor LightFuchsiaPink { get { return FromHtml("#FFF984EF"); } } + public static XLColor LightMauve { get { return FromHtml("#FFDCD0FF"); } } + public static XLColor LightPastelPurple { get { return FromHtml("#FFB19CD9"); } } + public static XLColor LightSalmonPink { get { return FromHtml("#FFFF9999"); } } + public static XLColor LightTaupe { get { return FromHtml("#FFB38B6D"); } } + public static XLColor LightThulianPink { get { return FromHtml("#FFE68FAC"); } } + public static XLColor LightYellow1 { get { return FromHtml("#FFFFFFED"); } } + public static XLColor Lilac { get { return FromHtml("#FFC8A2C8"); } } + public static XLColor LimeColorWheel { get { return FromHtml("#FFBFFF00"); } } + public static XLColor LincolnGreen { get { return FromHtml("#FF195905"); } } + public static XLColor Liver { get { return FromHtml("#FF534B4F"); } } + public static XLColor Lust { get { return FromHtml("#FFE62020"); } } + public static XLColor MacaroniAndCheese { get { return FromHtml("#FFFFBD88"); } } + public static XLColor MagentaDye { get { return FromHtml("#FFCA1F7B"); } } + public static XLColor MagentaProcess { get { return FromHtml("#FFFF0090"); } } + public static XLColor MagicMint { get { return FromHtml("#FFAAF0D1"); } } + public static XLColor Magnolia { get { return FromHtml("#FFF8F4FF"); } } + public static XLColor Mahogany { get { return FromHtml("#FFC04000"); } } + public static XLColor Maize { get { return FromHtml("#FFFBEC5D"); } } + public static XLColor MajorelleBlue { get { return FromHtml("#FF6050DC"); } } + public static XLColor Malachite { get { return FromHtml("#FF0BDA51"); } } + public static XLColor Manatee { get { return FromHtml("#FF979AAA"); } } + public static XLColor MangoTango { get { return FromHtml("#FFFF8243"); } } + public static XLColor MaroonX11 { get { return FromHtml("#FFB03060"); } } + public static XLColor Mauve { get { return FromHtml("#FFE0B0FF"); } } + public static XLColor Mauvelous { get { return FromHtml("#FFEF98AA"); } } + public static XLColor MauveTaupe { get { return FromHtml("#FF915F6D"); } } + public static XLColor MayaBlue { get { return FromHtml("#FF73C2FB"); } } + public static XLColor MeatBrown { get { return FromHtml("#FFE5B73B"); } } + public static XLColor MediumAquamarine1 { get { return FromHtml("#FF66DDAA"); } } + public static XLColor MediumCandyAppleRed { get { return FromHtml("#FFE2062C"); } } + public static XLColor MediumCarmine { get { return FromHtml("#FFAF4035"); } } + public static XLColor MediumChampagne { get { return FromHtml("#FFF3E5AB"); } } + public static XLColor MediumElectricBlue { get { return FromHtml("#FF035096"); } } + public static XLColor MediumJungleGreen { get { return FromHtml("#FF1C352D"); } } + public static XLColor MediumPersianBlue { get { return FromHtml("#FF0067A5"); } } + public static XLColor MediumRedViolet { get { return FromHtml("#FFBB3385"); } } + public static XLColor MediumSpringBud { get { return FromHtml("#FFC9DC87"); } } + public static XLColor MediumTaupe { get { return FromHtml("#FF674C47"); } } + public static XLColor Melon { get { return FromHtml("#FFFDBCB4"); } } + public static XLColor MidnightGreenEagleGreen { get { return FromHtml("#FF004953"); } } + public static XLColor MikadoYellow { get { return FromHtml("#FFFFC40C"); } } + public static XLColor Mint { get { return FromHtml("#FF3EB489"); } } + public static XLColor MintGreen { get { return FromHtml("#FF98FF98"); } } + public static XLColor ModeBeige { get { return FromHtml("#FF967117"); } } + public static XLColor MoonstoneBlue { get { return FromHtml("#FF73A9C2"); } } + public static XLColor MordantRed19 { get { return FromHtml("#FFAE0C00"); } } + public static XLColor MossGreen { get { return FromHtml("#FFADDFAD"); } } + public static XLColor MountainMeadow { get { return FromHtml("#FF30BA8F"); } } + public static XLColor MountbattenPink { get { return FromHtml("#FF997A8D"); } } + public static XLColor MsuGreen { get { return FromHtml("#FF18453B"); } } + public static XLColor Mulberry { get { return FromHtml("#FFC54B8C"); } } + public static XLColor Mustard { get { return FromHtml("#FFFFDB58"); } } + public static XLColor Myrtle { get { return FromHtml("#FF21421E"); } } + public static XLColor NadeshikoPink { get { return FromHtml("#FFF6ADC6"); } } + public static XLColor NapierGreen { get { return FromHtml("#FF2A8000"); } } + public static XLColor NaplesYellow { get { return FromHtml("#FFFADA5E"); } } + public static XLColor NeonCarrot { get { return FromHtml("#FFFFA343"); } } + public static XLColor NeonFuchsia { get { return FromHtml("#FFFE59C2"); } } + public static XLColor NeonGreen { get { return FromHtml("#FF39FF14"); } } + public static XLColor NonPhotoBlue { get { return FromHtml("#FFA4DDED"); } } + public static XLColor OceanBoatBlue { get { return FromHtml("#FFCC7422"); } } + public static XLColor Ochre { get { return FromHtml("#FFCC7722"); } } + public static XLColor OldGold { get { return FromHtml("#FFCFB53B"); } } + public static XLColor OldLavender { get { return FromHtml("#FF796878"); } } + public static XLColor OldMauve { get { return FromHtml("#FF673147"); } } + public static XLColor OldRose { get { return FromHtml("#FFC08081"); } } + public static XLColor OliveDrab7 { get { return FromHtml("#FF3C341F"); } } + public static XLColor Olivine { get { return FromHtml("#FF9AB973"); } } + public static XLColor Onyx { get { return FromHtml("#FF0F0F0F"); } } + public static XLColor OperaMauve { get { return FromHtml("#FFB784A7"); } } + public static XLColor OrangeColorWheel { get { return FromHtml("#FFFF7F00"); } } + public static XLColor OrangePeel { get { return FromHtml("#FFFF9F00"); } } + public static XLColor OrangeRyb { get { return FromHtml("#FFFB9902"); } } + public static XLColor OtterBrown { get { return FromHtml("#FF654321"); } } + public static XLColor OuCrimsonRed { get { return FromHtml("#FF990000"); } } + public static XLColor OuterSpace { get { return FromHtml("#FF414A4C"); } } + public static XLColor OutrageousOrange { get { return FromHtml("#FFFF6E4A"); } } + public static XLColor OxfordBlue { get { return FromHtml("#FF002147"); } } + public static XLColor PakistanGreen { get { return FromHtml("#FF00421B"); } } + public static XLColor PalatinateBlue { get { return FromHtml("#FF273BE2"); } } + public static XLColor PalatinatePurple { get { return FromHtml("#FF682860"); } } + public static XLColor PaleAqua { get { return FromHtml("#FFBCD4E6"); } } + public static XLColor PaleBrown { get { return FromHtml("#FF987654"); } } + public static XLColor PaleCarmine { get { return FromHtml("#FFAF4035"); } } + public static XLColor PaleCerulean { get { return FromHtml("#FF9BC4E2"); } } + public static XLColor PaleChestnut { get { return FromHtml("#FFDDADAF"); } } + public static XLColor PaleCopper { get { return FromHtml("#FFDA8A67"); } } + public static XLColor PaleCornflowerBlue { get { return FromHtml("#FFABCDEF"); } } + public static XLColor PaleGold { get { return FromHtml("#FFE6BE8A"); } } + public static XLColor PaleMagenta { get { return FromHtml("#FFF984E5"); } } + public static XLColor PalePink { get { return FromHtml("#FFFADADD"); } } + public static XLColor PaleRobinEggBlue { get { return FromHtml("#FF96DED1"); } } + public static XLColor PaleSilver { get { return FromHtml("#FFC9C0BB"); } } + public static XLColor PaleSpringBud { get { return FromHtml("#FFECEBBD"); } } + public static XLColor PaleTaupe { get { return FromHtml("#FFBC987E"); } } + public static XLColor PansyPurple { get { return FromHtml("#FF78184A"); } } + public static XLColor ParisGreen { get { return FromHtml("#FF50C878"); } } + public static XLColor PastelBlue { get { return FromHtml("#FFAEC6CF"); } } + public static XLColor PastelBrown { get { return FromHtml("#FF836953"); } } + public static XLColor PastelGray { get { return FromHtml("#FFCFCFC4"); } } + public static XLColor PastelGreen { get { return FromHtml("#FF77DD77"); } } + public static XLColor PastelMagenta { get { return FromHtml("#FFF49AC2"); } } + public static XLColor PastelOrange { get { return FromHtml("#FFFFB347"); } } + public static XLColor PastelPink { get { return FromHtml("#FFFFD1DC"); } } + public static XLColor PastelPurple { get { return FromHtml("#FFB39EB5"); } } + public static XLColor PastelRed { get { return FromHtml("#FFFF6961"); } } + public static XLColor PastelViolet { get { return FromHtml("#FFCB99C9"); } } + public static XLColor PastelYellow { get { return FromHtml("#FFFDFD96"); } } + public static XLColor PaynesGrey { get { return FromHtml("#FF40404F"); } } + public static XLColor Peach { get { return FromHtml("#FFFFE5B4"); } } + public static XLColor PeachOrange { get { return FromHtml("#FFFFCC99"); } } + public static XLColor PeachYellow { get { return FromHtml("#FFFADFAD"); } } + public static XLColor Pear { get { return FromHtml("#FFD1E231"); } } + public static XLColor Pearl { get { return FromHtml("#FFF0EAD6"); } } + public static XLColor Peridot { get { return FromHtml("#FFE6E200"); } } + public static XLColor Periwinkle { get { return FromHtml("#FFCCCCFF"); } } + public static XLColor PersianBlue { get { return FromHtml("#FF1C39BB"); } } + public static XLColor PersianGreen { get { return FromHtml("#FF00A693"); } } + public static XLColor PersianIndigo { get { return FromHtml("#FF32127A"); } } + public static XLColor PersianOrange { get { return FromHtml("#FFD99058"); } } + public static XLColor PersianPink { get { return FromHtml("#FFF77FBE"); } } + public static XLColor PersianPlum { get { return FromHtml("#FF701C1C"); } } + public static XLColor PersianRed { get { return FromHtml("#FFCC3333"); } } + public static XLColor PersianRose { get { return FromHtml("#FFFE28A2"); } } + public static XLColor Persimmon { get { return FromHtml("#FFEC5800"); } } + public static XLColor Phlox { get { return FromHtml("#FFDF00FF"); } } + public static XLColor PhthaloBlue { get { return FromHtml("#FF000F89"); } } + public static XLColor PhthaloGreen { get { return FromHtml("#FF123524"); } } + public static XLColor PiggyPink { get { return FromHtml("#FFFDDDE6"); } } + public static XLColor PineGreen { get { return FromHtml("#FF01796F"); } } + public static XLColor PinkOrange { get { return FromHtml("#FFFF9966"); } } + public static XLColor PinkPearl { get { return FromHtml("#FFE7ACCF"); } } + public static XLColor PinkSherbet { get { return FromHtml("#FFF78FA7"); } } + public static XLColor Pistachio { get { return FromHtml("#FF93C572"); } } + public static XLColor Platinum { get { return FromHtml("#FFE5E4E2"); } } + public static XLColor PlumTraditional { get { return FromHtml("#FF8E4585"); } } + public static XLColor PortlandOrange { get { return FromHtml("#FFFF5A36"); } } + public static XLColor PrincetonOrange { get { return FromHtml("#FFFF8F00"); } } + public static XLColor Prune { get { return FromHtml("#FF701C1C"); } } + public static XLColor PrussianBlue { get { return FromHtml("#FF003153"); } } + public static XLColor PsychedelicPurple { get { return FromHtml("#FFDF00FF"); } } + public static XLColor Puce { get { return FromHtml("#FFCC8899"); } } + public static XLColor Pumpkin { get { return FromHtml("#FFFF7518"); } } + public static XLColor PurpleHeart { get { return FromHtml("#FF69359C"); } } + public static XLColor PurpleMountainMajesty { get { return FromHtml("#FF9678B6"); } } + public static XLColor PurpleMunsell { get { return FromHtml("#FF9F00C5"); } } + public static XLColor PurplePizzazz { get { return FromHtml("#FFFE4EDA"); } } + public static XLColor PurpleTaupe { get { return FromHtml("#FF50404D"); } } + public static XLColor PurpleX11 { get { return FromHtml("#FFA020F0"); } } + public static XLColor RadicalRed { get { return FromHtml("#FFFF355E"); } } + public static XLColor Raspberry { get { return FromHtml("#FFE30B5D"); } } + public static XLColor RaspberryGlace { get { return FromHtml("#FF915F6D"); } } + public static XLColor RaspberryPink { get { return FromHtml("#FFE25098"); } } + public static XLColor RaspberryRose { get { return FromHtml("#FFB3446C"); } } + public static XLColor RawUmber { get { return FromHtml("#FF826644"); } } + public static XLColor RazzleDazzleRose { get { return FromHtml("#FFFF33CC"); } } + public static XLColor Razzmatazz { get { return FromHtml("#FFE3256B"); } } + public static XLColor RedMunsell { get { return FromHtml("#FFF2003C"); } } + public static XLColor RedNcs { get { return FromHtml("#FFC40233"); } } + public static XLColor RedPigment { get { return FromHtml("#FFED1C24"); } } + public static XLColor RedRyb { get { return FromHtml("#FFFE2712"); } } + public static XLColor Redwood { get { return FromHtml("#FFAB4E52"); } } + public static XLColor Regalia { get { return FromHtml("#FF522D80"); } } + public static XLColor RichBlack { get { return FromHtml("#FF004040"); } } + public static XLColor RichBrilliantLavender { get { return FromHtml("#FFF1A7FE"); } } + public static XLColor RichCarmine { get { return FromHtml("#FFD70040"); } } + public static XLColor RichElectricBlue { get { return FromHtml("#FF0892D0"); } } + public static XLColor RichLavender { get { return FromHtml("#FFA76BCF"); } } + public static XLColor RichLilac { get { return FromHtml("#FFB666D2"); } } + public static XLColor RichMaroon { get { return FromHtml("#FFB03060"); } } + public static XLColor RifleGreen { get { return FromHtml("#FF414833"); } } + public static XLColor RobinEggBlue { get { return FromHtml("#FF00CCCC"); } } + public static XLColor Rose { get { return FromHtml("#FFFF007F"); } } + public static XLColor RoseBonbon { get { return FromHtml("#FFF9429E"); } } + public static XLColor RoseEbony { get { return FromHtml("#FF674846"); } } + public static XLColor RoseGold { get { return FromHtml("#FFB76E79"); } } + public static XLColor RoseMadder { get { return FromHtml("#FFE32636"); } } + public static XLColor RosePink { get { return FromHtml("#FFFF66CC"); } } + public static XLColor RoseQuartz { get { return FromHtml("#FFAA98A9"); } } + public static XLColor RoseTaupe { get { return FromHtml("#FF905D5D"); } } + public static XLColor RoseVale { get { return FromHtml("#FFAB4E52"); } } + public static XLColor Rosewood { get { return FromHtml("#FF65000B"); } } + public static XLColor RossoCorsa { get { return FromHtml("#FFD40000"); } } + public static XLColor RoyalAzure { get { return FromHtml("#FF0038A8"); } } + public static XLColor RoyalBlueTraditional { get { return FromHtml("#FF002366"); } } + public static XLColor RoyalFuchsia { get { return FromHtml("#FFCA2C92"); } } + public static XLColor RoyalPurple { get { return FromHtml("#FF7851A9"); } } + public static XLColor Ruby { get { return FromHtml("#FFE0115F"); } } + public static XLColor Ruddy { get { return FromHtml("#FFFF0028"); } } + public static XLColor RuddyBrown { get { return FromHtml("#FFBB6528"); } } + public static XLColor RuddyPink { get { return FromHtml("#FFE18E96"); } } + public static XLColor Rufous { get { return FromHtml("#FFA81C07"); } } + public static XLColor Russet { get { return FromHtml("#FF80461B"); } } + public static XLColor Rust { get { return FromHtml("#FFB7410E"); } } + public static XLColor SacramentoStateGreen { get { return FromHtml("#FF00563F"); } } + public static XLColor SafetyOrangeBlazeOrange { get { return FromHtml("#FFFF6700"); } } + public static XLColor Saffron { get { return FromHtml("#FFF4C430"); } } + public static XLColor Salmon1 { get { return FromHtml("#FFFF8C69"); } } + public static XLColor SalmonPink { get { return FromHtml("#FFFF91A4"); } } + public static XLColor Sand { get { return FromHtml("#FFC2B280"); } } + public static XLColor SandDune { get { return FromHtml("#FF967117"); } } + public static XLColor Sandstorm { get { return FromHtml("#FFECD540"); } } + public static XLColor SandyTaupe { get { return FromHtml("#FF967117"); } } + public static XLColor Sangria { get { return FromHtml("#FF92000A"); } } + public static XLColor SapGreen { get { return FromHtml("#FF507D2A"); } } + public static XLColor Sapphire { get { return FromHtml("#FF082567"); } } + public static XLColor SatinSheenGold { get { return FromHtml("#FFCBA135"); } } + public static XLColor Scarlet { get { return FromHtml("#FFFF2000"); } } + public static XLColor SchoolBusYellow { get { return FromHtml("#FFFFD800"); } } + public static XLColor ScreaminGreen { get { return FromHtml("#FF76FF7A"); } } + public static XLColor SealBrown { get { return FromHtml("#FF321414"); } } + public static XLColor SelectiveYellow { get { return FromHtml("#FFFFBA00"); } } + public static XLColor Sepia { get { return FromHtml("#FF704214"); } } + public static XLColor Shadow { get { return FromHtml("#FF8A795D"); } } + public static XLColor ShamrockGreen { get { return FromHtml("#FF009E60"); } } + public static XLColor ShockingPink { get { return FromHtml("#FFFC0FC0"); } } + public static XLColor Sienna1 { get { return FromHtml("#FF882D17"); } } + public static XLColor Sinopia { get { return FromHtml("#FFCB410B"); } } + public static XLColor Skobeloff { get { return FromHtml("#FF007474"); } } + public static XLColor SkyMagenta { get { return FromHtml("#FFCF71AF"); } } + public static XLColor SmaltDarkPowderBlue { get { return FromHtml("#FF003399"); } } + public static XLColor SmokeyTopaz { get { return FromHtml("#FF933D41"); } } + public static XLColor SmokyBlack { get { return FromHtml("#FF100C08"); } } + public static XLColor SpiroDiscoBall { get { return FromHtml("#FF0FC0FC"); } } + public static XLColor SplashedWhite { get { return FromHtml("#FFFEFDFF"); } } + public static XLColor SpringBud { get { return FromHtml("#FFA7FC00"); } } + public static XLColor StPatricksBlue { get { return FromHtml("#FF23297A"); } } + public static XLColor StilDeGrainYellow { get { return FromHtml("#FFFADA5E"); } } + public static XLColor Straw { get { return FromHtml("#FFE4D96F"); } } + public static XLColor Sunglow { get { return FromHtml("#FFFFCC33"); } } + public static XLColor Sunset { get { return FromHtml("#FFFAD6A5"); } } + public static XLColor Tangelo { get { return FromHtml("#FFF94D00"); } } + public static XLColor Tangerine { get { return FromHtml("#FFF28500"); } } + public static XLColor TangerineYellow { get { return FromHtml("#FFFFCC00"); } } + public static XLColor Taupe { get { return FromHtml("#FF483C32"); } } + public static XLColor TaupeGray { get { return FromHtml("#FF8B8589"); } } + public static XLColor TeaGreen { get { return FromHtml("#FFD0F0C0"); } } + public static XLColor TealBlue { get { return FromHtml("#FF367588"); } } + public static XLColor TealGreen { get { return FromHtml("#FF006D5B"); } } + public static XLColor TeaRoseOrange { get { return FromHtml("#FFF88379"); } } + public static XLColor TeaRoseRose { get { return FromHtml("#FFF4C2C2"); } } + public static XLColor TennéTawny { get { return FromHtml("#FFCD5700"); } } + public static XLColor TerraCotta { get { return FromHtml("#FFE2725B"); } } + public static XLColor ThulianPink { get { return FromHtml("#FFDE6FA1"); } } + public static XLColor TickleMePink { get { return FromHtml("#FFFC89AC"); } } + public static XLColor TiffanyBlue { get { return FromHtml("#FF0ABAB5"); } } + public static XLColor TigersEye { get { return FromHtml("#FFE08D3C"); } } + public static XLColor Timberwolf { get { return FromHtml("#FFDBD7D2"); } } + public static XLColor TitaniumYellow { get { return FromHtml("#FFEEE600"); } } + public static XLColor Toolbox { get { return FromHtml("#FF746CC0"); } } + public static XLColor TractorRed { get { return FromHtml("#FFFD0E35"); } } + public static XLColor TropicalRainForest { get { return FromHtml("#FF00755E"); } } + public static XLColor TuftsBlue { get { return FromHtml("#FF417DC1"); } } + public static XLColor Tumbleweed { get { return FromHtml("#FFDEAA88"); } } + public static XLColor TurkishRose { get { return FromHtml("#FFB57281"); } } + public static XLColor Turquoise1 { get { return FromHtml("#FF30D5C8"); } } + public static XLColor TurquoiseBlue { get { return FromHtml("#FF00FFEF"); } } + public static XLColor TurquoiseGreen { get { return FromHtml("#FFA0D6B4"); } } + public static XLColor TuscanRed { get { return FromHtml("#FF823535"); } } + public static XLColor TwilightLavender { get { return FromHtml("#FF8A496B"); } } + public static XLColor TyrianPurple { get { return FromHtml("#FF66023C"); } } + public static XLColor UaBlue { get { return FromHtml("#FF0033AA"); } } + public static XLColor UaRed { get { return FromHtml("#FFD9004C"); } } + public static XLColor Ube { get { return FromHtml("#FF8878C3"); } } + public static XLColor UclaBlue { get { return FromHtml("#FF536895"); } } + public static XLColor UclaGold { get { return FromHtml("#FFFFB300"); } } + public static XLColor UfoGreen { get { return FromHtml("#FF3CD070"); } } + public static XLColor Ultramarine { get { return FromHtml("#FF120A8F"); } } + public static XLColor UltramarineBlue { get { return FromHtml("#FF4166F5"); } } + public static XLColor UltraPink { get { return FromHtml("#FFFF6FFF"); } } + public static XLColor Umber { get { return FromHtml("#FF635147"); } } + public static XLColor UnitedNationsBlue { get { return FromHtml("#FF5B92E5"); } } + public static XLColor UnmellowYellow { get { return FromHtml("#FFFFFF66"); } } + public static XLColor UpForestGreen { get { return FromHtml("#FF014421"); } } + public static XLColor UpMaroon { get { return FromHtml("#FF7B1113"); } } + public static XLColor UpsdellRed { get { return FromHtml("#FFAE2029"); } } + public static XLColor Urobilin { get { return FromHtml("#FFE1AD21"); } } + public static XLColor UscCardinal { get { return FromHtml("#FF990000"); } } + public static XLColor UscGold { get { return FromHtml("#FFFFCC00"); } } + public static XLColor UtahCrimson { get { return FromHtml("#FFD3003F"); } } + public static XLColor Vanilla { get { return FromHtml("#FFF3E5AB"); } } + public static XLColor VegasGold { get { return FromHtml("#FFC5B358"); } } + public static XLColor VenetianRed { get { return FromHtml("#FFC80815"); } } + public static XLColor Verdigris { get { return FromHtml("#FF43B3AE"); } } + public static XLColor Vermilion { get { return FromHtml("#FFE34234"); } } + public static XLColor Veronica { get { return FromHtml("#FFA020F0"); } } + public static XLColor Violet1 { get { return FromHtml("#FF8F00FF"); } } + public static XLColor VioletColorWheel { get { return FromHtml("#FF7F00FF"); } } + public static XLColor VioletRyb { get { return FromHtml("#FF8601AF"); } } + public static XLColor Viridian { get { return FromHtml("#FF40826D"); } } + public static XLColor VividAuburn { get { return FromHtml("#FF922724"); } } + public static XLColor VividBurgundy { get { return FromHtml("#FF9F1D35"); } } + public static XLColor VividCerise { get { return FromHtml("#FFDA1D81"); } } + public static XLColor VividTangerine { get { return FromHtml("#FFFFA089"); } } + public static XLColor VividViolet { get { return FromHtml("#FF9F00FF"); } } + public static XLColor WarmBlack { get { return FromHtml("#FF004242"); } } + public static XLColor Wenge { get { return FromHtml("#FF645452"); } } + public static XLColor WildBlueYonder { get { return FromHtml("#FFA2ADD0"); } } + public static XLColor WildStrawberry { get { return FromHtml("#FFFF43A4"); } } + public static XLColor WildWatermelon { get { return FromHtml("#FFFC6C85"); } } + public static XLColor Wisteria { get { return FromHtml("#FFC9A0DC"); } } + public static XLColor Xanadu { get { return FromHtml("#FF738678"); } } + public static XLColor YaleBlue { get { return FromHtml("#FF0F4D92"); } } + public static XLColor YellowMunsell { get { return FromHtml("#FFEFCC00"); } } + public static XLColor YellowNcs { get { return FromHtml("#FFFFD300"); } } + public static XLColor YellowProcess { get { return FromHtml("#FFFFEF00"); } } + public static XLColor YellowRyb { get { return FromHtml("#FFFEFE33"); } } + public static XLColor Zaffre { get { return FromHtml("#FF0014A8"); } } + public static XLColor ZinnwalditeBrown { get { return FromHtml("#FF2C1608"); } } + + } +} diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLBorder.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLBorder.cs index e1be727..d1b1d8f 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLBorder.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLBorder.cs @@ -27,19 +27,19 @@ { XLBorderStyleValues LeftBorder { get; set; } - Color LeftBorderColor { get; set; } + XLColor LeftBorderColor { get; set; } XLBorderStyleValues RightBorder { get; set; } - Color RightBorderColor { get; set; } + XLColor RightBorderColor { get; set; } XLBorderStyleValues TopBorder { get; set; } - Color TopBorderColor { get; set; } + XLColor TopBorderColor { get; set; } XLBorderStyleValues BottomBorder { get; set; } - Color BottomBorderColor { get; set; } + XLColor BottomBorderColor { get; set; } Boolean DiagonalUp { get; set; } @@ -47,6 +47,6 @@ XLBorderStyleValues DiagonalBorder { get; set; } - Color DiagonalBorderColor { get; set; } + XLColor DiagonalBorderColor { get; set; } } } diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFill.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFill.cs index 4c938de..9f73f3a 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFill.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFill.cs @@ -31,11 +31,11 @@ public interface IXLFill:IEquatable { - Color BackgroundColor { get; set; } + XLColor BackgroundColor { get; set; } - Color PatternColor { get; set; } + XLColor PatternColor { get; set; } - Color PatternBackgroundColor { get; set; } + XLColor PatternBackgroundColor { get; set; } XLFillPatternValues PatternType { get; set; } } diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFont.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFont.cs index 9388f09..784402f 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFont.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/IXLFont.cs @@ -41,7 +41,7 @@ XLFontVerticalTextAlignmentValues VerticalAlignment { get; set; } Boolean Shadow { get; set; } Double FontSize { get; set; } - Color FontColor { get; set; } + XLColor FontColor { get; set; } String FontName { get; set; } XLFontFamilyNumberingValues FontFamilyNumbering { get; set; } } diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLAlignment.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLAlignment.cs index 97218ab..5277cf7 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLAlignment.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLAlignment.cs @@ -245,7 +245,7 @@ public override bool Equals(object obj) { - return this.GetHashCode().Equals(obj.GetHashCode()); + return this.Equals((XLAlignment)obj); } public override int GetHashCode() diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs index 469488c..5514c3b 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs @@ -47,8 +47,8 @@ } } - private Color leftBorderColor; - public Color LeftBorderColor + private XLColor leftBorderColor; + public XLColor LeftBorderColor { get { @@ -79,8 +79,8 @@ } } - private Color rightBorderColor; - public Color RightBorderColor + private XLColor rightBorderColor; + public XLColor RightBorderColor { get { @@ -111,8 +111,8 @@ } } - private Color topBorderColor; - public Color TopBorderColor + private XLColor topBorderColor; + public XLColor TopBorderColor { get { @@ -143,8 +143,8 @@ } } - private Color bottomBorderColor; - public Color BottomBorderColor + private XLColor bottomBorderColor; + public XLColor BottomBorderColor { get { @@ -175,8 +175,8 @@ } } - private Color diagonalBorderColor; - public Color DiagonalBorderColor + private XLColor diagonalBorderColor; + public XLColor DiagonalBorderColor { get { @@ -272,7 +272,7 @@ public override bool Equals(object obj) { - return this.GetHashCode().Equals(obj.GetHashCode()); + return this.Equals((XLBorder)obj); } public override int GetHashCode() diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs index e443541..086fc92 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs @@ -10,7 +10,7 @@ { #region Properties - public Color BackgroundColor + public XLColor BackgroundColor { get { @@ -25,14 +25,14 @@ else { patternType = XLFillPatternValues.Solid; - patternColor = value; - patternBackgroundColor = value; + patternColor = new XLColor(value); + patternBackgroundColor = new XLColor(value); } } } - private Color patternColor; - public Color PatternColor + private XLColor patternColor; + public XLColor PatternColor { get { @@ -47,8 +47,8 @@ } } - private Color patternBackgroundColor; - public Color PatternBackgroundColor + private XLColor patternBackgroundColor; + public XLColor PatternBackgroundColor { get { @@ -127,7 +127,7 @@ public override bool Equals(object obj) { - return this.GetHashCode().Equals(obj.GetHashCode()); + return this.Equals((XLFill)obj); } public override int GetHashCode() diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs index 39e9b68..c7328cb 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs @@ -50,7 +50,7 @@ sb.Append("-"); sb.Append(FontSize.ToString()); sb.Append("-"); - sb.Append(FontColor.ToHex()); + sb.Append(FontColor.Color.ToHex()); sb.Append("-"); sb.Append(FontName); sb.Append("-"); @@ -172,8 +172,8 @@ } } - private Color fontColor; - public Color FontColor + private XLColor fontColor; + public XLColor FontColor { get { @@ -270,7 +270,7 @@ public override bool Equals(object obj) { - return this.GetHashCode().Equals(obj.GetHashCode()); + return this.Equals((XLFont)obj); } public override int GetHashCode() diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLNumberFormat.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLNumberFormat.cs index 57c52dd..641c4f3 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLNumberFormat.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLNumberFormat.cs @@ -88,7 +88,7 @@ public override bool Equals(object obj) { - return this.GetHashCode().Equals(obj.GetHashCode()); + return this.Equals((XLNumberFormat)obj); } public override int GetHashCode() diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStyle.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStyle.cs index 3c87bb4..bad11b6 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStyle.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLStyle.cs @@ -82,7 +82,7 @@ public override bool Equals(object obj) { - return this.GetHashCode().Equals(obj.GetHashCode()); + return this.Equals((XLStyle)obj); } public override int GetHashCode() diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLTheme.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLTheme.cs new file mode 100644 index 0000000..b30a81b --- /dev/null +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLTheme.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Drawing; + +namespace ClosedXML.Excel +{ + internal class XLTheme: IXLTheme + { + public IXLColor Background1 { get; set; } + public IXLColor Text1 { get; set; } + public IXLColor Background2 { get; set; } + public IXLColor Text2 { get; set; } + public IXLColor Accent1 { get; set; } + public IXLColor Accent2 { get; set; } + public IXLColor Accent3 { get; set; } + public IXLColor Accent4 { get; set; } + public IXLColor Accent5 { get; set; } + public IXLColor Accent6 { get; set; } + } +} diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook.cs index 078f984..be8a749 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook.cs @@ -29,6 +29,41 @@ Properties = new XLWorkbookProperties(); CalculateMode = XLCalculateMode.Default; ReferenceStyle = XLReferenceStyle.Default; + InitializeTheme(); + } + + private void InitializeTheme() + { + Theme = new XLTheme() { + Text1 = XLColor.FromHtml("#FF000000"), + Background1 = XLColor.FromHtml("#FFFFFFFF"), + Text2 = XLColor.FromHtml("#FF1F497D"), + Background2 = XLColor.FromHtml("#FFEEECE1"), + Accent1 = XLColor.FromHtml("#FF4F81BD"), + Accent2 = XLColor.FromHtml("#FFC0504D"), + Accent3 = XLColor.FromHtml("#FF9BBB59"), + Accent4 = XLColor.FromHtml("#FF8064A2"), + Accent5 = XLColor.FromHtml("#FF4BACC6"), + Accent6 = XLColor.FromHtml("#FFF79646"), + }; + } + + internal IXLColor GetXLColor(XLThemeColor themeColor) + { + switch (themeColor) + { + case XLThemeColor.Text1: return Theme.Text1; + case XLThemeColor.Background1: return Theme.Background1; + case XLThemeColor.Text2: return Theme.Text2; + case XLThemeColor.Background2: return Theme.Background2; + case XLThemeColor.Accent1: return Theme.Accent1; + case XLThemeColor.Accent2: return Theme.Accent2; + case XLThemeColor.Accent3: return Theme.Accent3; + case XLThemeColor.Accent4: return Theme.Accent4; + case XLThemeColor.Accent5: return Theme.Accent5; + case XLThemeColor.Accent6: return Theme.Accent6; + default: throw new ArgumentException("Invalid theme color"); + } } private String originalFile; @@ -61,6 +96,8 @@ /// public String FullName { get; private set; } + public IXLTheme Theme { get; private set; } + public void Save() { if (loadSource == XLLoadSource.New) @@ -113,16 +150,16 @@ Strikethrough = false, VerticalAlignment = XLFontVerticalTextAlignmentValues.Baseline, FontSize = 11, - FontColor = Color.FromArgb(0, 0, 0), + FontColor = XLColor.FromArgb(0, 0, 0), FontName = "Calibri", FontFamilyNumbering = XLFontFamilyNumberingValues.Swiss }, Fill = new XLFill(null) { - BackgroundColor = Color.FromArgb(255, 255, 255), + BackgroundColor = XLColor.FromIndex(64), PatternType = XLFillPatternValues.None, - PatternColor = Color.FromArgb(255, 255, 255) + PatternColor = XLColor.FromIndex(64) }, Border = new XLBorder(null, null) @@ -134,11 +171,11 @@ LeftBorder = XLBorderStyleValues.None, RightBorder = XLBorderStyleValues.None, TopBorder = XLBorderStyleValues.None, - BottomBorderColor = Color.Black, - DiagonalBorderColor = Color.Black, - LeftBorderColor = Color.Black, - RightBorderColor = Color.Black, - TopBorderColor = Color.Black + BottomBorderColor = XLColor.Black, + DiagonalBorderColor = XLColor.Black, + LeftBorderColor = XLColor.Black, + RightBorderColor = XLColor.Black, + TopBorderColor = XLColor.Black }, NumberFormat = new XLNumberFormat(null, null) { NumberFormatId = 0 }, Alignment = new XLAlignment(null) diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs index ab816a5..91f97b5 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Load.cs @@ -449,16 +449,10 @@ Properties.Title = p.Title; } - private struct XLColor - { - public System.Drawing.Color Color { get; set; } - public Boolean HasValue { get; set; } - } - private Dictionary colorList = new Dictionary(); private XLColor GetColor(ColorType color) { - var retVal = new XLColor(); + XLColor retVal = null; if (color != null) { if (color.Rgb != null) @@ -474,13 +468,12 @@ { thisColor = colorList[htmlColor]; } - retVal.HasValue = true; - retVal.Color = thisColor; + retVal = new XLColor(thisColor); } else if (color.Indexed != null && color.Indexed < 64) { - var indexedColors = GetIndexedColors(); - String htmlColor = "#" + indexedColors[(Int32)color.Indexed.Value]; + var indexedColors = XLColor.IndexedColors; + String htmlColor = "#" + indexedColors[(Int32)color.Indexed.Value].Color.ToHex(); System.Drawing.Color thisColor; if (!colorList.ContainsKey(htmlColor)) { @@ -491,11 +484,20 @@ { thisColor = colorList[htmlColor]; } - retVal.HasValue = true; - retVal.Color = thisColor; + retVal = new XLColor(thisColor); + } + else if (color.Theme != null) + { + if (color.Tint != null) + retVal = XLColor.FromTheme((XLThemeColor)color.Theme.Value, color.Tint.Value); + else + retVal = XLColor.FromTheme((XLThemeColor)color.Theme.Value); } } - return retVal; + if (retVal == null) + return new XLColor(); + else + return retVal; } private void ApplyStyle(IXLStylized xlStylized, Int32 styleIndex, Stylesheet s, Fills fills, Borders borders, Fonts fonts, NumberingFormats numberingFormats) @@ -513,10 +515,10 @@ xlStylized.Style.Fill.PatternType = fillPatternValues.Single(p => p.Value == fill.PatternFill.PatternType).Key; var fgColor = GetColor(fill.PatternFill.ForegroundColor); - if (fgColor.HasValue) xlStylized.Style.Fill.PatternColor = fgColor.Color; + if (fgColor.HasValue) xlStylized.Style.Fill.PatternColor = fgColor; var bgColor = GetColor(fill.PatternFill.BackgroundColor); - if (bgColor.HasValue) xlStylized.Style.Fill.PatternBackgroundColor = bgColor.Color; + if (bgColor.HasValue) xlStylized.Style.Fill.PatternBackgroundColor = bgColor; } } @@ -564,7 +566,7 @@ var bottomBorderColor = GetColor(bottomBorder.Color); if (bottomBorderColor.HasValue) - xlStylized.Style.Border.BottomBorderColor = bottomBorderColor.Color; + xlStylized.Style.Border.BottomBorderColor = bottomBorderColor; } var topBorder = (TopBorder)border.TopBorder; if (topBorder != null) @@ -573,7 +575,7 @@ xlStylized.Style.Border.TopBorder = borderStyleValues.Single(b => b.Value == topBorder.Style.Value).Key; var topBorderColor = GetColor(topBorder.Color); if (topBorderColor.HasValue) - xlStylized.Style.Border.TopBorderColor = topBorderColor.Color; + xlStylized.Style.Border.TopBorderColor = topBorderColor; } var leftBorder = (LeftBorder)border.LeftBorder; if (leftBorder != null) @@ -582,7 +584,7 @@ xlStylized.Style.Border.LeftBorder = borderStyleValues.Single(b => b.Value == leftBorder.Style.Value).Key; var leftBorderColor = GetColor(leftBorder.Color); if (leftBorderColor.HasValue) - xlStylized.Style.Border.LeftBorderColor = leftBorderColor.Color; + xlStylized.Style.Border.LeftBorderColor = leftBorderColor; } var rightBorder = (RightBorder)border.RightBorder; if (rightBorder != null) @@ -591,7 +593,7 @@ xlStylized.Style.Border.RightBorder = borderStyleValues.Single(b => b.Value == rightBorder.Style.Value).Key; var rightBorderColor = GetColor(rightBorder.Color); if (rightBorderColor.HasValue) - xlStylized.Style.Border.RightBorderColor = rightBorderColor.Color; + xlStylized.Style.Border.RightBorderColor = rightBorderColor; } var diagonalBorder = (DiagonalBorder)border.DiagonalBorder; if (diagonalBorder != null) @@ -600,7 +602,7 @@ xlStylized.Style.Border.DiagonalBorder = borderStyleValues.Single(b => b.Value == diagonalBorder.Style.Value).Key; var diagonalBorderColor = GetColor(diagonalBorder.Color); if (diagonalBorderColor.HasValue) - xlStylized.Style.Border.DiagonalBorderColor = diagonalBorderColor.Color; + xlStylized.Style.Border.DiagonalBorderColor = diagonalBorderColor; if (border.DiagonalDown != null) xlStylized.Style.Border.DiagonalDown = border.DiagonalDown; if (border.DiagonalUp != null) @@ -619,7 +621,7 @@ var fontColor = GetColor(font.Color); if (fontColor.HasValue) - xlStylized.Style.Font.FontColor = fontColor.Color; + xlStylized.Style.Font.FontColor = fontColor; if (font.FontFamilyNumbering != null && ((FontFamilyNumbering)font.FontFamilyNumbering).Val != null) xlStylized.Style.Font.FontFamilyNumbering = (XLFontFamilyNumberingValues)Int32.Parse(((FontFamilyNumbering)font.FontFamilyNumbering).Val.ToString()); @@ -692,80 +694,7 @@ } - private static Dictionary indexedColorList; - private static Dictionary GetIndexedColors() - { - if (indexedColorList == null) - { - Dictionary retVal = new Dictionary(); - retVal.Add(0, "000000"); - retVal.Add(1, "FFFFFF"); - retVal.Add(2, "FF0000"); - retVal.Add(3, "00FF00"); - retVal.Add(4, "0000FF"); - retVal.Add(5, "FFFF00"); - retVal.Add(6, "FF00FF"); - retVal.Add(7, "00FFFF"); - retVal.Add(8, "000000"); - retVal.Add(9, "FFFFFF"); - retVal.Add(10, "FF0000"); - retVal.Add(11, "00FF00"); - retVal.Add(12, "0000FF"); - retVal.Add(13, "FFFF00"); - retVal.Add(14, "FF00FF"); - retVal.Add(15, "00FFFF"); - retVal.Add(16, "800000"); - retVal.Add(17, "008000"); - retVal.Add(18, "000080"); - retVal.Add(19, "808000"); - retVal.Add(20, "800080"); - retVal.Add(21, "008080"); - retVal.Add(22, "C0C0C0"); - retVal.Add(23, "808080"); - retVal.Add(24, "9999FF"); - retVal.Add(25, "993366"); - retVal.Add(26, "FFFFCC"); - retVal.Add(27, "CCFFFF"); - retVal.Add(28, "660066"); - retVal.Add(29, "FF8080"); - retVal.Add(30, "0066CC"); - retVal.Add(31, "CCCCFF"); - retVal.Add(32, "000080"); - retVal.Add(33, "FF00FF"); - retVal.Add(34, "FFFF00"); - retVal.Add(35, "00FFFF"); - retVal.Add(36, "800080"); - retVal.Add(37, "800000"); - retVal.Add(38, "008080"); - retVal.Add(39, "0000FF"); - retVal.Add(40, "00CCFF"); - retVal.Add(41, "CCFFFF"); - retVal.Add(42, "CCFFCC"); - retVal.Add(43, "FFFF99"); - retVal.Add(44, "99CCFF"); - retVal.Add(45, "FF99CC"); - retVal.Add(46, "CC99FF"); - retVal.Add(47, "FFCC99"); - retVal.Add(48, "3366FF"); - retVal.Add(49, "33CCCC"); - retVal.Add(50, "003300"); - retVal.Add(51, "99CC00"); - retVal.Add(52, "FFCC00"); - retVal.Add(53, "FF9900"); - retVal.Add(54, "FF6600"); - retVal.Add(55, "666699"); - retVal.Add(56, "969696"); - retVal.Add(57, "003366"); - retVal.Add(58, "339966"); - retVal.Add(59, "333300"); - retVal.Add(60, "993300"); - retVal.Add(61, "993366"); - retVal.Add(62, "333399"); - retVal.Add(63, "333333"); - indexedColorList = retVal; - } - return indexedColorList; - } + } } \ No newline at end of file diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs index e744f2f..38fd375 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs @@ -35,21 +35,27 @@ private List> calculateModeValues = new List>(); private List> referenceModeValues = new List>(); private List> alignmentReadingOrderValues = new List>(); + + private Boolean populated = false; private void PopulateEnums() { - PopulateFillPatternValues(); - PopulateAlignmentHorizontalValues(); - PopulateAlignmentVerticalValues(); - PupulateBorderStyleValues(); - PopulateUnderlineValues(); - PopulateFontVerticalTextAlignmentValues(); - PopulatePageOrderValues(); - PopulatePageOrientationValues(); - PopulateShowCommentsValues(); - PopulatePrintErrorValues(); - PopulateCalculateModeValues(); - PopulateReferenceModeValues(); - PopulateAlignmentReadingOrderValues(); + if (!populated) + { + PopulateFillPatternValues(); + PopulateAlignmentHorizontalValues(); + PopulateAlignmentVerticalValues(); + PupulateBorderStyleValues(); + PopulateUnderlineValues(); + PopulateFontVerticalTextAlignmentValues(); + PopulatePageOrderValues(); + PopulatePageOrientationValues(); + PopulateShowCommentsValues(); + PopulatePrintErrorValues(); + PopulateCalculateModeValues(); + PopulateReferenceModeValues(); + PopulateAlignmentReadingOrderValues(); + populated = true; + } } private enum RelType { General, Workbook, Worksheet } @@ -81,7 +87,8 @@ } } - private Dictionary sharedStrings = new Dictionary(); + private Dictionary sharedStrings; + private Dictionary sharedStyles; private struct FontInfo { public UInt32 FontId; public IXLFont Font; }; private struct FillInfo { public UInt32 FillId; public IXLFill Fill; }; private struct BorderInfo { public UInt32 BorderId; public IXLBorder Border; }; @@ -98,8 +105,6 @@ public IXLStyle Style; }; - private Dictionary sharedStyles = new Dictionary(); - private CellValues GetCellValue(XLCellValues xlCellValue) { switch (xlCellValue) @@ -271,6 +276,8 @@ private void CreateParts(SpreadsheetDocument document) { relId = new RelIdGenerator(); + sharedStrings = new Dictionary(); + sharedStyles = new Dictionary(); WorkbookPart workbookPart; if (document.WorkbookPart == null) @@ -1033,27 +1040,27 @@ Border border = new Border() { DiagonalUp = borderInfo.Border.DiagonalUp, DiagonalDown = borderInfo.Border.DiagonalDown }; LeftBorder leftBorder = new LeftBorder() { Style = borderStyleValues.Single(b => b.Key == borderInfo.Border.LeftBorder).Value }; - Color leftBorderColor = new Color() { Rgb = borderInfo.Border.LeftBorderColor.ToHex() }; + Color leftBorderColor = GetNewColor(borderInfo.Border.LeftBorderColor); leftBorder.Append(leftBorderColor); border.Append(leftBorder); RightBorder rightBorder = new RightBorder() { Style = borderStyleValues.Single(b => b.Key == borderInfo.Border.RightBorder).Value }; - Color rightBorderColor = new Color() { Rgb = borderInfo.Border.RightBorderColor.ToHex() }; + Color rightBorderColor = GetNewColor(borderInfo.Border.RightBorderColor); rightBorder.Append(rightBorderColor); border.Append(rightBorder); TopBorder topBorder = new TopBorder() { Style = borderStyleValues.Single(b => b.Key == borderInfo.Border.TopBorder).Value }; - Color topBorderColor = new Color() { Rgb = borderInfo.Border.TopBorderColor.ToHex() }; + Color topBorderColor = GetNewColor(borderInfo.Border.TopBorderColor); topBorder.Append(topBorderColor); border.Append(topBorder); BottomBorder bottomBorder = new BottomBorder() { Style = borderStyleValues.Single(b => b.Key == borderInfo.Border.BottomBorder).Value }; - Color bottomBorderColor = new Color() { Rgb = borderInfo.Border.BottomBorderColor.ToHex() }; + Color bottomBorderColor = GetNewColor(borderInfo.Border.BottomBorderColor); bottomBorder.Append(bottomBorderColor); border.Append(bottomBorder); DiagonalBorder diagonalBorder = new DiagonalBorder() { Style = borderStyleValues.Single(b => b.Key == borderInfo.Border.DiagonalBorder).Value }; - Color diagonalBorderColor = new Color() { Rgb = borderInfo.Border.DiagonalBorderColor.ToHex() }; + Color diagonalBorderColor = GetNewColor(borderInfo.Border.DiagonalBorderColor); diagonalBorder.Append(diagonalBorderColor); border.Append(diagonalBorder); @@ -1075,7 +1082,7 @@ nb.LeftBorder = borderStyleValues.Single(p => p.Value == b.LeftBorder.Style).Key; var bColor = GetColor(b.LeftBorder.Color); if (bColor.HasValue) - nb.LeftBorderColor = bColor.Color; + nb.LeftBorderColor = bColor; } if (b.RightBorder != null) @@ -1084,7 +1091,7 @@ nb.RightBorder = borderStyleValues.Single(p => p.Value == b.RightBorder.Style).Key; var bColor = GetColor(b.RightBorder.Color); if (bColor.HasValue) - nb.RightBorderColor = bColor.Color; + nb.RightBorderColor = bColor; } if (b.TopBorder != null) @@ -1093,7 +1100,7 @@ nb.TopBorder = borderStyleValues.Single(p => p.Value == b.TopBorder.Style).Key; var bColor = GetColor(b.TopBorder.Color); if (bColor.HasValue) - nb.TopBorderColor = bColor.Color; + nb.TopBorderColor = bColor; } if (b.BottomBorder != null) @@ -1102,7 +1109,7 @@ nb.BottomBorder = borderStyleValues.Single(p => p.Value == b.BottomBorder.Style).Key; var bColor = GetColor(b.BottomBorder.Color); if (bColor.HasValue) - nb.BottomBorderColor = bColor.Color; + nb.BottomBorderColor = bColor; } return nb.Equals(xlBorder); @@ -1163,8 +1170,28 @@ Fill fill = new Fill(); PatternFill patternFill = new PatternFill() { PatternType = fillPatternValues.Single(p => p.Key == fillInfo.Fill.PatternType).Value }; - ForegroundColor foregroundColor = new ForegroundColor() { Rgb = fillInfo.Fill.PatternColor.ToHex() }; - BackgroundColor backgroundColor = new BackgroundColor() { Rgb = fillInfo.Fill.PatternBackgroundColor.ToHex() }; + ForegroundColor foregroundColor = new ForegroundColor(); + if (fillInfo.Fill.PatternColor.ColorType == XLColorType.Color) + foregroundColor.Rgb = fillInfo.Fill.PatternColor.Color.ToHex(); + else if (fillInfo.Fill.PatternColor.ColorType == XLColorType.Indexed) + foregroundColor.Indexed = (UInt32)fillInfo.Fill.PatternColor.Indexed; + else + { + foregroundColor.Theme = (UInt32)fillInfo.Fill.PatternColor.ThemeColor; + if (fillInfo.Fill.PatternColor.ThemeTint != 1) + foregroundColor.Tint = fillInfo.Fill.PatternColor.ThemeTint; + } + BackgroundColor backgroundColor = new BackgroundColor(); + if (fillInfo.Fill.PatternBackgroundColor.ColorType == XLColorType.Color) + backgroundColor.Rgb = fillInfo.Fill.PatternBackgroundColor.Color.ToHex(); + else if (fillInfo.Fill.PatternBackgroundColor.ColorType == XLColorType.Indexed) + backgroundColor.Indexed = (UInt32)fillInfo.Fill.PatternBackgroundColor.Indexed; + else + { + backgroundColor.Theme = (UInt32)fillInfo.Fill.PatternBackgroundColor.ThemeColor; + if (fillInfo.Fill.PatternBackgroundColor.ThemeTint != 1) + backgroundColor.Tint = fillInfo.Fill.PatternBackgroundColor.ThemeTint; + } patternFill.Append(foregroundColor); patternFill.Append(backgroundColor); @@ -1184,11 +1211,11 @@ var fColor = GetColor(f.PatternFill.ForegroundColor); if (fColor.HasValue) - nF.PatternColor = fColor.Color; + nF.PatternColor = fColor; var bColor = GetColor(f.PatternFill.BackgroundColor); if (bColor.HasValue) - nF.PatternBackgroundColor = bColor.Color; + nF.PatternBackgroundColor = bColor; } return nF.Equals(xlFill); } @@ -1233,7 +1260,8 @@ VerticalTextAlignment verticalAlignment = new VerticalTextAlignment() { Val = fontVerticalTextAlignmentValues.Single(f => f.Key == fontInfo.Font.VerticalAlignment).Value }; Shadow shadow = fontInfo.Font.Shadow ? new Shadow() : null; FontSize fontSize = new FontSize() { Val = fontInfo.Font.FontSize }; - Color color = new Color() { Rgb = fontInfo.Font.FontColor.ToHex() }; + Color color = GetNewColor(fontInfo.Font.FontColor); + FontName fontName = new FontName() { Val = fontInfo.Font.FontName }; FontFamilyNumbering fontFamilyNumbering = new FontFamilyNumbering() { Val = (Int32)fontInfo.Font.FontFamilyNumbering }; @@ -1251,6 +1279,22 @@ return font; } + private Color GetNewColor(IXLColor xlColor) + { + Color color = new Color(); + if (xlColor.ColorType == XLColorType.Color) + color.Rgb = xlColor.Color.ToHex(); + else if (xlColor.ColorType == XLColorType.Indexed) + color.Indexed = (UInt32)xlColor.Indexed; + else + { + color.Theme = (UInt32)xlColor.ThemeColor; + if (xlColor.ThemeTint != 1) + color.Tint = xlColor.ThemeTint; + } + return color; + } + private bool FontsAreEqual(Font f, IXLFont xlFont) { var nf = XLWorkbook.GetXLFont(); @@ -1272,7 +1316,7 @@ nf.FontSize = f.FontSize.Val; var fColor = GetColor(f.Color); if (fColor.HasValue) - nf.FontColor = fColor.Color; + nf.FontColor = fColor; if (f.FontName != null) nf.FontName = f.FontName.Val; if (f.FontFamilyNumbering != null) @@ -2072,52 +2116,52 @@ A.ColorScheme colorScheme1 = new A.ColorScheme() { Name = "Office" }; A.Dark1Color dark1Color1 = new A.Dark1Color(); - A.SystemColor systemColor1 = new A.SystemColor() { Val = A.SystemColorValues.WindowText, LastColor = "000000" }; + A.SystemColor systemColor1 = new A.SystemColor() { Val = A.SystemColorValues.WindowText, LastColor = Theme.Text1.Color.ToHex().Substring(3)}; dark1Color1.Append(systemColor1); A.Light1Color light1Color1 = new A.Light1Color(); - A.SystemColor systemColor2 = new A.SystemColor() { Val = A.SystemColorValues.Window, LastColor = "FFFFFF" }; + A.SystemColor systemColor2 = new A.SystemColor() { Val = A.SystemColorValues.Window, LastColor = Theme.Background1.Color.ToHex().Substring(3) }; light1Color1.Append(systemColor2); A.Dark2Color dark2Color1 = new A.Dark2Color(); - A.RgbColorModelHex rgbColorModelHex1 = new A.RgbColorModelHex() { Val = "1F497D" }; + A.RgbColorModelHex rgbColorModelHex1 = new A.RgbColorModelHex() { Val = Theme.Text2.Color.ToHex().Substring(3) }; dark2Color1.Append(rgbColorModelHex1); A.Light2Color light2Color1 = new A.Light2Color(); - A.RgbColorModelHex rgbColorModelHex2 = new A.RgbColorModelHex() { Val = "EEECE1" }; + A.RgbColorModelHex rgbColorModelHex2 = new A.RgbColorModelHex() { Val = Theme.Background2.Color.ToHex().Substring(3) }; light2Color1.Append(rgbColorModelHex2); A.Accent1Color accent1Color1 = new A.Accent1Color(); - A.RgbColorModelHex rgbColorModelHex3 = new A.RgbColorModelHex() { Val = "4F81BD" }; + A.RgbColorModelHex rgbColorModelHex3 = new A.RgbColorModelHex() { Val = Theme.Accent1.Color.ToHex().Substring(3) }; accent1Color1.Append(rgbColorModelHex3); A.Accent2Color accent2Color1 = new A.Accent2Color(); - A.RgbColorModelHex rgbColorModelHex4 = new A.RgbColorModelHex() { Val = "C0504D" }; + A.RgbColorModelHex rgbColorModelHex4 = new A.RgbColorModelHex() { Val = Theme.Accent2.Color.ToHex().Substring(3) }; accent2Color1.Append(rgbColorModelHex4); A.Accent3Color accent3Color1 = new A.Accent3Color(); - A.RgbColorModelHex rgbColorModelHex5 = new A.RgbColorModelHex() { Val = "9BBB59" }; + A.RgbColorModelHex rgbColorModelHex5 = new A.RgbColorModelHex() { Val = Theme.Accent3.Color.ToHex().Substring(3) }; accent3Color1.Append(rgbColorModelHex5); A.Accent4Color accent4Color1 = new A.Accent4Color(); - A.RgbColorModelHex rgbColorModelHex6 = new A.RgbColorModelHex() { Val = "8064A2" }; + A.RgbColorModelHex rgbColorModelHex6 = new A.RgbColorModelHex() { Val = Theme.Accent4.Color.ToHex().Substring(3) }; accent4Color1.Append(rgbColorModelHex6); A.Accent5Color accent5Color1 = new A.Accent5Color(); - A.RgbColorModelHex rgbColorModelHex7 = new A.RgbColorModelHex() { Val = "4BACC6" }; + A.RgbColorModelHex rgbColorModelHex7 = new A.RgbColorModelHex() { Val = Theme.Accent5.Color.ToHex().Substring(3) }; accent5Color1.Append(rgbColorModelHex7); A.Accent6Color accent6Color1 = new A.Accent6Color(); - A.RgbColorModelHex rgbColorModelHex8 = new A.RgbColorModelHex() { Val = "F79646" }; + A.RgbColorModelHex rgbColorModelHex8 = new A.RgbColorModelHex() { Val = Theme.Accent6.Color.ToHex().Substring(3) }; accent6Color1.Append(rgbColorModelHex8); diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs index 7e842ea..659f6da 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorksheet.cs @@ -467,7 +467,13 @@ { workbook.Worksheets.Delete(Name); } - + public new void Clear() + { + Internals.CellsCollection.Clear(); + Internals.ColumnsCollection.Clear(); + Internals.MergedCells.Clear(); + Internals.RowsCollection.Clear(); + } public IXLNamedRanges NamedRanges { get; private set; } } } diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/BasicTable.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/BasicTable.cs index b5e948e..8ef2f3e 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/BasicTable.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/BasicTable.cs @@ -66,14 +66,14 @@ var rngHeaders = rngTable.Range("A2:E2"); // The address is relative to rngTable (NOT the worksheet) rngHeaders.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; rngHeaders.Style.Font.Bold = true; - rngHeaders.Style.Fill.BackgroundColor = Color.Aqua; + rngHeaders.Style.Fill.BackgroundColor = XLColor.Aqua; //Adding grid lines rngTable.Style.Border.BottomBorder = XLBorderStyleValues.Thin; //Format title cell rngTable.Cell(1, 1).Style.Font.Bold = true; - rngTable.Cell(1, 1).Style.Fill.BackgroundColor = Color.CornflowerBlue; + rngTable.Cell(1, 1).Style.Fill.BackgroundColor = XLColor.CornflowerBlue; rngTable.Cell(1, 1).Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; //Merge title cells diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML_Examples.csproj b/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML_Examples.csproj index bdbf405..6ba614a 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML_Examples.csproj +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/ClosedXML_Examples.csproj @@ -93,6 +93,7 @@ + diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCollections.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCollections.cs index 6defc18..a80bce8 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCollections.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnCollections.cs @@ -51,27 +51,27 @@ var ws = workbook.Worksheets.Add("Columns of a Range"); // All columns in a range - ws.Range("A1:B2").Columns().Style.Fill.BackgroundColor = Color.DimGray; + ws.Range("A1:B2").Columns().Style.Fill.BackgroundColor = XLColor.DimGray; var bigRange = ws.Range("A4:V6"); // Contiguous columns by number - bigRange.Columns(1, 2).Style.Fill.BackgroundColor = Color.Red; + bigRange.Columns(1, 2).Style.Fill.BackgroundColor = XLColor.Red; // Contiguous columns by letter - bigRange.Columns("D", "E").Style.Fill.BackgroundColor = Color.Blue; + bigRange.Columns("D", "E").Style.Fill.BackgroundColor = XLColor.Blue; // Contiguous columns by letter - bigRange.Columns("G:H").Style.Fill.BackgroundColor = Color.DeepPink; + bigRange.Columns("G:H").Style.Fill.BackgroundColor = XLColor.DeepPink; // Spread columns by number - bigRange.Columns("10:11,13:14").Style.Fill.BackgroundColor = Color.Orange; + bigRange.Columns("10:11,13:14").Style.Fill.BackgroundColor = XLColor.Orange; // Spread columns by letter - bigRange.Columns("P:Q,S:T").Style.Fill.BackgroundColor = Color.Turquoise; + bigRange.Columns("P:Q,S:T").Style.Fill.BackgroundColor = XLColor.Turquoise; // Use a single number/letter - bigRange.Columns("V").Style.Fill.BackgroundColor = Color.Cyan; + bigRange.Columns("V").Style.Fill.BackgroundColor = XLColor.Cyan; // Adjust the width ws.Columns("A:V").Width = 3; @@ -79,22 +79,22 @@ var ws2 = workbook.Worksheets.Add("Columns of a worksheet"); // Contiguous columns by number - ws2.Columns(1, 2).Style.Fill.BackgroundColor = Color.Red; + ws2.Columns(1, 2).Style.Fill.BackgroundColor = XLColor.Red; // Contiguous columns by letter - ws2.Columns("D", "E").Style.Fill.BackgroundColor = Color.Blue; + ws2.Columns("D", "E").Style.Fill.BackgroundColor = XLColor.Blue; // Contiguous columns by letter - ws2.Columns("G:H").Style.Fill.BackgroundColor = Color.DeepPink; + ws2.Columns("G:H").Style.Fill.BackgroundColor = XLColor.DeepPink; // Spread columns by number - ws2.Columns("10:11,13:14").Style.Fill.BackgroundColor = Color.Orange; + ws2.Columns("10:11,13:14").Style.Fill.BackgroundColor = XLColor.Orange; // Spread columns by letter - ws2.Columns("P:Q,S:T").Style.Fill.BackgroundColor = Color.Turquoise; + ws2.Columns("P:Q,S:T").Style.Fill.BackgroundColor = XLColor.Turquoise; // Use a single number/letter - ws2.Columns("V").Style.Fill.BackgroundColor = Color.Cyan; + ws2.Columns("V").Style.Fill.BackgroundColor = XLColor.Cyan; // Adjust the width ws2.Columns("A:V").Width = 3; diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnSettings.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnSettings.cs index c7dfcda..587de5b 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnSettings.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/ColumnSettings.cs @@ -64,11 +64,11 @@ var ws = workbook.Worksheets.Add("Column Settings"); var col1 = ws.Column("B"); - col1.Style.Fill.BackgroundColor = Color.Red; + col1.Style.Fill.BackgroundColor = XLColor.Red; col1.Width = 20; var col2 = ws.Column(4); - col2.Style.Fill.BackgroundColor = Color.DarkOrange; + col2.Style.Fill.BackgroundColor = XLColor.DarkOrange; col2.Width = 5; workbook.SaveAs(filePath); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/DeletingColumns.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/DeletingColumns.cs index 7b1552f..5b747e2 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/DeletingColumns.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/DeletingColumns.cs @@ -57,10 +57,10 @@ var rng3 = ws.Range("A1:A3"); var col1 = ws.Column(1); - rng1.Style.Fill.BackgroundColor = Color.Orange; - rng2.Style.Fill.BackgroundColor = Color.Blue; - rng3.Style.Fill.BackgroundColor = Color.Red; - col1.Style.Fill.BackgroundColor = Color.Black; + rng1.Style.Fill.BackgroundColor = XLColor.Orange; + rng2.Style.Fill.BackgroundColor = XLColor.Blue; + rng3.Style.Fill.BackgroundColor = XLColor.Red; + col1.Style.Fill.BackgroundColor = XLColor.Black; ws.Columns("A,C,E:H").Delete(); ws.Cell("A2").Value = "OK"; diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/InsertColumns.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/InsertColumns.cs index f926103..19de03b 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/InsertColumns.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Columns/InsertColumns.cs @@ -50,7 +50,7 @@ var ws = workbook.Worksheets.Add("Inserting Columns"); // Color the entire spreadsheet using columns - ws.Columns().Style.Fill.BackgroundColor = Color.LightCyan; + ws.Columns().Style.Fill.BackgroundColor = XLColor.LightCyan; // Put a value in a few cells foreach (var r in Enumerable.Range(1, 5)) @@ -61,14 +61,14 @@ var blueColumn = ws.Column(2); var redColumn = ws.Column(5); - blueColumn.Style.Fill.BackgroundColor = Color.Blue; + blueColumn.Style.Fill.BackgroundColor = XLColor.Blue; blueColumn.InsertColumnsAfter(2); - redColumn.Style.Fill.BackgroundColor = Color.Red; + redColumn.Style.Fill.BackgroundColor = XLColor.Red; redColumn.InsertColumnsBefore(2); - ws.Rows(3, 4).Style.Fill.BackgroundColor = Color.Orange; + ws.Rows(3, 4).Style.Fill.BackgroundColor = XLColor.Orange; ws.Range("B1:D1").InsertColumnsAfter(2); ws.Range("B2:D2").InsertColumnsBefore(2); ws.Range("B3:D3").InsertColumnsAfter(2); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Creating/CreateFiles.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Creating/CreateFiles.cs index 057f483..056c71f 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Creating/CreateFiles.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Creating/CreateFiles.cs @@ -59,6 +59,7 @@ new CopyingRanges().Create(); new BlankCells().Create(@"C:\Excel Files\Created\BlankCells.xlsx"); new TwoPages().Create(@"C:\Excel Files\Created\TwoPages.xlsx"); + new UsingColors().Create(@"C:\Excel Files\Created\UsingColors.xlsx"); } } } diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/ChangingBasicTable.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/ChangingBasicTable.cs index b2fd4d8..836416d 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/ChangingBasicTable.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/ChangingBasicTable.cs @@ -17,7 +17,7 @@ // Change the background color of the headers var rngHeaders = ws.Range("B3:F3"); - rngHeaders.Style.Fill.BackgroundColor = Color.LightSalmon; + rngHeaders.Style.Fill.BackgroundColor = XLColor.LightSalmon; // Change the date formats var rngDates = ws.Range("E4:E6"); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/LoadFiles.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/LoadFiles.cs index 3404ed8..95ade51 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/LoadFiles.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Loading/LoadFiles.cs @@ -28,6 +28,7 @@ { var wb = new XLWorkbook(input); wb.SaveAs(output); + wb.SaveAs(output); } } } diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CellValues.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CellValues.cs index 6a64845..5a7ab67 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CellValues.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/CellValues.cs @@ -172,7 +172,7 @@ ws.Columns("B:G").Width = 20; var rngTitle = ws.Range("B2:G2"); rngTitle.Style.Font.Bold = true; - rngTitle.Style.Fill.BackgroundColor = Color.Cyan; + rngTitle.Style.Fill.BackgroundColor = XLColor.Cyan; ws.Columns().AdjustToContents(); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Collections.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Collections.cs index 77e10ac..0865b79 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Collections.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Collections.cs @@ -94,7 +94,7 @@ var titlesStyle = wb.Style; titlesStyle.Font.Bold = true; titlesStyle.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; - titlesStyle.Fill.BackgroundColor = Color.Cyan; + titlesStyle.Fill.BackgroundColor = XLColor.Cyan; // Format all titles in one shot wb.NamedRanges.NamedRange("Titles").Ranges.Style = titlesStyle; diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Formulas.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Formulas.cs index b466cbd..ffc77b1 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Formulas.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/Formulas.cs @@ -88,7 +88,7 @@ var rngData = ws.Range(2, 1, 4, 7); rngData.LastColumn().FormulaR1C1 = "=IF(RC[-3]=RC[-1],\"Yes\", \"No\")"; - ws.Range(1, 1, 1, 7).Style.Fill.BackgroundColor = Color.Cyan; + ws.Range(1, 1, 1, 7).Style.Fill.BackgroundColor = XLColor.Cyan; ws.Range(1, 1, 1, 7).Style.Font.Bold = true; ws.Columns().AdjustToContents(); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/LambdaExpressions.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/LambdaExpressions.cs index 2b3fe81..7d6446b 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/LambdaExpressions.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Misc/LambdaExpressions.cs @@ -28,7 +28,7 @@ // Put a light gray background to all text cells rngData.Cells() // From all cells .Where(c => c.DataType == XLCellValues.Text) // where the data type is Text - .ForEach(c => c.Style.Fill.BackgroundColor = Color.LightGray); // Fill with a light gray + .ForEach(c => c.Style.Fill.BackgroundColor = XLColor.LightGray); // Fill with a light gray // Put a thick border to the bottom of the table (we may have deleted the bottom cells with the border) rngData.LastRow().Style.Border.BottomBorder = XLBorderStyleValues.Thick; diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/HeaderFooters.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/HeaderFooters.cs index e63a636..db83726 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/HeaderFooters.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/PageSetup/HeaderFooters.cs @@ -27,7 +27,7 @@ ws.PageSetup.Header.Right.AddText("The ", XLHFOccurrence.FirstPage, font1); var font2 = XLWorkbook.GetXLFont(); - font2.FontColor = Color.Red; + font2.FontColor = XLColor.Red; ws.PageSetup.Header.Right.AddText("First ", XLHFOccurrence.FirstPage, font2); var font3 = XLWorkbook.GetXLFont(); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ClearingRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ClearingRanges.cs index bb205c1..4901484 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ClearingRanges.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ClearingRanges.cs @@ -24,7 +24,7 @@ var cell = ws.Cell(ro, co); cell.Value = cell.Address.ToString(); cell.Style.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; - cell.Style.Fill.BackgroundColor = Color.Turquoise; + cell.Style.Fill.BackgroundColor = XLColor.Turquoise; cell.Style.Font.Bold = true; } } diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs index 9df1d52..4a5e6a2 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingColumns.cs @@ -51,7 +51,7 @@ ws.Range("A1:A2").Delete(XLShiftDeletedCells.ShiftCellsLeft); ws.Range("D3:D4").Delete(XLShiftDeletedCells.ShiftCellsLeft); - rng.Style.Fill.BackgroundColor = Color.Orange; + rng.Style.Fill.BackgroundColor = XLColor.Orange; workbook.SaveAs(filePath); } diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs index 466ca88..04de147 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/InsertingDeletingRows.cs @@ -51,7 +51,7 @@ ws.Range("A1:B1").Delete(XLShiftDeletedCells.ShiftCellsUp); ws.Range("C4:D4").Delete(XLShiftDeletedCells.ShiftCellsUp); - rng.Style.Fill.BackgroundColor = Color.Orange; + rng.Style.Fill.BackgroundColor = XLColor.Orange; workbook.SaveAs(filePath); } diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/MultipleRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/MultipleRanges.cs index 91b69f7..e196a3b 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/MultipleRanges.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/MultipleRanges.cs @@ -15,10 +15,10 @@ var ws = workbook.Worksheets.Add("Multiple Ranges"); // using multiple string range definitions - ws.Ranges("A1:B2", "C3:D4", "E5:F6").Style.Fill.BackgroundColor = Color.Red; + ws.Ranges("A1:B2", "C3:D4", "E5:F6").Style.Fill.BackgroundColor = XLColor.Red; // using a single string separated by commas - ws.Ranges("A5:B6,E1:F2").Style.Fill.BackgroundColor = Color.Orange; + ws.Ranges("A5:B6,E1:F2").Style.Fill.BackgroundColor = XLColor.Orange; workbook.SaveAs(filePath); } diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ShiftingRanges.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ShiftingRanges.cs index a8570ec..16d2f8f 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ShiftingRanges.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Ranges/ShiftingRanges.cs @@ -22,7 +22,7 @@ ws.Column(1).InsertColumnsBefore(2); // Change the background color of the headers - rngHeaders.Style.Fill.BackgroundColor = Color.LightSalmon; + rngHeaders.Style.Fill.BackgroundColor = XLColor.LightSalmon; ws.Columns().AdjustToContents(); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/InsertRows.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/InsertRows.cs index b1b8efe..c9be41b 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/InsertRows.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/InsertRows.cs @@ -50,7 +50,7 @@ var ws = workbook.Worksheets.Add("Inserting Rows"); // Color the entire spreadsheet using rows - ws.Rows().Style.Fill.BackgroundColor = Color.LightCyan; + ws.Rows().Style.Fill.BackgroundColor = XLColor.LightCyan; // Put a value in a few cells foreach (var r in Enumerable.Range(1, 5)) @@ -60,14 +60,14 @@ var blueRow = ws.Row(2); var redRow = ws.Row(5); - blueRow.Style.Fill.BackgroundColor = Color.Blue; + blueRow.Style.Fill.BackgroundColor = XLColor.Blue; blueRow.InsertRowsBelow(2); - redRow.Style.Fill.BackgroundColor = Color.Red; + redRow.Style.Fill.BackgroundColor = XLColor.Red; redRow.InsertRowsAbove(2); - ws.Columns(3, 4).Style.Fill.BackgroundColor = Color.Orange; + ws.Columns(3, 4).Style.Fill.BackgroundColor = XLColor.Orange; ws.Range("A2:A4").InsertRowsBelow(2); ws.Range("B2:B4").InsertRowsAbove(2); ws.Range("C2:C4").InsertRowsBelow(2); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCollections.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCollections.cs index 7621cb4..61588e5 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCollections.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowCollections.cs @@ -51,21 +51,21 @@ var ws = workbook.Worksheets.Add("Rows of a Range"); // All rows in a range - ws.Range("A1:B2").Rows().Style.Fill.BackgroundColor = Color.DimGray; + ws.Range("A1:B2").Rows().Style.Fill.BackgroundColor = XLColor.DimGray; var bigRange = ws.Range("B4:C17"); // Contiguous rows by number - bigRange.Rows(1, 2).Style.Fill.BackgroundColor = Color.Red; + bigRange.Rows(1, 2).Style.Fill.BackgroundColor = XLColor.Red; // Contiguous rows by number - bigRange.Rows("4:5").Style.Fill.BackgroundColor = Color.Blue; + bigRange.Rows("4:5").Style.Fill.BackgroundColor = XLColor.Blue; // Spread rows by number - bigRange.Rows("7:8,10:11").Style.Fill.BackgroundColor = Color.Orange; + bigRange.Rows("7:8,10:11").Style.Fill.BackgroundColor = XLColor.Orange; // Using a single number - bigRange.Rows("13").Style.Fill.BackgroundColor = Color.Cyan; + bigRange.Rows("13").Style.Fill.BackgroundColor = XLColor.Cyan; // Adjust the height ws.Rows().Height = 15; @@ -73,16 +73,16 @@ var ws2 = workbook.Worksheets.Add("Rows of a Worksheet"); // Contiguous rows by number - ws2.Rows(1, 2).Style.Fill.BackgroundColor = Color.Red; + ws2.Rows(1, 2).Style.Fill.BackgroundColor = XLColor.Red; // Contiguous rows by number - ws2.Rows("4:5").Style.Fill.BackgroundColor = Color.Blue; + ws2.Rows("4:5").Style.Fill.BackgroundColor = XLColor.Blue; // Spread rows by number - ws2.Rows("7:8,10:11").Style.Fill.BackgroundColor = Color.Orange; + ws2.Rows("7:8,10:11").Style.Fill.BackgroundColor = XLColor.Orange; // Using a single number - ws2.Rows("13").Style.Fill.BackgroundColor = Color.Cyan; + ws2.Rows("13").Style.Fill.BackgroundColor = XLColor.Cyan; // Adjust the height ws2.Rows("1:13").Height = 15; diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowSettings.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowSettings.cs index a7cf9ce..fe093f8 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowSettings.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Rows/RowSettings.cs @@ -64,11 +64,11 @@ var ws = workbook.Worksheets.Add("Row Settings"); var row1 = ws.Row(2); - row1.Style.Fill.BackgroundColor = Color.Red; + row1.Style.Fill.BackgroundColor = XLColor.Red; row1.Height = 30; var row2 = ws.Row(4); - row2.Style.Fill.BackgroundColor = Color.DarkOrange; + row2.Style.Fill.BackgroundColor = XLColor.DarkOrange; row2.Height = 3; workbook.SaveAs(filePath); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/DefaultStyles.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/DefaultStyles.cs index 15d4c32..c4cfb3b 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/DefaultStyles.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/DefaultStyles.cs @@ -18,7 +18,7 @@ style.Border.DiagonalUp = true; style.Border.DiagonalDown = true; style.Border.DiagonalBorder = XLBorderStyleValues.Thick; - style.Border.DiagonalBorderColor = Color.Red; + style.Border.DiagonalBorderColor = XLColor.Red; // Create our workbook var workbook = new XLWorkbook(); diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleBorder.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleBorder.cs index 1b97e40..e2909e4 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleBorder.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleBorder.cs @@ -20,33 +20,33 @@ ws.Cell(++ro, co).Value = "BottomBorder = Thick; BottomBorderColor = Red"; ws.Cell(ro, co).Style.Border.BottomBorder = XLBorderStyleValues.Thick; - ws.Cell(ro, co).Style.Border.BottomBorderColor = Color.Red; + ws.Cell(ro, co).Style.Border.BottomBorderColor = XLColor.Red; ws.Cell(++ro, co).Value = "LeftBorder = Thick; LeftBorderColor = Blue"; ws.Cell(ro, co).Style.Border.LeftBorder = XLBorderStyleValues.Thick; - ws.Cell(ro, co).Style.Border.LeftBorderColor = Color.Blue; + ws.Cell(ro, co).Style.Border.LeftBorderColor = XLColor.Blue; ws.Cell(++ro, co).Value = "TopBorder = Thick; TopBorderColor = Yellow"; ws.Cell(ro, co).Style.Border.TopBorder = XLBorderStyleValues.Thick; - ws.Cell(ro, co).Style.Border.TopBorderColor = Color.Yellow; + ws.Cell(ro, co).Style.Border.TopBorderColor = XLColor.Yellow; ws.Cell(++ro, co).Value = "RightBorder = Thick; RightBorderColor = Black"; ws.Cell(ro, co).Style.Border.RightBorder = XLBorderStyleValues.Thick; - ws.Cell(ro, co).Style.Border.RightBorderColor = Color.Black; + ws.Cell(ro, co).Style.Border.RightBorderColor = XLColor.Black; ws.Cell(++ro, co).Value = "DiagonalBorder = Thin; DiagonalBorderColor = Red; DiagonalUp = true"; ws.Cell(ro, co).Style.Border.DiagonalBorder = XLBorderStyleValues.Thin; - ws.Cell(ro, co).Style.Border.DiagonalBorderColor = Color.Red; + ws.Cell(ro, co).Style.Border.DiagonalBorderColor = XLColor.Red; ws.Cell(ro, co).Style.Border.DiagonalUp = true; ws.Cell(++ro, co).Value = "DiagonalBorder = Thin; DiagonalBorderColor = Red; DiagonalDown = true"; ws.Cell(ro, co).Style.Border.DiagonalBorder = XLBorderStyleValues.Thin; - ws.Cell(ro, co).Style.Border.DiagonalBorderColor = Color.Red; + ws.Cell(ro, co).Style.Border.DiagonalBorderColor = XLColor.Red; ws.Cell(ro, co).Style.Border.DiagonalDown = true; ws.Cell(++ro, co).Value = "DiagonalBorder = Thin; DiagonalBorderColor = Red; DiagonalUp = true; DiagonalDown = true"; ws.Cell(ro, co).Style.Border.DiagonalBorder = XLBorderStyleValues.Thin; - ws.Cell(ro, co).Style.Border.DiagonalBorderColor = Color.Red; + ws.Cell(ro, co).Style.Border.DiagonalBorderColor = XLColor.Red; ws.Cell(ro, co).Style.Border.DiagonalUp = true; ws.Cell(ro, co).Style.Border.DiagonalDown = true; diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFill.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFill.cs index b2ef9a8..837a37f 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFill.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFill.cs @@ -21,12 +21,12 @@ var ro = 1; ws.Cell(++ro, co + 1).Value = "BackgroundColor = Red"; - ws.Cell(ro, co).Style.Fill.BackgroundColor = Color.Red; + ws.Cell(ro, co).Style.Fill.BackgroundColor = XLColor.Red; ws.Cell(++ro, co + 1).Value = "PatternType = DarkTrellis; PatternColor = Orange; PatternBackgroundColor = Blue"; ws.Cell(ro, co).Style.Fill.PatternType = XLFillPatternValues.DarkTrellis; - ws.Cell(ro, co).Style.Fill.PatternColor = Color.Orange; - ws.Cell(ro, co).Style.Fill.PatternBackgroundColor = Color.Blue; + ws.Cell(ro, co).Style.Fill.PatternColor = XLColor.Orange; + ws.Cell(ro, co).Style.Fill.PatternBackgroundColor = XLColor.Blue; workbook.SaveAs(filePath); } diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFont.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFont.cs index 76258f6..49c0e88 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFont.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleFont.cs @@ -22,7 +22,7 @@ ws.Cell(ro, co).Style.Font.Bold = true; ws.Cell(++ro, co).Value = "FontColor - Red"; - ws.Cell(ro, co).Style.Font.FontColor = Color.Red; + ws.Cell(ro, co).Style.Font.FontColor = XLColor.Red; ws.Cell(++ro, co).Value = "FontFamilyNumbering - Script"; ws.Cell(ro, co).Style.Font.FontFamilyNumbering = XLFontFamilyNumberingValues.Script; diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleRowsColumns.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleRowsColumns.cs index f47b100..f2a144c 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleRowsColumns.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleRowsColumns.cs @@ -17,7 +17,7 @@ //Set the entire worksheet's cells to be bold and with a light cyan background ws.Style.Font.Bold = true; - ws.Style.Fill.BackgroundColor = Color.LightCyan; + ws.Style.Fill.BackgroundColor = XLColor.LightCyan; // Set the width of all columns in the worksheet ws.Columns().Width = 5; @@ -26,11 +26,11 @@ ws.Rows().Height = 20; // Let's play with the rows and columns - ws.Rows(2, 3).Style.Fill.BackgroundColor = Color.Blue; - ws.Columns(3, 4).Style.Fill.BackgroundColor = Color.Orange; - ws.Rows(5, 5).Style.Fill.BackgroundColor = Color.Pink; - ws.Row(6).Style.Fill.BackgroundColor = Color.Brown; - ws.Column("E").Style.Fill.BackgroundColor = Color.Gray; + ws.Rows(2, 3).Style.Fill.BackgroundColor = XLColor.Blue; + ws.Columns(3, 4).Style.Fill.BackgroundColor = XLColor.Orange; + ws.Rows(5, 5).Style.Fill.BackgroundColor = XLColor.Pink; + ws.Row(6).Style.Fill.BackgroundColor = XLColor.Brown; + ws.Column("E").Style.Fill.BackgroundColor = XLColor.Gray; workbook.SaveAs(filePath); } diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleWorksheet.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleWorksheet.cs index 0f88485..0f12cbc 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleWorksheet.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/StyleWorksheet.cs @@ -16,8 +16,8 @@ var ws = workbook.Worksheets.Add("Style Worksheet"); ws.Style.Font.Bold = true; - ws.Style.Font.FontColor = Color.Red; - ws.Style.Fill.BackgroundColor = Color.Cyan; + ws.Style.Font.FontColor = XLColor.Red; + ws.Style.Fill.BackgroundColor = XLColor.Cyan; // The following cells will be bold and red // because we've specified those attributes to the entire worksheet diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs new file mode 100644 index 0000000..74e4cb3 --- /dev/null +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using ClosedXML.Excel; +using System.Drawing; + + +namespace ClosedXML_Examples.Styles +{ + public class UsingColors + { + public void Create(String filePath) + { + var wb = new XLWorkbook(); + var ws = wb.Worksheets.Add("Using Colors"); + + // From Known color + ws.Cell(1, 1).Style.Fill.BackgroundColor = XLColor.Red; + ws.Cell(1, 2).Value = "XLColor.Red"; + + // From Color not known + ws.Cell(2, 1).Style.Fill.BackgroundColor = XLColor.Byzantine; + ws.Cell(2, 2).Value = "XLColor.Byzantine"; + + // From Theme color + ws.Cell(3, 1).Style.Fill.BackgroundColor = XLColor.FromTheme(XLThemeColor.Accent1); + ws.Cell(3, 2).Value = "XLColor.FromTheme(XLThemeColor.Accent1)"; + + // From Theme color with tint + ws.Cell(4, 1).Style.Fill.BackgroundColor = XLColor.FromTheme(XLThemeColor.Accent2, 0.5); + ws.Cell(4, 2).Value = "XLColor.FromTheme(XLThemeColor.Accent2, 0.5)"; + + // From indexed color (legacy) + ws.Cell(5, 1).Style.Fill.BackgroundColor = XLColor.FromIndex(25); + ws.Cell(5, 2).Value = "XLColor.FromIndex(25)"; + + ws.Columns().AdjustToContents(); + + wb.SaveAs(filePath); + } + } +} \ No newline at end of file diff --git a/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj b/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj index 97dd3f9..697d48a 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj +++ b/ClosedXML/ClosedXML/ClosedXML_Net3.5/ClosedXML_Net3.5.csproj @@ -80,6 +80,9 @@ Excel\IXLOutline.cs + + Excel\IXLTheme.cs + Excel\IXLWorksheet.cs @@ -200,6 +203,18 @@ Excel\Rows\XLRows.cs + + Excel\Style\Colors\IXLColor.cs + + + Excel\Style\Colors\XLColor_Internal.cs + + + Excel\Style\Colors\XLColor_Public.cs + + + Excel\Style\Colors\XLColor_Static.cs + Excel\Style\IXLAlignment.cs @@ -245,6 +260,9 @@ Excel\XLOutline.cs + + Excel\XLTheme.cs + Excel\XLWorkbook.cs diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs index 259c831..a08f66f 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Sandbox/Program.cs @@ -3,7 +3,7 @@ using System.Linq; using System.Text; using ClosedXML.Excel; - +using ClosedXML; using System.Drawing; using System.IO; @@ -14,19 +14,35 @@ static void Main(string[] args) { var wb = new XLWorkbook(); - var ws = wb.Worksheets.Add("Sheet1"); - foreach (var ro in Enumerable.Range(1, 100)) - { - foreach (var co in Enumerable.Range(1, 10)) - { - ws.Cell(ro, co).Value = ws.Cell(ro, co).Address.ToString(); - } - } - ws.PageSetup.PagesWide = 1; - + ws.Cell(1, 1).Value = "Font Color = Theme Accent 6"; + ws.Cell(1, 1).Style.Font.FontColor = XLColor.FromTheme(XLThemeColor.Accent6); wb.SaveAs(@"C:\Excel Files\ForTesting\Sandbox.xlsx"); } + static void Main_5961(string[] args) + { + var fi = new FileInfo(@"C:\Excel Files\ForTesting\Issue_5961.xlsx"); + XLWorkbook wb = new XLWorkbook(fi.FullName); + { + IXLWorksheet s = wb.Worksheets.Add("test1"); + s.Cell(1, 1).Value = DateTime.Now.ToString(); + } + { + IXLWorksheet s = wb.Worksheets.Add("test2"); + s.Cell(1, 1).Value = DateTime.Now.ToString(); + } + wb.Save(); + wb = new XLWorkbook(fi.FullName); + wb.Worksheets.Delete("test1"); + { + IXLWorksheet s = wb.Worksheets.Add("test3"); + s.Cell(1, 1).Value = DateTime.Now.ToString(); + } + wb.Save(); + wb = new XLWorkbook(fi.FullName); + + wb.Save(); + } static void xMain(string[] args) { @@ -82,19 +98,19 @@ style1 = XLWorkbook.DefaultStyle; style1.Font.Bold = true; - style1.Fill.BackgroundColor = Color.Azure; + style1.Fill.BackgroundColor = XLColor.Azure; style1.Border.BottomBorder = XLBorderStyleValues.Medium; style1.Alignment.Horizontal = XLAlignmentHorizontalValues.Center; style2 = XLWorkbook.DefaultStyle; style2.Font.Italic = true; - style2.Fill.BackgroundColor = Color.Orange; + style2.Fill.BackgroundColor = XLColor.Orange; style2.Border.LeftBorder = XLBorderStyleValues.Medium; style2.Alignment.Vertical = XLAlignmentVerticalValues.Center; style3 = XLWorkbook.DefaultStyle; - style3.Font.FontColor = Color.Red; - style3.Fill.PatternColor = Color.Blue; + style3.Font.FontColor = XLColor.FromColor(Color.Red); + style3.Fill.PatternColor = XLColor.Blue; style3.Fill.PatternType = XLFillPatternValues.DarkTrellis; style3.Border.DiagonalBorder = XLBorderStyleValues.Dotted; }