diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs index 870443d..754c03b 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/Colors/XLColor_Public.cs @@ -104,5 +104,16 @@ { return _hashCode; } + + public override string ToString() + { + if (_colorType == XLColorType.Color) + return Color.ToHex(); + + if (_colorType == XLColorType.Theme) + return String.Format("Color Theme: {0}, Tint: {1}", _themeColor.ToString(), _themeTint.ToString()); + + return "Color Index: " + _indexed; + } } } diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs index 82c924d..f4cbf63 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLBorder.cs @@ -433,23 +433,23 @@ var sb = new StringBuilder(); sb.Append(LeftBorder.ToString()); sb.Append("-"); - sb.Append(LeftBorderColor.ToString()); + sb.Append(LeftBorderColor); sb.Append("-"); sb.Append(RightBorder.ToString()); sb.Append("-"); - sb.Append(RightBorderColor.ToString()); + sb.Append(RightBorderColor); sb.Append("-"); sb.Append(TopBorder.ToString()); sb.Append("-"); - sb.Append(TopBorderColor.ToString()); + sb.Append(TopBorderColor); sb.Append("-"); sb.Append(BottomBorder.ToString()); sb.Append("-"); - sb.Append(BottomBorderColor.ToString()); + sb.Append(BottomBorderColor); sb.Append("-"); sb.Append(DiagonalBorder.ToString()); sb.Append("-"); - sb.Append(DiagonalBorderColor.ToString()); + sb.Append(DiagonalBorderColor); sb.Append("-"); sb.Append(DiagonalUp.ToString()); sb.Append("-"); diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs index ea9c69c..6bf42b4 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFill.cs @@ -146,11 +146,11 @@ public override string ToString() { var sb = new StringBuilder(); - sb.Append(BackgroundColor.ToString()); + sb.Append(BackgroundColor); sb.Append("-"); sb.Append(PatternType.ToString()); sb.Append("-"); - sb.Append(PatternColor.ToString()); + sb.Append(PatternColor); return sb.ToString(); } diff --git a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs index 9d86ca6..c18a2b6 100644 --- a/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs +++ b/ClosedXML/ClosedXML/ClosedXML/Excel/Style/XLFont.cs @@ -305,7 +305,7 @@ sb.Append("-"); sb.Append(FontSize.ToString()); sb.Append("-"); - sb.Append(FontColor.Color.ToHex()); + sb.Append(FontColor); sb.Append("-"); sb.Append(FontName); sb.Append("-");