applied_patches/0488-sc-skip-overlapped-cells.diff

   1 diff -urp --exclude=CVS --exclude=unxlngi6.pro --exclude=sc.vpj sc.clean/source/core/data/table1.cxx sc/source/core/data/table1.cxx
   2 --- sc.clean/source/core/data/table1.cxx        2008-03-11 09:39:38.000000000 -0400
   3 +++ sc/source/core/data/table1.cxx      2008-03-11 17:26:50.000000000 -0400
   4 @@ -819,6 +819,10 @@ BOOL ScTable::ValidNextPos( SCCOL nCol,
   5         if (!ValidCol(nCol) || !ValidRow(nRow))
   6                 return FALSE;
   7
   8 +    if (pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED))
   9 +        // Skip an overlapped cell.
  10 +        return false;
  11 +
  12         if (bMarked && !rMark.IsCellMarked(nCol,nRow))
  13                 return FALSE;
  14
  15 @@ -861,7 +865,8 @@ void ScTable::GetNextPos( SCCOL& rCol, S
  16         {
  17                 BOOL bUp = ( nMovY < 0 );
  18                 nRow = rMark.GetNextMarked( nCol, nRow, bUp );
  19 -               while ( VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN) )
  20 +        while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
  21 +                pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
  22                 {
  23                         //      #53697# ausgeblendete ueberspringen (s.o.)
  24                         nRow += nMovY;
  25 @@ -890,7 +895,8 @@ void ScTable::GetNextPos( SCCOL& rCol, S
  26                         else if (nRow > MAXROW)
  27                                 nRow = 0;
  28                         nRow = rMark.GetNextMarked( nCol, nRow, bUp );
  29 -                       while ( VALIDROW(nRow) && pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN) )
  30 +            while ( VALIDROW(nRow) && ((pRowFlags && (pRowFlags->GetValue(nRow) & CR_HIDDEN)) ||
  31 +                    pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) )
  32                         {
  33                                 //      #53697# ausgeblendete ueberspringen (s.o.)
  34                                 nRow += nMovY;