diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-02-20 13:52:51 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2019-02-20 17:18:31 +0100 |
commit | 16a614c77ace3f44684efd9c964c52ddbd5f5cf9 (patch) | |
tree | 243a972fe3bace2665c78b2a4c67df932c8b6627 /xmloff/source | |
parent | caeaa7b90e42c60ec407e1f0cd5b5db2b30f55d2 (diff) |
More loplugin:simplifybool
...found with (trunk) libc++ on macOS, where the standard library iterator
implementations are apparently sufficiently different to libstdc++ to find more
cases of !(... == ...) vs. ... != ...
Change-Id: Ia3861406aa584c7b1d33f47448190b5cf2e770f7
Reviewed-on: https://gerrit.libreoffice.org/68089
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'xmloff/source')
19 files changed, 25 insertions, 25 deletions
diff --git a/xmloff/source/transform/ChartOASISTContext.cxx b/xmloff/source/transform/ChartOASISTContext.cxx index a0c233d87c2a..ad6e003e0f17 100644 --- a/xmloff/source/transform/ChartOASISTContext.cxx +++ b/xmloff/source/transform/ChartOASISTContext.cxx @@ -62,7 +62,7 @@ void XMLChartOASISTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/ChartOOoTContext.cxx b/xmloff/source/transform/ChartOOoTContext.cxx index b6de37a48d46..5759bfd556ed 100644 --- a/xmloff/source/transform/ChartOOoTContext.cxx +++ b/xmloff/source/transform/ChartOOoTContext.cxx @@ -63,7 +63,7 @@ void XMLChartOOoTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/ControlOASISTContext.cxx b/xmloff/source/transform/ControlOASISTContext.cxx index 3b5ece6da769..a34f10de7ca0 100644 --- a/xmloff/source/transform/ControlOASISTContext.cxx +++ b/xmloff/source/transform/ControlOASISTContext.cxx @@ -70,7 +70,7 @@ void XMLControlOASISTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/CreateElemTContext.cxx b/xmloff/source/transform/CreateElemTContext.cxx index d4943f62840e..2e65ef82cd08 100644 --- a/xmloff/source/transform/CreateElemTContext.cxx +++ b/xmloff/source/transform/CreateElemTContext.cxx @@ -69,7 +69,7 @@ void XMLCreateElemTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/DeepTContext.cxx b/xmloff/source/transform/DeepTContext.cxx index 86680110d86e..a9ae614e9fea 100644 --- a/xmloff/source/transform/DeepTContext.cxx +++ b/xmloff/source/transform/DeepTContext.cxx @@ -86,7 +86,7 @@ rtl::Reference<XMLTransformerContext> XMLPersElemContentTContext::CreateChildCon XMLTransformerActions::const_iterator aIter = GetTransformer().GetElemActions().find( aKey ); - if( !(aIter == GetTransformer().GetElemActions().end()) ) + if( aIter != GetTransformer().GetElemActions().end() ) { switch( (*aIter).second.m_nActionType ) { diff --git a/xmloff/source/transform/DlgOASISTContext.cxx b/xmloff/source/transform/DlgOASISTContext.cxx index 31e9400c9bfc..74e10a260ae0 100644 --- a/xmloff/source/transform/DlgOASISTContext.cxx +++ b/xmloff/source/transform/DlgOASISTContext.cxx @@ -64,7 +64,7 @@ void XMLDlgOASISTransformerContext::StartElement( XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/EventOASISTContext.cxx b/xmloff/source/transform/EventOASISTContext.cxx index f44b73398c1a..e975ba3099ca 100644 --- a/xmloff/source/transform/EventOASISTContext.cxx +++ b/xmloff/source/transform/EventOASISTContext.cxx @@ -111,7 +111,7 @@ OUString XMLEventOASISTransformerContext::GetEventName( { XMLTransformerOASISEventMap_Impl::const_iterator aIter = pMap2->find( aKey ); - if( !(aIter == pMap2->end()) ) + if( aIter != pMap2->end() ) return (*aIter).second; } @@ -185,7 +185,7 @@ void XMLEventOASISTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/EventOOoTContext.cxx b/xmloff/source/transform/EventOOoTContext.cxx index 12a4fd3265c8..ef00793a95d0 100644 --- a/xmloff/source/transform/EventOOoTContext.cxx +++ b/xmloff/source/transform/EventOOoTContext.cxx @@ -147,7 +147,7 @@ void XMLEventOOoTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/FormPropOASISTContext.cxx b/xmloff/source/transform/FormPropOASISTContext.cxx index 2e68b23134a1..0c88c3ba9ec9 100644 --- a/xmloff/source/transform/FormPropOASISTContext.cxx +++ b/xmloff/source/transform/FormPropOASISTContext.cxx @@ -122,7 +122,7 @@ void XMLFormPropOASISTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { const OUString& rAttrValue = xAttrList->getValueByIndex( i ); switch( (*aIter).second.m_nActionType ) diff --git a/xmloff/source/transform/FormPropOOoTContext.cxx b/xmloff/source/transform/FormPropOOoTContext.cxx index 187dad24dd20..c017a1c6b4f0 100644 --- a/xmloff/source/transform/FormPropOOoTContext.cxx +++ b/xmloff/source/transform/FormPropOOoTContext.cxx @@ -165,7 +165,7 @@ void XMLFormPropOOoTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { const OUString& rAttrValue = rAttrList->getValueByIndex( i ); switch( (*aIter).second.m_nActionType ) diff --git a/xmloff/source/transform/FrameOASISTContext.cxx b/xmloff/source/transform/FrameOASISTContext.cxx index cc68c4a88dfa..98386a85252c 100644 --- a/xmloff/source/transform/FrameOASISTContext.cxx +++ b/xmloff/source/transform/FrameOASISTContext.cxx @@ -128,7 +128,7 @@ rtl::Reference<XMLTransformerContext> XMLFrameOASISTransformerContext::CreateChi XMLTransformerActions::key_type aKey( nPrefix, rLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end()) ) + if( aIter != pActions->end() ) { switch( (*aIter).second.m_nActionType ) { diff --git a/xmloff/source/transform/FrameOOoTContext.cxx b/xmloff/source/transform/FrameOOoTContext.cxx index 0176964f7711..da04ae424d2d 100644 --- a/xmloff/source/transform/FrameOOoTContext.cxx +++ b/xmloff/source/transform/FrameOOoTContext.cxx @@ -73,7 +73,7 @@ void XMLFrameOOoTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { const OUString& rAttrValue = xAttrList->getValueByIndex( i ); switch( (*aIter).second.m_nActionType ) @@ -110,7 +110,7 @@ rtl::Reference<XMLTransformerContext> XMLFrameOOoTransformerContext::CreateChild XMLTransformerActions::key_type aKey( nPrefix, rLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end()) ) + if( aIter != pActions->end() ) { switch( (*aIter).second.m_nActionType ) { diff --git a/xmloff/source/transform/MergeElemTContext.cxx b/xmloff/source/transform/MergeElemTContext.cxx index dffdc817f315..b735b8d069de 100644 --- a/xmloff/source/transform/MergeElemTContext.cxx +++ b/xmloff/source/transform/MergeElemTContext.cxx @@ -170,7 +170,7 @@ rtl::Reference<XMLTransformerContext> XMLMergeElemTransformerContext::CreateChil XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end()) ) + if( aIter != pActions->end() ) { switch( (*aIter).second.m_nActionType ) { @@ -223,7 +223,7 @@ rtl::Reference<XMLTransformerContext> XMLMergeElemTransformerContext::CreateChil XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end()) ) + if( aIter != pActions->end() ) { switch( (*aIter).second.m_nActionType ) { diff --git a/xmloff/source/transform/NotesTContext.cxx b/xmloff/source/transform/NotesTContext.cxx index bef8abcd8e40..cfcafb929171 100644 --- a/xmloff/source/transform/NotesTContext.cxx +++ b/xmloff/source/transform/NotesTContext.cxx @@ -75,7 +75,7 @@ void XMLNotesTransformerContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { const OUString& rAttrValue = xAttrList->getValueByIndex( i ); diff --git a/xmloff/source/transform/OOo2Oasis.cxx b/xmloff/source/transform/OOo2Oasis.cxx index 1c3fdf367da9..c40160082e72 100644 --- a/xmloff/source/transform/OOo2Oasis.cxx +++ b/xmloff/source/transform/OOo2Oasis.cxx @@ -1317,7 +1317,7 @@ void XMLTabStopOOoTContext_Impl::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/Oasis2OOo.cxx b/xmloff/source/transform/Oasis2OOo.cxx index 5d0931f48935..966f2291ff2d 100644 --- a/xmloff/source/transform/Oasis2OOo.cxx +++ b/xmloff/source/transform/Oasis2OOo.cxx @@ -1328,7 +1328,7 @@ void XMLTabStopOASISTContext_Impl::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/StyleOASISTContext.cxx b/xmloff/source/transform/StyleOASISTContext.cxx index 45b5129c5973..180eb62b085b 100644 --- a/xmloff/source/transform/StyleOASISTContext.cxx +++ b/xmloff/source/transform/StyleOASISTContext.cxx @@ -156,7 +156,7 @@ void XMLPropertiesTContext_Impl::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { switch( (*aIter).second.m_nActionType ) { @@ -803,7 +803,7 @@ void XMLStyleOASISTContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/StyleOOoTContext.cxx b/xmloff/source/transform/StyleOOoTContext.cxx index fc2c72e33e03..3fe55a5eef6c 100644 --- a/xmloff/source/transform/StyleOOoTContext.cxx +++ b/xmloff/source/transform/StyleOOoTContext.cxx @@ -302,7 +302,7 @@ XMLTypedPropertiesOOoTContext_Impl XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end()) ) + if( aIter != pActions->end() ) { rAction = (*aIter).second; nIndex = i; @@ -1127,7 +1127,7 @@ void XMLStyleOOoTContext::StartElement( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { diff --git a/xmloff/source/transform/TransformerBase.cxx b/xmloff/source/transform/TransformerBase.cxx index a62f0dcee1e9..08be604575ab 100644 --- a/xmloff/source/transform/TransformerBase.cxx +++ b/xmloff/source/transform/TransformerBase.cxx @@ -77,7 +77,7 @@ XMLTransformerContext *XMLTransformerBase::CreateContext( sal_uInt16 nPrefix, XMLTransformerActions::const_iterator aIter = GetElemActions().find( aKey ); - if( !(aIter == GetElemActions().end()) ) + if( aIter != GetElemActions().end() ) { sal_uInt32 nActionType = (*aIter).second.m_nActionType; if( (nActionType & XML_ETACTION_USER_DEFINED) != 0 ) @@ -487,7 +487,7 @@ XMLMutableAttributeList *XMLTransformerBase::ProcessAttrList( XMLTransformerActions::key_type aKey( nPrefix, aLocalName ); XMLTransformerActions::const_iterator aIter = pActions->find( aKey ); - if( !(aIter == pActions->end() ) ) + if( aIter != pActions->end() ) { if( !pMutableAttrList ) { |