From 7face42b01e4e6a752dfe9946e04c9f712d8ea79 Mon Sep 17 00:00:00 2001 From: Kathy Date: Thu, 7 Nov 2019 13:45:42 +0000 Subject: [PATCH] B2019-164: Fix extra space at end of some replaced words --- PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs index 0d81ba13..86ae1fff 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/DisplayText.cs @@ -2301,8 +2301,10 @@ namespace VEPROMS.CSLA.Library with = with.Replace(@"\b0\", @"\"); if (with.EndsWith(@"\b0")) with = with.Replace(@"\b0",""); - if (with.LastIndexOf(@"\") > with.LastIndexOf(" ")) // B2019-092 - make sure there is a space char to terminate remaining rft formatting command - with = with + " "; + // Removed the following two lines of code to fix B2019-164. This change was not needed for + // B2019-092, a format file changed fixed that problem: + //if (with.LastIndexOf(@"\") > with.LastIndexOf(" ")) // B2019-092 - make sure there is a space char to terminate remaining rft formatting command + // with = with + " "; } bool IsUnderline = (((_Font.Style & E_Style.Underline) == E_Style.Underline) && with.Contains(@"\ul ")); // handle where replace words replaces a string with 'underline on'string'underline off', for example Point Beach @@ -2328,8 +2330,10 @@ namespace VEPROMS.CSLA.Library with = with.Replace(@"\ulnone\", @"\"); if (with.EndsWith(@"\ulnone")) with = with.Replace(@"\ulnone",""); - if (with.LastIndexOf(@"\") > with.LastIndexOf(" ")) // B2019-092 - make sure there is a space char to terminate remaining rft formatting command - with = with + " "; + // Removed the following two lines of code to fix B2019-164. This change was not needed for + // B2019-092, a format file changed fixed that problem: + //if (with.LastIndexOf(@"\") > with.LastIndexOf(" ")) // B2019-092 - make sure there is a space char to terminate remaining rft formatting command + // with = with + " "; } string preceedingText = text.Substring(0, offset + foundMatch.MyMatch.Index); int ndxBold = preceedingText.LastIndexOf(@"\b");