LT-21829: Properly remove excluded lex refs (#207)

sillsdev · Nov 15, 2024 · 25a2a14 · 25a2a14
1 parent 67cf893
commit 25a2a14
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Src/xWorks/ConfiguredLcmGenerator.cs b/Src/xWorks/ConfiguredLcmGenerator.cs
@@ -1711,7 +1711,7 @@ private static IFragment GenerateContentForSenses(ConfigurableDictionaryNode con
 			foreach (ILexSense item in senseCollection)
 			{
 				Debug.Assert(item != null);
-				if (publicationDecorator != null && publicationDecorator.IsExcludedObject(item))
+				if (publicationDecorator?.IsExcludedObject(item) ?? false)
 					continue;
 				filteredSenseCollection.Add(item);
 			}
@@ -2099,6 +2099,11 @@ private static IFragment GenerateCrossReferenceChildren(ConfigurableDictionaryNo
 				if (targetInfo == null)
 					return settings.ContentGenerator.CreateFragment();
 				var reference = targetInfo.Item2;
+				if (targetInfo.Item1 == null || (!publicationDecorator?.IsPublishableLexRef(reference.Hvo) ?? false))
+				{
+					return settings.ContentGenerator.CreateFragment();
+				}
+
 				if (LexRefTypeTags.IsUnidirectional((LexRefTypeTags.MappingTypes)reference.OwnerType.MappingType) &&
 					LexRefDirection(reference, collectionOwner) == ":r")
 				{

diff --git a/Src/xWorks/DictionaryPublicationDecorator.cs b/Src/xWorks/DictionaryPublicationDecorator.cs
@@ -525,7 +525,7 @@ private bool IsPublishableReversalEntry(IReversalIndexEntry revEntry)
 		/// </summary>
 		/// <param name="hvoRef"></param>
 		/// <returns></returns>
-		private bool IsPublishableLexRef(int hvoRef)
+		internal bool IsPublishableLexRef(int hvoRef)
 		{
 			var publishableItems = VecProp(hvoRef, LexReferenceTags.kflidTargets);
 			int originalItemCount = BaseSda.get_VecSize(hvoRef, LexReferenceTags.kflidTargets);