From 436b10ce8a7919beedc2103114396e7892926c5b Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 21 Jan 2014 17:47:16 +0100 Subject: bool improvements Change-Id: Ie9951690fa99705d2083e0d1515261f2f99fd97a --- unotools/source/config/configitem.cxx | 2 +- unotools/source/config/eventcfg.cxx | 2 +- unotools/source/config/extendedsecurityoptions.cxx | 2 +- unotools/source/config/fontoptions.cxx | 2 +- unotools/source/config/printwarningoptions.cxx | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'unotools') diff --git a/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx index d3127c873cae..1f5ce94f3601 100644 --- a/unotools/source/config/configitem.cxx +++ b/unotools/source/config/configitem.cxx @@ -234,7 +234,7 @@ void ConfigItem::impl_packLocalizedProperties( const Sequence< OUString >& { lInValues[nSourceCounter] >>= xLocalizedNode; Reference< XNameContainer > xSetAccess( xLocalizedNode, UNO_QUERY ); - if( xSetAccess.is() == sal_True ) + if( xSetAccess.is() ) { lPropertyNames = xSetAccess->getElementNames() ; nPropertiesSize = lPropertyNames.getLength() ; diff --git a/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx index a052613ca0ab..c01af9312787 100644 --- a/unotools/source/config/eventcfg.cxx +++ b/unotools/source/config/eventcfg.cxx @@ -236,7 +236,7 @@ void SAL_CALL GlobalEventConfig_Impl::replaceByName( const OUString& aName, cons { Sequence< beans::PropertyValue > props; //DF should we prepopulate the hash with a list of valid event Names? - if( sal_False == ( aElement >>= props ) ) + if( !( aElement >>= props ) ) { throw lang::IllegalArgumentException( OUString(), Reference< XInterface > (), 2); diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx index 2b3674eba5fc..9e097575081d 100644 --- a/unotools/source/config/extendedsecurityoptions.cxx +++ b/unotools/source/config/extendedsecurityoptions.cxx @@ -159,7 +159,7 @@ SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl() { // Safe impossible cases. // Check any for valid value. - DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()\nInvalid property value detected!\n" ); + DBG_ASSERT( seqValues[nProperty].hasValue(), "SvtExtendedSecurityOptions_Impl::SvtExtendedSecurityOptions_Impl()\nInvalid property value detected!\n" ); switch( nProperty ) { case PROPERTYHANDLE_HYPERLINKS_OPEN: diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx index e82308706d7d..89b8bbb5d5a7 100644 --- a/unotools/source/config/fontoptions.cxx +++ b/unotools/source/config/fontoptions.cxx @@ -152,7 +152,7 @@ SvtFontOptions_Impl::SvtFontOptions_Impl() { // Safe impossible cases. // Check any for valid value. - DBG_ASSERT( !(seqValues[nProperty].hasValue()==sal_False), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nInvalid property value detected!\n" ); + DBG_ASSERT( seqValues[nProperty].hasValue(), "SvtFontOptions_Impl::SvtFontOptions_Impl()\nInvalid property value detected!\n" ); switch( nProperty ) { case PROPERTYHANDLE_REPLACEMENTTABLE : { diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx index 471b4e10f7f4..73c171970c90 100644 --- a/unotools/source/config/printwarningoptions.cxx +++ b/unotools/source/config/printwarningoptions.cxx @@ -129,7 +129,7 @@ SvtPrintWarningOptions_Impl::SvtPrintWarningOptions_Impl() : for( nProperty=0; nProperty