diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-02-16 22:51:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-02-17 17:55:19 +0100 |
| commit | 05f742d28b3786f44781af5b069c05c16b84decd (patch) | |
| tree | dacb340f99ad4e47d20557eee04e6f69f5d15721 /comphelper | |
| parent | faced6b5f72b096800a232749cce6b38a76d5bac (diff) | |
comphelper: sal_Bool -> bool
Change-Id: I6fc331ae0706f4bb193543011c8d4ae0a385fcc0
Diffstat (limited to 'comphelper')
45 files changed, 306 insertions, 306 deletions
diff --git a/comphelper/source/container/container.cxx b/comphelper/source/container/container.cxx index 036375bcb97a..d3b440465de0 100644 --- a/comphelper/source/container/container.cxx +++ b/comphelper/source/container/container.cxx @@ -41,23 +41,23 @@ IndexAccessIterator::~IndexAccessIterator() {} //------------------------------------------------------------------------------ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> IndexAccessIterator::Next() { - sal_Bool bCheckingStartingPoint = !m_xCurrentObject.is(); + bool bCheckingStartingPoint = !m_xCurrentObject.is(); // Is the current node the starting point? - sal_Bool bAlreadyCheckedCurrent = m_xCurrentObject.is(); + bool bAlreadyCheckedCurrent = m_xCurrentObject.is(); // Have I already tested the current node through ShouldHandleElement? if (!m_xCurrentObject.is()) m_xCurrentObject = m_xStartingPoint; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xSearchLoop( m_xCurrentObject); - sal_Bool bHasMoreToSearch = sal_True; - sal_Bool bFoundSomething = sal_False; + bool bHasMoreToSearch = true; + bool bFoundSomething = false; while (!bFoundSomething && bHasMoreToSearch) { // Priming loop if (!bAlreadyCheckedCurrent && ShouldHandleElement(xSearchLoop)) { m_xCurrentObject = xSearchLoop; - bFoundSomething = sal_True; + bFoundSomething = true; } else { @@ -67,7 +67,7 @@ IndexAccessIterator::~IndexAccessIterator() {} { ::com::sun::star::uno::Any aElement(xContainerAccess->getByIndex(0)); xSearchLoop = *(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*)aElement.getValue(); - bCheckingStartingPoint = sal_False; + bCheckingStartingPoint = false; m_arrChildIndizies.push_back((sal_Int32)0); } @@ -92,7 +92,7 @@ IndexAccessIterator::~IndexAccessIterator() {} // and check the next child ::com::sun::star::uno::Any aElement(xContainerAccess->getByIndex(nOldSearchChildIndex)); xSearchLoop = *(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>*) aElement.getValue(); - bCheckingStartingPoint = sal_False; + bCheckingStartingPoint = false; // and update its position in the list. m_arrChildIndizies.push_back((sal_Int32)nOldSearchChildIndex); @@ -100,12 +100,12 @@ IndexAccessIterator::~IndexAccessIterator() {} } // Finally, if there's nothing more to do in this row (to the right), we'll move on to the next row. xSearchLoop = xParent; - bCheckingStartingPoint = sal_False; + bCheckingStartingPoint = false; } if (m_arrChildIndizies.empty() && !bCheckingStartingPoint) { //This is the case if there is nothing to the right in the original search loop - bHasMoreToSearch = sal_False; + bHasMoreToSearch = false; } } @@ -114,12 +114,12 @@ IndexAccessIterator::~IndexAccessIterator() {} if (ShouldHandleElement(xSearchLoop)) { m_xCurrentObject = xSearchLoop; - bFoundSomething = sal_True; + bFoundSomething = true; } else if (bCheckingStartingPoint) - bHasMoreToSearch = sal_False; - bAlreadyCheckedCurrent = sal_True; + bHasMoreToSearch = false; + bAlreadyCheckedCurrent = true; } } } diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 2d7df99a0e25..eaa97721f1a8 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -60,7 +60,7 @@ struct hashObjectName_Impl struct eqObjectName_Impl { - sal_Bool operator()(const OUString Str1, const OUString Str2) const + bool operator()(const OUString Str1, const OUString Str2) const { return ( Str1 == Str2 ); } @@ -148,13 +148,13 @@ void EmbeddedObjectContainer::SwitchPersistence( const uno::Reference < embed::X pImpl->bOwnsStorage = false; } -sal_Bool EmbeddedObjectContainer::CommitImageSubStorage() +bool EmbeddedObjectContainer::CommitImageSubStorage() { if ( pImpl->mxImageStorage.is() ) { try { - sal_Bool bReadOnlyMode = sal_True; + bool bReadOnlyMode = true; uno::Reference < beans::XPropertySet > xSet(pImpl->mxImageStorage,uno::UNO_QUERY); if ( xSet.is() ) { @@ -172,11 +172,11 @@ sal_Bool EmbeddedObjectContainer::CommitImageSubStorage() } catch (const uno::Exception&) { - return sal_False; + return false; } } - return sal_True; + return true; } void EmbeddedObjectContainer::ReleaseImageSubStorage() @@ -255,12 +255,12 @@ uno::Sequence < OUString > EmbeddedObjectContainer::GetObjectNames() return aSeq; } -sal_Bool EmbeddedObjectContainer::HasEmbeddedObjects() +bool EmbeddedObjectContainer::HasEmbeddedObjects() { return pImpl->maObjectContainer.size() != 0; } -sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const OUString& rName ) +bool EmbeddedObjectContainer::HasEmbeddedObject( const OUString& rName ) { EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.find( rName ); if ( aIt == pImpl->maObjectContainer.end() ) @@ -269,24 +269,24 @@ sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const OUString& rName ) return xAccess->hasByName(rName); } else - return sal_True; + return true; } -sal_Bool EmbeddedObjectContainer::HasEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj ) +bool EmbeddedObjectContainer::HasEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj ) { EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); while ( aIt != pImpl->maObjectContainer.end() ) { if ( (*aIt).second == xObj ) - return sal_True; + return true; else ++aIt; } - return sal_False; + return false; } -sal_Bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const OUString& rName ) +bool EmbeddedObjectContainer::HasInstantiatedEmbeddedObject( const OUString& rName ) { // allows to detect whether the object was already instantiated // currently the filter instantiate it on loading, so this method allows @@ -347,7 +347,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( con { // create the object from the storage uno::Reference < beans::XPropertySet > xSet( pImpl->mxStorage, uno::UNO_QUERY ); - sal_Bool bReadOnlyMode = sal_True; + bool bReadOnlyMode = true; if ( xSet.is() ) { // get the open mode from the parent storage @@ -493,7 +493,7 @@ void EmbeddedObjectContainer::AddEmbeddedObject( const ::com::sun::star::uno::Re } } -sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName, sal_Bool bCopy ) +bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName, bool bCopy ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::StoreEmbeddedObject" ); @@ -528,24 +528,24 @@ sal_Bool EmbeddedObjectContainer::StoreEmbeddedObject( const uno::Reference < em { SAL_WARN("comphelper.container", "EmbeddedObjectContainer::StoreEmbeddedObject: exception caught: " << e.Message); // TODO/LATER: better error recovery should keep storage intact - return sal_False; + return false; } - return sal_True; + return true; } -sal_Bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) +bool EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertEmbeddedObject( Object )" ); // store it into the container storage - if ( StoreEmbeddedObject( xObj, rName, sal_False ) ) + if ( StoreEmbeddedObject( xObj, rName, false ) ) { // remember object AddEmbeddedObject( xObj, rName ); - return sal_True; + return true; } else - return sal_False; + return false; } uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbeddedObject( const uno::Reference < io::XInputStream >& xStm, OUString& rNewName ) @@ -556,14 +556,14 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde rNewName = CreateUniqueObjectName(); // store it into the container storage - sal_Bool bIsStorage = sal_False; + bool bIsStorage = false; try { // first try storage persistence uno::Reference < embed::XStorage > xStore = ::comphelper::OStorageHelper::GetStorageFromInputStream( xStm ); // storage was created from stream successfully - bIsStorage = sal_True; + bIsStorage = true; uno::Reference < embed::XStorage > xNewStore = pImpl->mxStorage->openStorageElement( rNewName, embed::ElementModes::READWRITE ); xStore->copyToStorage( xNewStore ); @@ -681,13 +681,13 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::InsertEmbedde return xObj; } -sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc, +bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectContainer& rSrc, const OUString& aOrigName, const OUString& aTargetName ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::TryToCopyGraphReplacement" ); - sal_Bool bResult = sal_False; + bool bResult = false; if ( ( &rSrc != this || !aOrigName.equals( aTargetName ) ) && !aOrigName.isEmpty() && !aTargetName.isEmpty() ) { @@ -722,7 +722,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb rName = CreateUniqueObjectName(); // objects without persistance are not really stored by the method - if ( xObj.is() && StoreEmbeddedObject( xObj, rName, sal_True ) ) + if ( xObj.is() && StoreEmbeddedObject( xObj, rName, true ) ) { xResult = Get_Impl( rName, xObj); if ( !xResult.is() ) @@ -853,7 +853,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb return xResult; } -sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) +bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, OUString& rName ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Object )" ); @@ -864,7 +864,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r aName = xPersist->getEntryName(); // now move the object to the new container; the returned name is the new persist name in this container - sal_Bool bRet; + bool bRet; try { @@ -875,20 +875,20 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r catch (const uno::Exception&) { SAL_WARN( "comphelper.container", "Failed to insert embedded object into storage!" ); - bRet = sal_False; + bRet = false; } if ( bRet ) { // now remove the object from the former container - bRet = sal_False; + bRet = false; EmbeddedObjectContainerNameMap::iterator aIt = rSrc.pImpl->maObjectContainer.begin(); while ( aIt != rSrc.pImpl->maObjectContainer.end() ) { if ( (*aIt).second == xObj ) { rSrc.pImpl->maObjectContainer.erase( aIt ); - bRet = sal_True; + bRet = true; break; } @@ -907,7 +907,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r catch (const uno::Exception&) { SAL_WARN( "comphelper.container", "Failed to remove object from storage!" ); - bRet = sal_False; + bRet = false; } } @@ -918,7 +918,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( EmbeddedObjectContainer& r } // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+ -sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, sal_Bool bClose, sal_Bool bKeepToTempStorage ) +bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, bool bClose, bool bKeepToTempStorage ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Name )" ); @@ -927,10 +927,10 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const OUString& rName, s //return RemoveEmbeddedObject( xObj, bClose ); return RemoveEmbeddedObject( xObj, bClose, bKeepToTempStorage ); else - return sal_False; + return false; } -sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& rCnt ) +bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, EmbeddedObjectContainer& rCnt ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::MoveEmbeddedObject( Name )" ); @@ -939,7 +939,7 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, Emb OSL_ENSURE( aIt2 == rCnt.pImpl->maObjectContainer.end(), "Object does already exist in target container!" ); if ( aIt2 != rCnt.pImpl->maObjectContainer.end() ) - return sal_False; + return false; uno::Reference < embed::XEmbeddedObject > xObj; EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.find( rName ); @@ -969,23 +969,23 @@ sal_Bool EmbeddedObjectContainer::MoveEmbeddedObject( const OUString& rName, Emb rCnt.TryToCopyGraphReplacement( *this, rName, rName ); // RemoveGraphicStream( rName ); - return sal_True; + return true; } catch (const uno::Exception&) { SAL_WARN( "comphelper.container", "Could not move object!"); - return sal_False; + return false; } } else SAL_WARN( "comphelper.container", "Unknown object!"); - return sal_False; + return false; } //sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, sal_Bool bClose ) // #i119941, bKeepToTempStorage: use to specify whether store the removed object to temporary storage+ -sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, sal_Bool bClose, sal_Bool bKeepToTempStorage ) +bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj, bool bClose, bool bKeepToTempStorage ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveEmbeddedObject( Object )" ); @@ -1013,7 +1013,7 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e } catch (const util::CloseVetoException&) { - bClose = sal_False; + bClose = false; } } @@ -1081,18 +1081,18 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e } catch (const uno::Exception&) { - return sal_False; + return false; } } - sal_Bool bFound = sal_False; + bool bFound = false; EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); while ( aIt != pImpl->maObjectContainer.end() ) { if ( (*aIt).second == xObj ) { pImpl->maObjectContainer.erase( aIt ); - bFound = sal_True; + bFound = true; uno::Reference < container::XChild > xChild( xObj, uno::UNO_QUERY ); if ( xChild.is() ) xChild->setParent( uno::Reference < uno::XInterface >() ); @@ -1122,27 +1122,27 @@ sal_Bool EmbeddedObjectContainer::RemoveEmbeddedObject( const uno::Reference < e catch (const uno::Exception&) { SAL_WARN( "comphelper.container", "Failed to remove object from storage!" ); - return sal_False; + return false; } } - return sal_True; + return true; } -sal_Bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj ) +bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed::XEmbeddedObject >& xObj ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CloseEmbeddedObject" ); // disconnect the object from the container and close it if possible - sal_Bool bFound = sal_False; + bool bFound = false; EmbeddedObjectContainerNameMap::iterator aIt = pImpl->maObjectContainer.begin(); while ( aIt != pImpl->maObjectContainer.end() ) { if ( (*aIt).second == xObj ) { pImpl->maObjectContainer.erase( aIt ); - bFound = sal_True; + bFound = true; break; } @@ -1220,7 +1220,7 @@ uno::Reference < io::XInputStream > EmbeddedObjectContainer::GetGraphicStream( c return GetGraphicStream( aName, pMediaType ); } -sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) +bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertGraphicStream" ); @@ -1251,13 +1251,13 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStream( const com::sun::star::uno } catch (const uno::Exception&) { - return sal_False; + return false; } - return sal_True; + return true; } -sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) +bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& rStream, const OUString& rObjectName, const OUString& rMediaType ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::InsertGraphicStreamDirectly" ); @@ -1282,14 +1282,14 @@ sal_Bool EmbeddedObjectContainer::InsertGraphicStreamDirectly( const com::sun::s } catch (const uno::Exception&) { - return sal_False; + return false; } - return sal_True; + return true; } -sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName ) +bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectName ) { SAL_INFO( "comphelper.container", "comphelper (mv76033) comphelper::EmbeddedObjectContainer::RemoveGraphicStream" ); @@ -1300,10 +1300,10 @@ sal_Bool EmbeddedObjectContainer::RemoveGraphicStream( const OUString& rObjectNa } catch (const uno::Exception&) { - return sal_False; + return false; } - return sal_True; + return true; } namespace { void InsertStreamIntoPicturesStorage_Impl( const uno::Reference< embed::XStorage >& xDocStor, @@ -1338,9 +1338,9 @@ namespace { } // ----------------------------------------------------------------------------- -sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Bool _bCreateEmbedded,const uno::Reference < embed::XStorage >& _xStorage) +bool EmbeddedObjectContainer::StoreAsChildren(bool _bOasisFormat,bool _bCreateEmbedded,const uno::Reference < embed::XStorage >& _xStorage) { - sal_Bool bResult = sal_False; + bool bResult = false; try { comphelper::EmbeddedObjectContainer aCnt( _xStorage ); @@ -1353,7 +1353,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo SAL_WARN_IF( !xObj.is(), "comphelper.container", "An empty entry in the embedded objects list!\n" ); if ( xObj.is() ) { - sal_Bool bSwitchBackToLoaded = sal_False; + bool bSwitchBackToLoaded = false; uno::Reference< embed::XLinkageSupport > xLink( xObj, uno::UNO_QUERY ); uno::Reference < io::XInputStream > xStream; @@ -1372,7 +1372,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo // the image must be regenerated // TODO/LATER: another aspect could be used if ( xObj->getCurrentState() == embed::EmbedStates::LOADED ) - bSwitchBackToLoaded = sal_True; + bSwitchBackToLoaded = true; xStream = GetGraphicReplacementStream( embed::Aspects::MSOLE_CONTENT, @@ -1404,7 +1404,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo { uno::Sequence< beans::PropertyValue > aArgs( _bOasisFormat ? 2 : 3 ); aArgs[0].Name = "StoreVisualReplacement"; - aArgs[0].Value <<= (sal_Bool)( !_bOasisFormat ); + aArgs[0].Value <<= !_bOasisFormat; // if it is an embedded object or the optimized inserting fails the normal inserting should be done aArgs[1].Name = "CanTryOptimization"; @@ -1438,7 +1438,7 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo catch (const uno::Exception& e) { // TODO/LATER: error handling - bResult = sal_False; + bResult = false; SAL_WARN("comphelper.container", "failed. Message: " << e.Message); } @@ -1455,15 +1455,15 @@ sal_Bool EmbeddedObjectContainer::StoreAsChildren(sal_Bool _bOasisFormat,sal_Boo catch (const uno::Exception&) { // TODO/LATER: error handling; - bResult = sal_False; + bResult = false; } } return bResult; } // ----------------------------------------------------------------------------- -sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool _bObjectsOnly) +bool EmbeddedObjectContainer::StoreChildren(bool _bOasisFormat,bool _bObjectsOnly) { - sal_Bool bResult = sal_True; + bool bResult = true; const uno::Sequence < OUString > aNames = GetObjectNames(); const OUString* pIter = aNames.getConstArray(); const OUString* pEnd = pIter + aNames.getLength(); @@ -1534,7 +1534,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool catch (const uno::Exception&) { // TODO/LATER: error handling - bResult = sal_False; + bResult = false; break; } } @@ -1575,7 +1575,7 @@ sal_Bool EmbeddedObjectContainer::StoreChildren(sal_Bool _bOasisFormat,sal_Bool catch (const uno::Exception&) { // TODO/LATER: error handling - bResult = sal_False; + bResult = false; } } return bResult; @@ -1608,9 +1608,9 @@ uno::Reference< io::XInputStream > EmbeddedObjectContainer::GetGraphicReplacemen return xInStream; } // ----------------------------------------------------------------------------- -sal_Bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::XStorage >& _xStorage,bool _bClearModifedFlag) +bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed::XStorage >& _xStorage,bool _bClearModifedFlag) { - sal_Bool bError = sal_False; + bool bError = false; const uno::Sequence < OUString > aNames = GetObjectNames(); const OUString* pIter = aNames.getConstArray(); const OUString* pEnd = pIter + aNames.getLength(); @@ -1635,7 +1635,7 @@ sal_Bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< emb catch (const uno::Exception&) { // TODO/LATER: error handling - bError = sal_True; + bError = true; break; } } diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 207680e172ea..d2432d2e8cd6 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -280,7 +280,7 @@ namespace comphelper } // XEnumeration equivalents - ::sal_Bool hasMoreElements(); + bool hasMoreElements(); Any nextElement(); // IMapModificationListener @@ -725,7 +725,7 @@ namespace comphelper //= MapEnumerator //==================================================================== //-------------------------------------------------------------------- - ::sal_Bool MapEnumerator::hasMoreElements() + bool MapEnumerator::hasMoreElements() { if ( m_disposed ) throw DisposedException( OUString(), m_rParent ); diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index b48e67eae2ed..168cac43e5b9 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -33,7 +33,7 @@ OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::X :m_aNames(_rxAccess->getElementNames()) ,m_nPos(0) ,m_xAccess(_rxAccess) - ,m_bListening(sal_False) + ,m_bListening(false) { impl_startDisposeListening(); } @@ -44,7 +44,7 @@ OEnumerationByName::OEnumerationByName(const staruno::Reference<starcontainer::X :m_aNames(_aNames) ,m_nPos(0) ,m_xAccess(_rxAccess) - ,m_bListening(sal_False) + ,m_bListening(false) { impl_startDisposeListening(); } @@ -117,7 +117,7 @@ void OEnumerationByName::impl_startDisposeListening() if (xDisposable.is()) { xDisposable->addEventListener(this); - m_bListening = sal_True; + m_bListening = true; } --m_refCount; } @@ -135,7 +135,7 @@ void OEnumerationByName::impl_stopDisposeListening() if (xDisposable.is()) { xDisposable->removeEventListener(this); - m_bListening = sal_False; + m_bListening = false; } --m_refCount; } @@ -147,7 +147,7 @@ void OEnumerationByName::impl_stopDisposeListening() OEnumerationByIndex::OEnumerationByIndex(const staruno::Reference< starcontainer::XIndexAccess >& _rxAccess) :m_nPos(0) ,m_xAccess(_rxAccess) - ,m_bListening(sal_False) + ,m_bListening(false) { impl_startDisposeListening(); } @@ -220,7 +220,7 @@ void OEnumerationByIndex::impl_startDisposeListening() if (xDisposable.is()) { xDisposable->addEventListener(this); - m_bListening = sal_True; + m_bListening = true; } --m_refCount; } @@ -238,7 +238,7 @@ void OEnumerationByIndex::impl_stopDisposeListening() if (xDisposable.is()) { xDisposable->removeEventListener(this); - m_bListening = sal_False; + m_bListening = false; } --m_refCount; } diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx index d4cca73a7da0..e5daf792d2b7 100644 --- a/comphelper/source/misc/SelectionMultiplex.cxx +++ b/comphelper/source/misc/SelectionMultiplex.cxx @@ -68,11 +68,11 @@ void OSelectionChangeListener::setAdapter(OSelectionChangeMultiplexer* pAdapter) //= OSelectionChangeMultiplexer //======================================================================== //------------------------------------------------------------------ -OSelectionChangeMultiplexer::OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const Reference< XSelectionSupplier>& _rxSet, sal_Bool _bAutoReleaseSet) +OSelectionChangeMultiplexer::OSelectionChangeMultiplexer(OSelectionChangeListener* _pListener, const Reference< XSelectionSupplier>& _rxSet, bool _bAutoReleaseSet) :m_xSet(_rxSet) ,m_pListener(_pListener) ,m_nLockCount(0) - ,m_bListening(sal_False) + ,m_bListening(false) ,m_bAutoSetRelease(_bAutoReleaseSet) { m_pListener->setAdapter(this); @@ -113,7 +113,7 @@ void OSelectionChangeMultiplexer::dispose() m_pListener->setAdapter(NULL); m_pListener = NULL; - m_bListening = sal_False; + m_bListening = false; if (m_bAutoSetRelease) m_xSet = NULL; @@ -135,7 +135,7 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSour } m_pListener = NULL; - m_bListening = sal_False; + m_bListening = false; if (m_bAutoSetRelease) m_xSet = NULL; diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 816b24b30f3f..2fdaf84f12a6 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -44,7 +44,7 @@ namespace comphelper } //-------------------------------------------------------------------- - sal_Bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) throw (RuntimeException) + bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) throw (RuntimeException) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index 3b7836377698..f4d9df56bc86 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -196,7 +196,7 @@ namespace comphelper } //--------------------------------------------------------------------- - sal_Bool OAccessibleContextHelper::isAlive() const + bool OAccessibleContextHelper::isAlive() const { return !GetBroadcastHelper().bDisposed && !GetBroadcastHelper().bInDispose; } diff --git a/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx index c46d54a33420..be60fe3d9824 100644 --- a/comphelper/source/misc/accessibleeventnotifier.cxx +++ b/comphelper/source/misc/accessibleeventnotifier.cxx @@ -128,7 +128,7 @@ namespace <TRUE/> if and only if the client could be found and <arg>rPos</arg> has been filled with it's position */ - static sal_Bool implLookupClient( + static bool implLookupClient( const AccessibleEventNotifier::TClientId nClient, ClientMap::iterator& rPos ) { diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index dea19d29b880..ed93e6888a57 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.cxx @@ -46,7 +46,7 @@ namespace comphelper } //-------------------------------------------------------------------- - sal_Bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) { return( implIsSelected( nChildIndex ) ); } diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index 224a81ac6774..d21d7ff3cc41 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -81,21 +81,21 @@ namespace comphelper // ----------------------------------------------------------------------------- - sal_Bool OCommonAccessibleText::implIsValidBoundary( i18n::Boundary& rBoundary, sal_Int32 nLength ) + bool OCommonAccessibleText::implIsValidBoundary( i18n::Boundary& rBoundary, sal_Int32 nLength ) { return ( rBoundary.startPos >= 0 ) && ( rBoundary.startPos < nLength ) && ( rBoundary.endPos >= 0 ) && ( rBoundary.endPos <= nLength ); } // ----------------------------------------------------------------------------- - sal_Bool OCommonAccessibleText::implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ) + bool OCommonAccessibleText::implIsValidIndex( sal_Int32 nIndex, sal_Int32 nLength ) { return ( nIndex >= 0 ) && ( nIndex < nLength ); } // ----------------------------------------------------------------------------- - sal_Bool OCommonAccessibleText::implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ) + bool OCommonAccessibleText::implIsValidRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex, sal_Int32 nLength ) { return ( nStartIndex >= 0 ) && ( nStartIndex <= nLength ) && ( nEndIndex >= 0 ) && ( nEndIndex <= nLength ); } @@ -133,9 +133,9 @@ namespace comphelper // ----------------------------------------------------------------------------- - sal_Bool OCommonAccessibleText::implGetWordBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) + bool OCommonAccessibleText::implGetWordBoundary( i18n::Boundary& rBoundary, sal_Int32 nIndex ) { - sal_Bool bWord = sal_False; + bool bWord = false; OUString sText( implGetText() ); if ( implIsValidIndex( nIndex, sText.getLength() ) ) @@ -151,7 +151,7 @@ namespace comphelper { sal_Int32 nType = xCharClass->getCharacterType( sText, rBoundary.startPos, implGetLocale() ); if ( ( nType & ( i18n::KCharacterType::LETTER | i18n::KCharacterType::DIGIT ) ) != 0 ) - bWord = sal_True; + bWord = true; } } } @@ -360,7 +360,7 @@ namespace comphelper case AccessibleTextType::WORD: { // get word at index - sal_Bool bWord = implGetWordBoundary( aBoundary, nIndex ); + bool bWord = implGetWordBoundary( aBoundary, nIndex ); if ( bWord && implIsValidBoundary( aBoundary, nLength ) ) { aResult.SegmentText = sText.copy( aBoundary.startPos, aBoundary.endPos - aBoundary.startPos ); @@ -472,7 +472,7 @@ namespace comphelper // get word at index implGetWordBoundary( aBoundary, nIndex ); // get previous word - sal_Bool bWord = sal_False; + bool bWord = false; while ( !bWord && aBoundary.startPos > 0 ) bWord = implGetWordBoundary( aBoundary, aBoundary.startPos - 1 ); if ( bWord && implIsValidBoundary( aBoundary, nLength ) ) @@ -597,7 +597,7 @@ namespace comphelper // get word at index implGetWordBoundary( aBoundary, nIndex ); // get next word - sal_Bool bWord = sal_False; + bool bWord = false; while ( !bWord && aBoundary.endPos < nLength ) bWord = implGetWordBoundary( aBoundary, aBoundary.endPos ); if ( bWord && implIsValidBoundary( aBoundary, nLength ) ) @@ -615,7 +615,7 @@ namespace comphelper // get next sentence sal_Int32 nEnd = aBoundary.endPos; sal_Int32 nI = aBoundary.endPos; - sal_Bool bFound = sal_False; + bool bFound = false; while ( !bFound && ++nI < nLength ) { implGetSentenceBoundary( aBoundary, nI ); diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 7f47f62f246a..f189530365f0 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -75,7 +75,7 @@ namespace comphelper //------------------------------------------------------------------------- OWrappedAccessibleChildrenManager::OWrappedAccessibleChildrenManager( const Reference< XComponentContext >& _rxContext ) :m_xContext( _rxContext ) - ,m_bTransientChildren( sal_True ) + ,m_bTransientChildren( true ) { } @@ -85,7 +85,7 @@ namespace comphelper } //------------------------------------------------------------------------- - void OWrappedAccessibleChildrenManager::setTransientChildren( sal_Bool _bSet ) + void OWrappedAccessibleChildrenManager::setTransientChildren( bool _bSet ) { m_bTransientChildren = _bSet; } @@ -123,7 +123,7 @@ namespace comphelper //------------------------------------------------------------------------- Reference< XAccessible > OWrappedAccessibleChildrenManager::getAccessibleWrapperFor( - const Reference< XAccessible >& _rxKey, sal_Bool _bCreate ) + const Reference< XAccessible >& _rxKey, bool _bCreate ) { Reference< XAccessible > xValue; @@ -185,7 +185,7 @@ namespace comphelper _rOutValue.clear(); Reference< XAccessible > xChild; if ( _rInValue >>= xChild ) - _rOutValue <<= getAccessibleWrapperFor( xChild, sal_True ); + _rOutValue <<= getAccessibleWrapperFor( xChild, true ); } //------------------------------------------------------------------------- @@ -460,7 +460,7 @@ namespace comphelper #if OSL_DEBUG_LEVEL > 0 if ( AccessibleEventId::STATE_CHANGED == _rEvent.EventId ) { - sal_Bool bChildTransienceChanged = sal_False; + bool bChildTransienceChanged = false; sal_Int16 nChangeState = 0; if ( _rEvent.OldValue >>= nChangeState ) bChildTransienceChanged = bChildTransienceChanged || AccessibleStateType::MANAGES_DESCENDANTS == nChangeState; diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index 32e4cecc244b..b84853a27e25 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -139,7 +139,7 @@ namespace comphelper } //--------------------------------------------------------------------- - sal_Bool OAccessibleImplementationAccess::setAccessibleParent( + bool OAccessibleImplementationAccess::setAccessibleParent( const Reference< XAccessibleContext >& _rxComponent, const Reference< XAccessible >& _rxNewParent ) { OAccessibleImplementationAccess* pImplementation = getImplementation( _rxComponent ); diff --git a/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx index 14b82de407ff..4cb1cb1c812f 100644 --- a/comphelper/source/misc/configurationhelper.cxx +++ b/comphelper/source/misc/configurationhelper.cxx @@ -53,7 +53,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons } // enable lazy writing - sal_Bool bLazy = ((eMode & ConfigurationHelper::E_LAZY_WRITE)==ConfigurationHelper::E_LAZY_WRITE); + bool bLazy = ((eMode & ConfigurationHelper::E_LAZY_WRITE)==ConfigurationHelper::E_LAZY_WRITE); aParam.Name = "lazywrite"; aParam.Value = css::uno::makeAny(bLazy); lParams.push_back(css::uno::makeAny(aParam)); @@ -61,7 +61,7 @@ css::uno::Reference< css::uno::XInterface > ConfigurationHelper::openConfig(cons // open it css::uno::Reference< css::uno::XInterface > xCFG; - sal_Bool bReadOnly = ((eMode & ConfigurationHelper::E_READONLY)==ConfigurationHelper::E_READONLY); + bool bReadOnly = ((eMode & ConfigurationHelper::E_READONLY)==ConfigurationHelper::E_READONLY); if (bReadOnly) xCFG = xConfigProvider->createInstanceWithArguments( OUString("com.sun.star.configuration.ConfigurationAccess"), diff --git a/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx index 72b8636cbe7b..a690658ee84e 100644 --- a/comphelper/source/misc/docpasswordhelper.cxx +++ b/comphelper/source/misc/docpasswordhelper.cxx @@ -95,9 +95,9 @@ uno::Sequence< beans::PropertyValue > DocPasswordHelper::GenerateNewModifyPasswo } // ============================================================================ -sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const OUString& aPassword, const uno::Sequence< beans::PropertyValue >& aInfo ) +bool DocPasswordHelper::IsModifyPasswordCorrect( const OUString& aPassword, const uno::Sequence< beans::PropertyValue >& aInfo ) { - sal_Bool bResult = sal_False; + bool bResult = false; if ( !aPassword.isEmpty() && aInfo.getLength() ) { OUString sAlgorithm; @@ -123,7 +123,7 @@ sal_Bool DocPasswordHelper::IsModifyPasswordCorrect( const OUString& aPassword, for ( sal_Int32 nInd = 0; nInd < aNewHash.getLength() && nInd < aHash.getLength() && aNewHash[nInd] == aHash[nInd]; nInd ++ ) { if ( nInd == aNewHash.getLength() - 1 && nInd == aHash.getLength() - 1 ) - bResult = sal_True; + bResult = true; } } } diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index c0a59a79ab70..eb833fe74ce2 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -50,13 +50,13 @@ class AbortContinuation : public ::cppu::WeakImplHelper1< XInteractionAbort > public: inline explicit AbortContinuation() : mbSelected( false ) {} - inline sal_Bool isSelected() const { return mbSelected; } + inline bool isSelected() const { return mbSelected; } inline void reset() { mbSelected = false; } virtual void SAL_CALL select() throw( RuntimeException ) { mbSelected = true; } private: - sal_Bool mbSelected; + bool mbSelected; }; // ============================================================================ @@ -64,12 +64,12 @@ private: class PasswordContinuation : public ::cppu::WeakImplHelper1< XInteractionPassword2 > { public: - inline explicit PasswordContinuation() : mbReadOnly( sal_False ), mbSelected( sal_False ) {} + inline explicit PasswordContinuation() : mbReadOnly( false ), mbSelected( false ) {} - inline sal_Bool isSelected() const { return mbSelected; } - inline void reset() { mbSelected = sal_False; } + inline bool isSelected() const { return mbSelected; } + inline void reset() { mbSelected = false; } - virtual void SAL_CALL select() throw( RuntimeException ) { mbSelected = sal_True; } + virtual void SAL_CALL select() throw( RuntimeException ) { mbSelected = true; } virtual void SAL_CALL setPassword( const OUString& rPass ) throw( RuntimeException ) { maPassword = rPass; } virtual OUString SAL_CALL getPassword() throw( RuntimeException ) { return maPassword; } @@ -83,8 +83,8 @@ public: private: OUString maPassword; OUString maModifyPassword; - sal_Bool mbReadOnly; - sal_Bool mbSelected; + bool mbReadOnly; + bool mbSelected; }; // ============================================================================ @@ -106,7 +106,7 @@ SimplePasswordRequest::~SimplePasswordRequest() { } -sal_Bool SimplePasswordRequest::isPassword() const +bool SimplePasswordRequest::isPassword() const { return mpPassword->isSelected(); } @@ -129,7 +129,7 @@ Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest // ============================================================================ DocPasswordRequest::DocPasswordRequest( DocPasswordRequestType eType, - PasswordRequestMode eMode, const OUString& rDocumentName, sal_Bool bPasswordToModify ) + PasswordRequestMode eMode, const OUString& rDocumentName, bool bPasswordToModify ) : mpAbort( NULL ) , mpPassword( NULL ) { @@ -162,7 +162,7 @@ DocPasswordRequest::~DocPasswordRequest() { } -sal_Bool DocPasswordRequest::isPassword() const +bool DocPasswordRequest::isPassword() const { return mpPassword->isSelected(); } @@ -177,7 +177,7 @@ OUString DocPasswordRequest::getPasswordToModify() const return mpPassword->getPasswordToModify(); } -sal_Bool DocPasswordRequest::getRecommendReadOnly() const +bool DocPasswordRequest::getRecommendReadOnly() const { return mpPassword->getRecommendReadOnly(); } diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index a2e9de1f7447..5c588bbd1540 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.cxx @@ -34,8 +34,8 @@ namespace comphelper // ---------------------------------------------------------- OSimpleLogRing::OSimpleLogRing() : m_aMessages( SIMPLELOGRING_SIZE ) -, m_bInitialized( sal_False ) -, m_bFull( sal_False ) +, m_bInitialized( false ) +, m_bFull( false ) , m_nPos( 0 ) { } @@ -87,11 +87,11 @@ void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno:: if ( ++m_nPos >= m_aMessages.getLength() ) { m_nPos = 0; - m_bFull = sal_True; + m_bFull = true; } // if used once then default initialized - m_bInitialized = sal_True; + m_bInitialized = true; } // ---------------------------------------------------------- @@ -107,7 +107,7 @@ uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno: aResult[nInd] = m_aMessages[ ( nStart + nInd ) % m_aMessages.getLength() ]; // if used once then default initialized - m_bInitialized = sal_True; + m_bInitialized = true; return aResult; } @@ -135,7 +135,7 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu 0 ); } - m_bInitialized = sal_True; + m_bInitialized = true; } // XServiceInfo diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 99915c6dfc3d..30cf4ebf3412 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -39,8 +39,8 @@ class OSimpleLogRing : public ::cppu::WeakImplHelper3< ::com::sun::star::logging ::osl::Mutex m_aMutex; ::com::sun::star::uno::Sequence< OUString > m_aMessages; - sal_Bool m_bInitialized; - sal_Bool m_bFull; + bool m_bInitialized; + bool m_bFull; sal_Int32 m_nPos; public: diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index b25690829fcf..8e648c2c1e0b 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -43,8 +43,8 @@ OInstanceLocker::OInstanceLocker( const uno::Reference< uno::XComponentContext > : m_xContext( xContext ) , m_pLockListener( NULL ) , m_pListenersContainer( NULL ) -, m_bDisposed( sal_False ) -, m_bInitialized( sal_False ) +, m_bDisposed( false ) +, m_bInitialized( false ) { } @@ -92,7 +92,7 @@ void SAL_CALL OInstanceLocker::dispose() m_xLockListener = uno::Reference< uno::XInterface >(); } - m_bDisposed = sal_True; + m_bDisposed = true; } // -------------------------------------------------------- @@ -185,7 +185,7 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg throw; } - m_bInitialized = sal_True; + m_bInitialized = true; } // XServiceInfo @@ -242,8 +242,8 @@ OLockListener::OLockListener( const uno::WeakReference< lang::XComponent >& xWra : m_xInstance( xInstance ) , m_xApproval( xApproval ) , m_xWrapper( xWrapper ) -, m_bDisposed( sal_False ) -, m_bInitialized( sal_False ) +, m_bDisposed( false ) +, m_bInitialized( false ) , m_nMode( nMode ) { } @@ -289,7 +289,7 @@ void OLockListener::Dispose() } m_xInstance = uno::Reference< uno::XInterface >(); - m_bDisposed = sal_True; + m_bDisposed = true; } // XEventListener @@ -445,12 +445,12 @@ void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent // XInitialization // -------------------------------------------------------- -sal_Bool OLockListener::Init() +bool OLockListener::Init() { ::osl::ResettableMutexGuard aGuard( m_aMutex ); if ( m_bDisposed || m_bInitialized ) - return sal_False; + return false; try { @@ -480,9 +480,9 @@ sal_Bool OLockListener::Init() throw; } - m_bInitialized = sal_True; + m_bInitialized = true; - return sal_True; + return true; } void createRegistryInfo_OInstanceLocker() diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index ba80ce39ee8d..83153f793f53 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -51,8 +51,8 @@ class OInstanceLocker : public ::cppu::WeakImplHelper3< ::com::sun::star::lang:: ::cppu::OInterfaceContainerHelper* m_pListenersContainer; // list of listeners - sal_Bool m_bDisposed; - sal_Bool m_bInitialized; + bool m_bDisposed; + bool m_bInitialized; public: OInstanceLocker( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ); @@ -92,8 +92,8 @@ class OLockListener : public ::cppu::WeakImplHelper2< ::com::sun::star::util::XC ::com::sun::star::uno::WeakReference< ::com::sun::star::lang::XComponent > m_xWrapper; - sal_Bool m_bDisposed; - sal_Bool m_bInitialized; + bool m_bDisposed; + bool m_bInitialized; sal_Int32 m_nMode; @@ -105,7 +105,7 @@ public: ~OLockListener(); - sal_Bool Init(); + bool Init(); void Dispose(); // XEventListener diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index 0c6ffb7d2870..b734a8e2758c 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -261,10 +261,10 @@ OUString MimeConfigurationHelper::GetDocServiceNameFromMediaType( const OUString } //------------------------------------------------------------------------- -sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortcut, +bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortcut, embed::VerbDescriptor& aDescriptor ) { - sal_Bool bResult = sal_False; + bool bResult = false; uno::Reference< container::XNameAccess > xVerbsConfig = GetVerbsConfiguration(); uno::Reference< container::XNameAccess > xVerbsProps; @@ -279,7 +279,7 @@ sal_Bool MimeConfigurationHelper::GetVerbByShortcut( const OUString& aVerbShortc && ( xVerbsProps->getByName("VerbAttributes") >>= aTempDescr.VerbAttributes ) ) { aDescriptor = aTempDescr; - bResult = sal_True; + bResult = true; } } } @@ -569,7 +569,7 @@ OUString MimeConfigurationHelper::GetFactoryNameByMediaType( const OUString& aMe //----------------------------------------------------------------------- OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( uno::Sequence< beans::PropertyValue >& aMediaDescr, - sal_Bool bIgnoreType ) + bool bIgnoreType ) { OUString aFilterName; @@ -647,12 +647,12 @@ OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( OSL_ENSURE( !aDocName.isEmpty(), "The name must exist at this point!\n" ); - sal_Bool bNeedsAddition = sal_True; + bool bNeedsAddition = true; for ( sal_Int32 nMedInd = 0; nMedInd < aMediaDescr.getLength(); nMedInd++ ) if ( aMediaDescr[nMedInd].Name == "DocumentService" ) { aMediaDescr[nMedInd].Value <<= aDocName; - bNeedsAddition = sal_False; + bNeedsAddition = false; break; } @@ -664,7 +664,7 @@ OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( aMediaDescr[nOldLen].Value <<= aDocName; } - return UpdateMediaDescriptorWithFilterName( aMediaDescr, sal_True ); + return UpdateMediaDescriptorWithFilterName( aMediaDescr, true ); } #ifdef WNT @@ -871,16 +871,16 @@ uno::Sequence< beans::PropertyValue > MimeConfigurationHelper::SearchForFilter( //------------------------------------------------------------------------- -sal_Bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >& aClassID1, const uno::Sequence< sal_Int8 >& aClassID2 ) +bool MimeConfigurationHelper::ClassIDsEqual( const uno::Sequence< sal_Int8 >& aClassID1, const uno::Sequence< sal_Int8 >& aClassID2 ) { if ( aClassID1.getLength() != aClassID2.getLength() ) - return sal_False; + return false; for ( sal_Int32 nInd = 0; nInd < aClassID1.getLength(); nInd++ ) if ( aClassID1[nInd] != aClassID2[nInd] ) - return sal_False; + return false; - return sal_True; + return true; } //------------------------------------------------------------------------- diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index e3a03989b096..3977fd8c5eea 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -79,7 +79,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: if ( m_bRestartRequested ) return; - m_bRestartRequested = sal_True; + m_bRestartRequested = true; // the office is still not initialized, no need to terminate, changing the state is enough if ( !m_bOfficeInitialized ) @@ -103,7 +103,7 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: catch ( uno::Exception& ) { // the try to request restart has failed - m_bRestartRequested = sal_False; + m_bRestartRequested = false; } } @@ -126,7 +126,7 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) { try { - sal_Bool bSuccess = sal_False; + bool bSuccess = false; if ( m_xContext.is() ) { @@ -153,12 +153,12 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) } if ( !bSuccess ) - m_bRestartRequested = sal_False; + m_bRestartRequested = false; } catch( uno::Exception& ) { // the try to restart has failed - m_bRestartRequested = sal_False; + m_bRestartRequested = false; } } diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index 536484952b59..d7cae3dafec4 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -38,14 +38,14 @@ class OOfficeRestartManager : public ::cppu::WeakImplHelper3< ::com::sun::star:: ::osl::Mutex m_aMutex; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; - sal_Bool m_bOfficeInitialized; - sal_Bool m_bRestartRequested; + bool m_bOfficeInitialized; + bool m_bRestartRequested; public: OOfficeRestartManager( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext ) : m_xContext( xContext ) - , m_bOfficeInitialized( sal_False ) - , m_bRestartRequested( sal_False ) + , m_bOfficeInitialized( false ) + , m_bRestartRequested( false ) {} virtual ~OOfficeRestartManager() diff --git a/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx index 00b3c3d584fb..ea0cfe117f0d 100644 --- a/comphelper/source/misc/sequence.cxx +++ b/comphelper/source/misc/sequence.cxx @@ -25,7 +25,7 @@ namespace comphelper //......................................................................... //------------------------------------------------------------------------------ -staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, sal_Bool _bOnlyFirst) +staruno::Sequence<sal_Int16> findValue(const staruno::Sequence< OUString >& _rList, const OUString& _rValue, bool _bOnlyFirst) { sal_Int32 nLength = _rList.getLength(); diff --git a/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx index 24dd7edc9637..e3df3a9e9f78 100644 --- a/comphelper/source/misc/sequenceashashmap.cxx +++ b/comphelper/source/misc/sequenceashashmap.cxx @@ -180,7 +180,7 @@ void SequenceAsHashMap::operator>>(css::uno::Sequence< css::beans::NamedValue >& } } -const css::uno::Any SequenceAsHashMap::getAsConstAny(::sal_Bool bAsPropertyValueList) const +const css::uno::Any SequenceAsHashMap::getAsConstAny(bool bAsPropertyValueList) const { css::uno::Any aDestination; if (bAsPropertyValueList) @@ -204,7 +204,7 @@ const css::uno::Sequence< css::beans::PropertyValue > SequenceAsHashMap::getAsCo return lReturn; } -sal_Bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const +bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const { const_iterator pCheck; for ( pCheck = rCheck.begin(); @@ -216,14 +216,14 @@ sal_Bool SequenceAsHashMap::match(const SequenceAsHashMap& rCheck) const const_iterator pFound = find(sCheckName); if (pFound == end()) - return sal_False; + return false; const css::uno::Any& aFoundValue = pFound->second; if (aFoundValue != aCheckValue) - return sal_False; + return false; } - return sal_True; + return true; } void SequenceAsHashMap::update(const SequenceAsHashMap& rUpdate) diff --git a/comphelper/source/misc/stillreadwriteinteraction.cxx b/comphelper/source/misc/stillreadwriteinteraction.cxx index 79fcbdf90400..1d74d8ffcf7b 100644 --- a/comphelper/source/misc/stillreadwriteinteraction.cxx +++ b/comphelper/source/misc/stillreadwriteinteraction.cxx @@ -28,9 +28,9 @@ namespace comphelper{ StillReadWriteInteraction::StillReadWriteInteraction(const css::uno::Reference< css::task::XInteractionHandler >& xHandler) - : m_bUsed (sal_False) - , m_bHandledByMySelf (sal_False) - , m_bHandledByInternalHandler(sal_False) + : m_bUsed (false) + , m_bHandledByMySelf (false) + , m_bHandledByInternalHandler(false) { ::std::vector< ::ucbhelper::InterceptedInteraction::InterceptedRequest > lInterceptions; ::ucbhelper::InterceptedInteraction::InterceptedRequest aInterceptedRequest; @@ -58,12 +58,12 @@ void StillReadWriteInteraction::resetInterceptions() void StillReadWriteInteraction::resetErrorStates() { - m_bUsed = sal_False; - m_bHandledByMySelf = sal_False; - m_bHandledByInternalHandler = sal_False; + m_bUsed = false; + m_bHandledByMySelf = false; + m_bHandledByInternalHandler = false; } -sal_Bool StillReadWriteInteraction::wasWriteError() +bool StillReadWriteInteraction::wasWriteError() { return (m_bUsed && m_bHandledByMySelf); } @@ -72,10 +72,10 @@ ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction: const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionRequest >& xRequest) { // we are used! - m_bUsed = sal_True; + m_bUsed = true; // check if it's a real interception - might some parameters are not the right ones ... - sal_Bool bAbort = sal_False; + bool bAbort = false; switch(aRequest.Handle) { case HANDLE_INTERACTIVEIOEXCEPTION: @@ -97,7 +97,7 @@ ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction: case HANDLE_UNSUPPORTEDDATASINKEXCEPTION: { - bAbort = sal_True; + bAbort = true; } break; } @@ -105,7 +105,7 @@ ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction: // handle interaction by ourself if (bAbort) { - m_bHandledByMySelf = sal_True; + m_bHandledByMySelf = true; css::uno::Reference< css::task::XInteractionContinuation > xAbort = ::ucbhelper::InterceptedInteraction::extractContinuation( xRequest->getContinuations(), ::getCppuType(static_cast< css::uno::Reference< css::task::XInteractionAbort >* >(0))); @@ -118,7 +118,7 @@ ucbhelper::InterceptedInteraction::EInterceptionState StillReadWriteInteraction: // Otherwhise use internal handler. if (m_xInterceptedHandler.is()) { - m_bHandledByInternalHandler = sal_True; + m_bHandledByInternalHandler = true; m_xInterceptedHandler->handle(xRequest); } return ::ucbhelper::InterceptedInteraction::E_INTERCEPTED; diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index a4f36e8db0b0..2a362ebd040c 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -286,7 +286,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL( const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext, - sal_Bool bRepairStorage ) + bool bRepairStorage ) throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); @@ -317,7 +317,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStr const OUString& aFormat, const uno::Reference < io::XInputStream >& xStream, const uno::Reference< uno::XComponentContext >& rxContext, - sal_Bool bRepairStorage ) + bool bRepairStorage ) throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); @@ -349,7 +349,7 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream( const uno::Reference < io::XStream >& xStream, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext, - sal_Bool bRepairStorage ) + bool bRepairStorage ) throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); @@ -437,14 +437,14 @@ uno::Sequence< beans::NamedValue > OStorageHelper::CreatePackageEncryptionData( } // ---------------------------------------------------------------------- -sal_Bool OStorageHelper::IsValidZipEntryFileName( const OUString& aName, sal_Bool bSlashAllowed ) +bool OStorageHelper::IsValidZipEntryFileName( const OUString& aName, bool bSlashAllowed ) { return IsValidZipEntryFileName( aName.getStr(), aName.getLength(), bSlashAllowed ); } // ---------------------------------------------------------------------- -sal_Bool OStorageHelper::IsValidZipEntryFileName( - const sal_Unicode *pChar, sal_Int32 nLength, sal_Bool bSlashAllowed ) +bool OStorageHelper::IsValidZipEntryFileName( + const sal_Unicode *pChar, sal_Int32 nLength, bool bSlashAllowed ) { for ( sal_Int32 i = 0; i < nLength; i++ ) { @@ -457,23 +457,23 @@ sal_Bool OStorageHelper::IsValidZipEntryFileName( case '\"': case '|': case ':': - return sal_False; + return false; case '/': if ( !bSlashAllowed ) - return sal_False; + return false; break; default: if ( pChar[i] < 32 || (pChar[i] >= 0xD800 && pChar[i] <= 0xDFFF) ) - return sal_False; + return false; } } - return sal_True; + return true; } // ---------------------------------------------------------------------- -sal_Bool OStorageHelper::PathHasSegment( const OUString& aPath, const OUString& aSegment ) +bool OStorageHelper::PathHasSegment( const OUString& aPath, const OUString& aSegment ) { - sal_Bool bResult = sal_False; + bool bResult = false; const sal_Int32 nPathLen = aPath.getLength(); const sal_Int32 nSegLen = aSegment.getLength(); @@ -486,16 +486,16 @@ sal_Bool OStorageHelper::PathHasSegment( const OUString& aPath, const OUString& aInternalSegment += "/"; if ( aPath.indexOf( aInternalSegment ) >= 0 ) - bResult = sal_True; + bResult = true; if ( !bResult && !aPath.compareTo( aSegment, nSegLen ) ) { if ( nPathLen == nSegLen || aPath[nSegLen] == '/' ) - bResult = sal_True; + bResult = true; } if ( !bResult && nPathLen > nSegLen && aPath.copy( nPathLen - nSegLen - 1, nSegLen + 1 ) == aEndSegment ) - bResult = sal_True; + bResult = true; } return bResult; diff --git a/comphelper/source/misc/syntaxhighlight.cxx b/comphelper/source/misc/syntaxhighlight.cxx index 012dd9ee9dff..b747f79d6541 100644 --- a/comphelper/source/misc/syntaxhighlight.cxx +++ b/comphelper/source/misc/syntaxhighlight.cxx @@ -261,10 +261,10 @@ class SyntaxHighlighter::Tokenizer sal_uInt16 aCharTypeTab[256]; // Auxiliary function: testing of the character flags - sal_Bool testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags ); + bool testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags ); // Get new token, EmptyString == nothing more over there - sal_Bool getNextToken( const sal_Unicode*& pos, /*out*/TokenTypes& reType, + bool getNextToken( const sal_Unicode*& pos, /*out*/TokenTypes& reType, /*out*/const sal_Unicode*& rpStartPos, /*out*/const sal_Unicode*& rpEndPos ); const char** ppListKeyWords; @@ -282,7 +282,7 @@ public: }; // Helper function: test character flag -sal_Bool SyntaxHighlighter::Tokenizer::testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags ) +bool SyntaxHighlighter::Tokenizer::testCharFlags( sal_Unicode c, sal_uInt16 nTestFlags ) { bool bRet = false; if( c != 0 && c <= 255 ) @@ -303,7 +303,7 @@ void SyntaxHighlighter::Tokenizer::setKeyWords( const char** ppKeyWords, sal_uIn nKeyWordCount = nCount; } -sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /*out*/TokenTypes& reType, +bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /*out*/TokenTypes& reType, /*out*/const sal_Unicode*& rpStartPos, /*out*/const sal_Unicode*& rpEndPos ) { reType = TT_UNKNOWN; @@ -312,24 +312,24 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* sal_Unicode c = *pos; if( c == 0 ) - return sal_False; + return false; ++pos; //*** Go through all possibilities *** // Space? - if ( (testCharFlags( c, CHAR_SPACE ) == sal_True) ) + if ( testCharFlags( c, CHAR_SPACE ) ) { - while( testCharFlags( *pos, CHAR_SPACE ) == sal_True ) + while( testCharFlags( *pos, CHAR_SPACE ) ) ++pos; reType = TT_WHITESPACE; } // Identifier? - else if ( (testCharFlags( c, CHAR_START_IDENTIFIER ) == sal_True) ) + else if ( testCharFlags( c, CHAR_START_IDENTIFIER ) ) { - sal_Bool bIdentifierChar; + bool bIdentifierChar; do { // Naechstes Zeichen holen @@ -372,7 +372,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* { // Remove all characters until end of line or EOF sal_Unicode cPeek = *pos; - while( cPeek != 0 && testCharFlags( cPeek, CHAR_EOL ) == sal_False ) + while( cPeek != 0 && !testCharFlags( cPeek, CHAR_EOL ) ) { c = *pos++; cPeek = *pos; @@ -387,14 +387,14 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* // Operator? // only for BASIC '\'' should be a comment, otherwise it is a normal string and handled there - else if ( ( testCharFlags( c, CHAR_OPERATOR ) == sal_True ) || ( (c == '\'') && (aLanguage==HIGHLIGHT_BASIC)) ) + else if ( testCharFlags( c, CHAR_OPERATOR ) || ( (c == '\'') && (aLanguage==HIGHLIGHT_BASIC)) ) { // parameters for SQL view if ( (c==':') || (c=='?')) { if (c!='?') { - sal_Bool bIdentifierChar; + bool bIdentifierChar; do { // Get next character @@ -413,7 +413,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* if (cPeekNext=='-') { // Remove all characters until end of line or EOF - while( cPeekNext != 0 && testCharFlags( cPeekNext, CHAR_EOL ) == sal_False ) + while( cPeekNext != 0 && !testCharFlags( cPeekNext, CHAR_EOL ) ) { ++pos; cPeekNext = *pos; @@ -427,7 +427,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* if (cPeekNext=='/') { // Remove all characters until end of line or EOF - while( cPeekNext != 0 && testCharFlags( cPeekNext, CHAR_EOL ) == sal_False ) + while( cPeekNext != 0 && !testCharFlags( cPeekNext, CHAR_EOL ) ) { ++pos; cPeekNext = *pos; @@ -469,7 +469,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* } // Number? - else if( testCharFlags( c, CHAR_START_NUMBER ) == sal_True ) + else if( testCharFlags( c, CHAR_START_NUMBER ) ) { reType = TT_NUMBER; @@ -511,7 +511,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* if( reType == TT_NUMBER && nRadix == 10 ) { // Flag if the last character is an exponent - sal_Bool bAfterExpChar = sal_False; + bool bAfterExpChar = false; // Read all numbers while( testCharFlags( *pos, CHAR_IN_NUMBER ) || @@ -526,7 +526,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* } // String? - else if( testCharFlags( c, CHAR_START_STRING ) == sal_True ) + else if( testCharFlags( c, CHAR_START_STRING ) ) { // Remember which character has opened the string sal_Unicode cEndString = c; @@ -544,7 +544,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* break; } c = *pos++; - if( testCharFlags( c, CHAR_EOL ) == sal_True ) + if( testCharFlags( c, CHAR_EOL ) ) { // ERROR: unterminated string literal reType = TT_ERROR; @@ -563,11 +563,11 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* } // End of line? - else if( testCharFlags( c, CHAR_EOL ) == sal_True ) + else if( testCharFlags( c, CHAR_EOL ) ) { // If another EOL character comes, read it sal_Unicode cNext = *pos; - if( cNext != c && testCharFlags( cNext, CHAR_EOL ) == sal_True ) + if( cNext != c && testCharFlags( cNext, CHAR_EOL ) ) ++pos; reType = TT_EOL; @@ -577,7 +577,7 @@ sal_Bool SyntaxHighlighter::Tokenizer::getNextToken( const sal_Unicode*& pos, /* // Save end position rpEndPos = pos; - return sal_True; + return true; } SyntaxHighlighter::Tokenizer::Tokenizer( HighlighterLanguage aLang ): aLanguage(aLang) diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index 684f2d2779c2..ba5f936e7e25 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -42,7 +42,7 @@ using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; //------------------------------------------------------------------------- -sal_Bool operator ==(const DateTime& _rLeft, const DateTime& _rRight) +bool operator ==(const DateTime& _rLeft, const DateTime& _rRight) { return ( _rLeft.NanoSeconds == _rRight.NanoSeconds) && ( _rLeft.Seconds == _rRight.Seconds) && @@ -54,7 +54,7 @@ sal_Bool operator ==(const DateTime& _rLeft, const DateTime& _rRight) } //------------------------------------------------------------------------- -sal_Bool operator ==(const Date& _rLeft, const Date& _rRight) +bool operator ==(const Date& _rLeft, const Date& _rRight) { return ( _rLeft.Day == _rRight.Day) && ( _rLeft.Month == _rRight.Month) && @@ -62,7 +62,7 @@ sal_Bool operator ==(const Date& _rLeft, const Date& _rRight) } //------------------------------------------------------------------------- -sal_Bool operator ==(const Time& _rLeft, const Time& _rRight) +bool operator ==(const Time& _rLeft, const Time& _rRight) { return ( _rLeft.NanoSeconds == _rRight.NanoSeconds) && ( _rLeft.Seconds == _rRight.Seconds) && @@ -119,9 +119,9 @@ OUString getString(const Any& _rAny) } //------------------------------------------------------------------------------ -sal_Bool getBOOL(const Any& _rAny) +bool getBOOL(const Any& _rAny) { - sal_Bool nReturn = sal_False; + bool nReturn = false; if (_rAny.getValueType() == ::getCppuBooleanType()) nReturn = *(sal_Bool*)_rAny.getValue(); else @@ -149,7 +149,7 @@ FontDescriptor getDefaultFont() } //------------------------------------------------------------------------------ -sal_Bool isAssignableFrom(const Type& _rAssignable, const Type& _rFrom) +bool isAssignableFrom(const Type& _rAssignable, const Type& _rFrom) { // getthe type lib descriptions typelib_TypeDescription* pAssignable = NULL; @@ -164,7 +164,7 @@ sal_Bool isAssignableFrom(const Type& _rAssignable, const Type& _rFrom) //------------------------------------------------------------------ template<class TYPE> -bool tryCompare(const void* _pData, const Any& _rValue, sal_Bool& _bIdentical, TYPE& _rOut) +bool tryCompare(const void* _pData, const Any& _rValue, bool& _bIdentical, TYPE& _rOut) { bool bSuccess = _rValue >>= _rOut; _bIdentical = bSuccess && (_rOut == *reinterpret_cast<const TYPE*>(_pData)); @@ -172,7 +172,7 @@ bool tryCompare(const void* _pData, const Any& _rValue, sal_Bool& _bIdentical, T } //------------------------------------------------------------------ -bool tryCompare(const void* _pData, const Any& _rValue, sal_Bool& _bIdentical, sal_Unicode& _rOut) +bool tryCompare(const void* _pData, const Any& _rValue, bool& _bIdentical, sal_Unicode& _rOut) { bool bSuccess = ( _rValue.getValueTypeClass() == TypeClass_CHAR ); if ( bSuccess ) @@ -182,9 +182,9 @@ bool tryCompare(const void* _pData, const Any& _rValue, sal_Bool& _bIdentical, s } //------------------------------------------------------------------ -sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) +bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) { - sal_Bool bRes = sal_True; + bool bRes = true; if (_rType.getTypeClass() == TypeClass_ANY) { @@ -208,16 +208,16 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) } else { - sal_Bool bConversionSuccess = sal_False; + bool bConversionSuccess = false; switch (_rType.getTypeClass()) { case TypeClass_VOID: - bConversionSuccess = sal_True; + bConversionSuccess = true; bRes = _rValue.getValueType().getTypeClass() == TypeClass_VOID; break; case TypeClass_BOOLEAN: { - sal_Bool aDummy; + bool aDummy; bConversionSuccess = tryCompare(pData, _rValue, bRes, aDummy); break; } @@ -298,7 +298,7 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) bRes = *(FontDescriptor*)pData == aTemp; } else - bRes = sal_False; + bRes = false; break; } if (isA(_rType, static_cast<Date*>(NULL))) @@ -413,7 +413,7 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) } break; default: - bRes = sal_False; + bRes = false; } bRes = bRes && bConversionSuccess; @@ -422,13 +422,13 @@ sal_Bool compare_impl(const Type& _rType, const void* pData, const Any& _rValue) } //------------------------------------------------------------------------------ -sal_Bool compare(const Any& rLeft, const Any& rRight) +bool compare(const Any& rLeft, const Any& rRight) { return compare_impl(rLeft.getValueType(), rLeft.getValue(), rRight); } //------------------------------------------------------------------------- -sal_Bool operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight) +bool operator ==(const FontDescriptor& _rLeft, const FontDescriptor& _rRight) { return ( _rLeft.Name.equals( _rRight.Name ) ) && ( _rLeft.Height == _rRight.Height ) && diff --git a/comphelper/source/processfactory/processfactory.cxx b/comphelper/source/processfactory/processfactory.cxx index 32aff0f4f03f..fb4d2f7d9bc3 100644 --- a/comphelper/source/processfactory/processfactory.cxx +++ b/comphelper/source/processfactory/processfactory.cxx @@ -36,7 +36,7 @@ namespace comphelper This function preserves only that the xProcessFactory variable will not be create when the library is loaded. */ -Reference< XMultiServiceFactory > localProcessFactory( const Reference< XMultiServiceFactory >& xSMgr, sal_Bool bSet ) +Reference< XMultiServiceFactory > localProcessFactory( const Reference< XMultiServiceFactory >& xSMgr, bool bSet ) { Guard< Mutex > aGuard( Mutex::getGlobalMutex() ); @@ -52,13 +52,13 @@ Reference< XMultiServiceFactory > localProcessFactory( const Reference< XMultiSe void setProcessServiceFactory(const Reference< XMultiServiceFactory >& xSMgr) { - localProcessFactory( xSMgr, sal_True ); + localProcessFactory( xSMgr, true ); } Reference< XMultiServiceFactory > getProcessServiceFactory() { Reference< XMultiServiceFactory> xReturn; - xReturn = localProcessFactory( xReturn, sal_False ); + xReturn = localProcessFactory( xReturn, false ); if ( !xReturn.is() ) { throw DeploymentException( diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx index 5188331db2ad..c30df8aea05f 100644 --- a/comphelper/source/property/ChainablePropertySetInfo.cxx +++ b/comphelper/source/property/ChainablePropertySetInfo.cxx @@ -96,7 +96,7 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& r sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { - return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() ); + return maMap.find ( rName ) != maMap.end(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index 6477e11ee329..3e2f2ca7a11b 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -63,7 +63,7 @@ using namespace ::com::sun::star::beans; SlaveData::SlaveData ( ChainablePropertySet *pSlave) : mpSlave ( pSlave ) , mxSlave ( pSlave ) -, mbInit ( sal_False ) +, mbInit ( false ) { } @@ -242,7 +242,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& aOGuardArray[i].reset( new osl::Guard< comphelper::SolarMutex >(pSlave->mpSlave->mpMutex) ); pSlave->mpSlave->_preSetValues(); - pSlave->SetInit ( sal_True ); + pSlave->SetInit ( true ); } pSlave->mpSlave->_setSingleValue( *((*aIter).second->mpInfo), *pAny ); } @@ -255,7 +255,7 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& if ( (*aSlaveIter).second->IsInit()) { (*aSlaveIter).second->mpSlave->_postSetValues(); - (*aSlaveIter).second->SetInit ( sal_False ); + (*aSlaveIter).second->SetInit ( false ); } ++aSlaveIter; } @@ -307,7 +307,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O aOGuardArray[i].reset( new osl::Guard< comphelper::SolarMutex >(pSlave->mpSlave->mpMutex) ); pSlave->mpSlave->_preGetValues(); - pSlave->SetInit ( sal_True ); + pSlave->SetInit ( true ); } pSlave->mpSlave->_getSingleValue( *((*aIter).second->mpInfo), *pAny ); } @@ -320,7 +320,7 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O if ( (*aSlaveIter).second->IsInit()) { (*aSlaveIter).second->mpSlave->_postSetValues(); - (*aSlaveIter).second->SetInit ( sal_False ); + (*aSlaveIter).second->SetInit ( false ); } ++aSlaveIter; } @@ -406,7 +406,7 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S if (!pSlave->IsInit()) { pSlave->mpSlave->_preGetPropertyState(); - pSlave->SetInit ( sal_True ); + pSlave->SetInit ( true ); } pSlave->mpSlave->_getPropertyState( *((*aIter).second->mpInfo), *pState ); } @@ -418,7 +418,7 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S if ( (*aSlaveIter).second->IsInit()) { (*aSlaveIter).second->mpSlave->_postGetPropertyState(); - (*aSlaveIter).second->SetInit ( sal_False ); + (*aSlaveIter).second->SetInit ( false ); } ++aSlaveIter; } diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index 5628e641e5bc..74baf2737726 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -112,7 +112,7 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rNam sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName ) throw(::com::sun::star::uno::RuntimeException) { - return static_cast < sal_Bool > ( maMap.find ( rName ) != maMap.end() ); + return maMap.find ( rName ) != maMap.end(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 86cf28c7cb3d..fe724086670a 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -162,11 +162,11 @@ namespace comphelper bool bIgnoreRuntimeExceptionsWhileFiring) { if (nCount && !bVetoable) { - setModifiedImpl(sal_True, bIgnoreRuntimeExceptionsWhileFiring); + setModifiedImpl(true, bIgnoreRuntimeExceptionsWhileFiring); } } - void OPropertyBag::setModifiedImpl(::sal_Bool bModified, + void OPropertyBag::setModifiedImpl(bool bModified, bool bIgnoreRuntimeExceptionsWhileFiring) { { // do not lock mutex while notifying (#i93514#) to prevent deadlock diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 2006c85f0d9c..d196e8536ae2 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -185,7 +185,7 @@ namespace comphelper sal_Bool bVetoable, bool bIgnoreRuntimeExceptionsWhileFiring); - void SAL_CALL setModifiedImpl( ::sal_Bool bModified, + void SAL_CALL setModifiedImpl( bool bModified, bool bIgnoreRuntimeExceptionsWhileFiring); private: diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index 1256aeafc839..664d2bfbbb5a 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -201,7 +201,7 @@ sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle( OUString* _pPropName, sal_Int16* _pAttributes, sal_Int32 _nHandle) { ConstPropertyAccessorMapIterator i = m_aPropertyAccessors.find(_nHandle); - sal_Bool bRet = i != m_aPropertyAccessors.end(); + bool bRet = i != m_aPropertyAccessors.end(); if (bRet) { const ::com::sun::star::beans::Property& rProperty = m_aProperties.getConstArray()[(*i).second.nPos]; @@ -214,15 +214,15 @@ sal_Bool OPropertyArrayAggregationHelper::fillPropertyMembersByHandle( } //------------------------------------------------------------------------------ -sal_Bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandle, Property& _rProperty ) const +bool OPropertyArrayAggregationHelper::getPropertyByHandle( sal_Int32 _nHandle, Property& _rProperty ) const { ConstPropertyAccessorMapIterator pos = m_aPropertyAccessors.find(_nHandle); if ( pos != m_aPropertyAccessors.end() ) { _rProperty = m_aProperties[ pos->second.nPos ]; - return sal_True; + return true; } - return sal_False; + return false; } //------------------------------------------------------------------------------ @@ -442,7 +442,7 @@ namespace internal //------------------------------------------------------------------------------ OPropertySetAggregationHelper::OPropertySetAggregationHelper( ::cppu::OBroadcastHelper& rBHlp ) :OPropertyStateHelper( rBHlp ) - ,m_bListening( sal_False ) + ,m_bListening( false ) { m_pForwarder = new PropertyForwarder( *this ); } @@ -478,7 +478,7 @@ void OPropertySetAggregationHelper::disposing() // register as a single listener m_xAggregateMultiSet->removePropertiesChangeListener(this); m_xAggregateSet->removeVetoableChangeListener(OUString(), this); - m_bListening = sal_False; + m_bListening = false; } OPropertyStateHelper::disposing(); @@ -489,7 +489,7 @@ void SAL_CALL OPropertySetAggregationHelper::disposing(const ::com::sun::star:: { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::disposing : don't have an aggregate anymore !"); if (_rSource.Source == m_xAggregateSet) - m_bListening = sal_False; + m_bListening = false; } //------------------------------------------------------------------------------ @@ -565,7 +565,7 @@ void OPropertySetAggregationHelper::setAggregation(const ::com::sun::star::uno: { m_xAggregateMultiSet->removePropertiesChangeListener(this); m_xAggregateSet->removeVetoableChangeListener(OUString(), this); - m_bListening = sal_False; + m_bListening = false; } m_xAggregateState = m_xAggregateState.query( _rxDelegate ); @@ -590,7 +590,7 @@ void OPropertySetAggregationHelper::startListening() m_xAggregateMultiSet->addPropertiesChangeListener(aPropertyNames, this); m_xAggregateSet->addVetoableChangeListener(OUString(), this); - m_bListening = sal_True; + m_bListening = true; } } @@ -979,7 +979,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString //------------------------------------------------------------------------------ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException) { - sal_Bool bModified = sal_False; + bool bModified = false; OSL_ENSURE( m_pForwarder->isResponsibleFor( _nHandle ), "OPropertySetAggregationHelper::convertFastPropertyValue: this is no forwarded property - did you use declareForwardedProperty for it?" ); if ( m_pForwarder->isResponsibleFor( _nHandle ) ) diff --git a/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx index f1c544f3c93b..2eaec9af986c 100644 --- a/comphelper/source/property/property.cxx +++ b/comphelper/source/property/property.cxx @@ -130,14 +130,14 @@ void copyProperties(const Reference<XPropertySet>& _rxSource, } //------------------------------------------------------------------ -sal_Bool hasProperty(const OUString& _rName, const Reference<XPropertySet>& _rxSet) +bool hasProperty(const OUString& _rName, const Reference<XPropertySet>& _rxSet) { if (_rxSet.is()) { // XPropertySetInfoRef xInfo(rxSet->getPropertySetInfo()); return _rxSet->getPropertySetInfo()->hasPropertyByName(_rName); } - return sal_False; + return false; } //------------------------------------------------------------------ @@ -177,9 +177,9 @@ void ModifyPropertyAttributes(Sequence<Property>& seqProps, const OUString& sPro } //------------------------------------------------------------------ -sal_Bool tryPropertyValue(Any& _rConvertedValue, Any& _rOldValue, const Any& _rValueToSet, const Any& _rCurrentValue, const Type& _rExpectedType) +bool tryPropertyValue(Any& _rConvertedValue, Any& _rOldValue, const Any& _rValueToSet, const Any& _rCurrentValue, const Type& _rExpectedType) { - sal_Bool bModified(sal_False); + bool bModified(false); if (_rCurrentValue.getValue() != _rValueToSet.getValue()) { if ( _rValueToSet.hasValue() && ( !_rExpectedType.equals( _rValueToSet.getValueType() ) ) ) @@ -203,7 +203,7 @@ sal_Bool tryPropertyValue(Any& _rConvertedValue, Any& _rOldValue, const Any& _rV if ( _rCurrentValue != _rConvertedValue ) { _rOldValue = _rCurrentValue; - bModified = sal_True; + bModified = true; } } return bModified; diff --git a/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx index e019511d76e2..0a859ef2ff91 100644 --- a/comphelper/source/property/propertycontainerhelper.cxx +++ b/comphelper/source/property/propertycontainerhelper.cxx @@ -66,7 +66,7 @@ namespace //========================================================================== //-------------------------------------------------------------------------- OPropertyContainerHelper::OPropertyContainerHelper() - :m_bUnused(sal_False) + :m_bUnused(false) { } @@ -147,13 +147,13 @@ void OPropertyContainerHelper::registerPropertyNoMember(const OUString& _rName, } //-------------------------------------------------------------------------- -sal_Bool OPropertyContainerHelper::isRegisteredProperty( sal_Int32 _nHandle ) const +bool OPropertyContainerHelper::isRegisteredProperty( sal_Int32 _nHandle ) const { return const_cast< OPropertyContainerHelper* >( this )->searchHandle( _nHandle ) != m_aProperties.end(); } //-------------------------------------------------------------------------- -sal_Bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) const +bool OPropertyContainerHelper::isRegisteredProperty( const OUString& _rName ) const { // TODO: the current structure is from a time where properties were // static, not dynamic. Since we allow that properties are also dynamic, @@ -220,10 +220,10 @@ namespace } //-------------------------------------------------------------------------- -sal_Bool OPropertyContainerHelper::convertFastPropertyValue( +bool OPropertyContainerHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) SAL_THROW( (IllegalArgumentException) ) { - sal_Bool bModified = sal_False; + bool bModified = false; // get the property somebody is asking for PropertiesIterator aPos = searchHandle(_nHandle); @@ -241,7 +241,7 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( case PropertyDescription::ltHoldMyself: case PropertyDescription::ltDerivedClassAnyType: { - sal_Bool bMayBeVoid = ((aPos->aProperty.Attributes & PropertyAttribute::MAYBEVOID) != 0); + bool bMayBeVoid = ((aPos->aProperty.Attributes & PropertyAttribute::MAYBEVOID) != 0); // non modifiable version of the value-to-be-set @@ -320,7 +320,7 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( if (!_rValue.getValueType().equals(aPos->aProperty.Type)) { - sal_Bool bConverted = sal_False; + bool bConverted = false; // a temporary any of the correct (required) type aProperlyTyped = Any( NULL, aPos->aProperty.Type.getTypeLibType() ); @@ -336,7 +336,7 @@ sal_Bool OPropertyContainerHelper::convertFastPropertyValue( ) { // could query for the requested interface - bConverted = sal_True; + bConverted = true; pNewValue = &aProperlyTyped; } @@ -390,7 +390,7 @@ void OPropertyContainerHelper::setFastPropertyValue(sal_Int32 _nHandle, const An case PropertyDescription::ltDerivedClassRealType: #if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = + bool bSuccess = #endif // copy the data from the to-be-set value uno_type_assignData( diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index 21cea0cc30bf..beb0358e861a 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -145,7 +145,7 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& pEntries[nCount] = NULL; const OUString* pNames = aPropertyNames.getConstArray(); - sal_Bool bUnknown = sal_False; + bool bUnknown = false; sal_Int32 n; for( n = 0; !bUnknown && ( n < nCount ); n++, pNames++ ) { @@ -174,7 +174,7 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues( const Sequence< O pEntries[nCount] = NULL; const OUString* pNames = aPropertyNames.getConstArray(); - sal_Bool bUnknown = sal_False; + bool bUnknown = false; sal_Int32 n; for( n = 0; !bUnknown && ( n < nCount ); n++, pNames++ ) { @@ -239,7 +239,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S { const OUString* pNames = aPropertyName.getConstArray(); - sal_Bool bUnknown = sal_False; + bool bUnknown = false; PropertyMapEntry const ** pEntries = new PropertyMapEntry const *[nCount+1]; diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index cc4984122054..4e6a0e977892 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -43,7 +43,7 @@ public: const PropertyMap* getPropertyMap() const throw(); Property getPropertyByName( const OUString& aName ) throw( UnknownPropertyException ); - sal_Bool hasPropertyByName( const OUString& aName ) throw(); + bool hasPropertyByName( const OUString& aName ) throw(); private: PropertyMap maPropertyMap; @@ -138,7 +138,7 @@ Property PropertyMapImpl::getPropertyByName( const OUString& aName ) throw( Unkn return Property( aName, pEntry->mnHandle, pEntry->maType, pEntry->mnAttributes ); } -sal_Bool PropertyMapImpl::hasPropertyByName( const OUString& aName ) throw() +bool PropertyMapImpl::hasPropertyByName( const OUString& aName ) throw() { return maPropertyMap.find( aName ) != maPropertyMap.end(); } diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx index 63fbe56fde36..e93c6bb04199 100644 --- a/comphelper/source/property/propertystatecontainer.cxx +++ b/comphelper/source/property/propertystatecontainer.cxx @@ -159,7 +159,7 @@ namespace comphelper Any aCurrentValue; getFastPropertyValue( aCurrentValue, _nHandle ); Any aDefaultValue; getPropertyDefaultByHandle( _nHandle, aDefaultValue ); - sal_Bool bEqual = uno_type_equalData( + bool bEqual = uno_type_equalData( const_cast< void* >( aCurrentValue.getValue() ), aCurrentValue.getValueType().getTypeLibType(), const_cast< void* >( aDefaultValue.getValue() ), aDefaultValue.getValueType().getTypeLibType(), reinterpret_cast< uno_QueryInterfaceFunc >(cpp_queryInterface), diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx index e6cd40f0f344..08d27c6c8343 100644 --- a/comphelper/source/property/propmultiplex.cxx +++ b/comphelper/source/property/propmultiplex.cxx @@ -77,11 +77,11 @@ void OPropertyChangeListener::setAdapter(OPropertyChangeMultiplexer* pAdapter) //= OPropertyChangeMultiplexer //======================================================================== //------------------------------------------------------------------ -OPropertyChangeMultiplexer::OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const Reference< XPropertySet>& _rxSet, sal_Bool _bAutoReleaseSet) +OPropertyChangeMultiplexer::OPropertyChangeMultiplexer(OPropertyChangeListener* _pListener, const Reference< XPropertySet>& _rxSet, bool _bAutoReleaseSet) :m_xSet(_rxSet) ,m_pListener(_pListener) ,m_nLockCount(0) - ,m_bListening(sal_False) + ,m_bListening(false) ,m_bAutoSetRelease(_bAutoReleaseSet) { m_pListener->setAdapter(this); @@ -118,7 +118,7 @@ void OPropertyChangeMultiplexer::dispose() m_pListener->setAdapter(NULL); m_pListener = NULL; - m_bListening = sal_False; + m_bListening = false; if (m_bAutoSetRelease) m_xSet = NULL; @@ -140,7 +140,7 @@ void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSourc } m_pListener = NULL; - m_bListening = sal_False; + m_bListening = false; if (m_bAutoSetRelease) m_xSet = NULL; @@ -162,7 +162,7 @@ void OPropertyChangeMultiplexer::addProperty(const OUString& _sPropertyName) m_xSet->addPropertyChangeListener(_sPropertyName, static_cast< XPropertyChangeListener*>(this)); m_aProperties.realloc(m_aProperties.getLength() + 1); m_aProperties.getArray()[m_aProperties.getLength()-1] = _sPropertyName; - m_bListening = sal_True; + m_bListening = true; } } diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index e596bc158c0d..f2d0500af1eb 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -155,7 +155,7 @@ namespace comphelper Any aCurrentValue = getPropertyDefaultByHandle( _nHandle ); Any aDefaultValue; getFastPropertyValue( aDefaultValue, _nHandle ); - sal_Bool bEqual = uno_type_equalData( + bool bEqual = uno_type_equalData( const_cast< void* >( aCurrentValue.getValue() ), aCurrentValue.getValueType().getTypeLibType(), const_cast< void* >( aDefaultValue.getValue() ), aDefaultValue.getValueType().getTypeLibType(), reinterpret_cast< uno_QueryInterfaceFunc >(cpp_queryInterface), diff --git a/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx index 8a683a738570..ff68422ff94b 100644 --- a/comphelper/source/streaming/basicio.cxx +++ b/comphelper/source/streaming/basicio.cxx @@ -75,14 +75,14 @@ const staruno::Reference<stario::XObjectInputStream>& operator >> ( } //------------------------------------------------------------------------------ -const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, sal_Bool& _rVal) +const staruno::Reference<stario::XObjectInputStream>& operator >> (const staruno::Reference<stario::XObjectInputStream>& _rxInStream, bool& _rVal) { _rVal = _rxInStream->readBoolean(); return _rxInStream; } //------------------------------------------------------------------------------ -const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, sal_Bool _bVal) +const staruno::Reference<stario::XObjectOutputStream>& operator << (const staruno::Reference<stario::XObjectOutputStream>& _rxOutStream, bool _bVal) { _rxOutStream->writeBoolean(_bVal); return _rxOutStream; diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index 22986e58767e..80c07a51b809 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -81,13 +81,13 @@ private: ::osl::Mutex m_aMutex; - sal_Bool m_bInitialized; + bool m_bInitialized; uno::Reference< io::XInputStream > m_xInputStream; uno::Reference< io::XSeekable > m_xSeekable; }; SequenceInputStreamService::SequenceInputStreamService() -: m_bInitialized( sal_False ) +: m_bInitialized( false ) {} // com.sun.star.uno.XServiceInfo: @@ -221,7 +221,7 @@ void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< ::com uno::Reference< io::XSeekable > xSeekable( xInputStream, uno::UNO_QUERY_THROW ); m_xInputStream = xInputStream; m_xSeekable = xSeekable; - m_bInitialized = sal_True; + m_bInitialized = true; } else throw lang::IllegalArgumentException( OUString("Unexpected type of argument!\n"), diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index 1348f7ecba8c..f3395d191fef 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -143,7 +143,7 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence< sal_Int8 >& _rSeq, double ,m_nMinimumResize(_nMinimumResize) ,m_nMaximumResize(_nMaximumResize) ,m_nSize(0) // starting at position 0 - ,m_bConnected(sal_True) + ,m_bConnected(true) { OSL_ENSURE(m_nResizeFactor > 1, "OSequenceOutputStream::OSequenceOutputStream : invalid resize factor !"); OSL_ENSURE((m_nMaximumResize < 0) || (m_nMaximumResize > m_nMinimumResize), @@ -228,7 +228,7 @@ void SAL_CALL OSequenceOutputStream::closeOutput( ) throw(NotConnectedException // cut the sequence to the real size m_rSequence.realloc(m_nSize); // and don't allow any further accesses - m_bConnected = sal_False; + m_bConnected = false; } } // namespace comphelper |