diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-04-01 15:24:18 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-04-01 15:24:18 -0400 |
| commit | 1d74574c80d8c14f8768fe7c4b81f896c4137d33 (patch) | |
| tree | 9606ec838497f2bf04dbf7962c70549cfb2fb478 /sc/inc | |
| parent | da0fa9dbff98e6233872752423d16fd772b6da6c (diff) | |
Removed the dynamic row bits from the db range. It was a hack.
This concept was there before the Hamburg added their own mechanism
to allow dynamic expansion of db ranges. There is no need to have
two of them, or it would cause weird problems.
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/dbcolect.hxx | 8 | ||||
| -rw-r--r-- | sc/inc/document.hxx | 3 | ||||
| -rw-r--r-- | sc/inc/queryparam.hxx | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx index 8e4e28b5d..d34d383a9 100644 --- a/sc/inc/dbcolect.hxx +++ b/sc/inc/dbcolect.hxx @@ -90,7 +90,6 @@ private: ScQueryConnect eQueryConnect[MAXQUERY]; bool bIsAdvanced; // sal_True if created by advanced filter ScRange aAdvSource; // source range - SCROW nDynamicEndRow; ScSubTotalParam maSubTotal; @@ -126,17 +125,16 @@ public: const String& GetName() const { return aName; } void GetName(String& rName) const { rName = aName; } void SetName(const String& rName) { aName = rName; } - void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2, bool bUseDynamicRange = false) const; - SC_DLLPUBLIC void GetArea(ScRange& rRange, bool bUseDynamicRange = false) const; + void GetArea(SCTAB& rTab, SCCOL& rCol1, SCROW& rRow1, SCCOL& rCol2, SCROW& rRow2) const; + SC_DLLPUBLIC void GetArea(ScRange& rRange) const; void SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); - void SetDynamicEndRow(SCROW nRow); void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); bool IsByRow() const { return bByRow; } void SetByRow(bool bByR) { bByRow = bByR; } bool HasHeader() const { return bHasHeader; } void SetHeader(bool bHasH) { bHasHeader = bHasH; } void SetIndex(sal_uInt16 nInd) { nIndex = nInd; } - sal_uInt16 GetIndex() const { return nIndex; } + sal_uInt16 GetIndex() const { return nIndex; } bool IsDoSize() const { return bDoSize; } void SetDoSize(bool bSet) { bDoSize = bSet; } bool IsKeepFmt() const { return bKeepFmt; } diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index ba341a303..8f793e8f4 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1465,9 +1465,6 @@ public: SCTAB nTab, ScQueryParam& rQueryParam ); void GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, String& rStr); - /** Update the dynamic end row position of a current data area. */ - void UpdateDynamicEndRow(ScDBData& rDBData) const; - sal_Bool GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, TypedScStrCollection& rStrings, bool& rHasDates); SC_DLLPUBLIC sal_Bool GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, diff --git a/sc/inc/queryparam.hxx b/sc/inc/queryparam.hxx index 6042c20ba..d62061e80 100644 --- a/sc/inc/queryparam.hxx +++ b/sc/inc/queryparam.hxx @@ -82,12 +82,10 @@ struct ScQueryParamTable struct SC_DLLPUBLIC ScQueryParam : public ScQueryParamBase, public ScQueryParamTable { - sal_Bool bDestPers; // not saved + bool bDestPers; // not saved SCTAB nDestTab; SCCOL nDestCol; SCROW nDestRow; - SCROW nDynamicEndRow; - bool bUseDynamicRange; ScQueryParam(); ScQueryParam( const ScQueryParam& r ); |