applied_patches/0187-calc-row-limit-bad-ushort.diff

   1 diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
   2 index a105032..8e3c96b 100644
   3 --- sc/source/core/data/dpobject.cxx
   4 +++ sc/source/core/data/dpobject.cxx
   5 @@ -393,7 +393,7 @@ void ScDPObject::CreateOutput()
   6                  nNewRow = 0;
   7
   8              ScAddress aStart( aOutRange.aStart );
   9 -            aStart.SetRow( (USHORT) nNewRow );
  10 +            aStart.SetRow(nNewRow);
  11              pOutput->SetPosition( aStart );
  12
  13              //!        modify aOutRange?
  14 diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
  15 index 491fdc9..b5bb7c6 100644
  16 --- sc/source/ui/view/gridwin.cxx
  17 +++ sc/source/ui/view/gridwin.cxx
  18 @@ -2962,7 +2962,7 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel )
  19          //  clicked on selected object -> don't change anything
  20          bHitSelected = TRUE;
  21      }
  22 -    else if ( pViewData->GetMarkData().IsCellMarked( (USHORT) nCellX, (USHORT) nCellY ) )
  23 +    else if ( pViewData->GetMarkData().IsCellMarked(nCellX, nCellY) )
  24      {
  25          //  clicked on selected cell -> don't change anything
  26          bHitSelected = TRUE;
  27 @@ -2986,7 +2986,7 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel )
  28          if ( !bHitDraw )
  29          {
  30              pView->Unmark();
  31 -            pView->SetCursor( (USHORT) nCellX, (USHORT) nCellY );
  32 +            pView->SetCursor(nCellX, nCellY);
  33              if ( bWasDraw )
  34                  pViewData->GetViewShell()->SetDrawShell( FALSE );   // switch shells
  35          }