Kaydet (Commit) 3e5b9865 authored tarafından Lionel Elie Mamane's avatar Lionel Elie Mamane

fdo#64456 impl_getValues always set m_nConvertedBoundValuesType

That is, also when returning an ephemeral value constructed from StringItemList

Change-Id: I3f0edcb6cc31926c6b82acbcb88282829314b859
üst 7bb77f3d
...@@ -1026,6 +1026,7 @@ namespace frm ...@@ -1026,6 +1026,7 @@ namespace frm
} }
m_nConvertedBoundValuesType = nFieldType; m_nConvertedBoundValuesType = nFieldType;
OSL_ENSURE(dst == m_aConvertedBoundValues.end(), "OListBoxModel::convertBoundValues expected to have overwritten all of m_aConvertedBoundValues, but did not."); OSL_ENSURE(dst == m_aConvertedBoundValues.end(), "OListBoxModel::convertBoundValues expected to have overwritten all of m_aConvertedBoundValues, but did not.");
assert(dst == m_aConvertedBoundValues.end());
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
sal_Int32 OListBoxModel::getValueType() const sal_Int32 OListBoxModel::getValueType() const
...@@ -1056,6 +1057,9 @@ namespace frm ...@@ -1056,6 +1057,9 @@ namespace frm
*dst = *src; *dst = *src;
dst->setTypeKind(nFieldType); dst->setTypeKind(nFieldType);
} }
m_nConvertedBoundValuesType = nFieldType;
OSL_ENSURE(dst == aValues.end(), "OListBoxModel::impl_getValues expected to have set all of aValues, but did not.");
assert(dst == aValues.end());
return aValues; return aValues;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment