summaryrefslogtreecommitdiff
path: root/svl/source/items
diff options
context:
space:
mode:
Diffstat (limited to 'svl/source/items')
-rw-r--r--svl/source/items/aeitem.cxx6
-rw-r--r--svl/source/items/cenumitm.cxx12
-rw-r--r--svl/source/items/ctypeitm.cxx4
-rw-r--r--svl/source/items/itempool.cxx14
-rw-r--r--svl/source/items/itemprop.cxx12
-rw-r--r--svl/source/items/itemset.cxx26
-rw-r--r--svl/source/items/macitem.cxx6
-rw-r--r--svl/source/items/poolcach.cxx2
-rw-r--r--svl/source/items/poolio.cxx8
-rw-r--r--svl/source/items/srchitem.cxx14
-rw-r--r--svl/source/items/visitem.cxx2
11 files changed, 53 insertions, 53 deletions
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 13f8509de84a..237e0a714492 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -252,16 +252,16 @@ void SfxAllEnumItem::DisableValue( sal_uInt16 nValue )
pDisabledValues->push_back( nValue );
}
-sal_Bool SfxAllEnumItem::IsEnabled( sal_uInt16 nValue ) const
+bool SfxAllEnumItem::IsEnabled( sal_uInt16 nValue ) const
{
if ( pDisabledValues )
{
for ( size_t i=0; i<pDisabledValues->size(); i++ )
if ( (*pDisabledValues)[i] == nValue )
- return sal_False;
+ return false;
}
- return sal_True;
+ return true;
}
// -----------------------------------------------------------------------
diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 157a4f6043bc..74a631430b78 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.cxx
@@ -97,9 +97,9 @@ sal_uInt16 SfxEnumItemInterface::GetPosByValue(sal_uInt16 nValue) const
return USHRT_MAX;
}
-sal_Bool SfxEnumItemInterface::IsEnabled(sal_uInt16) const
+bool SfxEnumItemInterface::IsEnabled(sal_uInt16) const
{
- return sal_True;
+ return true;
}
// virtual
@@ -109,7 +109,7 @@ bool SfxEnumItemInterface::HasBoolValue() const
}
// virtual
-sal_Bool SfxEnumItemInterface::GetBoolValue() const
+bool SfxEnumItemInterface::GetBoolValue() const
{
return false;
}
@@ -169,7 +169,7 @@ TYPEINIT1_AUTOFACTORY(SfxBoolItem, SfxPoolItem);
SfxBoolItem::SfxBoolItem(sal_uInt16 const nWhich, SvStream & rStream)
: SfxPoolItem(nWhich)
{
- sal_Bool tmp = false;
+ unsigned char tmp = 0;
rStream.ReadUChar( tmp );
m_bValue = tmp;
}
@@ -210,7 +210,7 @@ bool SfxBoolItem::QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8) const
// virtual
bool SfxBoolItem::PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8)
{
- sal_Bool bTheValue = sal_Bool();
+ bool bTheValue = bool();
if (rVal >>= bTheValue)
{
m_bValue = bTheValue;
@@ -229,7 +229,7 @@ SfxPoolItem * SfxBoolItem::Create(SvStream & rStream, sal_uInt16) const
// virtual
SvStream & SfxBoolItem::Store(SvStream & rStream, sal_uInt16) const
{
- rStream.WriteUChar( static_cast<sal_Bool>(m_bValue) ); // not bool for serialization!
+ rStream.WriteUChar( m_bValue ); // not bool for serialization!
return rStream;
}
diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index d829aac1f00f..d2299ae61ce5 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.cxx
@@ -71,7 +71,7 @@ SfxPoolItem* CntContentTypeItem::Create( SvStream& rStream,
rStream.ReadUInt32( nMagic );
if (nMagic == CNTSTRINGITEM_STREAM_MAGIC)
{
- sal_Bool bEncrypted = sal_False;
+ unsigned char bEncrypted = sal_False;
rStream.ReadUChar( bEncrypted );
DBG_ASSERT(!bEncrypted,
"CntContentTypeItem::Create() reads encrypted data");
@@ -88,7 +88,7 @@ SvStream & CntContentTypeItem::Store(SvStream & rStream, sal_uInt16) const
// CntContentTypeItem used to be derived from CntStringItem, so take that
// into account:
writeUnicodeString(rStream, GetValue());
- rStream.WriteUInt32( CNTSTRINGITEM_STREAM_MAGIC ).WriteUChar( sal_Bool(sal_False) );
+ rStream.WriteUInt32( CNTSTRINGITEM_STREAM_MAGIC ).WriteUChar( false );
return rStream;
}
diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index b5000d6783c1..706f7fa4bba2 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.cxx
@@ -209,7 +209,7 @@ SfxItemPool::SfxItemPool
SfxItemPool::SfxItemPool
(
const SfxItemPool& rPool, // von dieser Instanz kopieren
- sal_Bool bCloneStaticDefaults /* sal_True
+ bool bCloneStaticDefaults /* sal_True
statische Defaults kopieren
sal_False
@@ -308,7 +308,7 @@ void SfxItemPool::SetDefaults( SfxPoolItem **pDefaults )
void SfxItemPool::ReleaseDefaults
(
- sal_Bool bDelete /* sal_True
+ bool bDelete /* sal_True
l"oscht sowohl das Array als auch die einzelnen
statischen Defaults
@@ -344,7 +344,7 @@ void SfxItemPool::ReleaseDefaults
sal_uInt16 nCount, /* Anzahl der statischen Defaults */
- sal_Bool bDelete /* sal_True
+ bool bDelete /* sal_True
l"oscht sowohl das Array als auch die
einzelnen statischen Defaults
@@ -1012,7 +1012,7 @@ sal_uInt32 SfxItemPool::GetItemCount2(sal_uInt16 nWhich) const
// -----------------------------------------------------------------------
-sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const
+sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, bool bDeep ) const
{
if ( !IsSlot(nSlotId) )
return nSlotId;
@@ -1028,7 +1028,7 @@ sal_uInt16 SfxItemPool::GetWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const
// -----------------------------------------------------------------------
-sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, sal_Bool bDeep ) const
+sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, bool bDeep ) const
{
if ( !IsWhich(nWhich) )
return nWhich;
@@ -1047,7 +1047,7 @@ sal_uInt16 SfxItemPool::GetSlotId( sal_uInt16 nWhich, sal_Bool bDeep ) const
// -----------------------------------------------------------------------
-sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const
+sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, bool bDeep ) const
{
if ( !IsSlot(nSlotId) )
return 0;
@@ -1063,7 +1063,7 @@ sal_uInt16 SfxItemPool::GetTrueWhich( sal_uInt16 nSlotId, sal_Bool bDeep ) const
// -----------------------------------------------------------------------
-sal_uInt16 SfxItemPool::GetTrueSlotId( sal_uInt16 nWhich, sal_Bool bDeep ) const
+sal_uInt16 SfxItemPool::GetTrueSlotId( sal_uInt16 nWhich, bool bDeep ) const
{
if ( !IsWhich(nWhich) )
return 0;
diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 8e88b781b22e..d7d3a81be093 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -172,9 +172,9 @@ SfxItemPropertySet::~SfxItemPropertySet()
{
}
-sal_Bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, sal_Bool) const
+bool SfxItemPropertySet::FillItem(SfxItemSet&, sal_uInt16, sal_Bool) const
{
- return sal_False;
+ return false;
}
void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEntry,
@@ -183,7 +183,7 @@ void SfxItemPropertySet::getPropertyValue( const SfxItemPropertySimpleEntry& rEn
{
// get the SfxPoolItem
const SfxPoolItem* pItem = 0;
- SfxItemState eState = rSet.GetItemState( rEntry.nWID, sal_True, &pItem );
+ SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem );
if(SFX_ITEM_SET != eState && SFX_WHICH_MAX > rEntry.nWID )
pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID);
// return item values as uno::Any
@@ -243,7 +243,7 @@ void SfxItemPropertySet::setPropertyValue( const SfxItemPropertySimpleEntry& rEn
// get the SfxPoolItem
const SfxPoolItem* pItem = 0;
SfxPoolItem *pNewItem = 0;
- SfxItemState eState = rSet.GetItemState( rEntry.nWID, sal_True, &pItem );
+ SfxItemState eState = rSet.GetItemState( rEntry.nWID, true, &pItem );
if(SFX_ITEM_SET != eState && SFX_WHICH_MAX > rEntry.nWID )
pItem = &rSet.GetPool()->GetDefaultItem(rEntry.nWID);
//maybe there's another way to find an Item
@@ -295,7 +295,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const SfxItemPropertySimpleEn
sal_uInt16 nWhich = rEntry.nWID;
// item state holen
- SfxItemState eState = rSet.GetItemState( nWhich, sal_False );
+ SfxItemState eState = rSet.GetItemState( nWhich, false );
// item-Wert als UnoAny zurueckgeben
if(eState == SFX_ITEM_DEFAULT)
eRet = PropertyState_DEFAULT_VALUE;
@@ -319,7 +319,7 @@ PropertyState SfxItemPropertySet::getPropertyState(const OUString& rName, cons
// item holen
const SfxPoolItem* pItem = 0;
- SfxItemState eState = rSet.GetItemState( nWhich, sal_False, &pItem );
+ SfxItemState eState = rSet.GetItemState( nWhich, false, &pItem );
if(!pItem && nWhich != rSet.GetPool()->GetSlotId(nWhich))
pItem = &rSet.GetPool()->GetDefaultItem(nWhich);
// item-Wert als UnoAny zurueckgeben
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index d68655f0414f..5403f2c95fb9 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -84,7 +84,7 @@ SfxItemSet::SfxItemSet
SfxItemPool& rPool, /* der Pool, in dem die SfxPoolItems,
welche in dieses SfxItemSet gelangen,
aufgenommen werden sollen */
- sal_Bool bTotalRanges /* komplette Pool-Ranges uebernehmen,
+ bool bTotalRanges /* komplette Pool-Ranges uebernehmen,
muss auf sal_True gesetzt werden */
)
/* [Beschreibung]
@@ -487,7 +487,7 @@ void SfxItemSet::InvalidateAllItems()
// -----------------------------------------------------------------------
SfxItemState SfxItemSet::GetItemState( sal_uInt16 nWhich,
- sal_Bool bSrchInParent,
+ bool bSrchInParent,
const SfxPoolItem **ppItem ) const
{
DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
@@ -760,7 +760,7 @@ void SfxItemSet::MergeRange( sal_uInt16 nFrom, sal_uInt16 nTo )
{
// special case: exactly one sal_uInt16 which is already included?
- if ( nFrom == nTo && SFX_ITEM_AVAILABLE <= GetItemState(nFrom, sal_False) )
+ if ( nFrom == nTo && SFX_ITEM_AVAILABLE <= GetItemState(nFrom, false) )
return;
// merge new range
@@ -807,7 +807,7 @@ void SfxItemSet::SetRanges( const sal_uInt16 *pNewRanges )
for ( sal_uInt16 nWID = *pRange; nWID <= pRange[1]; ++nWID, ++n )
{
// direct move of pointer (not via pool)
- SfxItemState eState = GetItemState( nWID, sal_False, aNewItems+n );
+ SfxItemState eState = GetItemState( nWID, false, aNewItems+n );
if ( SFX_ITEM_SET == eState )
{
// increment new item count and possibly increment ref count
@@ -917,7 +917,7 @@ bool SfxItemSet::Set
while ( nWhich )
{
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_True, &pItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( nWhich, true, &pItem ) )
bRet |= 0 != Put( *pItem, pItem->Which() );
nWhich = aIter.NextWhich();
}
@@ -932,7 +932,7 @@ bool SfxItemSet::Set
const SfxPoolItem* SfxItemSet::GetItem
(
sal_uInt16 nId, // Slot-Id oder Which-Id des Items
- sal_Bool bSrchInParent, // sal_True: auch in Parent-ItemSets suchen
+ bool bSrchInParent, // sal_True: auch in Parent-ItemSets suchen
TypeId aItemType // != 0 => RTTI Pruefung mit Assertion
) const
@@ -1124,7 +1124,7 @@ void SfxItemSet::Intersect( const SfxItemSet& rSet )
sal_uInt16 nWhich = IsInvalidItem( pItem )
? GetWhichByPos( aIter.GetCurPos() )
: pItem->Which();
- if( 0 == rSet.GetItemState( nWhich, sal_False ) )
+ if( 0 == rSet.GetItemState( nWhich, false ) )
ClearItem( nWhich ); // loeschen
if( aIter.IsAtEnd() )
break;
@@ -1195,7 +1195,7 @@ void SfxItemSet::Differentiate( const SfxItemSet& rSet )
sal_uInt16 nWhich = IsInvalidItem( pItem )
? GetWhichByPos( aIter.GetCurPos() )
: pItem->Which();
- if( SFX_ITEM_SET == rSet.GetItemState( nWhich, sal_False ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( nWhich, false ) )
ClearItem( nWhich ); // loeschen
if( aIter.IsAtEnd() )
break;
@@ -1287,7 +1287,7 @@ unknown unknown != sal_True - - -
static void MergeItem_Impl( SfxItemPool *_pPool, sal_uInt16 &rCount,
const SfxPoolItem **ppFnd1, const SfxPoolItem *pFnd2,
- sal_Bool bIgnoreDefaults )
+ bool bIgnoreDefaults )
{
DBG_ASSERT( ppFnd1 != 0, "Merging to 0-Item" );
@@ -1392,7 +1392,7 @@ void SfxItemSet::MergeValues( const SfxItemSet& rSet, sal_Bool bIgnoreDefaults )
while( 0 != ( nWhich = aIter.NextWhich() ) )
{
const SfxPoolItem* pItem = 0;
- rSet.GetItemState( nWhich, sal_True, &pItem );
+ rSet.GetItemState( nWhich, true, &pItem );
if( !pItem )
{
// nicht gesetzt, also default
@@ -1659,8 +1659,8 @@ bool SfxItemSet::operator==(const SfxItemSet &rCmp) const
// wenn die Pointer von poolable Items ungleich sind,
// muessen die Items gleich sein
const SfxPoolItem *pItem1 = 0, *pItem2 = 0;
- if ( GetItemState( nWh, sal_False, &pItem1 ) !=
- rCmp.GetItemState( nWh, sal_False, &pItem2 ) ||
+ if ( GetItemState( nWh, false, &pItem1 ) !=
+ rCmp.GetItemState( nWh, false, &pItem2 ) ||
( pItem1 != pItem2 &&
( !pItem1 || IsInvalidItem(pItem1) ||
( _pPool->IsItemFlag(*pItem1, SFX_ITEM_POOLABLE) &&
@@ -1711,7 +1711,7 @@ SfxItemSet *SfxItemSet::Clone(sal_Bool bItems, SfxItemPool *pToPool ) const
while ( nWhich )
{
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == GetItemState( nWhich, sal_False, &pItem ) )
+ if ( SFX_ITEM_SET == GetItemState( nWhich, false, &pItem ) )
pNewSet->Put( *pItem, pItem->Which() );
nWhich = aIter.NextWhich();
}
diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index c5a6f28760f3..393f4c9b0cf1 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.cxx
@@ -179,15 +179,15 @@ SvxMacro& SvxMacroTableDtor::Insert(sal_uInt16 nEvent, const SvxMacro& rMacro)
}
// If the entry exists, remove it from the map and release it's storage
-sal_Bool SvxMacroTableDtor::Erase(sal_uInt16 nEvent)
+bool SvxMacroTableDtor::Erase(sal_uInt16 nEvent)
{
SvxMacroTable::iterator it = aSvxMacroTable.find(nEvent);
if ( it != aSvxMacroTable.end())
{
aSvxMacroTable.erase(it);
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
// -----------------------------------------------------------------------
diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index 909c33b78c67..d49a4319218d 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.cxx
@@ -67,7 +67,7 @@ SfxItemPoolCache::~SfxItemPoolCache()
}
-const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, sal_Bool bNew )
+const SfxSetItem& SfxItemPoolCache::ApplyTo( const SfxSetItem &rOrigItem, bool bNew )
{
DBG_CHKTHIS(SfxItemPoolCache, 0);
DBG_ASSERT( pPool == rOrigItem.GetItemSet().GetPool(), "invalid Pool" );
diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 45c1e4c82d51..a6ec3016555d 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.cxx
@@ -187,7 +187,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
pImp->bInSetItem == (bool) (*ppDefItem)->ISA(SfxSetItem) )
{
// eigene Kennung, globale Which-Id und Item-Version
- sal_uInt16 nSlotId = GetSlotId( (*ppDefItem)->Which(), sal_False );
+ sal_uInt16 nSlotId = GetSlotId( (*ppDefItem)->Which(), false );
aWhichIdsRec.NewContent(nSlotId, 0);
rStream.WriteUInt16( (*ppDefItem)->Which() );
rStream.WriteUInt16( nItemVersion );
@@ -256,7 +256,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const
continue;
// eigene Kennung, globale Kennung, Version
- sal_uInt16 nSlotId = GetSlotId( pDefaultItem->Which(), sal_False );
+ sal_uInt16 nSlotId = GetSlotId( pDefaultItem->Which(), false );
aDefsRec.NewContent( nSlotId, 0 );
rStream.WriteUInt16( pDefaultItem->Which() );
rStream.WriteUInt16( nItemVersion );
@@ -1059,7 +1059,7 @@ const SfxPoolItem* SfxItemPool::LoadSurrogate
{
// Bei einem anders aufgebauten Pool im Stream, mu\s die SlotId
// aus dem Stream in eine Which-Id gemappt werden k"onnen.
- sal_uInt16 nMappedWhich = nSlotId ? GetWhich(nSlotId, sal_True) : 0;
+ sal_uInt16 nMappedWhich = nSlotId ? GetWhich(nSlotId, true) : 0;
if ( IsWhich(nMappedWhich) )
{
// gemappte SlotId kann "ubernommen werden
@@ -1479,7 +1479,7 @@ bool SfxItemPool::StoreItem( SvStream &rStream, const SfxPoolItem &rItem,
DBG_ASSERT( !pImp->bInSetItem || !rItem.ISA(SfxSetItem),
"SetItem contains ItemSet with SetItem" );
- sal_uInt16 nSlotId = pPool->GetSlotId( rItem.Which(), sal_True );
+ sal_uInt16 nSlotId = pPool->GetSlotId( rItem.Which(), true );
sal_uInt16 nItemVersion = rItem.GetVersion(pImp->mnFileFormatVersion);
if ( USHRT_MAX == nItemVersion )
return false;
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 5e4ee561b2ab..9da71b854baa 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -398,19 +398,19 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
case MID_SEARCH_CELLTYPE:
rVal <<= (sal_Int32) nCellType; break;
case MID_SEARCH_ROWDIRECTION:
- rVal <<= (sal_Bool) bRowDirection; break;
+ rVal <<= bRowDirection; break;
case MID_SEARCH_ALLTABLES:
- rVal <<= (sal_Bool) bAllTables; break;
+ rVal <<= bAllTables; break;
case MID_SEARCH_SEARCHFILTERED:
- rVal <<= (sal_Bool) bSearchFiltered; break;
+ rVal <<= bSearchFiltered; break;
case MID_SEARCH_BACKWARD:
- rVal <<= (sal_Bool) bBackward; break;
+ rVal <<= bBackward; break;
case MID_SEARCH_PATTERN:
- rVal <<= (sal_Bool) bPattern; break;
+ rVal <<= bPattern; break;
case MID_SEARCH_CONTENT:
- rVal <<= (sal_Bool) bContent; break;
+ rVal <<= bContent; break;
case MID_SEARCH_ASIANOPTIONS:
- rVal <<= (sal_Bool) bAsianOptions; break;
+ rVal <<= bAsianOptions; break;
case MID_SEARCH_ALGORITHMTYPE:
rVal <<= (sal_Int16) aSearchOpt.algorithmType; break;
case MID_SEARCH_FLAGS:
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index 9bceaf6559d1..dbd8ec5c37cf 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.cxx
@@ -33,7 +33,7 @@ SfxVisibilityItem::SfxVisibilityItem(sal_uInt16 which, SvStream & rStream):
SfxPoolItem(which)
{
DBG_CTOR(SfxVisibilityItem, 0);
- sal_Bool bValue = 0;
+ unsigned char bValue = 0;
rStream.ReadUChar( bValue );
m_nValue.bVisible = bValue;
}
generated by cgit (git 2.34.1) at 2025-01-09 22:41:10 +0000