[Libreoffice-commits] core.git: cppu/source filter/source scripting/source

[Libreoffice Gerrit user]

 cppu/source/typelib/typelib.cxx                    |    2 +-
 filter/source/svg/svgexport.cxx                    |    2 +-
 scripting/source/stringresource/stringresource.cxx |    6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e51cc9ebf39598c1204d9b89af4e4145433adbd4
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Feb 19 11:58:27 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Feb 19 14:25:15 2019 +0100

    More loplugin:simplifybool
    
    ...found with GCC 9, where the standard library iterator implementations are
    apparently sufficiently different to older versions of GCC to find more cases
    of !(... == ...) vs. ... != ...
    
    Change-Id: Ibe7c5140049a69d2c5318b4b2371f2e66bd05028
    Reviewed-on: https://gerrit.libreoffice.org/68012
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 817601e03d42..ce4757594036 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -2137,7 +2137,7 @@ extern "C" void SAL_CALL typelib_typedescriptionreference_release(
             {
                 MutexGuard aGuard( rInit.getMutex() );
                 WeakMap_Impl::iterator aIt = rInit.pWeakMap->find( pRef->pTypeName->buffer );
-                if( !(aIt == rInit.pWeakMap->end()) && (*aIt).second == pRef )
+                if( aIt != rInit.pWeakMap->end() && (*aIt).second == pRef )
                 {
                     // remove only if it contains the same object
                     rInit.pWeakMap->erase( aIt );
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index fa04227f18ce..b872b842b36e 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -2289,7 +2289,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
                 OSL_FAIL( "error: !mCreateOjectsCurrentMasterPage.is()" );
                 return;
             }
-            bool bHasCharSetMap = !( mTextFieldCharSets.find( mCreateOjectsCurrentMasterPage ) == mTextFieldCharSets.end() );
+            bool bHasCharSetMap = mTextFieldCharSets.find( mCreateOjectsCurrentMasterPage ) != mTextFieldCharSets.end();
 
             static const OUString aHeaderId( NSPREFIX "header-field" );
             static const OUString aFooterId( aOOOAttrFooterField );
diff --git a/scripting/source/stringresource/stringresource.cxx b/scripting/source/stringresource/stringresource.cxx
index 1215ab8ceba3..4814f7ef57a7 100644
--- a/scripting/source/stringresource/stringresource.cxx
+++ b/scripting/source/stringresource/stringresource.cxx
@@ -157,7 +157,7 @@ OUString StringResourceImpl::implResolveString
     if( pLocaleItem != nullptr && loadLocale( pLocaleItem ) )
     {
         IdToStringMap::iterator it = pLocaleItem->m_aIdToStringMap.find( ResourceID );
-        if( !( it == pLocaleItem->m_aIdToStringMap.end() ) )
+        if( it != pLocaleItem->m_aIdToStringMap.end() )
         {
             aRetStr = (*it).second;
             bSuccess = true;
@@ -189,7 +189,7 @@ bool StringResourceImpl::implHasEntryForId( const OUString& ResourceID, LocaleIt
     if( pLocaleItem != nullptr && loadLocale( pLocaleItem ) )
     {
         IdToStringMap::iterator it = pLocaleItem->m_aIdToStringMap.find( ResourceID );
-        if( !( it == pLocaleItem->m_aIdToStringMap.end() ) )
+        if( it != pLocaleItem->m_aIdToStringMap.end() )
             bSuccess = true;
     }
     return bSuccess;
@@ -2039,7 +2039,7 @@ bool StringResourcePersistenceImpl::implWritePropertiesFile( LocaleItem const *
             {
                 OUString aResourceID = *pStr;
                 IdToStringMap::const_iterator it = rHashMap.find( aResourceID );
-                if( !( it == rHashMap.end() ) )
+                if( it != rHashMap.end() )
                 {
                     implWriteStringWithEncoding( aResourceID, xTextOutputStream, true );
                     xTextOutputStream->writeString( "=" );