diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/inc/consoli.hxx | |
parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/inc/consoli.hxx')
-rw-r--r-- | sc/inc/consoli.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sc/inc/consoli.hxx b/sc/inc/consoli.hxx index 5b52f49e03ce..67e7e1346c7c 100644 --- a/sc/inc/consoli.hxx +++ b/sc/inc/consoli.hxx @@ -84,13 +84,13 @@ class ScConsData { private: ScSubTotalFunc eFunction; - BOOL bReference; - BOOL bColByName; - BOOL bRowByName; - BOOL bSubTitles; + sal_Bool bReference; + sal_Bool bColByName; + sal_Bool bRowByName; + sal_Bool bSubTitles; SCSIZE nColCount; SCSIZE nRowCount; - BOOL** ppUsed; + sal_Bool** ppUsed; double** ppSum; double** ppCount; double** ppSumSqr; @@ -101,7 +101,7 @@ private: SCSIZE nTitleCount; String** ppTitles; SCSIZE** ppTitlePos; - BOOL bCornerUsed; + sal_Bool bCornerUsed; String aCornerText; // only for bColByName && bRowByName public: @@ -109,9 +109,9 @@ public: ~ScConsData(); void SetSize( SCCOL nCols, SCROW nRows ); - void SetFlags( ScSubTotalFunc eFunc, BOOL bColName, BOOL bRowName, BOOL bRef ); + void SetFlags( ScSubTotalFunc eFunc, sal_Bool bColName, sal_Bool bRowName, sal_Bool bRef ); - void InitData(BOOL bDelete=TRUE); + void InitData(sal_Bool bDelete=sal_True); void DeleteData(); void AddFields( ScDocument* pSrcDoc, SCTAB nTab, |