From 79b89f18218759a2d543e4a5f47ca996c1edad5a Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 6 Jun 2008 12:50:07 +0000 Subject: INTEGRATION: CWS dba30c (1.62.6); FILE MERGED 2008/04/23 10:59:23 fs 1.62.6.1: #154303# --- svx/source/fmcomp/fmgridcl.cxx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index d9cc4c3da557..bb255229537b 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmgridcl.cxx,v $ - * $Revision: 1.62 $ + * $Revision: 1.63 $ * * This file is part of OpenOffice.org. * @@ -1262,7 +1262,10 @@ void FmGridControl::DeleteSelectedRows() Any aBookmark; sal_Bool bNewPos = sal_False; // if the current row isn't selected we take the row as row after deletion - if (!IsRowSelected(GetCurrentPos()) && !IsCurrentAppending()) + OSL_ENSURE( GetCurrentRow().Is(), "FmGridControl::DeleteSelectedRows: no current row here?" ); + // crash reports suggest it can happen we don't have a current row - how? + // #154303# / 2008-04-23 / frank.schoenheit@sun.com + if ( !IsRowSelected( GetCurrentPos() ) && !IsCurrentAppending() && GetCurrentRow().Is() ) { aBookmark = GetCurrentRow()->GetBookmark(); bNewPos = sal_True; -- cgit