diff options
| -rw-r--r-- | sc/inc/global.hxx | 10 | ||||
| -rw-r--r-- | sc/source/core/data/global2.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 7eb87012d5e4..8cf6ba8a08c3 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -752,18 +752,18 @@ struct ScConsolidateParam SCROW nRow; // or start of destination area respectively SCTAB nTab; ScSubTotalFunc eFunction; - sal_uInt16 nDataAreaCount; // number of data areas + sal_uInt16 nDataAreaCount; // number of data areas ScArea** ppDataAreas; // array of pointers into data areas - sal_Bool bByCol; - sal_Bool bByRow; - sal_Bool bReferenceData; // reference source data + bool bByCol; + bool bByRow; + bool bReferenceData; // reference source data ScConsolidateParam(); ScConsolidateParam( const ScConsolidateParam& r ); ~ScConsolidateParam(); ScConsolidateParam& operator= ( const ScConsolidateParam& r ); - sal_Bool operator== ( const ScConsolidateParam& r ) const; + bool operator== ( const ScConsolidateParam& r ) const; void Clear (); // = ClearDataAreas()+Members void ClearDataAreas (); void SetAreas ( ScArea* const* ppAreas, sal_uInt16 nCount ); diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index ae5bdf92e560..db1a66400420 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -183,9 +183,9 @@ ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r ) //------------------------------------------------------------------------ -sal_Bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const +bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const { - sal_Bool bEqual = (nCol == r.nCol) + bool bEqual = (nCol == r.nCol) && (nRow == r.nRow) && (nTab == r.nTab) && (bByCol == r.bByCol) |