Author: kostat
Date: 2005-12-13 10:51:55 -0500 (Tue, 13 Dec 2005)
New Revision: 54301

Modified:
   
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing.Text/TextLineIterator.jvm.cs
   
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing.Text/changelog
Log:
merge -r 54299:54300

Modified: 
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing.Text/TextLineIterator.jvm.cs
===================================================================
--- 
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing.Text/TextLineIterator.jvm.cs
        2005-12-13 15:50:30 UTC (rev 54300)
+++ 
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing.Text/TextLineIterator.jvm.cs
        2005-12-13 15:51:55 UTC (rev 54301)
@@ -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: 
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing.Text/changelog
===================================================================
--- 
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing.Text/changelog  
    2005-12-13 15:50:30 UTC (rev 54300)
+++ 
branches/mainsoft/gh1.7/mcs/class/System.Drawing/System.Drawing.Text/changelog  
    2005-12-13 15:51:55 UTC (rev 54301)
@@ -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

Reply via email to