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

[Kohei Yoshida]

 patches/dev300/apply                              |    3 +++
 patches/dev300/calc-delete-note-cell-crasher.diff |   14 ++++++++++++++
 2 files changed, 17 insertions(+)

New commits:
commit 9f219cfdd88e7ae50a8141c9ffc4e928ba36c935
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Mon Jun 29 19:55:37 2009 -0400

    Fixes a crasher when deleting a cell with note.
    
    This affects only when CalcRowLimit is enabled. (n#517566)
    
    * patches/dev300/apply:
    * patches/dev300/calc-delete-note-cell-crasher.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6d49330..582b4e5 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3021,6 +3021,9 @@ calc-perf-page-and-manual-breaks.diff, n#503482, kohei
 # Speed up selection of large area, cursor placement in split view.
 calc-perf-lazy-overlay-objects.diff, n#511006, kohei
 
+# crash on deleting cells with notes.
+calc-delete-note-cell-crasher.diff, n#517566, kohei
+
 [ CalcExperimental ]
 
 # speed up sheet switch operation.
diff --git a/patches/dev300/calc-delete-note-cell-crasher.diff b/patches/dev300/calc-delete-note-cell-crasher.diff
new file mode 100644
index 0000000..8225f84
--- /dev/null
+++ b/patches/dev300/calc-delete-note-cell-crasher.diff
@@ -0,0 +1,14 @@
+diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+index 59ac167..38684c3 100644
+--- sc/source/core/data/document.cxx
++++ sc/source/core/data/document.cxx
+@@ -2984,6 +2984,9 @@ ULONG ScDocument::GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) con
+ ULONG ScDocument::FastGetRowHeight( SCROW nStartRow, SCROW nEndRow,
+         SCTAB nTab ) const
+ {
++    if (!pTab[nTab]->pRowFlags || !pTab[nTab]->pRowHeight)
++        return GetRowHeight(nStartRow, nEndRow, nTab);
++
+     return pTab[nTab]->pRowFlags->SumCoupledArrayForCondition( nStartRow,
+             nEndRow, CR_HIDDEN, 0, *(pTab[nTab]->pRowHeight));
+ }