diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2013-10-07 17:02:13 +0900 |
|---|---|---|
| committer | Takeshi Abe <tabe@fixedpoint.jp> | 2013-10-07 17:08:18 +0900 |
| commit | d57010faf14c7bf2efc0eeb37249b671f7ea986b (patch) | |
| tree | 119673b65bb1900c199970e5f36988205b57a118 /basic/source/sbx | |
| parent | aa52753785154f0e95fed559f613f5eae9105dcf (diff) | |
sal_Bool to bool
Change-Id: Ie8e35c4342db6e2dc35fca33cee7b4d71cfcb732
Diffstat (limited to 'basic/source/sbx')
| -rw-r--r-- | basic/source/sbx/sbxobj.cxx | 12 | ||||
| -rw-r--r-- | basic/source/sbx/sbxvalue.cxx | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/basic/source/sbx/sbxobj.cxx b/basic/source/sbx/sbxobj.cxx index ea82ec7a0c7c..46244abd3be7 100644 --- a/basic/source/sbx/sbxobj.cxx +++ b/basic/source/sbx/sbxobj.cxx @@ -592,12 +592,12 @@ void SbxObject::Remove( SbxVariable* pVar ) } } -static sal_Bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray ) +static bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray ) { SbxArrayRef p = (SbxArray*) SbxBase::Load( rStrm ); if( !p.Is() ) { - return sal_False; + return false; } for( sal_uInt16 i = 0; i < p->Count(); i++ ) { @@ -610,7 +610,7 @@ static sal_Bool LoadArray( SvStream& rStrm, SbxObject* pThis, SbxArray* pArray ) } } pArray->Merge( p ); - return sal_True; + return true; } // The load of an object is additive! @@ -758,7 +758,7 @@ OUString SbxObject::GenerateSource( const OUString &rLinePrefix, return aSource; } -static sal_Bool CollectAttrs( const SbxBase* p, OUString& rRes ) +static bool CollectAttrs( const SbxBase* p, OUString& rRes ) { OUString aAttrs; if( p->IsHidden() ) @@ -794,12 +794,12 @@ static sal_Bool CollectAttrs( const SbxBase* p, OUString& rRes ) rRes = " ("; rRes += aAttrs; rRes += ")"; - return sal_True; + return true; } else { rRes = ""; - return sal_False; + return false; } } diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx index 3deced11ec62..43c98835a4d3 100644 --- a/basic/source/sbx/sbxvalue.cxx +++ b/basic/source/sbx/sbxvalue.cxx @@ -191,7 +191,7 @@ void SbxValue::Clear() { SAL_WARN("basic.sbx", "Not at Parent-Prop - otherwise CyclicRef"); SbxVariable *pThisVar = PTR_CAST(SbxVariable, this); - sal_Bool bParentProp = pThisVar && 5345 == + bool bParentProp = pThisVar && 5345 == ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) ); if ( !bParentProp ) aData.pObj->ReleaseRef(); @@ -540,7 +540,7 @@ sal_Bool SbxValue::Put( const SbxValues& rVal ) } SAL_WARN("basic.sbx", "Not at Parent-Prop - otherwise CyclicRef"); SbxVariable *pThisVar = PTR_CAST(SbxVariable, this); - sal_Bool bParentProp = pThisVar && 5345 == + bool bParentProp = pThisVar && 5345 == ( (sal_Int16) ( pThisVar->GetUserData() & 0xFFFF ) ); if ( !bParentProp ) p->aData.pObj->AddRef(); @@ -809,7 +809,7 @@ sal_Bool SbxValue::SetType( SbxDataType t ) : 0; DBG_ASSERT( nSlotId != 5345 || pThisVar->GetName().equalsAscii("Parent"), "SID_PARENTOBJECT is not named 'Parent'" ); - sal_Bool bParentProp = 5345 == nSlotId; + bool bParentProp = 5345 == nSlotId; if ( !bParentProp ) aData.pObj->ReleaseRef(); } |