diff options
| author | Noel Grandin <noel@peralex.com> | 2014-02-10 13:58:08 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-02-10 14:44:56 +0200 |
| commit | acf5f162662b94b149873e538f6bd8d69977f909 (patch) | |
| tree | 16feea528a6d93da73b8fb6d5ce8bcd348916adf | |
| parent | 1c0f0a9f5b1772a8ac43230de79e39c65f0663df (diff) | |
sal_Bool->bool
Change-Id: Iadbdb3b96d5e546e407e80f1ccc65e5db5f84f4e
| -rw-r--r-- | sc/inc/dpgroup.hxx | 8 | ||||
| -rw-r--r-- | sc/inc/dptabdat.hxx | 10 | ||||
| -rw-r--r-- | sc/source/core/data/dpgroup.cxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/dptabdat.cxx | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index 4065361c52ca..dc8b5dc00d90 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -175,12 +175,12 @@ public: virtual const ScDPFilteredCache& GetCacheTable() const; virtual void ReloadCacheTable(); - virtual sal_Bool IsBaseForGroup(long nDim) const; + virtual bool IsBaseForGroup(long nDim) const; virtual long GetGroupBase(long nGroupDim) const; - virtual sal_Bool IsNumOrDateGroup(long nDim) const; - virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, + virtual sal_Bool IsNumOrDateGroup(long nDim) const; + virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, const ScDPItemData& rBaseData, long nBaseIndex ) const; - virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, + virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, const ScDPItemData& rSecondData, long nSecondIndex ) const; #if DEBUG_PIVOT_TABLE diff --git a/sc/inc/dptabdat.hxx b/sc/inc/dptabdat.hxx index da1891c13db7..c6702be15716 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -130,12 +130,12 @@ public: virtual void ReloadCacheTable() = 0; // overloaded in ScDPGroupTableData: - virtual sal_Bool IsBaseForGroup(long nDim) const; - virtual long GetGroupBase(long nGroupDim) const; - virtual sal_Bool IsNumOrDateGroup(long nDim) const; - virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, + virtual bool IsBaseForGroup(long nDim) const; + virtual long GetGroupBase(long nGroupDim) const; + virtual sal_Bool IsNumOrDateGroup(long nDim) const; + virtual sal_Bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, const ScDPItemData& rBaseData, long nBaseIndex ) const; - virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, + virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, const ScDPItemData& rSecondData, long nSecondIndex ) const; virtual long GetMembersCount( long nDim ); diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index df4c0dfb95a3..71f80065294b 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -920,13 +920,13 @@ void ScDPGroupTableData::FillGroupValues(vector<SCROW>& rItems, const vector<lon } } -sal_Bool ScDPGroupTableData::IsBaseForGroup(long nDim) const +bool ScDPGroupTableData::IsBaseForGroup(long nDim) const { for ( ScDPGroupDimensionVec::const_iterator aIter(aGroups.begin()); aIter != aGroups.end(); ++aIter ) { const ScDPGroupDimension& rDim = *aIter; if ( rDim.GetSourceDim() == nDim ) - return sal_True; + return true; } return false; diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index fdd5b5ab7de8..a35a02115b11 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -120,7 +120,7 @@ sal_uLong ScDPTableData::GetNumberFormat(long) return 0; // default format } -sal_Bool ScDPTableData::IsBaseForGroup(long) const +bool ScDPTableData::IsBaseForGroup(long) const { return false; // always false } |