Compare commits

..

8 Commits

2 changed files with 8 additions and 3 deletions

View File

@@ -372,12 +372,14 @@ namespace Volian.Controls.Library
{ {
// B2022-088: [JPR] Find Doc Ro button not working in Word Sections // B2022-088: [JPR] Find Doc Ro button not working in Word Sections
// B2022-098: [JPR] ROs not being resolved in Word Sections // B2022-098: [JPR] ROs not being resolved in Word Sections
if (e.Node.Tag is ROFSTLookup.rochild){ if (e.Node.Tag is ROFSTLookup.rochild)
{
ROFSTLookup.rochild chld = (ROFSTLookup.rochild)e.Node.Tag; ROFSTLookup.rochild chld = (ROFSTLookup.rochild)e.Node.Tag;
selectedChld = chld; selectedChld = chld;
if (chld.value != null) if (chld.value != null)
{ {
chld.value = Regex.Replace(chld.value, @"\\u([0-9]{1,4})\?", m => int.TryParse(m?.Groups[1]?.Value, out int result) ? Convert.ToChar(result).ToString() : "");
RoUsageInfo SavROLink = null; RoUsageInfo SavROLink = null;
if (_savCurROLink != null) SavROLink = _savCurROLink; if (_savCurROLink != null) SavROLink = _savCurROLink;
@@ -1172,3 +1174,4 @@ namespace Volian.Controls.Library
#endregion #endregion
} }
} }

View File

@@ -1672,9 +1672,11 @@ namespace Volian.Controls.Library
//if can't, log it and use old method of scoping clipboard to PROMS life //if can't, log it and use old method of scoping clipboard to PROMS life
try try
{ {
Clipboard.SetDataObject(myDO, true); // this saves the cleaned up information to the Windows clipboard // noticed that sometimes the clipboard will get stuck - so set it to retry twice
// and if it fails, scope the clipboard to within PROMS
Clipboard.SetDataObject(myDO, true, 2, 100); // this saves the cleaned up information to the Windows clipboard
} }
catch (Exception ex) catch (System.Runtime.InteropServices.ExternalException ex)
{ {
_MyLog.Warn($"Error Setting Clipboard Object to Persist beyond PROMS. Clipboard will be scoped to PROMS. Error:{ex.Message}"); _MyLog.Warn($"Error Setting Clipboard Object to Persist beyond PROMS. Clipboard will be scoped to PROMS. Error:{ex.Message}");
Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard Clipboard.SetDataObject(myDO); // this saves the cleaned up information to the Windows clipboard