[ooo-build-commit] .: patches/dev300
Kohei Yoshida
kohei at kemper.freedesktop.org
Fri Mar 5 09:27:14 PST 2010
patches/dev300/sc-dbrange-dynamic-resize.diff | 69 ++++++++++++++++----------
1 file changed, 45 insertions(+), 24 deletions(-)
New commits:
commit 11edf1291565ef4259bbd19873334833a122b4e3
Author: Kohei Yoshida <kyoshida at novell.com>
Date: Fri Mar 5 12:18:48 2010 -0500
Fixed the failure to populate string list in standard filter dialog.
* patches/dev300/sc-dbrange-dynamic-resize.diff: bug was introduced
during patch re-ordering and "fixing" of this patch, especially
with the cws-kohei03-sc.diff patch. (n#584975)
diff --git a/patches/dev300/sc-dbrange-dynamic-resize.diff b/patches/dev300/sc-dbrange-dynamic-resize.diff
index 3236a74..ed427ad 100644
--- a/patches/dev300/sc-dbrange-dynamic-resize.diff
+++ b/patches/dev300/sc-dbrange-dynamic-resize.diff
@@ -24,10 +24,10 @@ index eea9076..00ea53b 100644
BOOL IsByRow() const { return bByRow; }
void SetByRow(BOOL bByR) { bByRow = bByR; }
diff --git sc/inc/document.hxx sc/inc/document.hxx
-index a92545f..daeb91e 100644
+index 846daf5..7775029 100644
--- sc/inc/document.hxx
+++ sc/inc/document.hxx
-@@ -873,7 +873,7 @@ public:
+@@ -874,7 +874,7 @@ public:
bool ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow) const;
void GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
@@ -36,7 +36,7 @@ index a92545f..daeb91e 100644
SC_DLLPUBLIC BOOL GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
SC_DLLPUBLIC BOOL GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const;
SC_DLLPUBLIC BOOL GetPrintArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow,
-@@ -1392,6 +1392,9 @@ public:
+@@ -1393,6 +1393,9 @@ public:
SCTAB nTab, ScQueryParam& rQueryParam );
void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr);
@@ -73,10 +73,10 @@ index 3659381..89f505e 100644
SCSIZE GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow,
SCCOL nEndCol, SCROW nEndRow, ScDirection eDir );
diff --git sc/source/core/data/documen3.cxx sc/source/core/data/documen3.cxx
-index caeb5b1..396d54c 100644
+index 01868e9..0c31071 100644
--- sc/source/core/data/documen3.cxx
+++ sc/source/core/data/documen3.cxx
-@@ -1255,6 +1255,18 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
+@@ -1256,6 +1256,18 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol,
//return FALSE;
}
@@ -95,7 +95,7 @@ index caeb5b1..396d54c 100644
//
// GetFilterEntries - Eintraege fuer AutoFilter-Listbox
//
-@@ -1267,6 +1279,7 @@ BOOL ScDocument::GetFilterEntries(
+@@ -1268,6 +1280,7 @@ BOOL ScDocument::GetFilterEntries(
ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE); //!??
if (pDBData)
{
@@ -103,7 +103,7 @@ index caeb5b1..396d54c 100644
SCTAB nAreaTab;
SCCOL nStartCol;
SCROW nStartRow;
-@@ -1278,6 +1291,7 @@ BOOL ScDocument::GetFilterEntries(
+@@ -1279,6 +1292,7 @@ BOOL ScDocument::GetFilterEntries(
ScQueryParam aParam;
pDBData->GetQueryParam( aParam );
@@ -112,10 +112,10 @@ index caeb5b1..396d54c 100644
// return all filter entries, if a filter condition is connected with a boolean OR
diff --git sc/source/core/data/document.cxx sc/source/core/data/document.cxx
-index 3d61f28..187199f 100644
+index 3180d78..bb0d324 100644
--- sc/source/core/data/document.cxx
+++ sc/source/core/data/document.cxx
-@@ -663,7 +663,7 @@ bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow
+@@ -669,7 +669,7 @@ bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow
// zusammenhaengender Bereich
void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow,
@@ -125,10 +125,10 @@ index 3d61f28..187199f 100644
if (VALIDTAB(nTab))
if (pTab[nTab])
diff --git sc/source/core/data/table1.cxx sc/source/core/data/table1.cxx
-index 15db733..10b8cda 100644
+index 22d9f64..a9f7255 100644
--- sc/source/core/data/table1.cxx
+++ sc/source/core/data/table1.cxx
-@@ -680,7 +680,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
+@@ -685,7 +685,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const
}
void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow,
@@ -208,10 +208,25 @@ index 4f0e755..5fae4bd 100644
rQueryParam.Resize( MAXQUERY );
for (SCSIZE i=0; i<MAXQUERY; i++)
diff --git sc/source/core/tool/queryparam.cxx sc/source/core/tool/queryparam.cxx
-index d9d477d..0593534 100644
+index b97558d..d04880f 100644
--- sc/source/core/tool/queryparam.cxx
+++ sc/source/core/tool/queryparam.cxx
-@@ -177,7 +177,8 @@ ScQueryParam::ScQueryParam() :
+@@ -171,7 +171,13 @@ ScQueryParamTable::~ScQueryParamTable()
+
+ ScQueryParam::ScQueryParam() :
+ ScQueryParamBase(),
+- ScQueryParamTable()
++ ScQueryParamTable(),
++ bDestPers(true),
++ nDestTab(0),
++ nDestCol(0),
++ nDestRow(0),
++ nDynamicEndRow(0),
++ bUseDynamicRange(false)
+ {
+ Clear();
+ }
+@@ -181,7 +187,8 @@ ScQueryParam::ScQueryParam() :
ScQueryParam::ScQueryParam( const ScQueryParam& r ) :
ScQueryParamBase(r),
ScQueryParamTable(r),
@@ -221,7 +236,7 @@ index d9d477d..0593534 100644
{
}
-@@ -187,7 +188,9 @@ ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) :
+@@ -191,7 +198,9 @@ ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) :
bDestPers(true),
nDestTab(0),
nDestCol(0),
@@ -232,7 +247,7 @@ index d9d477d..0593534 100644
{
}
-@@ -221,6 +224,8 @@ void ScQueryParam::ClearDestParams()
+@@ -225,6 +234,8 @@ void ScQueryParam::ClearDestParams()
nDestTab = 0;
nDestCol = 0;
nDestRow = 0;
@@ -241,7 +256,7 @@ index d9d477d..0593534 100644
}
//------------------------------------------------------------------------
-@@ -243,6 +248,8 @@ ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
+@@ -247,6 +258,8 @@ ScQueryParam& ScQueryParam::operator=( const ScQueryParam& r )
bDuplicate = r.bDuplicate;
bByRow = r.bByRow;
bDestPers = r.bDestPers;
@@ -250,7 +265,7 @@ index d9d477d..0593534 100644
maEntries = r.maEntries;
-@@ -281,7 +288,9 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
+@@ -285,7 +298,9 @@ BOOL ScQueryParam::operator==( const ScQueryParam& rOther ) const
&& (bDestPers == rOther.bDestPers)
&& (nDestTab == rOther.nDestTab)
&& (nDestCol == rOther.nDestCol)
@@ -261,7 +276,7 @@ index d9d477d..0593534 100644
{
bEqual = TRUE;
for ( SCSIZE i=0; i<nUsed && bEqual; i++ )
-@@ -305,6 +314,7 @@ void ScQueryParam::MoveToDest()
+@@ -309,6 +324,7 @@ void ScQueryParam::MoveToDest()
nCol2 = sal::static_int_cast<SCCOL>( nCol2 + nDifX );
nRow2 = sal::static_int_cast<SCROW>( nRow2 + nDifY );
nTab = sal::static_int_cast<SCTAB>( nTab + nDifZ );
@@ -332,10 +347,10 @@ index 05dce54..e78581a 100644
}
return pData;
diff --git sc/source/ui/view/gridwin.cxx sc/source/ui/view/gridwin.cxx
-index 6e0280a..57f1996 100644
+index 30081ce..a5f860a 100644
--- sc/source/ui/view/gridwin.cxx
+++ sc/source/ui/view/gridwin.cxx
-@@ -1276,6 +1276,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
+@@ -1279,6 +1279,7 @@ void ScGridWindow::ExecFilter( ULONG nSel,
pViewData->GetViewShell()->UpdateInputHandler();
}
@@ -344,7 +359,7 @@ index 6e0280a..57f1996 100644
pDBData->SetQueryParam( aParam ); // speichern
}
diff --git sc/source/ui/view/tabvwshc.cxx sc/source/ui/view/tabvwshc.cxx
-index 968984d..499c2a0 100644
+index 968984d..42d6fb3 100644
--- sc/source/ui/view/tabvwshc.cxx
+++ sc/source/ui/view/tabvwshc.cxx
@@ -178,8 +178,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
@@ -352,18 +367,24 @@ index 968984d..499c2a0 100644
SCITEM_QUERYDATA );
- ScDBData* pDBData = GetDBData();
-+ ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, true);
++ ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, true, true);
pDBData->GetQueryParam( aQueryParam );
+ aQueryParam.bUseDynamicRange = true;
ScQueryItem aItem( SCITEM_QUERYDATA, GetViewData(), &aQueryParam );
ScRange aAdvSource;
-@@ -203,8 +204,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
+@@ -197,14 +198,14 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog(
+
+ case SID_FILTER:
+ {
+-
+ ScQueryParam aQueryParam;
+ SfxItemSet aArgSet( GetPool(),
SCITEM_QUERYDATA,
SCITEM_QUERYDATA );
- ScDBData* pDBData = GetDBData();
-+ ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, true);
++ ScDBData* pDBData = GetDBData(true, SC_DB_MAKE, true, true);
pDBData->GetQueryParam( aQueryParam );
+ aQueryParam.bUseDynamicRange = true;
More information about the ooo-build-commit
mailing list