TableRef: introduce ScDBDataPortion enum

... to replace
* bool bStartonly=false with ScDBDataPortion::AREA
* bool bStartonly=true  with ScDBDataPortion::TOP_LEFT

and provide means to look at header row only with
ScDBDataPortion::HEADER as needed for TableRef.

Change-Id: I9f6affd04c15a6204193687b2379160eb975f56e

1 files changed, 12 insertions, 4 deletions

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index 967ba3033a18..efe0d2f5052e 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -37,6 +37,14 @@ struct ScQueryParam;
 struct ScSubTotalParam;
 struct ScImportParam;
 
+/** Enum used to indicate which portion of the DBArea is to be considered. */
+enum class ScDBDataPortion
+{
+    TOP_LEFT,   ///< top left cell of area
+    HEADER,     ///< header row of area, if headers are present
+    AREA        ///< entire area
+};
+
 class ScDBData : public ScRefreshTimer
 {
 private:
@@ -151,7 +159,7 @@ public:
     void        GetImportParam(ScImportParam& rImportParam) const;
     void        SetImportParam(const ScImportParam& rImportParam);
 
-    bool        IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) const;
+    bool        IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) const;
     bool        IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
 
     bool        HasImportParam() const;
@@ -242,7 +250,7 @@ public:
         iterator end();
         const_iterator begin() const;
         const_iterator end() const;
-        const ScDBData* findAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) const;
+        const ScDBData* findAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) const;
         const ScDBData* findByRange(const ScRange& rRange) const;
         void deleteOnTab(SCTAB nTab);
         ScDBData* getByRange(const ScRange& rRange);
@@ -269,8 +277,8 @@ public:
     AnonDBs& getAnonDBs() { return maAnonDBs;}
     const AnonDBs& getAnonDBs() const { return maAnonDBs;}
 
-    const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) const;
-    ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly);
+    const ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion) const;
+    ScDBData* GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, ScDBDataPortion ePortion);
     const ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const;
     ScDBData* GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2);
     ScDBData* GetDBNearCursor(SCCOL nCol, SCROW nRow, SCTAB nTab );