* RTF.cs: Kick out of the text swallowing loop if we begin a new

        group, this happens when there is an alternate font name.  TODO:
        We should probably handle alternate font names somehow.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/ChangeLog
index 2049070b909dc165199bba2805f6eabeb16d5301..1994ae73fd2f83580af1db75bf597b9db64ca3db 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-25  Jackson Harper  <jackson@ximian.com>
+
+       * RTF.cs: Kick out of the text swallowing loop if we begin a new
+       group, this happens when there is an alternate font name.  TODO:
+       We should probably handle alternate font names somehow.
+
 2006-10-20  Jackson Harper  <jackson@ximian.com>
 
        * RTF.cs: Need to cast this to a char now.

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/RTF.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/RTF.cs
index 5a85c4254eba4c6be5c6267f9cf4eafe4cc77756..a3b55a0b7afce36eccc9147afa011602d71fdcf7 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/RTF.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms.RTF/RTF.cs
@@ -679,7 +679,7 @@ SkipCRLF:
 
                                                sb = new StringBuilder();
 
-                                               while ((rtf.rtf_class != TokenClass.EOF) && (!rtf.CheckCM(TokenClass.Text, (Major)';')) && (!rtf.CheckCM(TokenClass.Group, Major.EndGroup))) {
+                                               while ((rtf.rtf_class != TokenClass.EOF) && (!rtf.CheckCM(TokenClass.Text, (Major)';')) && (!rtf.CheckCM(TokenClass.Group, Major.EndGroup)) && (!rtf.CheckCM(TokenClass.Group, Major.BeginGroup))) {
                                                        sb.Append((char)rtf.major);
                                                        rtf.GetToken();
                                                }