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

B2016-173 Transition to MS Word section causes crash

Browse Source 
B2016-135 Hanging Indent crash on History
B2016-162 Backslash typed into table cell does not get saved as a Backslash
This commit is contained in:
Rich 2016-07-19 14:25:29 +00:00
parent 523a767a49
commit e19db72647
3 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PROMS/Volian.Controls.Library/DisplayTransition.cs
View File

@ -78,6 +78,7 @@ namespace Volian.Controls.Library
if (_II_Procedure != cbTranProcs.SelectedIndex) return true; if (_II_Procedure != cbTranProcs.SelectedIndex) return true;
if (_II_Section != cbTranSects.SelectedIndex) return true; if (_II_Section != cbTranSects.SelectedIndex) return true;
// Use VEObject // Use VEObject
if(tvTran.Nodes.Count == 0) return true;//B2016-173 If no nodes then the transtion is to a MS Word Section
if (_II_ItemID != ((tvTran.SelectedNode as VETreeNode).VEObject as ItemInfo).ItemID) return true; if (_II_ItemID != ((tvTran.SelectedNode as VETreeNode).VEObject as ItemInfo).ItemID) return true;
return false; return false;
} }

2
PROMS/Volian.Controls.Library/StepRTB.cs
View File

@ -1096,6 +1096,8 @@ namespace Volian.Controls.Library
{ {
this.Invalidate(); this.Invalidate();
base.WndProc(ref m); base.WndProc(ref m);
// B2016-135 Don't Show Hanging Indent if MyItemInfo is null
if (MyItemInfo == null) return;
if ((FieldToEdit == E_FieldToEdit.StepText) && (SelectionHangingIndent > 0 || SelectionIndent > 0) && (ActiveMode || MyItemInfo.IsTable)) if ((FieldToEdit == E_FieldToEdit.StepText) && (SelectionHangingIndent > 0 || SelectionIndent > 0) && (ActiveMode || MyItemInfo.IsTable))
{ {
using (Graphics g = Graphics.FromHwnd(this.Handle)) using (Graphics g = Graphics.FromHwnd(this.Handle))

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

@ -4625,7 +4625,12 @@ namespace Volian.Controls.Library
Text = ""; Text = "";
FindAllLinks(); // jsj 1-5-2011 FindAllLinks(); // jsj 1-5-2011
if (_pendingKey > ' ' && !ReadOnly) if (_pendingKey > ' ' && !ReadOnly)
{
if(_pendingKey == '\\')
SendKeys.Send("\\"); // B2016-162 Send a backslash which will be converted to "\u9586?"
else
Text = _pendingKey.ToString(); Text = _pendingKey.ToString();
}
else if (_owner[row, col] != null) else if (_owner[row, col] != null)
{ {
string tmp = _owner[row, col].ToString(); string tmp = _owner[row, col].ToString();