diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-05-10 16:28:53 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-05-10 16:28:53 -0400 |
| commit | a906c18d470619143ca699062fd9954a159b872b (patch) | |
| tree | 30c820135d48fffd4bdf4e88e8b3637eaa5ffa6e /sc/inc | |
| parent | 8f8df657b92005d3212345dbd3d61ae230f44476 (diff) | |
Use ScSortParam as data member in ScDBData.
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/dbcolect.hxx | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/sc/inc/dbcolect.hxx b/sc/inc/dbcolect.hxx index 7dc841abf617..0c7c63a989f1 100644 --- a/sc/inc/dbcolect.hxx +++ b/sc/inc/dbcolect.hxx @@ -47,6 +47,11 @@ class ScDocument; class ScDBData : public ScDataObject, public ScRefreshTimer { private: + ScSortParam maSortParam; + ScQueryParam maQueryParam; + ScSubTotalParam maSubTotal; + ScImportParam maImportParam; + // DBParam ::rtl::OUString aName; SCTAB nTable; @@ -59,32 +64,14 @@ private: bool bDoSize; bool bKeepFmt; bool bStripData; - // SortParam - bool bSortCaseSens; - bool bSortNaturalSort; - bool bIncludePattern; - bool bSortInplace; - bool bSortUserDef; - sal_uInt16 nSortUserIndex; - SCTAB nSortDestTab; - SCCOL nSortDestCol; - SCROW nSortDestRow; - bool bDoSort[MAXSORT]; - SCCOLROW nSortField[MAXSORT]; - bool bAscending[MAXSORT]; - ::com::sun::star::lang::Locale aSortLocale; - ::rtl::OUString aSortAlgorithm; + // QueryParam bool bIsAdvanced; // true if created by advanced filter ScRange aAdvSource; // source range - ScQueryParam maQueryParam; - ScSubTotalParam maSubTotal; - ScImportParam maImportParam; - bool bDBSelection; // not in Param: if selection, block update - sal_uInt16 nIndex; // unique index formulas + sal_uInt16 nIndex; // unique index formulas bool bAutoFilter; // AutoFilter? (not saved) bool bModified; // is set/cleared for/by(?) UpdateReference @@ -146,7 +133,7 @@ public: bool HasImportParam() const { return maImportParam.bImport; } SC_DLLPUBLIC bool HasQueryParam() const; - bool HasSortParam() const { return bDoSort[0]; } + bool HasSortParam() const { return maSortParam.bDoSort[0]; } bool HasSubTotalParam() const { return maSubTotal.bGroupActive[0]; } bool HasImportSelection() const { return bDBSelection; } |