2004-07-07 Sebastien Pouliot <sebastien@ximian.com>

	* FileDialogPermission.cs: Removed the unrequired override ToString
	from the NET_2_0 profile.

svn path=/trunk/mcs/; revision=30851

diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog
index 219a8c199ea90acaa5f6437eba165ea76f5396f6..0989ca53e4fc92079c32611e25431f2d5b3013fe 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/ChangeLog
+++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-07  Sebastien Pouliot  <sebastien@ximian.com>
+
+       * FileDialogPermission.cs: Removed the unrequired override ToString
+       from the NET_2_0 profile.
+
 2004-06-10  Gert Driesen <drieseng@users.sourceforge.net>
 
        * StrongNameIdentityPermission.cs: removed extra useless finalizer

diff --git a/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs b/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs
index bee58bf056ce10972aacbb15d69c5b31c7dcd8d8..4d687784bdc38fb637834d08f48af106013be8f6 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs
@@ -157,11 +157,13 @@ namespace System.Security.Permissions {
                        return (_access == FileDialogPermissionAccess.OpenSave);
                }
 
+#if !NET_2_0
                // Same results as base class - so why is it overrided ?
                public override string ToString () 
                {
                        return base.ToString ();
                }
+#endif
 
                public override SecurityElement ToXml () 
                {
@@ -202,4 +204,4 @@ namespace System.Security.Permissions {
                        return 1;
                }
        }
-}
\ No newline at end of file
+}