From 22ad763cb67766c1f97b0d843dc5fe054022f70d Mon Sep 17 00:00:00 2001 From: Lionel Elie Mamane Date: Mon, 12 Sep 2011 00:00:33 +0200 Subject: [PATCH] fdo#40701: DbGridControl::RemoveColumn even if no corresponding Model column That case crops up when nId==0 i.e. the Handle column --- svx/source/fmcomp/gridctrl.cxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index bb666bc..eaf6a31 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -1722,12 +1722,12 @@ sal_uInt16 DbGridControl::AppendColumn(const XubString& rName, sal_uInt16 nWidth //------------------------------------------------------------------------------ void DbGridControl::RemoveColumn(sal_uInt16 nId) { + DbGridControl_Base::RemoveColumn(nId); + sal_uInt16 nIndex = GetModelColumnPos(nId); if (nIndex == GRID_COLUMN_NOT_FOUND) return; - DbGridControl_Base::RemoveColumn(nId); - delete m_aColumns[ nIndex ]; DbGridColumns::iterator it = m_aColumns.begin(); ::std::advance( it, nIndex ); -- 1.7.2.5