Author: kostat
Date: 2005-12-13 10:50:30 -0500 (Tue, 13 Dec 2005)
New Revision: 54300
Modified:
trunk/mcs/class/System.Drawing/System.Drawing.Text/TextLineIterator.jvm.cs
trunk/mcs/class/System.Drawing/System.Drawing.Text/changelog
Log:
handle null string
Modified:
trunk/mcs/class/System.Drawing/System.Drawing.Text/TextLineIterator.jvm.cs
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing.Text/TextLineIterator.jvm.cs
2005-12-13 15:34:49 UTC (rev 54299)
+++ trunk/mcs/class/System.Drawing/System.Drawing.Text/TextLineIterator.jvm.cs
2005-12-13 15:50:30 UTC (rev 54300)
@@ -73,7 +73,7 @@
internal TextLineIterator(string s, Font font,
font.FontRenderContext frc, StringFormat format, float width, float height) {
_format = (format != null) ? format : new
StringFormat();
_font = font;
- _s = s;
+ _s = (s != null) ? s : String.Empty;
_frc = frc;
FontFamily ff = font.FontFamily;
_margin =
font.Size*ff.GetDrawMargin(font.Style)/ff.GetEmHeight(font.Style);
@@ -239,4 +239,4 @@
#endregion
}
-}
\ No newline at end of file
+}
Modified: trunk/mcs/class/System.Drawing/System.Drawing.Text/changelog
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing.Text/changelog
2005-12-13 15:34:49 UTC (rev 54299)
+++ trunk/mcs/class/System.Drawing/System.Drawing.Text/changelog
2005-12-13 15:50:30 UTC (rev 54300)
@@ -1,3 +1,7 @@
+2005-12-13 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * TextLineIterator.jvm.cs: handle null string.
+
2005-11-16 Konstantin Triger <[EMAIL PROTECTED]>
* PrivateFontCollection.jvm.cs: open a correct stream.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches