dbaccess/source/core/api/RowSet.cxx | 3 +++ 1 file changed, 3 insertions(+)
New commits: commit 4c700dfc0b3909b11a0711c2d64c779fab19070b Author: Lionel Elie Mamane <[email protected]> Date: Thu Sep 13 16:24:38 2012 +0200 fdo#37529 clear DataColumns read-only information when we clear DataColumns Change-Id: I6f3b4f1646df1244d97ae98f56ba054bc26e3314 (cherry picked from commit 522b4c65dcc90719288b4f7aa7eb565c15b64e86) Signed-off-by: Miklos Vajna <[email protected]> diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index c14a4b0..dcb8d2f 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -571,6 +571,8 @@ void ORowSet::freeResources( bool _bComplete ) // the columns must be disposed before the querycomposer is disposed because // their owner can be the composer TDataColumns().swap(m_aDataColumns);// clear and resize capacity + ::std::vector<bool>().swap(m_aReadOnlyDataColumns); + m_xColumns = NULL; if ( m_pColumns ) m_pColumns->disposing(); @@ -1252,6 +1254,7 @@ void ORowSet::impl_setDataColumnsWriteable_throw() void ORowSet::impl_restoreDataColumnsWriteable_throw() { + assert(m_aDataColumns.size() == m_aReadOnlyDataColumns.size() || m_aReadOnlyDataColumns.size() == 0 ); TDataColumns::iterator aIter = m_aDataColumns.begin(); ::std::vector<bool, std::allocator<bool> >::iterator aReadIter = m_aReadOnlyDataColumns.begin(); for(;aReadIter != m_aReadOnlyDataColumns.end();++aIter,++aReadIter) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
