From 985bbc7ad56e539c17f460441d584e4e91bb2b19 Mon Sep 17 00:00:00 2001 From: "D. Ror." Date: Thu, 23 Jan 2025 14:57:44 -0500 Subject: [PATCH] Preserve sense examples, subsenses importing from The Combine (#253) --- Src/LexText/LexTextControls/LiftMerger.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/LexText/LexTextControls/LiftMerger.cs b/Src/LexText/LexTextControls/LiftMerger.cs index 0a3d479f64..4d7abc3afe 100644 --- a/Src/LexText/LexTextControls/LiftMerger.cs +++ b/Src/LexText/LexTextControls/LiftMerger.cs @@ -4003,7 +4003,7 @@ private void MergeIntoExistingSense(ILexSense ls, CmLiftSense sense) setUsed.Add(lsSub.Hvo); } // If we're keeping only the imported data, delete any unused subsense. - if (m_msImport == MergeStyle.MsKeepOnlyNew || m_msImport == MergeStyle.MsTheCombine) + if (m_msImport == MergeStyle.MsKeepOnlyNew) { foreach (int hvo in ls.SensesOS.ToHvoArray()) { @@ -4063,7 +4063,7 @@ private void MergeSenseExamples(ILexSense ls, CmLiftSense sense) setUsed.Add(les.Hvo); } // If we're keeping only the imported data, delete any unused example. - if (m_msImport == MergeStyle.MsKeepOnlyNew || m_msImport == MergeStyle.MsTheCombine) + if (m_msImport == MergeStyle.MsKeepOnlyNew) { foreach (int hvo in ls.ExamplesOS.ToHvoArray()) { @@ -4297,7 +4297,7 @@ private void MergeExampleTranslations(ILexExampleSentence les, CmLiftExample exp setUsed.Add(ct.Hvo); } // If we're keeping only the imported data, erase any unused existing data first. - if (m_msImport == MergeStyle.MsKeepOnlyNew || m_msImport == MergeStyle.MsTheCombine) + if (m_msImport == MergeStyle.MsKeepOnlyNew) { foreach (int hvo in les.TranslationsOC.ToHvoArray()) {