2005-09-21 Lluis Sanchez Gual <lluis@novell.com>

[mono.git] / mcs / class / System.XML / System.Xml.Serialization / XmlCustomFormatter.cs

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
index 17514268a90ffcfa350575ad16fb34b1e0bfddee..dc3818bd360e7a528c2bad1ece3d9bf6c9bd7f31 100644 (file)
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
@@ -195,7 +195,9 @@ namespace System.Xml.Serialization {
                                case "unsignedInt": return XmlConvert.ToString ((UInt32)value);
                                case "unsignedLong": return XmlConvert.ToString ((UInt64)value);
                                case "guid": return XmlConvert.ToString ((Guid)value);
+                               case "base64":
                                case "base64Binary": return Convert.ToBase64String ((byte[])value);
+                               case "duration": return XmlConvert.ToString ((TimeSpan) value);
                        default: return value is IFormattable ? ((IFormattable) value).ToString (null, CultureInfo.InvariantCulture) : value.ToString ();
                        }
                }
@@ -223,7 +225,9 @@ namespace System.Xml.Serialization {
                                case "unsignedInt": return XmlConvert.ToUInt32 (value);
                                case "unsignedLong": return XmlConvert.ToUInt64 (value);
                                case "guid": return XmlConvert.ToGuid (value);
+                               case "base64":
                                case "base64Binary": return Convert.FromBase64String (value);
+                               case "duration": return XmlConvert.ToTimeSpan (value);
                                default: 
                                        if (type.Type != null)
                                                return Convert.ChangeType (value, type.Type);
@@ -253,7 +257,9 @@ namespace System.Xml.Serialization {
                                case "unsignedInt": return value + ".ToString(CultureInfo.InvariantCulture)";
                                case "unsignedLong": return value + ".ToString(CultureInfo.InvariantCulture)";
                                case "guid": return "XmlConvert.ToString (" + value + ")";
+                               case "base64":
                                case "base64Binary": return "Convert.ToBase64String (" + value + ")";
+                               case "duration": return "XmlConvert.ToString (" + value + ")";
                                case "NMTOKEN":
                                case "Name":
                                case "NCName":
@@ -285,12 +291,14 @@ namespace System.Xml.Serialization {
                                case "int": return "Int32.Parse (" + value + ", CultureInfo.InvariantCulture)";
                                case "long": return "Int64.Parse (" + value + ", CultureInfo.InvariantCulture)";
                                case "byte": return "SByte.Parse (" + value + ", CultureInfo.InvariantCulture)";
-                               case "float": return "XmlConvert.ToSingle (" + value + ", CultureInfo.InvariantCulture)";
+                               case "float": return "XmlConvert.ToSingle (" + value + ")";
                                case "unsignedShort": return "UInt16.Parse (" + value + ", CultureInfo.InvariantCulture)";
                                case "unsignedInt": return "UInt32.Parse (" + value + ", CultureInfo.InvariantCulture)";
                                case "unsignedLong": return "UInt64.Parse (" + value + ", CultureInfo.InvariantCulture)";
                                case "guid": return "XmlConvert.ToGuid (" + value + ")";
+                               case "base64:":
                                case "base64Binary": return "Convert.FromBase64String (" + value + ")";
+                               case "duration": return "XmlConvert.ToTimeSpan (" + value + ")";
                                default: return value;
                        }
                }