From f555ab4e96a3d796c67cbec1c948cb920ebb3750 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 20 Apr 2016 17:15:31 +0200 Subject: loplugin:salbool: Automatic rewrite of sal_False/True Change-Id: Idb7e5ff0c73bbc2c462b92cd96444eb5d2d4194b --- comphelper/source/container/embeddedobjectcontainer.cxx | 10 +++++----- comphelper/source/container/enumerablemap.cxx | 4 ++-- comphelper/source/container/enumhelper.cxx | 8 ++++---- comphelper/source/eventattachermgr/eventattachermgr.cxx | 2 +- comphelper/source/misc/accessibletexthelper.cxx | 2 +- comphelper/source/misc/instancelocker.cxx | 2 +- comphelper/source/misc/mimeconfighelper.cxx | 2 +- comphelper/source/property/opropertybag.cxx | 10 +++++----- comphelper/source/property/propagg.cxx | 10 +++++----- comphelper/source/property/propstate.cxx | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) (limited to 'comphelper') diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 6604be32ee0b..9b9d32643b22 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -203,7 +203,7 @@ void EmbeddedObjectContainer::CloseEmbeddedObjects() { try { - xClose->close( sal_True ); + xClose->close( true ); } catch (const uno::Exception&) { @@ -508,7 +508,7 @@ bool EmbeddedObjectContainer::StoreEmbeddedObject( //TODO/LATER: possible optimization, don't store immediately //xPersist->setPersistentEntry( pImpl->mxStorage, rName, embed::EntryInitModes::ENTRY_NO_INIT, aSeq, aSeq ); xPersist->storeAsEntry( pImpl->mxStorage, rName, aSeq, aSeq ); - xPersist->saveCompleted( sal_True ); + xPersist->saveCompleted( true ); } } } @@ -802,7 +802,7 @@ uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmb { try { - xResult->close( sal_True ); + xResult->close( true ); } catch (const uno::Exception&) { @@ -1093,7 +1093,7 @@ bool EmbeddedObjectContainer::CloseEmbeddedObject( const uno::Reference < embed: uno::Reference < ::util::XCloseable > xClose( xObj, uno::UNO_QUERY ); try { - xClose->close( sal_True ); + xClose->close( true ); } catch (const uno::Exception&) { @@ -1598,7 +1598,7 @@ bool EmbeddedObjectContainer::SetPersistentEntries(const uno::Reference< embed:: { uno::Reference< util::XModifiable > xModif( xObj->getComponent(), uno::UNO_QUERY_THROW ); if ( xModif->isModified() ) - xModif->setModified( sal_False ); + xModif->setModified( false ); } catch (const uno::Exception&) { diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 7ea8d30237db..3b45fda06255 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -564,9 +564,9 @@ namespace comphelper ) { if ( mapping->second == _value ) - return sal_True; + return true; } - return sal_False; + return false; } diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index e3b03ef46269..d501dd9dadd5 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -56,7 +56,7 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::Runtim ::osl::ResettableMutexGuard aLock(m_aLock); if (m_xAccess.is() && m_aNames.getLength() > m_nPos) - return sal_True; + return true; if (m_xAccess.is()) { @@ -64,7 +64,7 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::Runtim m_xAccess.clear(); } - return sal_False; + return false; } @@ -155,7 +155,7 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::Runti ::osl::ResettableMutexGuard aLock(m_aLock); if (m_xAccess.is() && m_xAccess->getCount() > m_nPos) - return sal_True; + return true; if (m_xAccess.is()) { @@ -163,7 +163,7 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::Runti m_xAccess.clear(); } - return sal_False; + return false; } diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index e4ff4a9ac80c..70fbe1c756b6 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -210,7 +210,7 @@ void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rR break; case TypeClass_BOOLEAN: - rRet <<= sal_True; + rRet <<= true; break; case TypeClass_STRING: diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index 6113e219833a..3cec05e24a1f 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -135,7 +135,7 @@ namespace comphelper Reference < i18n::XBreakIterator > xBreakIter = implGetBreakIterator(); if ( xBreakIter.is() ) { - rBoundary = xBreakIter->getWordBoundary( sText, nIndex, implGetLocale(), i18n::WordType::ANY_WORD, sal_True ); + rBoundary = xBreakIter->getWordBoundary( sText, nIndex, implGetLocale(), i18n::WordType::ANY_WORD, true ); // it's a word, if the first character is an alpha-numeric character Reference< i18n::XCharacterClassification > xCharClass = implGetCharacterClassification(); diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index 38370c5837b0..11bc0e18836c 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -244,7 +244,7 @@ void OLockListener::Dispose() uno::Reference< util::XCloseable > xCloseable( m_xInstance, uno::UNO_QUERY ); if ( xCloseable.is() ) - xCloseable->close( sal_True ); + xCloseable->close( true ); } catch( uno::Exception& ) {} diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx index 5f6a93e235e1..ecd82fe506b2 100644 --- a/comphelper/source/misc/mimeconfighelper.cxx +++ b/comphelper/source/misc/mimeconfighelper.cxx @@ -589,7 +589,7 @@ OUString MimeConfigurationHelper::UpdateMediaDescriptorWithFilterName( uno::Sequence< beans::PropertyValue > aTempMD( aMediaDescr ); // get TypeName - OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aTempMD, sal_True ); + OUString aTypeName = xTypeDetection->queryTypeByDescriptor( aTempMD, true ); // get FilterName for ( sal_Int32 nInd = 0; nInd < aTempMD.getLength(); nInd++ ) diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 651c72c2a2e3..512003beb142 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -223,7 +223,7 @@ namespace comphelper { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty - return sal_False; + return false; } @@ -250,7 +250,7 @@ namespace comphelper m_pArrayHelper.reset(); g.clear(); - setModified(sal_True); + setModified(true); } @@ -282,7 +282,7 @@ namespace comphelper { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty - return sal_False; + return false; } @@ -356,7 +356,7 @@ namespace comphelper m_pArrayHelper.reset(); g.clear(); - setModified(sal_True); + setModified(true); } @@ -370,7 +370,7 @@ namespace comphelper m_pArrayHelper.reset(); g.clear(); - setModified(sal_True); + setModified(true); } diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index a1044c741f7c..778021eea005 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -425,7 +425,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Se // implementation) if ( ( nHandle != -1 ) && !isCurrentlyForwardingProperty( nHandle ) ) - fire(&nHandle, &evt.NewValue, &evt.OldValue, 1, sal_False); + fire(&nHandle, &evt.NewValue, &evt.OldValue, 1, false); } else { @@ -448,7 +448,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Se } if (nDest) - fire(pHandles.get(), pNewValues.get(), pOldValues.get(), nDest, sal_False); + fire(pHandles.get(), pNewValues.get(), pOldValues.get(), nDest, false); } } @@ -460,7 +460,7 @@ void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::Pr cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rEvent.PropertyName); - fire(&nHandle, &_rEvent.NewValue, &_rEvent.OldValue, 1, sal_True); + fire(&nHandle, &_rEvent.NewValue, &_rEvent.OldValue, 1, true); } @@ -759,7 +759,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( } // fire vetoable events - fire( pHandles.get(), pConvertedValues.get(), pOldValues.get(), nHitCount, sal_True ); + fire( pHandles.get(), pConvertedValues.get(), pOldValues.get(), nHitCount, true ); // setting the agg Properties m_xAggregateMultiSet->setPropertyValues(AggPropertyNames, AggValues); @@ -777,7 +777,7 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( } // fire change events - fire( pHandles.get(), pConvertedValues.get(), pOldValues.get(), nHitCount, sal_False ); + fire( pHandles.get(), pConvertedValues.get(), pOldValues.get(), nHitCount, false ); } else m_xAggregateMultiSet->setPropertyValues(AggPropertyNames, AggValues); diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index 77a9dbbc760e..5272ebf725a1 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -71,7 +71,7 @@ namespace comphelper void OPropertyStateHelper::firePropertyChange(sal_Int32 nHandle, const css::uno::Any& aNewValue, const css::uno::Any& aOldValue) { - fire(&nHandle, &aNewValue, &aOldValue, 1, sal_False); + fire(&nHandle, &aNewValue, &aOldValue, 1, false); } // XPropertyState -- cgit