diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:33:40 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:33:40 +0100 |
| commit | e6064484fae8aa2797f86c68e9a8d23d2e213367 (patch) | |
| tree | db2f4d140efca43ab01dee4fc053fff0829d106b /sc/inc/consoli.hxx | |
| parent | 9e0a09e89c38774dd1af902387a8b25de158b634 (diff) | |
| parent | 378c75a798c8baa34cb26e7f07fe28cb5ee2a85f (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
chart2/source/controller/main/UndoManager.cxx
chart2/source/tools/RegressionCurveHelper.cxx
sc/inc/address.hxx
sc/inc/attrib.hxx
sc/inc/bigrange.hxx
sc/inc/callform.hxx
sc/inc/cell.hxx
sc/inc/chartarr.hxx
sc/inc/chartlis.hxx
sc/inc/chgtrack.hxx
sc/inc/collect.hxx
sc/inc/compiler.hxx
sc/inc/detdata.hxx
sc/inc/document.hxx
sc/inc/fillinfo.hxx
sc/inc/olinetab.hxx
sc/inc/prnsave.hxx
sc/inc/queryparam.hxx
sc/inc/sc.hrc
sc/inc/scabstdlg.hxx
sc/inc/table.hxx
sc/inc/validat.hxx
sc/inc/zforauto.hxx
sc/source/core/data/documen2.cxx
sc/source/core/data/document.cxx
sc/source/core/data/table1.cxx
sc/source/core/tool/address.cxx
sc/source/core/tool/token.cxx
sc/source/filter/excel/frmbase.cxx
sc/source/filter/excel/impop.cxx
sc/source/filter/excel/xename.cxx
sc/source/filter/inc/formel.hxx
sc/source/filter/inc/xename.hxx
sc/source/filter/xml/xmlexprt.cxx
sc/source/filter/xml/xmlnexpi.cxx
sc/source/filter/xml/xmlnexpi.hxx
sc/source/ui/dbgui/filtdlg.cxx
sc/source/ui/inc/docfunc.hxx
sc/source/ui/inc/namedlg.hxx
sc/source/ui/namedlg/namedlg.cxx
sc/source/ui/src/namedlg.src
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 f72813ab9458..f56a4a521435 100644 --- a/sc/inc/consoli.hxx +++ b/sc/inc/consoli.hxx @@ -79,13 +79,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; @@ -96,7 +96,7 @@ private: SCSIZE nTitleCount; String** ppTitles; SCSIZE** ppTitlePos; - BOOL bCornerUsed; + sal_Bool bCornerUsed; String aCornerText; // only for bColByName && bRowByName public: @@ -104,9 +104,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, |