[ooo-build-commit] .: patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Fri May 28 07:42:32 PDT 2010
patches/dev300/apply | 2
patches/dev300/calc-perf-outlining-with-notes.diff | 63 ++++-----------------
2 files changed, 13 insertions(+), 52 deletions(-)
New commits:
commit 157d566e9e14d3ce95e94d850f81e4eb9840773f
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri May 28 10:41:57 2010 -0400
Fixed the outlining-with-notes patch for dev300-m77.
* patches/dev300/apply:
* patches/dev300/calc-perf-outlining-with-notes.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index d52b276..40c5bb4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3594,7 +3594,7 @@ calc-extref-trim-empty-cells.diff, n#600667, i#110595, kohei
calc-perf-xlsx-import-string-cells.diff, n#594513, kohei
# Speed up outline level changes with notes.
-# FIXME dev300-m77 calc-perf-outlining-with-notes.diff, kohei
+calc-perf-outlining-with-notes.diff, kohei
# Fix parse error on minus operator e.g. R[-2]C-R[-1]C.
calc-formula-r1c1-parser-fix.diff, n#604903, kohei
diff --git a/patches/dev300/calc-perf-outlining-with-notes.diff b/patches/dev300/calc-perf-outlining-with-notes.diff
index 389d9bc..d4eb8b9 100644
--- a/patches/dev300/calc-perf-outlining-with-notes.diff
+++ b/patches/dev300/calc-perf-outlining-with-notes.diff
@@ -1,20 +1,5 @@
-From 6307bba4c74b6c64042921952c5bad5874972a86 Mon Sep 17 00:00:00 2001
-From: Jan Holesovsky <kendy at suse.cz>
-Date: Fri, 14 May 2010 17:08:30 +0200
-Subject: [PATCH 723/768] calc-perf-outlining-with-notes.diff
-
----
- sc/inc/document.hxx | 2 ++
- sc/inc/table.hxx | 2 +-
- sc/source/core/data/documen9.cxx | 8 ++++++++
- sc/source/core/data/table2.cxx | 4 ----
- sc/source/core/tool/consoli.cxx | 2 ++
- sc/source/ui/app/transobj.cxx | 3 +--
- sc/source/ui/docshell/olinefun.cxx | 9 ++++++++-
- 7 files changed, 22 insertions(+), 8 deletions(-)
-
diff --git sc/inc/document.hxx sc/inc/document.hxx
-index 6f0bef1..fa9d9e8 100644
+index 4eeea54..cf9c075 100644
--- sc/inc/document.hxx
+++ sc/inc/document.hxx
@@ -826,6 +826,8 @@ public:
@@ -27,10 +12,10 @@ index 6f0bef1..fa9d9e8 100644
SCCOL& rEndCol, SCROW& rEndRow, const ScMarkData& rMark,
BOOL bRefresh = FALSE, BOOL bAttrs = FALSE );
diff --git sc/inc/table.hxx sc/inc/table.hxx
-index c7611da..eff29ba 100644
+index e972912..eb48fb5 100644
--- sc/inc/table.hxx
+++ sc/inc/table.hxx
-@@ -769,6 +769,7 @@ public:
+@@ -772,6 +772,7 @@ public:
BOOL IsSortCollatorGlobal() const;
void InitSortCollator( const ScSortParam& rPar );
void DestroySortCollator();
@@ -38,7 +23,7 @@ index c7611da..eff29ba 100644
private:
void FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2,
-@@ -848,7 +849,6 @@ private:
+@@ -851,7 +852,6 @@ private:
BOOL GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel,
const ScMarkData& rMark) const;
BOOL GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMark );
@@ -47,7 +32,7 @@ index c7611da..eff29ba 100644
void CompileDBFormula();
void CompileDBFormula( BOOL bCreateFormulaString );
diff --git sc/source/core/data/documen9.cxx sc/source/core/data/documen9.cxx
-index 6812ef2..98ddf88 100644
+index 92b5fb7..80a6cf0 100644
--- sc/source/core/data/documen9.cxx
+++ sc/source/core/data/documen9.cxx
@@ -226,6 +226,14 @@ void ScDocument::UpdateDrawPrinter()
@@ -66,10 +51,10 @@ index 6812ef2..98ddf88 100644
{
// #109985#
diff --git sc/source/core/data/table2.cxx sc/source/core/data/table2.cxx
-index 428d067..55b6eab 100644
+index d25df6d..73c0ffe 100644
--- sc/source/core/data/table2.cxx
+++ sc/source/core/data/table2.cxx
-@@ -2462,8 +2462,6 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow)
+@@ -2459,8 +2459,6 @@ void ScTable::ShowRow(SCROW nRow, bool bShow)
bool bWasVis = !RowHidden(nRow);
if (bWasVis != bShow)
{
@@ -78,10 +63,10 @@ index 428d067..55b6eab 100644
ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
if (pDrawLayer)
{
-@@ -2479,8 +2477,6 @@ void ScTable::ShowRow(SCROW nRow, BOOL bShow)
+@@ -2475,8 +2473,6 @@ void ScTable::ShowRow(SCROW nRow, bool bShow)
+ SetRowHidden(nRow, nRow, !bShow);
if (bShow)
- SetRowFiltered(nRow, nRow, false);
-
+ SetRowFiltered(nRow, nRow, false);
- DecRecalcLevel();
-
ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
@@ -102,29 +87,8 @@ index b1b018c..4fa6d3f 100644
pDestDoc->UpdateOutlineRow( nOutStart, nOutEnd, nTab, FALSE );
// Zwischentitel
-diff --git sc/source/ui/app/transobj.cxx sc/source/ui/app/transobj.cxx
-index 38340a5..fb6be6a 100644
---- sc/source/ui/app/transobj.cxx
-+++ sc/source/ui/app/transobj.cxx
-@@ -603,7 +603,6 @@ void ScTransferObj::InitDocShell()
- // (must be copied before CopyFromClip, for drawing objects)
-
- SCCOL nCol, nLastCol;
-- SCROW nRow;
- SCTAB nSrcTab = aBlock.aStart.Tab();
- pDestDoc->SetLayoutRTL(0, pDoc->IsLayoutRTL(nSrcTab));
- for (nCol=nStartX; nCol<=nEndX; nCol++)
-@@ -700,7 +699,7 @@ void ScTransferObj::InitDocShell()
- break;
- nSizeX += nAdd;
- }
-- for (nRow=nStartY; nRow<=nEndY; nRow++)
-+ for (SCROW nRow=nStartY; nRow<=nEndY; nRow++)
- {
- long nAdd = pDestDoc->FastGetRowHeight( nRow, 0 );
- if ( nSizeY+nAdd > aPaperSize.Height() && nSizeY ) // above limit?
diff --git sc/source/ui/docshell/olinefun.cxx sc/source/ui/docshell/olinefun.cxx
-index 105783b..82928bc 100644
+index 265cef4..67298f1 100644
--- sc/source/ui/docshell/olinefun.cxx
+++ sc/source/ui/docshell/olinefun.cxx
@@ -392,6 +392,7 @@ BOOL ScOutlineDocFunc::SelectLevel( SCTAB nTab, BOOL bColumns, USHORT nLevel,
@@ -153,7 +117,7 @@ index 105783b..82928bc 100644
{
nStart = pEntry->GetStart();
@@ -521,6 +523,7 @@ BOOL ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, BOOL bRecord,
- if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden
+ if ( !pDoc->RowFiltered( i,nTab ) ) // weggefilterte nicht einblenden
pDoc->ShowRow( i, nTab, TRUE );
+ pDoc->SetDrawPageSize(nTab);
@@ -192,6 +156,3 @@ index 105783b..82928bc 100644
pDoc->InvalidatePageBreaks(nTab);
pDoc->UpdatePageBreaks( nTab );
---
-1.7.0.1
-
More information about the ooo-build-commit
mailing list