svtools/source/brwbox/brwbox2.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit de89f1694b4cb2a5bf8ade020bfdef33e7135d35 Author: Lionel Elie Mamane <lio...@mamane.lu> Date: Wed Jan 11 19:05:36 2012 +0100 fdo#44283: contination of 8a17792f2e5 (Handle/invalid column ID cleanup) Thanks to Julien Nabet for pointer and first part of this patch diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 92c29de..7fe378e 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -2001,11 +2001,13 @@ void BrowseBox::Dispatch( sal_uInt16 nId ) { sal_uInt16 nNewPos = GetColumnPos( GetCurColumnId() ) + 1; sal_uInt16 nNewId = GetColumnId( nNewPos ); - if (nNewId != 0) // Am Zeilenende ? + if (nNewId != BROWSER_INVALIDID) // At end of row ? bDone = GoToColumnId( nNewId ); else { - sal_uInt16 nColId = ( GetColumnId(0) == 0 ) ? GetColumnId(1) : GetColumnId(0); + sal_uInt16 nColId = GetColumnId(0); + if ( nColId == BROWSER_INVALIDID || nColId == HandleColumnId ) + nColId = GetColumnId(1); if ( GetRowCount() ) bDone = ( nCurRow < GetRowCount() - 1 ) && GoToRowColumnId( nCurRow + 1, nColId ); else if ( ColCount() ) _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits