Merge pull request #386 from sillsdev/hotfix/9.2.10

Cherry-picks for hotfix/9.2.10

Author: jasonleenaylor

Src/Common/Controls/Widgets/FontHeightAdjuster.cs

@@ -165,7 +165,7 @@ public static LgCharRenderProps GetChrpForStyle(string styleName, IVwStylesheet
 				}
 			}
 
-			IVwPropertyStore vwps = VwPropertyStoreClass.Create();
+			VwPropertyStoreManaged vwps = new VwPropertyStoreManaged();
 			vwps.Stylesheet = styleSheet;
 			vwps.WritingSystemFactory = writingSystemFactory;
 

Src/Common/FwUtils/FwUtilsTests/TestFwStylesheetTests.cs

@@ -127,7 +127,7 @@ public void TestOverrideFontForWritingSystem_ForStyleWithNullProps()
 			stylesheet.OverrideFontsForWritingSystems("FirstStyle", fontOverrides);
 
 			//check results
-			IVwPropertyStore vwps = VwPropertyStoreClass.Create();
+			VwPropertyStoreManaged vwps = new VwPropertyStoreManaged();
 			vwps.Stylesheet = stylesheet;
 			vwps.WritingSystemFactory = wsf;
 
@@ -190,7 +190,7 @@ public void TestOverrideFontsForWritingSystems_ForStyleWithProps()
 			stylesheet.OverrideFontsForWritingSystems("FirstStyle", fontOverrides);
 
 			//check results
-			IVwPropertyStore vwps = VwPropertyStoreClass.Create();
+			VwPropertyStoreManaged vwps = new VwPropertyStoreManaged();
 			vwps.Stylesheet = stylesheet;
 			vwps.WritingSystemFactory = wsf;
 

Src/Common/SimpleRootSite/EditingHelper.cs

@@ -22,6 +22,7 @@
 using SIL.Reporting;
 using SIL.LCModel.Utils;
 using SIL.Windows.Forms.Keyboarding;
