Fixed logic adding an RO before another RO in a table cell,

Fixed logic adding a transition before another transition in a table cell.
This commit is contained in:
Rich 2014-06-12 14:18:59 +00:00
parent 88aa8f1759
commit 985b419736

View File

@ -3036,7 +3036,7 @@ namespace Volian.Controls.Library
int indx = Rtf.IndexOf(@"#Link:ReferencedObject:<NewID>"); int indx = Rtf.IndexOf(@"#Link:ReferencedObject:<NewID>");
if (indx > 0) if (indx > 0)
{ {
Match mro = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*)\[END>"); Match mro = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*?)\[END>");
string linkstr = mro.Groups[2].Value; string linkstr = mro.Groups[2].Value;
string[] roparts = linkstr.Split(" ".ToCharArray()); string[] roparts = linkstr.Split(" ".ToCharArray());
ContentRoUsage rousg = null; ContentRoUsage rousg = null;
@ -3065,7 +3065,7 @@ namespace Volian.Controls.Library
if (mt.Length > 0) if (mt.Length > 0)
{ {
indx = mt.Index+6; // get past '#Link:" indx = mt.Index+6; // get past '#Link:"
Match m = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*)\[END>"); Match m = Regex.Match(Rtf.Substring(indx, Rtf.Length - indx), @"([A-Za-z]*):(.*?)\[END>");
bool isSingleTran = true; bool isSingleTran = true;
if (Rtf.Substring(indx, 16).IndexOf("TransitionRange") >= 0) isSingleTran = false; if (Rtf.Substring(indx, 16).IndexOf("TransitionRange") >= 0) isSingleTran = false;
string linkstr = m.Groups[2].Value; string linkstr = m.Groups[2].Value;