dbaccess: Use appropriate OUString functions on string constants

Change-Id: Iea28ad5e1a469830e002471517197365fd6de3ee

15 files changed, 51 insertions, 50 deletions

diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 9992c15ca227..0b2256a9c467 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -397,7 +397,7 @@ void OKeySet::executeStatement(OUStringBuffer& io_aFilter, Reference<XSingleSele
             for(;pAnd != pAndEnd;++pAnd)
             {
                 OUString sValue;
-                if ( !(pAnd->Value >>= sValue) || !( sValue == "?" || sValue.matchAsciiL( ":",1,0 ) ) )
+                if ( !(pAnd->Value >>= sValue) || !( sValue == "?" || sValue.startsWith( ":" ) ) )
                 { // we have a criteria which has to be taken into account for updates
                     m_aFilterColumns.push_back(pAnd->Name);
                 }
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx
index ff3247724149..7bca406280e4 100644
--- a/dbaccess/source/core/dataaccess/ContentHelper.cxx
+++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx
@@ -156,7 +156,7 @@ sal_Int32 SAL_CALL OContentHelper::createCommandIdentifier(  ) throw (RuntimeExc
 Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*CommandId*/, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException, std::exception)
 {
     Any aRet;
-    if ( aCommand.Name.equalsAscii( "getPropertyValues" ) )
+    if ( aCommand.Name == "getPropertyValues" )
     {
         // getPropertyValues
 
@@ -174,7 +174,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
         }
         aRet <<= getPropertyValues( Properties);
     }
-    else if ( aCommand.Name.equalsAscii( "setPropertyValues" ) )
+    else if ( aCommand.Name == "setPropertyValues" )
     {
         // setPropertyValues
 
@@ -205,7 +205,7 @@ Any SAL_CALL OContentHelper::execute( const Command& aCommand, sal_Int32 /*Comma
 
         aRet <<= setPropertyValues( aProperties, Environment );
     }
-    else if ( aCommand.Name.equalsAscii( "getPropertySetInfo" ) )
+    else if ( aCommand.Name == "getPropertySetInfo" )
     {
         // getPropertySetInfo
 
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 657f0cd76eb6..4e8099de80a1 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -779,7 +779,7 @@ bool ODatabaseDocument::impl_attachResource( const OUString& i_rLogicalDocumentU
 {
     if  (   ( i_rLogicalDocumentURL == getURL() )
         &&  ( i_rMediaDescriptor.getLength() == 1 )
-        &&  ( i_rMediaDescriptor[0].Name.equalsAscii( "BreakMacroSignature" ) )
+        &&  ( i_rMediaDescriptor[0].Name == "BreakMacroSignature" )
         )
     {
         // this is a BAD hack of the Basic importer code ... there should be a dedicated API for this,
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index be531a4f41da..36465ff295d0 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -401,7 +401,7 @@ Sequence< OUString > SAL_CALL ODocumentContainer::getAvailableServiceNames(  ) t
 Any SAL_CALL ODocumentContainer::execute( const Command& aCommand, sal_Int32 CommandId, const Reference< XCommandEnvironment >& Environment ) throw (Exception, CommandAbortedException, RuntimeException, std::exception)
 {
     Any aRet;
-    if ( aCommand.Name.equalsAscii( "open" ) )
+    if ( aCommand.Name == "open" )
     {
         // open command for a folder content
         OpenCommandArgument2 aOpenCommand;
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index d72667c024f7..0cbeb70e8f48 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -1086,14 +1086,14 @@ Any SAL_CALL ODocumentDefinition::execute( const Command& aCommand, sal_Int32 Co
         dispose();
 
     }
-    else if (   aCommand.Name.equalsAscii( "storeOwn" ) // compatibility
-            ||  aCommand.Name.equalsAscii( "store" )
+    else if (   aCommand.Name == "storeOwn" // compatibility
+            ||  aCommand.Name == "store"
             )
     {
         impl_store_throw();
     }
-    else if (   aCommand.Name.equalsAscii( "shutdown" ) // compatibility
-            ||  aCommand.Name.equalsAscii( "close" )
+    else if (   aCommand.Name == "shutdown" // compatibility
+            ||  aCommand.Name == "close"
             )
     {
         aRet <<= impl_close_throw();
diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx
index c6b241971c95..a5cf896ca044 100644
--- a/dbaccess/source/core/misc/dsntypes.cxx
+++ b/dbaccess/source/core/misc/dsntypes.cxx
@@ -192,22 +192,22 @@ OUString ODsnTypeCollection::getDatasourcePrefixFromMediaType(const OUString& _s
 
 bool ODsnTypeCollection::isShowPropertiesEnabled( const OUString& _sURL ) const
 {
-    return !(    _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:hsqldb",sizeof("sdbc:embedded:hsqldb")-1)
-            ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:embedded:firebird",sizeof("sdbc:embedded:firebird")-1)
-            ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlook",sizeof("sdbc:address:outlook")-1)
-            ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:outlookexp",sizeof("sdbc:address:outlookexp")-1)
-            ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:mozilla:",sizeof("sdbc:address:mozilla:")-1)
-            ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:kab",sizeof("sdbc:address:kab")-1)
-            ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:local",sizeof("sdbc:address:evolution:local")-1)
-            ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:groupwise",sizeof("sdbc:address:evolution:groupwise")-1)
-            ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:evolution:ldap",sizeof("sdbc:address:evolution:ldap")-1)
-            ||  _sURL.matchIgnoreAsciiCaseAsciiL("sdbc:address:macab",sizeof("sdbc:address:macab")-1)  );
+    return !(   _sURL.startsWithIgnoreAsciiCase("sdbc:embedded:hsqldb")
+            ||  _sURL.startsWithIgnoreAsciiCase("sdbc:embedded:firebird")
+            ||  _sURL.startsWithIgnoreAsciiCase("sdbc:address:outlook")
+            ||  _sURL.startsWithIgnoreAsciiCase("sdbc:address:outlookexp")
+            ||  _sURL.startsWithIgnoreAsciiCase("sdbc:address:mozilla:")
+            ||  _sURL.startsWithIgnoreAsciiCase("sdbc:address:kab")
+            ||  _sURL.startsWithIgnoreAsciiCase("sdbc:address:evolution:local")
+            ||  _sURL.startsWithIgnoreAsciiCase("sdbc:address:evolution:groupwise")
+            ||  _sURL.startsWithIgnoreAsciiCase("sdbc:address:evolution:ldap")
+            ||  _sURL.startsWithIgnoreAsciiCase("sdbc:address:macab")  );
 }
 
 void ODsnTypeCollection::extractHostNamePort(const OUString& _rDsn,OUString& _sDatabaseName,OUString& _rsHostname,sal_Int32& _nPortNumber) const
 {
     OUString sUrl = cutPrefix(_rDsn);
-    if ( _rDsn.matchIgnoreAsciiCaseAsciiL("jdbc:oracle:thin:",sizeof("jdbc:oracle:thin:")-1) )
+    if ( _rDsn.startsWithIgnoreAsciiCase("jdbc:oracle:thin:") )
     {
         lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber);
         if ( !_rsHostname.getLength() && comphelper::string::getTokenCount(sUrl, ':') == 2 )
@@ -219,11 +219,12 @@ void ODsnTypeCollection::extractHostNamePort(const OUString& _rDsn,OUString& _sD
             _rsHostname = _rsHostname.getToken(comphelper::string::getTokenCount(_rsHostname, '@') - 1, '@');
         _sDatabaseName = sUrl.getToken(comphelper::string::getTokenCount(sUrl, ':') - 1, ':');
     }
-    else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:address:ldap:",sizeof("sdbc:address:ldap:")-1) )
+    else if ( _rDsn.startsWithIgnoreAsciiCase("sdbc:address:ldap:") )
     {
         lcl_extractHostAndPort(sUrl,_sDatabaseName,_nPortNumber);
     }
-    else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:mysql:mysqlc:",sizeof("sdbc:mysql:mysqlc:")-1) || _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:mysql:jdbc:",sizeof("sdbc:mysql:jdbc:")-1) )
+    else if ( _rDsn.startsWithIgnoreAsciiCase("sdbc:mysql:mysqlc:")
+              || _rDsn.startsWithIgnoreAsciiCase("sdbc:mysql:jdbc:") )
     {
         lcl_extractHostAndPort(sUrl,_rsHostname,_nPortNumber);
 
@@ -231,8 +232,8 @@ void ODsnTypeCollection::extractHostNamePort(const OUString& _rDsn,OUString& _sD
             _rsHostname = sUrl.getToken(0,'/');
         _sDatabaseName = sUrl.getToken(comphelper::string::getTokenCount(sUrl, '/') - 1, '/');
     }
-    else if ( _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=",sizeof("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=")-1)
-         || _rDsn.matchIgnoreAsciiCaseAsciiL("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=",sizeof("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=")-1))
+    else if ( _rDsn.startsWithIgnoreAsciiCase("sdbc:ado:access:Provider=Microsoft.ACE.OLEDB.12.0;DATA SOURCE=")
+         || _rDsn.startsWithIgnoreAsciiCase("sdbc:ado:access:PROVIDER=Microsoft.Jet.OLEDB.4.0;DATA SOURCE=") )
     {
         OUString sNewFileName;
         if ( ::osl::FileBase::getFileURLFromSystemPath( sUrl, sNewFileName ) == ::osl::FileBase::E_None )
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index 7568034d6b77..01b43d4793c0 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -208,7 +208,7 @@ namespace dbaxml
                     pCreatorThread = new FastLoader(m_xContext, FastLoader::E_JAVA);
 #endif
                 }
-                else if ( sURL.matchIgnoreAsciiCaseAsciiL("sdbc:calc:",10,0) )
+                else if ( sURL.startsWithIgnoreAsciiCase("sdbc:calc:") )
                 {
                     pCreatorThread = new FastLoader(m_xContext, FastLoader::E_CALC);
                 }
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index b57741836cd5..9075c8d98a51 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -64,7 +64,7 @@ public:
 #define IMPLEMENT_SERVICE_INFO_IMPLNAME(classname, implasciiname)   \
     OUString SAL_CALL classname::getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException, std::exception)   \
     {   \
-        return OUString::createFromAscii(implasciiname); \
+        return OUString(implasciiname); \
     }   \
 
 #define IMPLEMENT_SERVICE_INFO_IMPLNAME_STATIC(classname, implasciiname)    \
@@ -74,7 +74,7 @@ public:
     }   \
     OUString SAL_CALL classname::getImplementationName_Static(  ) throw (::com::sun::star::uno::RuntimeException)    \
     {   \
-        return OUString::createFromAscii(implasciiname); \
+        return OUString(implasciiname); \
     }   \
 
 #define IMPLEMENT_SERVICE_INFO_SUPPORTS(classname)  \
@@ -93,7 +93,7 @@ public:
     ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)  \
     {   \
         ::com::sun::star::uno::Sequence< OUString > aSupported(1);   \
-        aSupported[0] = OUString::createFromAscii(serviceasciiname); \
+        aSupported[0] = serviceasciiname; \
         return aSupported;  \
     }   \
 
@@ -105,7 +105,7 @@ public:
     ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static(  ) throw(::com::sun::star::uno::RuntimeException)   \
     {   \
         ::com::sun::star::uno::Sequence< OUString > aSupported(1);   \
-        aSupported[0] = OUString::createFromAscii(serviceasciiname); \
+        aSupported[0] = serviceasciiname; \
         return aSupported;  \
     }   \
 
@@ -117,8 +117,8 @@ public:
     ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames_Static(  ) throw(::com::sun::star::uno::RuntimeException)   \
     {   \
         ::com::sun::star::uno::Sequence< OUString > aSupported(2);   \
-        aSupported[0] = OUString::createFromAscii(serviceasciiname1);    \
-        aSupported[1] = OUString::createFromAscii(serviceasciiname2);    \
+        aSupported[0] = serviceasciiname1;    \
+        aSupported[1] = serviceasciiname2;    \
         return aSupported;  \
     }   \
 
@@ -126,8 +126,8 @@ public:
     ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)  \
     {   \
         ::com::sun::star::uno::Sequence< OUString > aSupported(2);   \
-        aSupported[0] = OUString::createFromAscii(serviceasciiname1);    \
-        aSupported[1] = OUString::createFromAscii(serviceasciiname2);    \
+        aSupported[0] = serviceasciiname1;    \
+        aSupported[1] = serviceasciiname2;    \
         return aSupported;  \
     }   \
 
@@ -135,9 +135,9 @@ public:
     ::com::sun::star::uno::Sequence< OUString > SAL_CALL classname::getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException, std::exception)  \
     {   \
         ::com::sun::star::uno::Sequence< OUString > aSupported(3);   \
-        aSupported[0] = OUString::createFromAscii(serviceasciiname1);    \
-        aSupported[1] = OUString::createFromAscii(serviceasciiname2);    \
-        aSupported[2] = OUString::createFromAscii(serviceasciiname3);    \
+        aSupported[0] = serviceasciiname1;    \
+        aSupported[1] = serviceasciiname2;    \
+        aSupported[2] = serviceasciiname3;    \
         return aSupported;  \
     }   \
 
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index 1788fc78e683..ae53681d9b35 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -437,7 +437,7 @@ Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::get
 
 sal_Bool SAL_CALL SbaXDataBrowserController::FormControllerImpl::supportsMode( const OUString& aMode ) throw (RuntimeException, std::exception)
 {
-    return aMode.equalsAscii( "DataMode" );
+    return aMode == "DataMode";
 }
 
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Reference< ::com::sun::star::awt::XTabControllerModel > & /*Model*/) throw( RuntimeException, std::exception )
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index bc68c796c872..310078bb2010 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -274,11 +274,11 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
 
     for ( ; pIter != pEnd; ++pIter )
     {
-        if ( ( *pIter >>= aValue ) && aValue.Name.equalsAscii( "Frame" ) )
+        if ( ( *pIter >>= aValue ) && aValue.Name == "Frame" )
         {
             xFrame.set(aValue.Value,UNO_QUERY_THROW);
         }
-        else if ( ( *pIter >>= aValue ) && aValue.Name.equalsAscii( "Preview" ) )
+        else if ( ( *pIter >>= aValue ) && aValue.Name == "Preview" )
         {
             aValue.Value >>= m_bPreview;
             m_bReadOnly = true;
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index fd56da879ef0..2136336277ec 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; i<aAdditionalInfo.getLength(); ++i, ++pAdditionalInfo)
         {
-            if( pAdditionalInfo->Name.equalsAscii("JDBCDRV"))
+            if( pAdditionalInfo->Name == "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( pInfo->Name.equalsAscii("JDBCDRV"))
+        else if( pInfo->Name == "JDBCDRV" )
         {   // this is a compatibility setting, remove it from the sequence (it's replaced by JavaDriverClass)
             nObsoleteSetting = i;
         }
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 2ab17aac08b2..4ed0b22a0490 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -198,7 +198,7 @@ namespace
     {
         return  ( !_displayInfo.sErrorCode.isEmpty() )
                 ||  (   !_displayInfo.sSQLState.isEmpty()
-                    &&  !_displayInfo.sSQLState.equalsAscii( "S1000" )
+                    &&  _displayInfo.sSQLState != "S1000"
                     );
     }
 
@@ -340,7 +340,7 @@ OExceptionChainDialog::OExceptionChainDialog(vcl::Window* pParent, const Excepti
         )
     {
         lcl_insertExceptionEntry( *m_pExceptionList, elementPos, *loop );
-        bHave22018 = loop->sSQLState.equalsAscii( "22018" );
+        bHave22018 = loop->sSQLState == "22018";
     }
 
     // if the error has the code 22018, then add an additional explanation
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index f3b025168a7d..c4cde09124ba 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1620,8 +1620,8 @@ static ::std::vector< CommentStrip > getComment( const OUString& rQuery )
     ::std::vector< CommentStrip > aRet;
     // First a quick search if there is any "--" or "//" or "/*", if not then
     // the whole copying loop is pointless.
-    if (rQuery.indexOfAsciiL( "--", 2, 0) < 0 && rQuery.indexOfAsciiL( "//", 2, 0) < 0 &&
-            rQuery.indexOfAsciiL( "/*", 2, 0) < 0)
+    if (rQuery.indexOf( "--" ) < 0 && rQuery.indexOf( "//" ) < 0 &&
+            rQuery.indexOf( "/*" ) < 0)
         return aRet;
 
     const sal_Unicode* pCopy = rQuery.getStr();
diff --git a/dbaccess/source/ui/uno/unoDirectSql.cxx b/dbaccess/source/ui/uno/unoDirectSql.cxx
index 9c214d5a4dce..9f752dac81d0 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.cxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.cxx
@@ -106,12 +106,12 @@ namespace dbaui
         PropertyValue aProperty;
         if (_rValue >>= aProperty)
         {
-            if (aProperty.Name.equalsAscii("InitialSelection"))
+            if (aProperty.Name == "InitialSelection")
             {
                 OSL_VERIFY( aProperty.Value >>= m_sInitialSelection );
                 return;
             }
-            else if (aProperty.Name.equalsAscii("ActiveConnection"))
+            else if (aProperty.Name == "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 702138310548..7653ec7d03d0 100644
--- a/dbaccess/source/ui/uno/unoadmin.cxx
+++ b/dbaccess/source/ui/uno/unoadmin.cxx
@@ -80,11 +80,11 @@ void ODatabaseAdministrationDialog::implInitialize(const Any& _rValue)
     PropertyValue aProperty;
     if (_rValue >>= aProperty)
     {
-        if (aProperty.Name.equalsAscii("InitialSelection"))
+        if (aProperty.Name == "InitialSelection")
         {
             m_aInitialSelection = aProperty.Value;
         }
-        else if (aProperty.Name.equalsAscii("ActiveConnection"))
+        else if (aProperty.Name == "ActiveConnection")
         {
             m_xActiveConnection.set(aProperty.Value,UNO_QUERY);
         }