[ooo-build-commit] .: patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                                 |    4 --
 patches/dev300/calc-perf-ods-export-hidden-rows.diff |   32 -------------------
 2 files changed, 36 deletions(-)

New commits:
commit 9e2dc94f793444476e347a641d86dff99624d845
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Tue Oct 5 14:39:57 2010 -0400

    Removed patch as it is no longer relevant.
    
    Different fix came from Oracle.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 739789c..7061eed 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2661,10 +2661,6 @@ calc-pdf-export-allow-filtered-range-filter.diff, n#585028, kohei
 # Fix handling of DB functions.
 calc-formula-db-function-fix.diff, n#594332, n#595713, kohei
 
-# Fix poor performance on saving document with hidden rows.
-# #FIXME ooo330-m4: doesn't apply in m3f
-# FIXME ooo330-m3: does not apply: calc-perf-ods-export-hidden-rows.diff, deb#582785, kohei
-
 # Opening an xml file with xls extension
 sc-xml-with-xls-ext.diff, n#527738, muthusuba
 
diff --git a/patches/dev300/calc-perf-ods-export-hidden-rows.diff b/patches/dev300/calc-perf-ods-export-hidden-rows.diff
deleted file mode 100644
index 6367679..0000000
--- a/patches/dev300/calc-perf-ods-export-hidden-rows.diff
+++ /dev/null
@@ -1,32 +0,0 @@
----
- sc/source/core/data/document.cxx |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 736a3f2..735fb5b 100644
---- sc/source/core/data/document.cxx
-+++ sc/source/core/data/document.cxx
-@@ -3712,15 +3712,18 @@ SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCa
- {
-     if ( ValidTab(nTab) && pTab[nTab] && pTab[nTab]->GetRowFlagsArray() && pTab[nTab]->mpRowHeights )
-     {
-+        // Use the original row height for comparison, which may not be zero 
-+        // even for hidden rows; it's the height before the row has become
-+        // hidden.
-         BYTE nStartFlags = pTab[nTab]->GetRowFlags(nStart);
--        USHORT nStartHeight = pTab[nTab]->GetOriginalHeight(nStart);
-+        USHORT nStartHeight = pTab[nTab]->GetRowHeight(nStart, NULL, NULL, false);
-         for (SCROW nRow = nStart + 1; nRow <= MAXROW; nRow++)
-         {
-             size_t nIndex;          // ignored
-             SCROW nFlagsEndRow;
-             SCROW nHeightEndRow;
-             BYTE nFlags = pTab[nTab]->GetRowFlagsArray()->GetValue( nRow, nIndex, nFlagsEndRow );
--            USHORT nHeight = pTab[nTab]->GetRowHeight(nRow, NULL, &nHeightEndRow);
-+            USHORT nHeight = pTab[nTab]->GetRowHeight(nRow, NULL, &nHeightEndRow, false);
-             if (((nStartFlags & CR_MANUALBREAK) != (nFlags & CR_MANUALBREAK)) ||
-                 ((nStartFlags & CR_MANUALSIZE) != (nFlags & CR_MANUALSIZE)) ||
-                 (bCareManualSize && (nStartFlags & CR_MANUALSIZE) && (nStartHeight != nHeight)) ||
--- 
-1.7.0.1
-