diff --git a/PROMS/VEPROMS User Interface/frmSI.cs b/PROMS/VEPROMS User Interface/frmSI.cs index 3311b51d..116e446a 100644 --- a/PROMS/VEPROMS User Interface/frmSI.cs +++ b/PROMS/VEPROMS User Interface/frmSI.cs @@ -71,7 +71,8 @@ namespace VEPROMS tb.Enter += new System.EventHandler(this.FieldStepRTB_Enter); tb.ContextMenuStrip = contextMenuStrip1; // B2017-024 clipboard context menu // see if config has data for this field, i.e. search for the 'name' - string val = DoFolder ? folderConfig.GetValue("SI", fld.name) : dvConfig.GetValue("SI", fld.name); + // B2019-133 continuation of B2018-057 Replace non-breaking hyphen with hyphen. + string val = (DoFolder ? folderConfig.GetValue("SI", fld.name) : dvConfig.GetValue("SI", fld.name)).Replace("\\u8209?", "-"); DisplayText dt = new DisplayText(val, new VE_Font("Arial", 10, E_Style.None, 12), false); StringBuilder sb = new StringBuilder(); sb.Append(@"{\rtf1\ansi\ansicpg1252\deff0\deflang1033{\fonttbl{\f0\fnil\fcharset2 Arial;}"); @@ -146,9 +147,9 @@ namespace VEPROMS { isDirty = true; if (DoFolder) - folderConfig.SetValue("SI", fld.name, newval); + folderConfig.SetValue("SI", fld.name, newval.Replace("\\u8209?", "-"));// B2019-133 continuation of B2018-057 Replace non-breaking hyphen with hyphen. else - dvConfig.SetValue("SI", fld.name, newval); + dvConfig.SetValue("SI", fld.name, newval.Replace("\\u8209?", "-"));// B2019-133 continuation of B2018-057 Replace non-breaking hyphen with hyphen. } } else if (fld.type.ToLower() == "logical") diff --git a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs index b8f63e86..8c8a761f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs +++ b/PROMS/VEPROMS.CSLA.Library/Format/PlantFormat.cs @@ -2398,6 +2398,15 @@ namespace VEPROMS.CSLA.Library return LazyLoad(ref _UseTildaPoundCharsForSuperSubScriptInROValues, "@UseTildaPoundCharsForSuperSubScriptInROValues"); } } + // C2019-043 will convert "->" to the right arrow symbol and "<-" to the left arrow symbol for RO return values + private LazyLoad _UseDashGreaterLessThenForArrowsInROValue; + public bool UseDashGreaterLessThenForArrowsInROValue + { + get + { + return LazyLoad(ref _UseDashGreaterLessThenForArrowsInROValue, "@UseDashGreaterLessThenForArrowsInROValue"); + } + } private LazyLoad _ConvertUnderscoreToUnderline; public bool ConvertUnderscoreToUnderline {