From 0a9ef5a18e148c7a5c9a088e153a7873d1564841 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 5 Nov 2013 11:06:18 +0200 Subject: convert OUString 0==compareToAscii to equalsAscii Convert code like: 0 == aStr.compareToAscii("XXX") to aStr.equalsAscii("XXX") which is both clearer and faster. Change-Id: I2e906d7d38494db38eb292702fadb781b1251e07 --- dbaccess/source/ui/browser/genericcontroller.cxx | 4 ++-- dbaccess/source/ui/dlg/DbAdminImpl.cxx | 4 ++-- dbaccess/source/ui/uno/unoDirectSql.cxx | 4 ++-- dbaccess/source/ui/uno/unoadmin.cxx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'dbaccess') diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 064670ccaf5f..07ec8087c0e8 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -282,11 +282,11 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen for ( ; pIter != pEnd; ++pIter ) { - if ( ( *pIter >>= aValue ) && ( 0 == aValue.Name.compareToAscii( "Frame" ) ) ) + if ( ( *pIter >>= aValue ) && aValue.Name.equalsAscii( "Frame" ) ) { xFrame.set(aValue.Value,UNO_QUERY_THROW); } - else if ( ( *pIter >>= aValue ) && ( 0 == aValue.Name.compareToAscii( "Preview" ) ) ) + else if ( ( *pIter >>= aValue ) && aValue.Name.equalsAscii( "Preview" ) ) { aValue.Value >>= m_bPreview; m_bReadOnly = sal_True; diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 8f9dae0c4529..43abe7e4602c 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -600,7 +600,7 @@ void ODbDataSourceAdministrationHelper::translateProperties(const Reference< XPr PropertyValueSet aInfos; for (sal_Int32 i=0; iName.compareToAscii("JDBCDRV")) + if( pAdditionalInfo->Name.equalsAscii("JDBCDRV")) { // compatibility PropertyValue aCompatibility(*pAdditionalInfo); aCompatibility.Name = "JavaDriverClass"; @@ -752,7 +752,7 @@ void ODbDataSourceAdministrationHelper::fillDatasourceInfo(const SfxItemSet& _rS *pInfo = *aOverwrittenSetting; aRelevantSettings.erase(aOverwrittenSetting); } - else if (0 == pInfo->Name.compareToAscii("JDBCDRV")) + else if( pInfo->Name.equalsAscii("JDBCDRV")) { // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass) nObsoleteSetting = i; } diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx index 47c92fd2ee49..ac3ead395dfd 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.cxx +++ b/dbaccess/source/ui/uno/unoDirectSql.cxx @@ -102,12 +102,12 @@ DBG_NAME(ODirectSQLDialog) PropertyValue aProperty; if (_rValue >>= aProperty) { - if (0 == aProperty.Name.compareToAscii("InitialSelection")) + if (aProperty.Name.equalsAscii("InitialSelection")) { OSL_VERIFY( aProperty.Value >>= m_sInitialSelection ); return; } - else if (0 == aProperty.Name.compareToAscii("ActiveConnection")) + else if (aProperty.Name.equalsAscii("ActiveConnection")) { m_xActiveConnection.set( aProperty.Value, UNO_QUERY ); OSL_ENSURE( m_xActiveConnection.is(), "ODirectSQLDialog::implInitialize: invalid connection!" ); diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index b4ae0a336f44..e88e253aead7 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -83,11 +83,11 @@ void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue) PropertyValue aProperty; if (_rValue >>= aProperty) { - if (0 == aProperty.Name.compareToAscii("InitialSelection")) + if (aProperty.Name.equalsAscii("InitialSelection")) { m_aInitialSelection = aProperty.Value; } - else if (0 == aProperty.Name.compareToAscii("ActiveConnection")) + else if (aProperty.Name.equalsAscii("ActiveConnection")) { m_xActiveConnection.set(aProperty.Value,UNO_QUERY); } -- cgit v1.2.3