From 3e5b9865fa6e1f7de77ebe1464b4eb964ff61006 Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Sun, 12 May 2013 04:32:24 +0200 Subject: fdo#64456 impl_getValues always set m_nConvertedBoundValuesType That is, also when returning an ephemeral value constructed from StringItemList Change-Id: I3f0edcb6cc31926c6b82acbcb88282829314b859 --- forms/source/component/ListBox.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'forms/source/component/ListBox.cxx') diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index f26a57469b4a..ee7c32709561 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -1026,6 +1026,7 @@ namespace frm } m_nConvertedBoundValuesType = nFieldType; 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 @@ -1056,6 +1057,9 @@ namespace frm *dst = *src; 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; } //------------------------------------------------------------------------------ -- cgit