+using SIL.LCModel;
 
 namespace SIL.FieldWorks.Common.RootSites
 {
@@ -1535,7 +1536,7 @@ public static Font GetFontForNormalStyle(int hvoWs, IVwStylesheet styleSheet,
 			ttpBldr.SetIntPropValues((int)FwTextPropType.ktptWs, 0, hvoWs);
 			ITsTextProps ttp = ttpBldr.GetTextProps();
 
-			IVwPropertyStore vwps = VwPropertyStoreClass.Create();
+			VwPropertyStoreManaged vwps = new VwPropertyStoreManaged();
 			vwps.Stylesheet = styleSheet;
 			vwps.WritingSystemFactory = wsf;
 			LgCharRenderProps chrps = vwps.get_ChrpFor(ttp);
@@ -3426,6 +3427,18 @@ public string GetClipboardAsString()
 		/// <returns>True if the paste succeeded, false otherwise</returns>
 		/// ------------------------------------------------------------------------------------
 		public virtual bool PasteClipboard()
+		{
+			return PasteClipboard(null);
+		}
+
+		/// ------------------------------------------------------------------------------------
+		/// <summary>
+		/// Paste data from the clipboard into the view. Caller is reponsible to make UOW.
+		/// </summary>
+		/// <param name="cache">The LcmCache.</param>
+		/// <returns>True if the paste succeeded, false otherwise</returns>
+		/// ------------------------------------------------------------------------------------
+		public virtual bool PasteClipboard(LcmCache cache)
 		{
 			CheckDisposed();
 			// Do nothing if command is not enabled. Needed for Ctrl-V keypress.
@@ -3450,23 +3463,25 @@ public virtual bool PasteClipboard()
 			ChangeStyleForPaste(vwsel, ref vttp);
 
 			ITsString tss = GetTextFromClipboard(vwsel, vwsel.CanFormatChar, vttp[0]);
-			return PasteCore(tss);
+			return PasteCore(tss, cache);
 		}
 
 		/// ------------------------------------------------------------------------------------
 		/// <summary>
 		/// Core logic for Paste command (without modifying the clipboard, to support testing).
 		/// </summary>
 		/// <param name="tss">The TsString to paste.</param>
+		/// <param name="cache">The LcmCache.</param>
 		/// <returns>True if that paste succeeded, false otherwise</returns>
 		/// ------------------------------------------------------------------------------------
-		public bool PasteCore(ITsString tss)
+		public bool PasteCore(ITsString tss, LcmCache cache)
 		{
 			IVwSelection vwsel = EditedRootBox.Selection;
 			try
 			{
 				if (tss != null)
 				{
+					tss = ReplaceExternalWritingSystems(tss, vwsel, cache);
 					// At this point, we may need to override internal formatting values
 					// for certain target rootsites. We do this with an event handler that the
 					// rootsite can register for its editing helper. (See LT-1445.)
@@ -3507,6 +3522,58 @@ public bool PasteCore(ITsString tss)
 			return true;
 		}
 
+		private ITsString ReplaceExternalWritingSystems(ITsString tss, IVwSelection vwsel, LcmCache cache)
+		{
+			if (cache == null)
+				// Can't tell whether writing systems are external.
+				return tss;
+
+			// Check for external writing systems.
+			bool hasExternalWritingSystem = false;
+			for (int i = 0; i < tss.RunCount; i++)
+			{
+				int ws = tss.get_WritingSystem(i);
+				if (IsExternalWritingSystem(ws, cache))
+				{
+					hasExternalWritingSystem = true;
+					break;
+				}
+			}
+			if (!hasExternalWritingSystem)
+				return tss;
+
+			// Replace external writing systems with selection's writing system.
+			ITsString selTss;
+			vwsel.GetSelectionString(out selTss, string.Empty);
+			ITsStrBldr stringBldr = TsStringUtils.MakeStrBldr();
+			TsRunInfo runInfo;
+			for (int irun = 0; irun < tss.RunCount; irun++)
+			{
+				int ttv, ws;
+				ITsTextProps props = tss.FetchRunInfo(irun, out runInfo);
+				ws = props.GetIntPropValues((int)FwTextPropType.ktptWs, out ttv);
+				if (IsExternalWritingSystem(ws, cache))
+				{
+					ws = selTss.get_WritingSystemAt(0);
+					ITsPropsBldr propsBldr = props.GetBldr();
+					propsBldr.SetIntPropValues((int)FwTextPropType.ktptWs, ttv, ws);
+					props = propsBldr.GetTextProps();
+				}
+				stringBldr.Replace(runInfo.ichMin, runInfo.ichMin, tss.get_RunText(irun), props);
+			}
+			return stringBldr.GetString();
+		}
+
+		private bool IsExternalWritingSystem(int ws, LcmCache cache)
+		{
+			foreach (CoreWritingSystemDefinition writingSystem in cache.LanguageProject.AllWritingSystems)
+			{
+				if (writingSystem.Handle == ws)
+					return false;
+			}
+			return true;
+		}
+
 		/// ------------------------------------------------------------------------------------
 		/// <summary>
 		/// Gets the text from clipboard.

Src/Common/ViewsInterfaces/ViewsInterfaces.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
@@ -163,6 +163,7 @@
     <Compile Include="AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="VwPropertyStoreManaged.cs" />
     <None Include="BuildInclude.targets">
       <SubType>Designer</SubType>
     </None>

Src/Common/ViewsInterfaces/VwPropertyStoreManaged.cs

@@ -0,0 +1,101 @@
+// Copyright (c) 2002-2025 SIL International
+// This software is licensed under the LGPL, version 2.1 or later
+// (http://www.gnu.org/licenses/lgpl-2.1.html)
+
+using System;
+using System.Runtime.InteropServices;
+using System.Threading;
+using SIL.LCModel.Core.KernelInterfaces;
+
+namespace SIL.FieldWorks.Common.ViewsInterfaces
+{
+	/// <summary/>
+	public sealed class VwPropertyStoreManaged : IDisposable
+	{
+		private const string _viewsDllPath = "views.dll";
+		private IntPtr pVwPropStore;
+
+		// Detect redundant Dispose() calls in a thread-safe manner.
+		// _isDisposed == 0 means Dispose(bool) has not been called yet.
+		// _isDisposed == 1 means Dispose(bool) has already been called.
+		private int _isDisposed;
+
+		/// <summary/>
+		public VwPropertyStoreManaged()
+		{
+			pVwPropStore = VwPropertyStore_Create();
+		}
+
+		/// <summary/>
+		public IVwStylesheet Stylesheet
+		{
+			set
+			{
+				VwPropertyStore_Stylesheet(pVwPropStore, value);
+			}
+		}
+
+		/// <summary/>
+		public ILgWritingSystemFactory WritingSystemFactory
+		{
+			set
+			{
+				VwPropertyStore_WritingSystemFactory(pVwPropStore, value);
+			}
+		}
+
+		/// <summary/>
+		public LgCharRenderProps get_ChrpFor(ITsTextProps ttp)
+		{
+			IntPtr pInt = VwPropertyStore_get_ChrpFor(pVwPropStore, ttp);
+			return (LgCharRenderProps)Marshal.PtrToStructure(pInt, typeof(LgCharRenderProps));
+		}
+
+		#region Disposable stuff
+		/// <summary/>
+		~VwPropertyStoreManaged() => Dispose(false);
+
+		/// <summary/>
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+
+		/// <summary/>
+		private void Dispose(bool disposing)
+		{
+			if (Interlocked.CompareExchange(ref _isDisposed, 1, 0) == 0)
+			{
+				// Dispose managed resources (if there are any).
+				if (disposing)
+				{
+				}
+
+				// Dispose unmanaged resources.
+				VwPropertyStore_Delete(pVwPropStore);
+			}
+		}
+		#endregion
+
+		#region DLLImport stuff
+		[DllImport(_viewsDllPath, CallingConvention = CallingConvention.Cdecl)]
+		private static extern IntPtr VwPropertyStore_Create();
+
+		[DllImport(_viewsDllPath, CallingConvention = CallingConvention.Cdecl)]
+		private static extern void VwPropertyStore_Delete(IntPtr pVwPropStore);
+
+		[DllImport(_viewsDllPath, CallingConvention = CallingConvention.Cdecl)]
+		private static extern void VwPropertyStore_Stylesheet(IntPtr pVwPropStore,
+			[MarshalAs(UnmanagedType.Interface)] IVwStylesheet pss);
+
+		[DllImport(_viewsDllPath, CallingConvention = CallingConvention.Cdecl)]
+		private static extern void VwPropertyStore_WritingSystemFactory(IntPtr pVwPropStore,
+			[MarshalAs(UnmanagedType.Interface)] ILgWritingSystemFactory pwsf);
+
+		[DllImport(_viewsDllPath, CallingConvention = CallingConvention.Cdecl)]
+		private static extern IntPtr VwPropertyStore_get_ChrpFor(IntPtr pVwPropStore,
+			[MarshalAs(UnmanagedType.Interface)] ITsTextProps _ttp);
+		#endregion
+	}
+}

Src/FwCoreDlgs/FwStylesDlg.cs

@@ -863,6 +863,15 @@ private void m_btnOk_Click(object sender, EventArgs e)
 
 					try
 					{
+						// Preprocess deletions (For LT-22002).
+						foreach (string deleted in m_deletedStyleNames)
+						{
+							if (m_styleTable.ContainsKey(deleted))
+								m_styleTable.Remove(deleted);
+						}
+						if (m_deletedStyleNames.Contains(m_styleListHelper.SelectedStyleName))
+							m_deletedStyleNames.Remove(m_styleListHelper.SelectedStyleName);
+
 						// Check to make sure new styles are not going to result in duplicates
 						// in the database
 						m_styleSheet.CheckForDuplicates(m_styleTable);
@@ -1223,6 +1232,9 @@ private void DeleteAndRenameStylesInDB()
 			foreach (var kvp in m_renamedStyles)
 				replaceSpec[kvp.Value] = kvp.Key;
 			StringServices.ReplaceStyles(m_cache, replaceSpec);
+			// Don't process again.
+			m_deletedStyleNames.Clear();
+			m_renamedStyles.Clear();
 
 			m_changeType |= StyleChangeType.RenOrDel;
 		}

Src/FwCoreDlgs/FwWritingSystemSetupModel.cs

@@ -215,10 +215,8 @@ public FwWritingSystemSetupModel(IWritingSystemContainer container, ListType typ
 		private List<WSListItemModel> BuildWorkingList(ICollection<CoreWritingSystemDefinition> allForType, IList<CoreWritingSystemDefinition> currentForType)
 		{
 			var list = new List<WSListItemModel>();
-			// We prefer to display the current ones first, because that's what the code that orders them
-			// in the lexical data fields does. Usually this happens automatically, but there have
-			// been cases where the order is different in the two lists, even if they have the same items.
-			var wssInPreferredOrder = currentForType.Concat(allForType.Except(currentForType));
+			// Don't reorder the writing systems here even though the lexical data fields are reordered (cf. LT-22136).
+			var wssInPreferredOrder = allForType;
 			foreach (var ws in wssInPreferredOrder)
 			{
 				list.Add(new WSListItemModel(currentForType.Contains(ws), ws, new CoreWritingSystemDefinition(ws, true)));

Src/LexText/Lexicon/ReversalListener.cs

@@ -417,7 +417,15 @@ private void ChangeOwningObject(Guid newGuid)
 			var layoutFinder = ((Sorter as GenRecordSorter)?.Comparer as StringFinderCompare)?.Finder as LayoutFinder;
 			if (layoutFinder?.Vc != null)
 			{
-				layoutFinder.Vc.OverrideWs = WritingSystemServices.CurrentReversalWsId;
+				var wsComparer = ((Sorter as GenRecordSorter)?.Comparer as StringFinderCompare)?.SubComparer as WritingSystemComparer;
+				if (wsComparer != null)
+				{
+					layoutFinder.Vc.OverrideWs = Cache.WritingSystemFactory.GetWsFromStr(wsComparer.WsId);
+				}
+				else
+				{
+					layoutFinder.Vc.OverrideWs = WritingSystemServices.CurrentReversalWsId;
+				}
 			}
 
 			try

Src/LexText/Morphology/InflAffixTemplateControl.cs

@@ -627,8 +627,8 @@ private SimpleListChooser MakeChooserWithExtantSlots(bool fIsPrefixSlot)
 			chooser.TextParamHvo = m_template.Owner.Hvo;
 			chooser.Title = m_sSlotChooserTitle;
 			chooser.InstructionalText = m_sSlotChooserInstructionalText;
-			string sTopPOS;
-			var pos = GetHighestPOS(m_template.OwnerOfClass<IPartOfSpeech>(), out sTopPOS);
+			IPartOfSpeech pos = m_template.OwnerOfClass<IPartOfSpeech>();
+			string sTopPOS = pos.ShortName;
 			string sLabel = String.Format(m_sObligatorySlot, sTopPOS);
 			chooser.AddLink(sLabel, SimpleListChooser.LinkType.kSimpleLink,
 				new MakeInflAffixSlotChooserCommand(Cache, true, sLabel, pos.Hvo,
@@ -641,20 +641,6 @@ private SimpleListChooser MakeChooserWithExtantSlots(bool fIsPrefixSlot)
 			return chooser;
 		}
 
-		private IPartOfSpeech GetHighestPOS(IPartOfSpeech pos, out string sTopPOS)
-		{
-			IPartOfSpeech result = null;
-			sTopPOS = MEStrings.ksQuestions;
-			ICmObject obj = pos;
-			while (obj.ClassID == PartOfSpeechTags.kClassId)
-			{
-				result = obj as IPartOfSpeech;
-				sTopPOS = obj.ShortName;
-				obj = obj.Owner;
-			}
-			return result;
-		}
-
 		private bool IsRTL()
 		{
 			return Cache.ServiceLocator.WritingSystems.DefaultVernacularWritingSystem.RightToLeftScript;

Src/LexText/ParserCore/FwXmlTraceManager.cs

@@ -388,7 +388,8 @@ private static XElement CreateParseCompleteElement(Word word, XElement reasonEle
 
 		private static XElement CreateInflFeaturesElement(string name, FeatureStruct fs)
 		{
-			return new XElement(name, fs.Head().ToString().Replace(",", ""));
+			string feat = (fs.Head() == null) ? "" : fs.Head().ToString().Replace(",", "");
+			return new XElement(name, feat);
 		}
 
 		private static XElement CreateWordElement(string name, Word word, bool analysis, bool bracketed = false)