summaryrefslogtreecommitdiff
path: root/svl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-22 14:58:57 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-22 15:00:54 +0100
commitbbd9668d5f70d8ff00a7b10915e7a16ceadb8443 (patch)
tree4e65b4d58e6a4298219b1909f524b710677606d9 /svl
parent4eda1a0293a869bf804056f1e9e04c984c69454d (diff)
bool improvements (related to mixing bool/sal_Bool in &=, |=, ^=)
Change-Id: I9869d9709f28b68ef7b518527175589d80644668
Diffstat (limited to 'svl')
-rw-r--r--svl/source/items/itemset.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index c17af642d95c..bc27dd128b5a 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.cxx
@@ -633,7 +633,7 @@ const SfxPoolItem* SfxItemSet::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich
int SfxItemSet::Put( const SfxItemSet& rSet, sal_Bool bInvalidAsDefault )
{
DBG_CHKTHIS(SfxItemSet, DbgCheckItemSet);
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if( rSet.Count() )
{
SfxItemArray ppFnd = rSet._aItems;
@@ -658,7 +658,7 @@ int SfxItemSet::Put( const SfxItemSet& rSet, sal_Bool bInvalidAsDefault )
pPtr += 2;
}
}
- return bRet;
+ return int(bRet);
}
// -----------------------------------------------------------------------