Merge pull request #2072 from AdamBurgess/master

[mono.git] / mcs / class / System.Drawing / System.Drawing.Printing / PrintingPermission.cs

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingPermission.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingPermission.cs
index 8aee6ce95cd6ba0da3bfcdde37150c8ea5a3ade9..44e2171bad024c8b73bfa5b13a1d5fbeb3d98d7f 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingPermission.cs
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingPermission.cs
@@ -46,8 +46,6 @@ namespace System.Drawing.Printing {
                {
                        if (CheckPermissionState (state, true) == PermissionState.Unrestricted)
                                _Level = PrintingPermissionLevel.AllPrinting;
-                       else
-                               _Level = PrintingPermissionLevel.NoPrinting;
                }
 
                public PrintingPermission (PrintingPermissionLevel printingLevel) 
@@ -201,17 +199,10 @@ namespace System.Drawing.Printing {
                                throw new ArgumentNullException (parameterName);
 
                        string c = se.Attribute ("class");
-#if NET_2_0
                        if (c == null) {
                                string msg = Locale.GetText ("Missing 'class' attribute.");
                                throw new ArgumentException (msg, parameterName);
                        }
-#else
-                       if ((c == null) || (String.Compare (c, 0, "System.Drawing.Printing.PrintingPermission", 0, 42) != 0)) {
-                               string msg = Locale.GetText ("Wrong 'class' attribute.");
-                               throw new ArgumentException (msg, parameterName);
-                       }
-#endif
                        // we assume minimum version if no version number is supplied
                        int version = minimumVersion;
                        string v = se.Attribute ("version");
@@ -225,12 +216,6 @@ namespace System.Drawing.Printing {
                                        throw new ArgumentException (msg, parameterName, e);
                                }
                        }
-#if !NET_2_0
-                       else {
-                               string msg = Locale.GetText ("Missing 'version' attribute.");
-                               throw new ArgumentException (msg, parameterName);
-                       }
-#endif
 
                        if ((version < minimumVersion) || (version > maximumVersion)) {
                                string msg = Locale.GetText ("Unknown version '{0}', expected versions between ['{1}','{2}'].");