gnustep/libs-gui
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gui.git synced 2025-04-23 12:00:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't raise exception on invalid row or column indexes for table view.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@26486 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2008-05-03 18:05:07 +00:00
parent 0cba457027
commit 0cb8c36a82
2 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-05-03 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTableView.m (-selectRow:byExtendingSelection:,
-selectColumn:byExtendingSelection:, -rectOfColumn:, -rectOfRow:): Don't
raise an exception for invalid indexes.
2008-05-01 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSTableColumn.m (-initWithIdentifier:, -initWithCoder:):

36
Source/NSTableView.m
View file

@ -31,6 +31,7 @@
*/
#include <Foundation/NSAutoreleasePool.h>
#include <Foundation/NSDebug.h>
#include <Foundation/NSEnumerator.h>
#include <Foundation/NSException.h>
#include <Foundation/NSFormatter.h>
@ -2550,8 +2551,8 @@ static void computeNewSelection
{
if (columnIndex < 0 || columnIndex > _numberOfColumns)
{
[NSException raise: NSInvalidArgumentException
format: @"Column index out of table in selectColumn"];
NSDebugLLog(@"NSTableView", @"Column index %d out of table in selectColumn", columnIndex);
return;
}
_selectingColumns = YES;
@ -2622,8 +2623,8 @@ byExtendingSelection: (BOOL)flag
{
if (rowIndex < 0 || rowIndex >= _numberOfRows)
{
[NSException raise: NSInvalidArgumentException
format: @"Row index out of table in selectRow"];
NSDebugLLog(@"NSTableView", @"Row index %d out of table in selectRow", rowIndex);
return;
}
if (_selectingColumns)
@ -4250,17 +4251,10 @@ static BOOL selectContiguousRegion(NSTableView *self,
{
NSRect rect;
if (columnIndex < 0)
if (columnIndex < 0 || columnIndex > _numberOfColumns)
{
[NSException
raise: NSInternalInconsistencyException
format: @"ColumnIndex < 0 in [NSTableView -rectOfColumn:]"];
}
if (columnIndex >= _numberOfColumns)
{
[NSException
raise: NSInternalInconsistencyException
format: @"ColumnIndex => _numberOfColumns in [NSTableView -rectOfColumn:]"];
NSDebugLLog(@"NSTableView", @"Column index %d out of table in rectOfColumn", columnIndex);
return NSZeroRect;
}
rect.origin.x = _columnOrigins[columnIndex];
@ -4274,18 +4268,12 @@ static BOOL selectContiguousRegion(NSTableView *self,
{
NSRect rect;
if (rowIndex < 0)
if (rowIndex < 0 || rowIndex >= _numberOfRows)
{
[NSException
raise: NSInternalInconsistencyException
format: @"RowIndex < 0 in [NSTableView -rectOfRow:]"];
}
if (rowIndex >= _numberOfRows)
{
[NSException
raise: NSInternalInconsistencyException
format: @"RowIndex => _numberOfRows in [NSTableView -rectOfRow:]"];
NSDebugLLog(@"NSTableView", @"Row index %d out of table in rectOfRow", rowIndex);
return NSZeroRect;
}
rect.origin.x = _bounds.origin.x;
rect.origin.y = _bounds.origin.y + (_rowHeight * rowIndex);
rect.size.width = _bounds.size.width;