diff options
| author | Noel Grandin <noel@peralex.com> | 2012-09-25 15:11:54 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-04 21:29:32 +0200 |
| commit | 414ac85bfee7d034668e954e0f68751852c24062 (patch) | |
| tree | 3a01f2612d775c1b1c389df765d6a64681515023 /comphelper | |
| parent | 5a651522acb42fcffa6defc212cb8d0e9b9b7d3f (diff) | |
sal_Bool -> bool in comphelper
Change-Id: Id9f4aef6c7453cebd83dcaedf2ad7427e03cc960
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/propagg.hxx | 12 | ||||
| -rw-r--r-- | comphelper/source/property/propagg.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx index 305c5524d898..f499b2091a33 100644 --- a/comphelper/inc/comphelper/propagg.hxx +++ b/comphelper/inc/comphelper/propagg.hxx @@ -45,15 +45,15 @@ namespace internal { sal_Int32 nOriginalHandle; sal_Int32 nPos; - sal_Bool bAggregate; + bool bAggregate; - OPropertyAccessor(sal_Int32 _nOriginalHandle, sal_Int32 _nPos, sal_Bool _bAggregate) + OPropertyAccessor(sal_Int32 _nOriginalHandle, sal_Int32 _nPos, bool _bAggregate) :nOriginalHandle(_nOriginalHandle) ,nPos(_nPos) ,bAggregate(_bAggregate) { } OPropertyAccessor() - :nOriginalHandle(-1) ,nPos(-1) ,bAggregate(sal_False) { } + :nOriginalHandle(-1) ,nPos(-1) ,bAggregate(false) { } - sal_Bool operator==(const OPropertyAccessor& rOb) const { return nPos == rOb.nPos; } - sal_Bool operator <(const OPropertyAccessor& rOb) const { return nPos < rOb.nPos; } + bool operator==(const OPropertyAccessor& rOb) const { return nPos == rOb.nPos; } + bool operator <(const OPropertyAccessor& rOb) const { return nPos < rOb.nPos; } }; typedef std::map< sal_Int32, OPropertyAccessor, ::std::less< sal_Int32 > > PropertyAccessorMap; @@ -149,7 +149,7 @@ public: @return sal_True, if _nHandle marks an aggregate property, otherwise sal_False */ - virtual sal_Bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, + virtual bool SAL_CALL fillAggregatePropertyInfoByHandle(::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const; /** returns information about a property given by handle diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index a2d9ff08cebc..bc24d9499527 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -226,11 +226,11 @@ sal_Bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandl } //------------------------------------------------------------------------------ -sal_Bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( +bool OPropertyArrayAggregationHelper::fillAggregatePropertyInfoByHandle( ::rtl::OUString* _pPropName, sal_Int32* _pOriginalHandle, sal_Int32 _nHandle) const { ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle); - sal_Bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate; + bool bRet = i != m_aPropertyAccessors.end() && (*i).second.bAggregate; if (bRet) { if (_pOriginalHandle) |