Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing 2011-03-01 13:28:50 +00:00
parent 4b7a168dbd
commit 97e5cf4ee6
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
PROMS/Volian.Controls.Library/VlnFlexGrid.cs
View File

@ -66,6 +66,25 @@ namespace Volian.Controls.Library
AllowEditing = _vwMode == E_ViewMode.Edit; 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 #region Grid Initialize
public VlnFlexGrid() public VlnFlexGrid()
@ -778,7 +797,7 @@ namespace Volian.Controls.Library
{ {
Console.WriteLine("fromStr:\r\n'{0}'\r\nfromRTF:\r\n'{1}'", fromStr, fromRTF); Console.WriteLine("fromStr:\r\n'{0}'\r\nfromRTF:\r\n'{1}'", fromStr, fromRTF);
ShowRawString(rawstr, "rawstr"); 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; return;
} }
} }
@ -1709,8 +1728,11 @@ namespace Volian.Controls.Library
CellRange cr = GetMergedRange(r, c); CellRange cr = GetMergedRange(r, c);
if (cr.r1 == r && cr.c1 == c) if (cr.r1 == r && cr.c1 == c)
{ {
string strp = DisplayText.StaticStripRtfCommands((string)this[r, c]); if (this[r, c] != null)
sb.Append(strp.Replace(@"\r\n", " ")); {
string strp = DisplayText.StaticStripRtfCommands((string)this[r, c]);
sb.Append(strp.Replace(@"\r\n", " "));
}
sb.Append(@"\r\n"); sb.Append(@"\r\n");
} }
c = c + 1; c = c + 1;