diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-09-12 00:00:33 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-10-24 17:24:25 +0200 |
| commit | 45e6ceee47e4f1c5fdf800ae35b062f8387cf61c (patch) | |
| tree | 79de2377b03a5039afe531bbaa42500aefdbd54e | |
| parent | 1191c474bdf21fda5e8b8ced6b0b50286dea2391 (diff) | |
fdo#40701: DbGridControl::RemoveColumn even if no corresponding Model column
That case crops up when nId==0 i.e. the Handle column
Signed-off-by: Petr Mladek <pmladek@suse.cz>
| -rw-r--r-- | 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 bb666bcca4..eaf6a319d3 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 ); |