[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/calc-perf-copy-table-flags.diff |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 8672c3a2cce263b768a9f8225fdd986c49f65299
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Jun 30 11:12:51 2009 -0400

    When copying row flags, don't exceed the upper bound specified by the caller.
    
    * patches/dev300/calc-perf-copy-table-flags.diff:

diff --git a/patches/dev300/calc-perf-copy-table-flags.diff b/patches/dev300/calc-perf-copy-table-flags.diff
index eaa8838..28d82b3 100644
--- a/patches/dev300/calc-perf-copy-table-flags.diff
+++ b/patches/dev300/calc-perf-copy-table-flags.diff
@@ -10,7 +10,7 @@ index 7907caa..c719e4f 100644
              if (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth)
                  for (SCCOL i=nCol1; i<=nCol2; i++)
                  {
-@@ -658,35 +659,46 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
+@@ -658,35 +659,50 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
                          pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab ));
  
                      if (bChange)
@@ -48,6 +48,10 @@ index 7907caa..c719e4f 100644
 +
 +                    // If the segment sizes differ, we take the shorter segment of the two.
 +                    SCROW nLastRow = ::std::min(nThisLastRow, nDestLastRow);
++                    if (nLastRow >= nRow2)
++                        // the last row shouldn't exceed the upper bound the caller specified.
++                        nLastRow = nRow2;
++
 +                    pDestTab->SetRowHidden(i, nLastRow, bThisHidden);
  
 -                    if (bHiddenChange)