diff --git a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs index 09597f97..741a3475 100644 --- a/PROMS/Volian.Controls.Library/VlnFlexGrid.cs +++ b/PROMS/Volian.Controls.Library/VlnFlexGrid.cs @@ -66,6 +66,25 @@ namespace Volian.Controls.Library AllowEditing = _vwMode == E_ViewMode.Edit; } } + private bool _IsRoTable = false; + public bool IsRoTable + { + get { return _IsRoTable; } + set { _IsRoTable = value; } + } + private int _RODbId; + public int RODbId + { + get { return _RODbId; } + set { _RODbId = value; } + } + private string _ROID; + + public string ROID + { + get { return _ROID; } + set { _ROID = value; } + } #region Grid Initialize public VlnFlexGrid() @@ -778,7 +797,7 @@ namespace Volian.Controls.Library { Console.WriteLine("fromStr:\r\n'{0}'\r\nfromRTF:\r\n'{1}'", fromStr, fromRTF); ShowRawString(rawstr, "rawstr"); - Console.WriteLine("Str:'{0}' , RTF:'{1}'", fromStr.Substring(j, 10), fromRTF.Substring(i, 10)); + //Console.WriteLine("Str:'{0}' , RTF:'{1}'", fromStr.Substring(j, 10), fromRTF.Substring(i, 10)); return; } } @@ -1709,8 +1728,11 @@ namespace Volian.Controls.Library CellRange cr = GetMergedRange(r, c); if (cr.r1 == r && cr.c1 == c) { - string strp = DisplayText.StaticStripRtfCommands((string)this[r, c]); - sb.Append(strp.Replace(@"\r\n", " ")); + if (this[r, c] != null) + { + string strp = DisplayText.StaticStripRtfCommands((string)this[r, c]); + sb.Append(strp.Replace(@"\r\n", " ")); + } sb.Append(@"\r\n"); } c = c + 1;