Skip to content

Fix LT-22155: Merge entry/sense losing some custom fields #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 28, 2025
Merged

Fix LT-22155: Merge entry/sense losing some custom fields #340

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bda367e
Fix LT-22155: Merge entry/sense losing some custom fields
jtmaxwell3 Aug 27, 2025
89bc6c9
Merge branch 'master' into LT-22155
jasonleenaylor Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/SIL.LCModel/DomainImpl/CmObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -833,9 +833,16 @@ public void MergeSelectedPropertiesOfObject(ICmObject objSrc, bool fLoseNoString
myCurrentValue = new MultiStringAccessor(this, flid);
srcCurrentValue = new MultiStringAccessor(objSrc, flid);
break;
case (int)CellarPropertyType.MultiUnicode:
myCurrentValue = new MultiUnicodeAccessor(this, flid);
srcCurrentValue = new MultiUnicodeAccessor(objSrc, flid);
case (int)CellarPropertyType.OwningAtomic:
case (int)CellarPropertyType.ReferenceAtomic:
int myHvo = m_cache.DomainDataByFlid.get_ObjectProp(Hvo, flid);
int srcHvo = m_cache.DomainDataByFlid.get_ObjectProp(objSrc.Hvo, flid);
myCurrentValue = m_cache.GetAtomicPropObject(myHvo);
srcCurrentValue = m_cache.GetAtomicPropObject(srcHvo);
break;
default:
myCurrentValue = this.GetCustomPropertyForSDA(flid);
srcCurrentValue = ((CmObject)objSrc).GetCustomPropertyForSDA(flid);
break;
}
}
Expand Down
Loading