diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 09:55:21 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 11:03:14 +0200 |
commit | a394d67f374e1b253f288a58113a3cfc8d301743 (patch) | |
tree | 91190e8212fc72b1c91a0e629c3504f59095d71b /connectivity | |
parent | 8a75aa52ef572655db261679da431aff84f52348 (diff) |
use more OUString::operator== comphelper..cui
Change-Id: Ib5f3037249152be2b66acf347d1a0c236dc7adfa
Reviewed-on: https://gerrit.libreoffice.org/39888
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
6 files changed, 10 insertions, 10 deletions
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index c89a9578e5db..37e69c7f9d74 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -1737,7 +1737,7 @@ void askForParameters(const Reference< XSingleSelectQueryComposer >& _xComposer, { OUString sName; xParamColumn->getPropertyValue(PROPERTY_NAME) >>= sName; - OSL_ENSURE(sName.equals(pFinalValues->Name), "::dbaui::askForParameters: inconsistent parameter names!"); + OSL_ENSURE(sName == pFinalValues->Name, "::dbaui::askForParameters: inconsistent parameter names!"); // determine the field type and ... sal_Int32 nParamType = 0; diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 6f0b4188943c..b37206798150 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -194,7 +194,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Refe // now we should look if the name of the column changed OUString sNewColumnName; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_NAME)) >>= sNewColumnName; - if ( !sNewColumnName.equals(colName) ) + if ( sNewColumnName != colName ) { const OUString sQuote = getMetaData()->getIdentifierQuoteString( ); diff --git a/connectivity/source/drivers/postgresql/pq_xtable.cxx b/connectivity/source/drivers/postgresql/pq_xtable.cxx index 148c21a927c2..1d9e37cae218 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.cxx @@ -163,7 +163,7 @@ void Table::rename( const OUString& newName ) } OUString fullNewName = concatQualified( newSchemaName, newTableName ); - if( extractStringProperty( this, st.TYPE ).equals( st.VIEW ) && m_pSettings->views.is() ) + if( extractStringProperty( this, st.TYPE ) == st.VIEW && m_pSettings->views.is() ) { // maintain view list (really strange API !) Any a = m_pSettings->pViewsImpl->getByName( fullOldName ); @@ -177,7 +177,7 @@ void Table::rename( const OUString& newName ) } else { - if( ! newSchemaName.equals(schema) ) + if( newSchemaName != schema ) { // try new schema name first try @@ -201,7 +201,7 @@ void Table::rename( const OUString& newName ) } } - if( ! newTableName.equals( oldName ) ) // might also be just the change of a schema name + if( newTableName != oldName ) // might also be just the change of a schema name { OUStringBuffer buf(128); buf.append( "ALTER TABLE" ); diff --git a/connectivity/source/drivers/postgresql/pq_xtables.cxx b/connectivity/source/drivers/postgresql/pq_xtables.cxx index feaaf745fad1..52a418da6a9c 100644 --- a/connectivity/source/drivers/postgresql/pq_xtables.cxx +++ b/connectivity/source/drivers/postgresql/pq_xtables.cxx @@ -326,7 +326,7 @@ void Tables::dropByIndex( sal_Int32 index ) OUString name,schema; set->getPropertyValue( st.SCHEMA_NAME ) >>= schema; set->getPropertyValue( st.NAME ) >>= name; - if( extractStringProperty( set, st.TYPE ).equals( st.VIEW ) && m_pSettings->views.is() ) + if( extractStringProperty( set, st.TYPE ) == st.VIEW && m_pSettings->views.is() ) { m_pSettings->pViewsImpl->dropByName( concatQualified( schema, name ) ); } @@ -334,7 +334,7 @@ void Tables::dropByIndex( sal_Int32 index ) { OUStringBuffer update( 128 ); update.append( "DROP " ); - if( extractStringProperty( set, st.TYPE ).equals( st.VIEW ) ) + if( extractStringProperty( set, st.TYPE ) == st.VIEW ) update.append( "VIEW " ); else update.append( "TABLE " ); diff --git a/connectivity/source/drivers/postgresql/pq_xview.cxx b/connectivity/source/drivers/postgresql/pq_xview.cxx index 2c8b6b7035b5..99f2f8510c2a 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.cxx +++ b/connectivity/source/drivers/postgresql/pq_xview.cxx @@ -112,7 +112,7 @@ void View::rename( const OUString& newName ) } OUString fullNewName = concatQualified( newSchemaName, newTableName ); - if( ! schema.equals( newSchemaName ) ) + if( schema != newSchemaName ) { try { @@ -135,7 +135,7 @@ void View::rename( const OUString& newName ) } } - if( ! oldName.equals( newTableName ) ) + if( oldName != newTableName ) { OUStringBuffer buf(128); buf.append( "ALTER TABLE" ); diff --git a/connectivity/source/manager/mdrivermanager.cxx b/connectivity/source/manager/mdrivermanager.cxx index b69e8646910e..53216e2bd0cd 100644 --- a/connectivity/source/manager/mdrivermanager.cxx +++ b/connectivity/source/manager/mdrivermanager.cxx @@ -229,7 +229,7 @@ Any SAL_CALL ODriverEnumeration::nextElement( ) bool operator()( const DriverAccess& lhs) { - return lhs.sImplementationName.equals(m_sImplName); + return lhs.sImplementationName == m_sImplName; } }; |