Index: src/Common/DelftTools.Controls.Swf/Table/TableViewComboBoxItem.cs =================================================================== diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r5fc71a385897af92ccb092f2f969b5709afab85a --- src/Common/DelftTools.Controls.Swf/Table/TableViewComboBoxItem.cs (.../TableViewComboBoxItem.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9) +++ src/Common/DelftTools.Controls.Swf/Table/TableViewComboBoxItem.cs (.../TableViewComboBoxItem.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a) @@ -6,32 +6,32 @@ internal class TableViewComboBoxItem : IConvertible { public object Value { get; set; } - - public string DisplayText - { + + public string DisplayText + { get { if (CustomFormatter != null) { return CustomFormatter.Format(null, Value, null); } - if(Value.GetType().IsEnum) + if (Value.GetType().IsEnum) { return EnumDescriptionAttributeTypeConverter.GetEnumDescription((Enum) Value); } return Value.ToString(); - } + } } - + + public ICustomFormatter CustomFormatter { get; set; } + public override string ToString() { return Value != null ? Value.ToString() : "null"; } - public ICustomFormatter CustomFormatter { get; set; } - #region Implementation of IConvertible public TypeCode GetTypeCode()