use more OUString::operator== in dbaccess..filter

Change-Id: Ib7b4f2b2403ce766a7db2f6ffc118468e7677776
Reviewed-on: https://gerrit.libreoffice.org/39889
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 17 insertions, 17 deletions

diff --git a/embeddedobj/source/commonembedding/miscobj.cxx b/embeddedobj/source/commonembedding/miscobj.cxx
index 9cbf770c11da..f289c5b9b102 100644
--- a/embeddedobj/source/commonembedding/miscobj.cxx
+++ b/embeddedobj/source/commonembedding/miscobj.cxx
@@ -234,7 +234,7 @@ void OCommonEmbeddedObject::LinkInit_Impl(
     {
         ::comphelper::MimeConfigurationHelper aHelper( m_xContext );
         OUString aExportFilterName = aHelper.GetExportFilterFromImportFilter( m_aLinkFilterName );
-        m_bReadOnly = !( aExportFilterName.equals( m_aLinkFilterName ) );
+        m_bReadOnly = aExportFilterName != m_aLinkFilterName;
     }
 
     m_aDocMediaDescriptor = GetValuableArgs_Impl( aMediaDescr, false );
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 27db3956834b..ba5a3fde2c6e 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -244,7 +244,7 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
                                                   const uno::Reference< embed::XStorage >& xNewObjectStorage,
                                                   const OUString& aNewName )
 {
-    if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) )
+    if ( xNewParentStorage == m_xParentStorage && aNewName == m_aEntryName )
     {
         SAL_WARN_IF( xNewObjectStorage != m_xObjectStorage, "embeddedobj.common", "The storage must be the same!" );
         return;
@@ -278,7 +278,7 @@ void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::X
 void OCommonEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage,
                                                   const OUString& aNewName )
 {
-    if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) )
+    if ( xNewParentStorage == m_xParentStorage && aNewName == m_aEntryName )
         return;
 
     sal_Int32 nStorageMode = m_bReadOnly ? embed::ElementModes::READ : embed::ElementModes::READWRITE;
@@ -956,7 +956,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
         if ( nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
         {
             // saveCompleted is expected, handle it accordingly
-            if ( m_xNewParentStorage == xStorage && m_aNewEntryName.equals( sEntName ) )
+            if ( m_xNewParentStorage == xStorage && m_aNewEntryName == sEntName )
             {
                 saveCompleted( true );
                 return;
@@ -964,7 +964,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
 
             // if a completely different entry is provided, switch first back to the old persistence in saveCompleted
             // and then switch to the target persistence
-            bool bSwitchFurther = ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
+            bool bSwitchFurther = ( m_xParentStorage != xStorage || m_aEntryName != sEntName );
             saveCompleted( false );
             if ( !bSwitchFurther )
                 return;
@@ -1697,7 +1697,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
             }
         }
 
-        if ( !aOldLinkFilter.equals( m_aLinkFilterName ) )
+        if ( aOldLinkFilter != m_aLinkFilterName )
         {
             uno::Sequence< beans::NamedValue > aObject = aHelper.GetObjectPropsByFilter( m_aLinkFilterName );
 
@@ -1806,7 +1806,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
 
     m_bReadOnly = false;
 
-    if ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) )
+    if ( m_xParentStorage != xStorage || m_aEntryName != sEntName )
         SwitchOwnPersistence( xStorage, sEntName );
 
     // for linked object it means that it becomes embedded object
diff --git a/embeddedobj/source/commonembedding/register.cxx b/embeddedobj/source/commonembedding/register.cxx
index 7c4ccfad8852..6fadef47f007 100644
--- a/embeddedobj/source/commonembedding/register.cxx
+++ b/embeddedobj/source/commonembedding/register.cxx
@@ -40,21 +40,21 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL embobj_component_getFactory(
 
     if ( pServiceManager )
     {
-        if ( aImplName.equals( OOoEmbeddedObjectFactory::impl_staticGetImplementationName() ) )
+        if ( aImplName == OOoEmbeddedObjectFactory::impl_staticGetImplementationName() )
         {
             xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ),
                                                 OOoEmbeddedObjectFactory::impl_staticGetImplementationName(),
                                                 OOoEmbeddedObjectFactory::impl_staticCreateSelfInstance,
                                                 OOoEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
         }
-        else if ( aImplName.equals( OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() ) )
+        else if ( aImplName == OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName() )
         {
             xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ),
                                                 OOoSpecialEmbeddedObjectFactory::impl_staticGetImplementationName(),
                                                 OOoSpecialEmbeddedObjectFactory::impl_staticCreateSelfInstance,
                                                 OOoSpecialEmbeddedObjectFactory::impl_staticGetSupportedServiceNames() );
         }
