diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs index 9ae3941..760771d 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/XLWorkbook_Save.cs @@ -1397,6 +1397,7 @@ if (NumberFormatsAreEqual(nf, numberFormatInfo.NumberFormat)) { foundOne = true; + numberingFormatId = (Int32)nf.NumberFormatId.Value; break; } numberingFormatId++; diff --git a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs index 74e4cb3..34705ec 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs +++ b/ClosedXML/ClosedXML/ClosedXML_Examples/Styles/UsingColors.cs @@ -15,25 +15,75 @@ 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"; + Int32 ro = 0; - // From Color not known - ws.Cell(2, 1).Style.Fill.BackgroundColor = XLColor.Byzantine; - ws.Cell(2, 2).Value = "XLColor.Byzantine"; + // From Known color + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.Red; + ws.Cell(ro, 2).Value = "XLColor.Red"; + + // From Color not so known + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.Byzantine; + ws.Cell(ro, 2).Value = "XLColor.Byzantine"; + + ro++; + + // FromArgb(Int32 argb) using Hex notation + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(0xFF00FF); + ws.Cell(ro, 2).Value = "XLColor.FromArgb(0xFF00FF)"; + + // FromArgb(Int32 argb) using an integer (you need to convert the hex value to an int) + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(16711935); + ws.Cell(ro, 2).Value = "XLColor.FromArgb(16711935)"; + + // FromArgb(Int32 r, Int32 g, Int32 b) + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(255, 0, 255); + ws.Cell(ro, 2).Value = "XLColor.FromArgb(255, 0, 255)"; + + // FromArgb(Int32 a, Int32 r, Int32 g, Int32 b) + // Note: Excel ignores the alpha value + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromArgb(0, 255, 0, 255); + ws.Cell(ro, 2).Value = "XLColor.FromArgb(0, 255, 0, 255)"; + + ro++; + + // FromColor(Color color) + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromColor(Color.Red); + ws.Cell(ro, 2).Value = "XLColor.FromColor(Color.Red)"; + + ro++; + + // FromHtml(String htmlColor) + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromHtml("#FF996515"); + ws.Cell(ro, 2).Value = "XLColor.FromHtml(\"#FF996515\")"; + + ro++; + + // FromIndex(Int32 indexedColor) + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromIndex(25); + ws.Cell(ro, 2).Value = "XLColor.FromIndex(25)"; + + ro++; + + // FromKnownColor(KnownColor knownColor) + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromKnownColor(KnownColor.Plum); + ws.Cell(ro, 2).Value = "XLColor.FromKnownColor(KnownColor.Plum)"; + + ro++; + + // FromName(String colorName) + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromName("PowderBlue"); + ws.Cell(ro, 2).Value = "XLColor.FromName(\"PowderBlue\")"; + + ro++; // From Theme color - ws.Cell(3, 1).Style.Fill.BackgroundColor = XLColor.FromTheme(XLThemeColor.Accent1); - ws.Cell(3, 2).Value = "XLColor.FromTheme(XLThemeColor.Accent1)"; + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromTheme(XLThemeColor.Accent1); + ws.Cell(ro, 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)"; + ws.Cell(++ro, 1).Style.Fill.BackgroundColor = XLColor.FromTheme(XLThemeColor.Accent1, 0.5); + ws.Cell(ro, 2).Value = "XLColor.FromTheme(XLThemeColor.Accent1, 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(); diff --git a/ClosedXML/ClosedXML/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj b/ClosedXML/ClosedXML/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj index 858a71f..8b1cfcd 100644 --- a/ClosedXML/ClosedXML/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj +++ b/ClosedXML/ClosedXML/ClosedXML_Sandbox/ClosedXML_Sandbox.csproj @@ -62,10 +62,6 @@ {BD5E6BFE-E837-4A35-BCA9-39667D873A20} ClosedXML - - {03A518D0-1CB7-488E-861C-C4E782B27A46} - ClosedXML_Examples -