diff options
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/dbcolect.hxx | 14 | ||||
| -rw-r--r-- | sc/inc/document.hxx | 8 | ||||
| -rw-r--r-- | sc/inc/global.hxx | 11 | ||||
| -rw-r--r-- | sc/inc/rangeutl.hxx | 1 |
4 files changed, 18 insertions, 16 deletions
diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx index 3c436d9f3e98..ca244359a4b5 100644 --- a/sc/inc/dbcolect.hxx +++ b/sc/inc/dbcolect.hxx @@ -136,8 +136,10 @@ public: 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); - //If the name of DBData is started with "unnamed", it will be recognized as build in DBData - sal_Bool IsBuildin(); + + bool IsInternalUnnamed() const; + bool IsInternalForAutoFilter() const; + void MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2); sal_Bool IsByRow() const { return bByRow; } void SetByRow(sal_Bool bByR) { bByRow = bByR; } @@ -216,9 +218,13 @@ public: virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; virtual sal_Bool IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const; ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Bool bStartOnly) const; - ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; + ScDBData* GetDBAtArea( + const SCTAB nTab, + const SCCOL nCol1, + const SCROW nRow1, + const SCCOL nCol2, + const SCROW nRow2 ) const; ScDBData* GetFilterDBAtTable(SCTAB nTab) const; - ScDBData* GetDBAtTable(SCTAB nTab, ScGetDBMode eMode) const; sal_Bool SearchName( const String& rName, sal_uInt16& rIndex ) const; diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 025c322d585d..be2a41748556 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -505,10 +505,7 @@ public: sal_Bool bStartOnly = sal_False) const; ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const; ScDBData* GetFilterDBAtTable(SCTAB nTab) const; -//UNUSED2008-05 ScRangeData* GetRangeAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, -//UNUSED2008-05 sal_Bool bStartOnly = sal_False) const; SC_DLLPUBLIC ScRangeData* GetRangeAtBlock( const ScRange& rBlock, String* pName=NULL ) const; - ScDBData* GetDBAtTable(SCTAB nTab, ScGetDBMode eMode) const; SC_DLLPUBLIC ScDPCollection* GetDPCollection(); ScDPObject* GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const; @@ -1514,7 +1511,10 @@ public: TypedScStrCollection& rStrings, sal_Bool bLimit = sal_False ); sal_Bool GetFormulaEntries( TypedScStrCollection& rStrings ); - sal_Bool HasAutoFilter( SCCOL nCol, SCROW nRow, SCTAB nTab ); + sal_Bool HasAutoFilter( + const SCCOL nCol, + const SCROW nRow, + const SCTAB nTab ); SC_DLLPUBLIC sal_Bool HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ); diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index d2206aa46bb2..2c5d8343b879 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -404,13 +404,10 @@ enum ScAnchorType // Verankerung eines Zeichenobjekts enum ScGetDBMode { - SC_DB_MAKE, // wenn noetig, "unbenannt" anlegen - SC_DB_IMPORT, // wenn noetig, "Importx" anlegen - SC_DB_OLD, // nicht neu anlegen - SC_DB_MAKE_FILTER, // to create a new filter/sort/subtotal - SC_DB_MAKE_SORT, - SC_DB_MAKE_SUBTOTAL, - SC_DB_OLD_FILTER //to find a existed filter + SC_DB_MAKE, // if needed create database range with name $STR_DB_NONAME + SC_DB_IMPORT, // if needed create database range with name $STR_DBNAME_IMPORT[X] + SC_DB_OLD, // do not create new database range, provide only existing one + SC_DB_MAKE_AUTOFILTER // if needed create database range with name $SC_DBNAME_UNNAMED[X] }; /// For ScDBFunc::GetDBData() diff --git a/sc/inc/rangeutl.hxx b/sc/inc/rangeutl.hxx index c2226ace61ce..08915b3b43cd 100644 --- a/sc/inc/rangeutl.hxx +++ b/sc/inc/rangeutl.hxx @@ -302,7 +302,6 @@ private: ScDBCollection* pDBCollection; sal_Bool bFirstPass; sal_uInt16 nPos; - String aStrNoName; public: ScAreaNameIterator( ScDocument* pDoc ); |