-        else if ( aImplName.equals( UNOEmbeddedObjectCreator::impl_staticGetImplementationName() ) )
+        else if ( aImplName == UNOEmbeddedObjectCreator::impl_staticGetImplementationName() )
         {
             xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ),
                                                 UNOEmbeddedObjectCreator::impl_staticGetImplementationName(),
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 1c24905e9dbd..1bef54e7741f 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -114,12 +114,12 @@ static void InsertMenu_Impl( const uno::Reference< container::XIndexContainer >&
     for ( nInd = 0; nInd < aSourceProps.getLength(); nInd++ )
     {
         aTargetProps[nInd].Name = aSourceProps[nInd].Name;
-        if ( !aContModuleName.isEmpty() && aTargetProps[nInd].Name.equals( aModuleIdentPropName ) )
+        if ( !aContModuleName.isEmpty() && aTargetProps[nInd].Name == aModuleIdentPropName )
         {
             aTargetProps[nInd].Value <<= aContModuleName;
             bModuleNameSet = true;
         }
-        else if ( aTargetProps[nInd].Name.equals( aDispProvPropName ) )
+        else if ( aTargetProps[nInd].Name == aDispProvPropName )
         {
             aTargetProps[nInd].Value <<= xSourceDisp;
             bDispProvSet = true;
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 269599af679d..fa44b4db4286 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -294,7 +294,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
     if ( m_bWaitSaveCompleted )
     {
         if ( nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
-            saveCompleted( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
+            saveCompleted( m_xParentStorage != xStorage || m_aEntryName != sEntName );
         else
             throw embed::WrongStateException(
                         "The object waits for saveCompleted() call!",
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index e039a306f867..3e1f39e7e722 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -744,7 +744,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor
                                               const uno::Reference< io::XStream >& xNewObjectStream,
                                               const OUString& aNewName )
 {
-    if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) )
+    if ( xNewParentStorage == m_xParentStorage && aNewName == m_aEntryName )
     {
         SAL_WARN_IF( xNewObjectStream != m_xObjectStream, "embeddedobj.ole", "The streams must be the same!" );
         return;
@@ -769,7 +769,7 @@ void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStor
 void OleEmbeddedObject::SwitchOwnPersistence( const uno::Reference< embed::XStorage >& xNewParentStorage,
                                               const OUString& aNewName )
 {
-    if ( xNewParentStorage == m_xParentStorage && aNewName.equals( m_aEntryName ) )
+    if ( xNewParentStorage == m_xParentStorage && aNewName == m_aEntryName )
         return;
 
     sal_Int32 nStreamMode = m_bReadOnly ? embed::ElementModes::READ : embed::ElementModes::READWRITE;
@@ -1305,7 +1305,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
     if ( m_bWaitSaveCompleted )
     {
         if ( nEntryConnectionMode == embed::EntryInitModes::NO_INIT )
-            saveCompleted( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) );
+            saveCompleted( m_xParentStorage != xStorage || m_aEntryName != sEntName );
         else
             throw embed::WrongStateException(
                         "The object waits for saveCompleted() call!",
diff --git a/embeddedobj/source/msole/oleregister.cxx b/embeddedobj/source/msole/oleregister.cxx
index 5cb0ae690507..5d01379c7870 100644
--- a/embeddedobj/source/msole/oleregister.cxx
+++ b/embeddedobj/source/msole/oleregister.cxx
@@ -43,7 +43,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL emboleobj_component_getFactory(
 
     if ( pServiceManager )
     {
-        if ( aImplName.equals( OleEmbeddedObjectFactory::impl_staticGetImplementationName() ) )
+        if ( aImplName == OleEmbeddedObjectFactory::impl_staticGetImplementationName() )
         {
             xFactory= ::cppu::createOneInstanceFactory( static_cast< lang::XMultiServiceFactory*>( pServiceManager ),
                                                 OleEmbeddedObjectFactory::impl_staticGetImplementationName(),