2004-07-27 Atsushi Enomoto <atsushi@ximian.com>

	* DataSet.cs : on serialization to XmlWriter, XmlConvert should be
	  used. There were also some culture dependency problems to write int.

svn path=/branches/mono-1-0/mcs/; revision=31495

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 5477819e4027cf04b34fd8d1faa5c98d7919a423..19a97068767a4d994285ec48dd77159d7f106d65 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-27  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DataSet.cs : on serialization to XmlWriter, XmlConvert should be
+         used. There were also some culture dependency problems to write int.
+
 2004-06-27  Atsushi Enomoto  <atsushi@ximian.com>
 
        * XmlDataInferenceLoader.cs : It was not always filling relation

diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
index 34f9f8f4c8012d2c025e77effa3a20da02902789..49ae0f024f96056d5ef7b4fdcc4429ff015bba5e 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataSet.cs
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -1270,7 +1270,7 @@ namespace System.Data {
 
                private void WriteColumnAsAttribute (XmlWriter writer, XmlWriteMode mode, DataColumn col, DataRow row, DataRowVersion version)
                {
-                       WriteAttributeString (writer, mode, col.Namespace, col.Prefix, XmlConvert.EncodeLocalName (col.ColumnName), row[col, version].ToString ());
+                       WriteAttributeString (writer, mode, col.Namespace, col.Prefix, XmlConvert.EncodeLocalName (col.ColumnName), WriteObjectXml (row[col, version]));
                }
 
                private void WriteTableElement (XmlWriter writer, XmlWriteMode mode, DataTable table, DataRow row, DataRowVersion version)
@@ -1282,7 +1282,7 @@ namespace System.Data {
 
                        if (mode == XmlWriteMode.DiffGram) {
                                WriteAttributeString (writer, mode, XmlConstants.DiffgrNamespace, XmlConstants.DiffgrPrefix, "id", table.TableName + (row.XmlRowID + 1));
-                               WriteAttributeString (writer, mode, XmlConstants.MsdataNamespace, XmlConstants.MsdataPrefix, "rowOrder", row.XmlRowID.ToString());
+                               WriteAttributeString (writer, mode, XmlConstants.MsdataNamespace, XmlConstants.MsdataPrefix, "rowOrder", XmlConvert.ToString (row.XmlRowID));
                                string modeName = null;
                                if (row.RowState == DataRowState.Modified)
                                        modeName = "modified";
@@ -1618,7 +1618,7 @@ namespace System.Data {
                                
                                // add ordinal attribute
                                xlmAttrs[1] = doc.CreateAttribute (XmlConstants.MsdataPrefix, XmlConstants.Ordinal, XmlConstants.MsdataNamespace);
-                               xlmAttrs[1].Value = simple.Ordinal.ToString();
+                               xlmAttrs[1].Value = XmlConvert.ToString (simple.Ordinal);
                                simpleContent.UnhandledAttributes = xlmAttrs;
                                
                                
@@ -1655,12 +1655,12 @@ namespace System.Data {
 
                                        if (col.AutoIncrementSeed != 0) {
                                                xattr = doc.CreateAttribute (XmlConstants.MsdataPrefix, XmlConstants.AutoIncrementSeed, XmlConstants.MsdataNamespace);
-                                               xattr.Value = col.AutoIncrementSeed.ToString();
+                                               xattr.Value = XmlConvert.ToString (col.AutoIncrementSeed);
                                                xattrs.Add (xattr);
                                        }
 
                                        if (col.DefaultValue.ToString () != String.Empty)
-                                               colElem.DefaultValue = col.DefaultValue.ToString ();
+                                               colElem.DefaultValue = WriteObjectXml (col.DefaultValue);
                                        
                                        if (col.MaxLength < 0)
                                                colElem.SchemaTypeName = MapType (col.DataType);