summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-04-02 12:56:48 +0200
committerNoel Grandin <noel@peralex.com>2014-04-03 09:17:52 +0200
commit0523304875cf810acb1ff7caf9c9a2ec5d982b70 (patch)
tree741920994ba1fb097e162ecbf2c8c60929536bd8 /svl
parentabc429987c6ce644658824fb20db113af855c8b2 (diff)
svl: sal_Bool->bool
Change-Id: I6938314a08d061d2b07d9129742d74a989bd1385
Diffstat (limited to 'svl')
-rw-r--r--svl/source/items/itemprop.cxx6
-rw-r--r--svl/source/items/itemset.cxx32
-rw-r--r--svl/source/items/sitem.cxx4
-rw-r--r--svl/source/items/stylepool.cxx2
4 files changed, 22 insertions, 22 deletions
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index e2492d3d6b54..41f1a0433055 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -172,7 +172,7 @@ SfxItemPropertySet::~SfxItemPropertySet()
{
}
-bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, sal_Bool) const
+bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, bool) const
{
return false;
}
@@ -194,7 +194,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
else
{
SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID);
- if(FillItem(aSet, rEntry.nWID, sal_True))
+ if(FillItem(aSet, rEntry.nWID, true))
{
const SfxPoolItem& rItem = aSet.Get(rEntry.nWID);
rItem.QueryValue( rAny, rEntry.nMemberId );
@@ -250,7 +250,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
if(eState < SFX_ITEM_DEFAULT)
{
SfxItemSet aSet(*rSet.GetPool(), rEntry.nWID, rEntry.nWID);
- if(FillItem(aSet, rEntry.nWID, sal_False))
+ if(FillItem(aSet, rEntry.nWID, false))
{
const SfxPoolItem &rItem = aSet.Get(rEntry.nWID);
pNewItem = rItem.Clone();
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index cd48ed66eb80..03905eaa6b2e 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -351,7 +351,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
if ( nWhich <= SFX_WHICH_MAX )
{
const SfxPoolItem& rNew = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( *pItemToClear, rNew );
@@ -389,7 +389,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
if ( nWhich <= SFX_WHICH_MAX )
{
const SfxPoolItem& rNew = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( *pItemToClear, rNew );
@@ -417,7 +417,7 @@ sal_uInt16 SfxItemSet::ClearItem( sal_uInt16 nWhich )
-void SfxItemSet::ClearInvalidItems( sal_Bool bHardDefault )
+void SfxItemSet::ClearInvalidItems( bool bHardDefault )
{
sal_uInt16* pPtr = _pWhichRanges;
SfxItemArray ppFnd = _aItems;
@@ -592,7 +592,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
if (nWhich <= SFX_WHICH_MAX )
{
const SfxPoolItem& rOld = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( rOld, rNew );
}
@@ -846,12 +846,12 @@ bool SfxItemSet::Set
const SfxItemSet& rSet, /* das SfxItemSet, dessen SfxPoolItems
"ubernommen werden sollen */
- sal_Bool bDeep /* sal_True (default)
+ bool bDeep /* true (default)
auch die SfxPoolItems aus den ggf. an
rSet vorhandenen Parents werden direkt
in das SfxItemSet "ubernommen
- sal_False
+ false
die SfxPoolItems aus den Parents von
rSet werden nicht ber"ucksichtigt */
)
@@ -950,7 +950,7 @@ const SfxPoolItem* SfxItemSet::GetItem
-const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, sal_Bool bSrchInParent) const
+const SfxPoolItem& SfxItemSet::Get( sal_uInt16 nWhich, bool bSrchInParent) const
{
// suche den Bereich in dem das Which steht:
const SfxItemSet* pAktSet = this;
@@ -1076,7 +1076,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
if(nWhich <= SFX_WHICH_MAX)
{
const SfxPoolItem& rNew = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( **ppFnd1, rNew );
@@ -1146,7 +1146,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet )
if(nWhich <= SFX_WHICH_MAX)
{
const SfxPoolItem& rNew = _pParent
- ? _pParent->Get( nWhich, sal_True )
+ ? _pParent->Get( nWhich, true )
: _pPool->GetDefaultItem( nWhich );
Changed( **ppFnd1, rNew );
@@ -1323,7 +1323,7 @@ static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount,
-void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
+void SfxItemSet::MergeValues( const SfxItemSet& rSet, bool bIgnoreDefaults )
{
// Achtung!!! Bei Aenderungen/Bugfixes immer obenstehende Tabelle pflegen!
DBG_ASSERT( GetPool() == rSet.GetPool(), "MergeValues mit verschiedenen Pools" );
@@ -1380,7 +1380,7 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
-void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, sal_Bool bIgnoreDefaults )
+void SfxItemSet::MergeValue( const SfxPoolItem& rAttr, bool bIgnoreDefaults )
{
SfxItemArray ppFnd = _aItems;
const sal_uInt16* pPtr = _pWhichRanges;
@@ -1470,7 +1470,7 @@ SvStream &SfxItemSet::Store
[Querverweise]
- <SfxItemSet::Load(SvStream&,sal_Bool,const SfxItemPool*)>
+ <SfxItemSet::Load(SvStream&,bool,const SfxItemPool*)>
*/
{
@@ -1541,7 +1541,7 @@ SvStream &SfxItemSet::Load
[Querverweise]
- <SfxItemSet::Store(Stream&,sal_Bool)const>
+ <SfxItemSet::Store(Stream&,bool)const>
*/
{
@@ -1660,7 +1660,7 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
-SfxItemSet *SfxItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
+SfxItemSet *SfxItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const
{
if ( pToPool && pToPool != _pPool )
{
@@ -1944,7 +1944,7 @@ const SfxPoolItem* SfxAllItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhi
{
bIncrementCount = true;
pOld = _pParent ?
- &_pParent->Get( nWhich, sal_True )
+ &_pParent->Get( nWhich, true )
: nWhich <= SFX_WHICH_MAX ? &_pPool->GetDefaultItem( nWhich ) : 0;
}
@@ -1975,7 +1975,7 @@ void SfxItemSet::DisableItem(sal_uInt16 nWhich)
-SfxItemSet *SfxAllItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
+SfxItemSet *SfxAllItemSet::Clone(bool bItems, SfxItemPool *pToPool ) const
{
if ( pToPool && pToPool != _pPool )
{
diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index dee7a63b805b..b91b42808df8 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.cxx
@@ -24,7 +24,7 @@
SfxSetItem::SfxSetItem( sal_uInt16 which, const SfxItemSet &rSet) :
SfxPoolItem(which),
- pSet(rSet.Clone(sal_True))
+ pSet(rSet.Clone(true))
{
}
@@ -41,7 +41,7 @@ SfxSetItem::SfxSetItem( sal_uInt16 which, SfxItemSet *pS) :
SfxSetItem::SfxSetItem( const SfxSetItem& rCopy, SfxItemPool *pPool ) :
SfxPoolItem(rCopy.Which()),
- pSet(rCopy.pSet->Clone(sal_True, pPool))
+ pSet(rCopy.pSet->Clone(true, pPool))
{
}
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 3b79dbc4b9dd..b3d7b8537915 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.cxx
@@ -369,7 +369,7 @@ public:
: maRoot(),
mnCount(0),
mpIgnorableItems( pIgnorableItems != 0
- ? pIgnorableItems->Clone( sal_False )
+ ? pIgnorableItems->Clone( false )
: 0 )
{
DBG_ASSERT( !pIgnorableItems || !pIgnorableItems->Count(),