diff --git a/PROMS/LBWordLibrary/LBObjectExtension.cs b/PROMS/LBWordLibrary/LBObjectExtension.cs index 674c0475..1d99d387 100644 --- a/PROMS/LBWordLibrary/LBObjectExtension.cs +++ b/PROMS/LBWordLibrary/LBObjectExtension.cs @@ -285,11 +285,11 @@ namespace LBWordLibrary return ReplaceSymbolCharacters(GetRangeText(myRange)); } } - private static string[] SymbolFontName = { "VolianDraw", "WingDings" }; + private static string[] SymbolFontName = { "VolianDraw", "WingDings", "VESymb", "VESymbFix", "Symbol" }; private static bool IsSymbolFont(string fontName) { foreach (string symbolFont in SymbolFontName) - if (symbolFont.ToUpper() == fontName.ToUpper()) + if (fontName.ToUpper().StartsWith(symbolFont.ToUpper())) return true; return false; } diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs index d7ee2ae0..ec6206c7 100644 --- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs +++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs @@ -338,7 +338,7 @@ namespace VEPROMS VETreeNode vNode = (VETreeNode)args.Node; IVEDrillDownReadOnly veObj = vNode.VEObject; SectionInfo mySection = veObj as SectionInfo; - if (mySection.MyContent.MyEntry != null) + if (mySection != null && mySection.MyContent.MyEntry != null) { // if it is a word section, find the DisplayTabItem; DisplayTabItem tabItem = tc.GetProcDisplayTabItem(mySection); diff --git a/PROMS/Volian.Controls.Library/StepItem.cs b/PROMS/Volian.Controls.Library/StepItem.cs index 9bd1ac45..9fb3bcbe 100644 --- a/PROMS/Volian.Controls.Library/StepItem.cs +++ b/PROMS/Volian.Controls.Library/StepItem.cs @@ -543,9 +543,15 @@ namespace Volian.Controls.Library { get { - return Top + (Visible ? Height : 0); + return Top + (Hidden ? 0 : Height); } } + private bool _Hidden = false; + public bool Hidden + { + get { return _Hidden; } + set { _Hidden = value; Visible = !value; } + } /// /// Bottom most child /// @@ -1958,7 +1964,7 @@ namespace Volian.Controls.Library foreach (StepItem child in childStepItems) { if (child.Expanded) child.HideChildren(); - child.Visible = false; + child.Hidden = true; } } } @@ -1989,7 +1995,7 @@ namespace Volian.Controls.Library child.UnhideChildren(expand); else if (expand) child.Expand(expand); - child.Visible = true; + child.Hidden = false; } } } @@ -2031,7 +2037,7 @@ namespace Volian.Controls.Library { child.Expand(true); } - child.Visible = true; + child.Hidden = false; } } } diff --git a/PROMS/Volian.Controls.Library/vlnTreeView.cs b/PROMS/Volian.Controls.Library/vlnTreeView.cs index 47ee5e03..5be275e5 100644 --- a/PROMS/Volian.Controls.Library/vlnTreeView.cs +++ b/PROMS/Volian.Controls.Library/vlnTreeView.cs @@ -860,7 +860,8 @@ namespace Volian.Controls.Library else p1 = procedure.ItemID; } - if (p1 != -1) Item.Delete(p1); + if (p1 != -1) + DeleteItemInfoAndChildren(_LastProcedureInfo);// Delete Item and reset Previous and Next } else if (newtype == MenuSelections.ProcedureAfter || newtype == MenuSelections.ProcedureBefore) { @@ -881,7 +882,8 @@ namespace Volian.Controls.Library else p2 = procedure.ItemID; } - if (p2 != -1) Item.Delete(p2); + if (p2 != -1) + DeleteItemInfoAndChildren(_LastProcedureInfo); // Delete Item and reset Previous and Next } #endregion #region InsertSection @@ -902,7 +904,8 @@ namespace Volian.Controls.Library else s1 = section.ItemID; } - if (s1 != -1) Item.Delete(s1); + if (s1 != -1) + DeleteItemInfoAndChildren(_LastSectionInfo);// Delete Item and reset Previous and Next } } else if (newtype == MenuSelections.SectionAfter || newtype == MenuSelections.SectionBefore) @@ -923,7 +926,8 @@ namespace Volian.Controls.Library else s2 = section.ItemID; } - if (s2 != -1) Item.Delete(s2); + if (s2 != -1) + DeleteItemInfoAndChildren(_LastSectionInfo);// Delete Item and reset Previous and Next } #endregion #region InsertStep