diff --git a/core/src/kmx/kmx_plus.h b/core/src/kmx/kmx_plus.h index 31585429f53..b75fcf2bd04 100644 --- a/core/src/kmx/kmx_plus.h +++ b/core/src/kmx/kmx_plus.h @@ -272,8 +272,8 @@ struct COMP_KMXPLUS_TRAN_GROUP { struct COMP_KMXPLUS_TRAN_TRANSFORM { KMXPLUS_STR from; KMXPLUS_STR to; - KMXPLUS_ELEM mapFrom; - KMXPLUS_ELEM mapTo; + KMXPLUS_STR mapFrom; // variable name + KMXPLUS_STR mapTo; // variable name }; struct COMP_KMXPLUS_TRAN_REORDER { diff --git a/core/src/ldml/ldml_transforms.cpp b/core/src/ldml/ldml_transforms.cpp index a3996c28b22..318f5689a82 100644 --- a/core/src/ldml/ldml_transforms.cpp +++ b/core/src/ldml/ldml_transforms.cpp @@ -796,7 +796,9 @@ transforms::load( const kmx::COMP_KMXPLUS_TRAN_TRANSFORM *element = tranHelper.getTransform(group->index + itemNumber); const std::u32string fromStr = kmx::u16string_to_u32string(kplus.strs->get(element->from)); const std::u32string toStr = kmx::u16string_to_u32string(kplus.strs->get(element->to)); - newGroup.emplace_back(fromStr, toStr, element->mapFrom, element->mapTo, kplus); // creating a transform_entry + KMX_DWORD mapFrom = element->mapFrom; // copy, because of alignment + KMX_DWORD mapTo = element->mapTo; // copy, because of alignment + newGroup.emplace_back(fromStr, toStr, mapFrom, mapTo, kplus); // creating a transform_entry } transforms->addGroup(newGroup); } else if (group->type == LDML_TRAN_GROUP_TYPE_REORDER) {