------------------------------------------------------------
revno: 2010 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Fri 2010-06-04 19:10:32 +0200
message:
add fix for saving with hidden rows from ooo-build-3-2-1 branch
added:
patches/fix-save-performance-with-hidden-rows.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-06-03 19:58:55 +0000
+++ b/changelog 2010-06-04 17:10:32 +0000
@@ -15,12 +15,15 @@
on cifs
* debian/patches/fix-incorrect-automatic-print-area-assignment.diff: as name
says,
also from ooo-build-3-2-1 branch
+ * debian/patches/fix-save-performance-with-hidden-rows.diff: add patch
+ from ooo-build-3-2-1 branch to fix performance when saving with hidden rows
+ (closes: #582785)
* debian/rules:
- use Oracles tarballs again
* debian/changelog: mention security fix in rc1s changelog
- -- Rene Engelhard <r...@debian.org> Thu, 03 Jun 2010 21:57:13 +0200
+ -- Rene Engelhard <r...@debian.org> Fri, 04 Jun 2010 19:07:56 +0200
openoffice.org (1:3.2.1~rc2-2) experimental; urgency=low
=== added file 'patches/fix-save-performance-with-hidden-rows.diff'
--- a/patches/fix-save-performance-with-hidden-rows.diff 1970-01-01
00:00:00 +0000
+++ b/patches/fix-save-performance-with-hidden-rows.diff 2010-06-04
17:10:32 +0000
@@ -0,0 +1,45 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index d0759aa..e8f7e33 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
+@@ -3862,6 +3862,9 @@ mdds-prj-d-lst.diff, kohei
+ mdds-build-dependency-sc.diff, kohei
+ system-mdds.diff, rengelha
+
++# Fix poor performance on saving document with hidden rows.
++calc-perf-ods-export-hidden-rows.diff, deb#582785, kohei
++
+ [ GentooExperimental ]
+ SectionOwner => hmth
+ # jemalloc, FreeBSD 7 allocator
+diff --git a/patches/dev300/calc-perf-ods-export-hidden-rows.diff
b/patches/dev300/calc-perf-ods-export-hidden-rows.diff
+new file mode 100644
+index 0000000..9fa54e1
+--- /dev/null
++++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/calc-perf-ods-export-hidden-rows.diff
+@@ -0,0 +1,25 @@
++diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
++index 6490cf4..75c5266 100644
++--- sc/source/core/data/document.cxx
+++++ sc/source/core/data/document.cxx
++@@ -3717,15 +3717,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)) ||
=== modified file 'patches/series'
--- a/patches/series 2010-06-03 19:58:55 +0000
+++ b/patches/series 2010-06-04 17:10:32 +0000
@@ -1,3 +1,4 @@
hu-translation-fixes.diff
backport-ftruncate-check.diff
fix-incorrect-automatic-print-area-assignment.diff
+fix-save-performance-with-hidden-rows.diff
