sal_Bool to bool.

2 files changed, 24 insertions, 24 deletions

diff --git a/sc/inc/dptabres.hxx b/sc/inc/dptabres.hxx
index 4e6c6eddd060..aedb6f77c8a7 100644
--- a/sc/inc/dptabres.hxx
+++ b/sc/inc/dptabres.hxx
@@ -300,12 +300,12 @@ private:
     ::com::sun::star::sheet::DataPilotFieldReference* pMeasRefs;
     sal_uInt16*                 pMeasRefOrient;
     String*                 pMeasNames;
-    sal_Bool                    bLateInit;
-    sal_Bool                    bDataAtCol;
-    sal_Bool                    bDataAtRow;
+    bool                    bLateInit:1;
+    bool                    bDataAtCol:1;
+    bool                    bDataAtRow:1;
 
     //! add "displayed values" settings
-        mutable std::vector< ResultMembers* > mpDimMembers;
+    mutable std::vector< ResultMembers* > mpDimMembers;
 public:
                         ScDPResultData( ScDPSource* pSrc );     //! Ref
                         ~ScDPResultData();
@@ -314,18 +314,18 @@ public:
                                         const ::com::sun::star::sheet::DataPilotFieldReference* pRefs,
                                         const sal_uInt16* pRefOrient, const String* pNames );
     void                SetDataLayoutOrientation( sal_uInt16 nOrient );
-    void                SetLateInit( sal_Bool bSet );
+    void                SetLateInit( bool bSet );
 
     long                GetMeasureCount() const     { return nMeasCount; }
     ScSubTotalFunc      GetMeasureFunction(long nMeasure) const;
-    String              GetMeasureString(long nMeasure, sal_Bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const;
+    String              GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const;
     String              GetMeasureDimensionName(long nMeasure) const;
     const ::com::sun::star::sheet::DataPilotFieldReference& GetMeasureRefVal(long nMeasure) const;
     sal_uInt16              GetMeasureRefOrient(long nMeasure) const;
 
-    sal_Bool                IsDataAtCol() const             { return bDataAtCol; }
-    sal_Bool                IsDataAtRow() const             { return bDataAtRow; }
-    sal_Bool                IsLateInit() const              { return bLateInit; }
+    bool                IsDataAtCol() const             { return bDataAtCol; }
+    bool                IsDataAtRow() const             { return bDataAtRow; }
+    bool                IsLateInit() const              { return bLateInit; }
 
     long                GetColStartMeasure() const;
     long                GetRowStartMeasure() const;
@@ -333,14 +333,14 @@ public:
     long                GetCountForMeasure( long nMeas ) const
                                 { return ( nMeas == SC_DPMEASURE_ALL ) ? nMeasCount : 1; }
 
-    sal_Bool                IsBaseForGroup( long nDim ) const;              // any group
+    bool                IsBaseForGroup( long nDim ) const;              // any group
     long                GetGroupBase( long nGroupDim ) const;
-    sal_Bool                IsNumOrDateGroup( long nDim ) const;
-    sal_Bool                IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
-                                               long nBaseDataId, long nBaseIndex ) const;
-    sal_Bool                IsInGroup( SCROW nGroupDataId, long nGroupIndex,
-                                              const ScDPItemData& rBaseData, long nBaseIndex ) const;
-    sal_Bool                HasCommonElement( SCROW nFirstDataId, long nFirstIndex,
+    bool                IsNumOrDateGroup( long nDim ) const;
+    bool                IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+                                   long nBaseDataId, long nBaseIndex ) const;
+    bool                IsInGroup( SCROW nGroupDataId, long nGroupIndex,
+                                   const ScDPItemData& rBaseData, long nBaseIndex ) const;
+    bool                HasCommonElement( SCROW nFirstDataId, long nFirstIndex,
                                           const ScDPItemData& rSecondData, long nSecondIndex ) const;
 
     ResultMembers* GetDimResultMembers( long nDim , ScDPDimension* pDim , ScDPLevel*   pLevel) const ;
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index c1a1824dd4a9..3f18da1ea2e9 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -829,7 +829,7 @@ void ScDPResultData::SetDataLayoutOrientation( sal_uInt16 nOrient )
     bDataAtRow = ( nOrient == sheet::DataPilotFieldOrientation_ROW );
 }
 
-void ScDPResultData::SetLateInit( sal_Bool bSet )
+void ScDPResultData::SetLateInit( bool bSet )
 {
     bLateInit = bSet;
 }
@@ -864,7 +864,7 @@ sal_uInt16 ScDPResultData::GetMeasureRefOrient(long nMeasure) const
     return pMeasRefOrient[nMeasure];
 }
 
-String ScDPResultData::GetMeasureString(long nMeasure, sal_Bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const
+String ScDPResultData::GetMeasureString(long nMeasure, bool bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const
 {
     //  with bForce==sal_True, return function instead of "result" for single measure
     //  with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc
@@ -915,7 +915,7 @@ String ScDPResultData::GetMeasureDimensionName(long nMeasure) const
     return pSource->GetDataDimName( nMeasure );
 }
 
-sal_Bool ScDPResultData::IsBaseForGroup( long nDim ) const
+bool ScDPResultData::IsBaseForGroup( long nDim ) const
 {
     return pSource->GetData()->IsBaseForGroup( nDim );
 }
@@ -925,12 +925,12 @@ long ScDPResultData::GetGroupBase( long nGroupDim ) const
     return pSource->GetData()->GetGroupBase( nGroupDim );
 }
 
-sal_Bool ScDPResultData::IsNumOrDateGroup( long nDim ) const
+bool ScDPResultData::IsNumOrDateGroup( long nDim ) const
 {
     return pSource->GetData()->IsNumOrDateGroup( nDim );
 }
 
-sal_Bool ScDPResultData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
+bool ScDPResultData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex,
                                 long nBaseDataId, long nBaseIndex ) const
 {
     const ScDPItemData* pData = pSource->GetItemDataById( nGroupIndex , nBaseDataId);
@@ -939,8 +939,8 @@ sal_Bool ScDPResultData::IsInGroup( const ScDPItemData& rGroupData, long nGroupI
     else
         return false;
 }
-sal_Bool ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex,
-                                                               const ScDPItemData& rBaseData, long nBaseIndex ) const
+bool ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex,
+                                const ScDPItemData& rBaseData, long nBaseIndex ) const
 {
     const ScDPItemData* pGroupData = pSource->GetItemDataById( nGroupIndex , nGroupDataId);
     if ( pGroupData )
@@ -949,7 +949,7 @@ sal_Bool ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex,
         return false;
 }
 
-sal_Bool ScDPResultData::HasCommonElement(/* const ScDPItemData& rFirstData*/SCROW nFirstDataId, long nFirstIndex,
+bool ScDPResultData::HasCommonElement( SCROW nFirstDataId, long nFirstIndex,
                                        const ScDPItemData& rSecondData, long nSecondIndex ) const
 {
     const ScDPItemData* pFirstData = pSource->GetItemDataById( nFirstIndex , nFirstDataId);