diff options
author | Noel Grandin <noel@peralex.com> | 2014-02-10 14:11:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-02-10 14:44:57 +0200 |
commit | f32e6d14c880ba38c1398083eb4145cb3cac5230 (patch) | |
tree | 8c89cda7dd3762fb2a261283076af4107c86fc0f /sc | |
parent | 11491b64130fc551f4ee363f9fd2af5d0bb029fb (diff) |
sal_Bool->bool
Change-Id: I131f8fe012f3ed5908fee40459941dd43c284bc8
Diffstat (limited to 'sc')
-rw-r--r-- | sc/inc/dpgroup.hxx | 2 | ||||
-rw-r--r-- | sc/inc/dptabdat.hxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/dpgroup.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/data/dptabdat.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/dpgroup.hxx b/sc/inc/dpgroup.hxx index fbf11b556a9f..cff29df6c796 100644 --- a/sc/inc/dpgroup.hxx +++ b/sc/inc/dpgroup.hxx @@ -180,7 +180,7 @@ public: virtual bool IsNumOrDateGroup(long nDim) const; virtual bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, const ScDPItemData& rBaseData, long nBaseIndex ) const; - virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, + virtual 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 46815ba5a672..1bf6114ef737 100644 --- a/sc/inc/dptabdat.hxx +++ b/sc/inc/dptabdat.hxx @@ -135,7 +135,7 @@ public: virtual bool IsNumOrDateGroup(long nDim) const; virtual bool IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex, const ScDPItemData& rBaseData, long nBaseIndex ) const; - virtual sal_Bool HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, + virtual 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 5ff7a7866dc9..7121f8be6592 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -992,7 +992,7 @@ bool ScDPGroupTableData::IsInGroup( const ScDPItemData& rGroupData, long nGroupI return true; } -sal_Bool ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, +bool ScDPGroupTableData::HasCommonElement( const ScDPItemData& rFirstData, long nFirstIndex, const ScDPItemData& rSecondData, long nSecondIndex ) const { const ScDPGroupDimension* pFirstDim = NULL; diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index 821dbb679cc5..954cdeefe3b8 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -142,7 +142,7 @@ bool ScDPTableData::IsInGroup( const ScDPItemData&, long, return false; } -sal_Bool ScDPTableData::HasCommonElement( const ScDPItemData&, long, +bool ScDPTableData::HasCommonElement( const ScDPItemData&, long, const ScDPItemData&, long ) const { OSL_FAIL("HasCommonElement shouldn't be called for non-group data"); |