[ooo-build-commit] 5 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 11 00:59:28 PDT 2009
patches/dev300/apply | 13 ++---
patches/dev300/sc-dbrange-dynamic-resize.diff | 29 +++++------
patches/dev300/sc-status-bar-launch-navigator.diff | 51 ---------------------
3 files changed, 18 insertions(+), 75 deletions(-)
New commits:
commit 1d9e72f96b56f0275860f5374ee3adf52d38f14f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 10:56:14 2009 +0300
Our i#81209 patches are upstream
* patches/dev300/apply: Move the patches to
UnUsedButNotYetRemovedFromGit. Actually I am pretty sure they are
upstream, and don't contain any extra functionality, so could be
deleted. Kohei?
diff --git a/patches/dev300/apply b/patches/dev300/apply
index a8b17a4..c34fa3c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -724,9 +724,6 @@ sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
sc-fit-to-width-height-skip-breaks.diff, n#404232, n#404563, i#94698, kohei
# skip data in hidden cells when rendering charts.
-chart-skip-hidden-cells-oox.diff, n#404190, i#81209, n#425617, kohei
-chart-skip-hidden-cells-xmloff.diff, n#404190, i#81209, n#425617, kohei
-chart-skip-hidden-cells-sc.diff, n#404190, i#81209, n#425617, kohei
chart-skip-hidden-cells-sc-fix.diff, i#101273, kohei
# render charts with multiple chart types correctly for xls interop.
@@ -2272,6 +2269,9 @@ sc-copy-on-merged-cells.diff, i#7500, mloiseleur
chart-skip-hidden-cells-chart2.diff, n#404190, i#81209, n#427545, kohei
chart-skip-hidden-cells-offapi.diff, n#404190, i#81209, n#425617, kohei
+chart-skip-hidden-cells-oox.diff, n#404190, i#81209, n#425617, kohei
+chart-skip-hidden-cells-xmloff.diff, n#404190, i#81209, n#425617, kohei
+chart-skip-hidden-cells-sc.diff, n#404190, i#81209, n#425617, kohei
[ Store ]
SectionOwner => rodo
commit 0010e45fa120f7ad8f18628bb3a1842610b43189
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 10:48:35 2009 +0300
chart-skip-hidden-cells-offapi.diff seems to be upstream
* patches/dev300/apply: Move chart-skip-hidden-cells-offapi.diff to
UnUsedButNotYetRemovedFromGit. But actually this patch seems to be
upstream as such, so could probably just remove it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 51209d9..a8b17a4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -724,7 +724,6 @@ sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
sc-fit-to-width-height-skip-breaks.diff, n#404232, n#404563, i#94698, kohei
# skip data in hidden cells when rendering charts.
-chart-skip-hidden-cells-offapi.diff, n#404190, i#81209, n#425617, kohei
chart-skip-hidden-cells-oox.diff, n#404190, i#81209, n#425617, kohei
chart-skip-hidden-cells-xmloff.diff, n#404190, i#81209, n#425617, kohei
chart-skip-hidden-cells-sc.diff, n#404190, i#81209, n#425617, kohei
@@ -2272,6 +2271,7 @@ calc-multiline-formula-ref.diff, i#35913, kohei
sc-copy-on-merged-cells.diff, i#7500, mloiseleur
chart-skip-hidden-cells-chart2.diff, n#404190, i#81209, n#427545, kohei
+chart-skip-hidden-cells-offapi.diff, n#404190, i#81209, n#425617, kohei
[ Store ]
SectionOwner => rodo
commit f74e7da64d54a913f5a028cd0cd2196b697f635b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 10:46:08 2009 +0300
chart-skip-hidden-cells-chart2.diff seems to be upstream
* patches/dev300/apply: Move chart-skip-hidden-cells-chart2.diff to
UnUsedButNotYetRemovedFromGit. It seems to be mostly upstream as
such, but there are some small differences. i#81209 is marked as
fixed and verified.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 43aa672..51209d9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -724,7 +724,6 @@ sc-cellformat-icon-toggle.diff, n#358548, i#86377, kohei
sc-fit-to-width-height-skip-breaks.diff, n#404232, n#404563, i#94698, kohei
# skip data in hidden cells when rendering charts.
-chart-skip-hidden-cells-chart2.diff, n#404190, i#81209, n#427545, kohei
chart-skip-hidden-cells-offapi.diff, n#404190, i#81209, n#425617, kohei
chart-skip-hidden-cells-oox.diff, n#404190, i#81209, n#425617, kohei
chart-skip-hidden-cells-xmloff.diff, n#404190, i#81209, n#425617, kohei
@@ -2272,6 +2271,7 @@ calc-multiline-formula-ref.diff, i#35913, kohei
# Allow to copy-paste on merged cells.
sc-copy-on-merged-cells.diff, i#7500, mloiseleur
+chart-skip-hidden-cells-chart2.diff, n#404190, i#81209, n#427545, kohei
[ Store ]
SectionOwner => rodo
commit b0df24778192f90b972013095256c8a940a3c62f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 10:43:13 2009 +0300
Adapt sc-dbrange-dynamic-resize.diff for dev300
* patches/dev300/sc-dbrange-dynamic-resize.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/sc-dbrange-dynamic-resize.diff b/patches/dev300/sc-dbrange-dynamic-resize.diff
index 8614030..bf74d4e 100644
--- a/patches/dev300/sc-dbrange-dynamic-resize.diff
+++ b/patches/dev300/sc-dbrange-dynamic-resize.diff
@@ -76,16 +76,14 @@ index 2b4017b..d754363 100644
void FindAreaPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY );
void GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY,
BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark );
-diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
-index 5db1f9a..411d542 100644
--- sc/source/core/data/documen3.cxx
+++ sc/source/core/data/documen3.cxx
@@ -1290,14 +1290,24 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
- //if (VALIDTAB(nTab))
- // if (pTab[nTab])
- // return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow );
+ //if (VALIDTAB(nTab))
+ // if (pTab[nTab])
+ // return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow );
-
- //return FALSE;
+ //return FALSE;
}
+void ScDocument::UpdateDynamicEndRow(ScDBData& rDBData) const
@@ -104,9 +102,9 @@ index 5db1f9a..411d542 100644
// GetFilterEntries - Eintraege fuer AutoFilter-Listbox
//
-
- BOOL ScDocument::GetFilterEntries(
- SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates)
+ BOOL ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, TypedScStrCollection& rStrings, bool bFilter )
{
+ if ( ValidTab(nTab) && pTab[nTab] && pDBCollection )
@@ -1306,6 +1316,7 @@ BOOL ScDocument::GetFilterEntries(
ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE); //!??
if (pDBData)
@@ -270,19 +268,18 @@ index 1304c49..2627d87 100644
rQueryParam.Resize( MAXQUERY );
for (SCSIZE i=0; i<MAXQUERY; i++)
-diff --git sc/source/ui/dbgui/filtdlg.cxx sc/source/ui/dbgui/filtdlg.cxx
-index 846cbad..369785e 100644
--- sc/source/ui/dbgui/filtdlg.cxx
+++ sc/source/ui/dbgui/filtdlg.cxx
-@@ -390,7 +390,7 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
- {
- SCTAB nTab = nSrcTab;
- SCROW nFirstRow = theQueryData.nRow1;
+@@ -390,7 +390,8 @@ void ScFilterDlg::UpdateValueList( USHORT nList )
+ {
+ SCTAB nTab = nSrcTab;
+ SCROW nFirstRow = theQueryData.nRow1;
- SCROW nLastRow = theQueryData.nRow2;
+ SCROW nLastRow = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
- mbHasDates[nList-1] = false;
++ SCROW nLastRow = theQueryData.bUseDynamicRange ? theQueryData.nDynamicEndRow : theQueryData.nRow2;
+
+ // erstmal ohne die erste Zeile
- // erstmal ohne die erste Zeile
diff --git sc/source/ui/inc/dbfunc.hxx sc/source/ui/inc/dbfunc.hxx
index 814fc5f..f5e9ae4 100644
--- sc/source/ui/inc/dbfunc.hxx
commit 1f861433087ca01ac51527b042565905816de263
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 10:34:11 2009 +0300
sc-status-bar-launch-navigator.diff is upstream
* patches/dev300/sc-status-bar-launch-navigator.diff: Delete.
* patches/dev300/apply: Remove it.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 022de64..43aa672 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -706,9 +706,6 @@ sc-biffdump.diff, i#82184, jonp
# actual understanding of code needed
# sc-object-row-position.diff, i#47088, jonp
-# Launch navigator when double-clicking the leftmost status area box.
-sc-status-bar-launch-navigator.diff, i#49491, kohei
-
# Support print & page preview for files containing only lines
sc-print-lines.diff, n#351468, i#85076, jonp
diff --git a/patches/dev300/sc-status-bar-launch-navigator.diff b/patches/dev300/sc-status-bar-launch-navigator.diff
deleted file mode 100644
index 7adca7d..0000000
--- a/patches/dev300/sc-status-bar-launch-navigator.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-? sc/sc.vpj
-Index: sc/source/ui/view/cellsh3.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/cellsh3.cxx,v
-retrieving revision 1.22
-diff -u -r1.22 cellsh3.cxx
---- sc/source/ui/view/cellsh3.cxx 22 May 2007 20:12:35 -0000 1.22
-+++ sc/source/ui/view/cellsh3.cxx 5 Dec 2007 21:21:49 -0000
-@@ -934,15 +934,11 @@
- DBG_ERROR("Execute von InputLine-Status");
- break;
-
--
-- case SID_STATUS_DOCPOS:
-- {
-- //! Navigator an-/ausschalten (wie im Writer) ???
-- //!pViewData->GetDispatcher().Execute( SID_NAVIGATOR,
-- //! SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
-- }
-- break;
--
-+ case SID_STATUS_DOCPOS:
-+ // Launch navigator.
-+ GetViewData()->GetDispatcher().Execute(
-+ SID_NAVIGATOR, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
-+ break;
-
- case SID_MARKAREA:
- // called from Basic at the hidden view to select a range in the visible view
-Index: sc/source/ui/view/tabvwsh3.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/view/tabvwsh3.cxx,v
-retrieving revision 1.35
-diff -u -r1.35 tabvwsh3.cxx
---- sc/source/ui/view/tabvwsh3.cxx 27 Sep 2007 13:56:50 -0000 1.35
-+++ sc/source/ui/view/tabvwsh3.cxx 5 Dec 2007 21:21:49 -0000
-@@ -929,14 +929,6 @@
- }
- break;
-
-- case SID_STATUS_DOCPOS:
-- {
-- //! Navigator an-/ausschalten (wie im Writer) ???
-- //!GetViewData()->GetDispatcher().Execute( SID_NAVIGATOR,
-- //! SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD );
-- }
-- break;
--
- case FID_PROTECT_DOC:
- {
- ScDocument* pDoc = GetViewData()->GetDocument();
More information about the ooo-build-commit
mailing list