[ooo-build-commit] Branch 'ooo-build-3-1' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                          |    3 ++
 patches/dev300/calc-row-limit-bad-ushort.diff |   35 ++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

New commits:
commit c407d53c2aea945fabd9b156b1109e886b9a5fac
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Thu Jun 4 00:10:42 2009 -0400

    Squash even more USHORT where SCROW or SCCOL should have been used.
    
    Incorrect use of USHORT instead of SCROW or SCCOL caused the cell
    cursor to jump from A65537 to A1 when the cell was right-clicked.
    (n#509768)
    
    * patches/dev300/apply:
    * patches/dev300/calc-row-limit-bad-ushort.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c8a280f..48c495d 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2996,6 +2996,9 @@ calc-odf-export-autostyle-maxrow.diff, n#497610, kohei
 # speed up ods import by using flat_segment_tree.
 calc-perf-ods-import-properties.diff, n#498547, kohei
 
+# squash USHORT where SCROW or SCCOL should have been used.
+calc-row-limit-bad-ushort.diff, n#509768, kohei
+
 # type cast to SCROW and SCCOL for row and column, not to USHORT!
 calc-ods-export-no-more-ushort.diff, n#501029, kohei
 
diff --git a/patches/dev300/calc-row-limit-bad-ushort.diff b/patches/dev300/calc-row-limit-bad-ushort.diff
new file mode 100644
index 0000000..f35c797
--- /dev/null
+++ b/patches/dev300/calc-row-limit-bad-ushort.diff
@@ -0,0 +1,35 @@
+diff --git sc/source/core/data/dpobject.cxx sc/source/core/data/dpobject.cxx
+index a105032..8e3c96b 100644
+--- sc/source/core/data/dpobject.cxx
++++ sc/source/core/data/dpobject.cxx
+@@ -393,7 +393,7 @@ void ScDPObject::CreateOutput()
+                 nNewRow = 0;
+ 
+             ScAddress aStart( aOutRange.aStart );
+-            aStart.SetRow( (USHORT) nNewRow );
++            aStart.SetRow(nNewRow);
+             pOutput->SetPosition( aStart );
+ 
+             //!	modify aOutRange?
+diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
+index 491fdc9..b5bb7c6 100644
+--- sc/source/ui/view/gridwin.cxx
++++ sc/source/ui/view/gridwin.cxx
+@@ -2962,7 +2962,7 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel )
+         //  clicked on selected object -> don't change anything
+         bHitSelected = TRUE;
+     }
+-    else if ( pViewData->GetMarkData().IsCellMarked( (USHORT) nCellX, (USHORT) nCellY ) )
++    else if ( pViewData->GetMarkData().IsCellMarked(nCellX, nCellY) )
+     {
+         //  clicked on selected cell -> don't change anything
+         bHitSelected = TRUE;
+@@ -2986,7 +2986,7 @@ void ScGridWindow::SelectForContextMenu( const Point& rPosPixel )
+         if ( !bHitDraw )
+         {
+             pView->Unmark();
+-            pView->SetCursor( (USHORT) nCellX, (USHORT) nCellY );
++            pView->SetCursor(nCellX, nCellY);
+             if ( bWasDraw )
+                 pViewData->GetViewShell()->SetDrawShell( FALSE );   // switch shells
+         }