Replaced equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(...)) with == operator

Pattern used:

find . -name "*.cxx" -exec sed -i 's/\( *\)\(else if\|if\) *( *\([^!()|&]*\)\.equalsAsciiL( *RTL_CONSTASCII_STRINGPARAM *( *\([^)]*\) ) *) *)$/\1\2 ( \3 == \4 )/' \{\} \;

7 files changed, 63 insertions, 63 deletions

diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx
index f765f1947069..8c12f93157b8 100644
--- a/ucb/source/ucp/cmis/cmis_content.cxx
+++ b/ucb/source/ucp/cmis/cmis_content.cxx
@@ -130,41 +130,41 @@ namespace cmis
             fprintf( stderr, "Property: %s\n", rtl::OUStringToOString( rProp.Name, RTL_TEXTENCODING_UTF8 ).getStr() );
 #endif
 
-            if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
+            if ( rProp.Name == "IsDocument" )
             {
                 if ( m_pObject->getBaseType( ) == "cmis:document" )
                     xRow->appendBoolean( rProp, true );
                 else
                     xRow->appendVoid( rProp );
             }
-            else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
+            else if ( rProp.Name == "IsFolder" )
             {
                 if( m_pObject->getBaseType( ) == "cmis:folder" )
                     xRow->appendBoolean( rProp, true );
                 else
                     xRow->appendVoid( rProp );
             }
-            else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "TitleOnServer" ) ) )
+            else if ( rProp.Name == "TitleOnServer" )
             {
                 // TODO Set the path instead of the name
                 xRow->appendString( rProp, rtl::OUString::createFromAscii( m_pObject->getName().c_str() ) );
             }
-            else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) )
+            else if ( rProp.Name == "IsReadOnly" )
             {
                 // TODO Fix this value
                 xRow->appendBoolean( rProp, sal_True );
             }
-            else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) )
+            else if ( rProp.Name == "DateCreated" )
             {
                 // TODO Fix this value
                 xRow->appendVoid( rProp );
             }
-            else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) )
+            else if ( rProp.Name == "DateModified" )
             {
                 // TODO Fix this value
                 xRow->appendVoid( rProp );
             }
-            else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
+            else if ( rProp.Name == "Size" )
             {
                 libcmis::Document* document = dynamic_cast< libcmis::Document* >( m_pObject.get( ) );
                 if ( NULL != document )
@@ -480,32 +480,32 @@ namespace cmis
     {
         uno::Any aRet;
 
-        if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ))
+        if ( aCommand.Name == "getPropertyValues" )
         {
             uno::Sequence< beans::Property > Properties;
             if ( !( aCommand.Argument >>= Properties ) )
                 ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
             aRet <<= getPropertyValues( Properties, xEnv );
         }
-        else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ))
+        else if ( aCommand.Name == "getPropertySetInfo" )
             aRet <<= getPropertySetInfo( xEnv, sal_False );
-        else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ))
+        else if ( aCommand.Name == "getCommandInfo" )
             aRet <<= getCommandInfo( xEnv, sal_False );
-        else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "open" ) ))
+        else if ( aCommand.Name == "open" )
         {
             ucb::OpenCommandArgument2 aOpenCommand;
             if ( !( aCommand.Argument >>= aOpenCommand ) )
                 ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
             aRet = open( aOpenCommand, xEnv );
         }
-        else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "transfer" ) ))
+        else if ( aCommand.Name == "transfer" )
         {
             ucb::TransferInfo transferArgs;
             if ( !( aCommand.Argument >>= transferArgs ) )
                 ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
             transfer( transferArgs, xEnv );
         }
-        else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ))
+        else if ( aCommand.Name == "setPropertyValues" )
         {
             uno::Sequence< beans::PropertyValue > aProperties;
             if ( !( aCommand.Argument >>= aProperties ) || !aProperties.getLength() )
@@ -520,14 +520,14 @@ namespace cmis
                     ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
             aRet <<= createNewContent( arg );
         }
-        else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "insert" ) ))
+        else if ( aCommand.Name == "insert" )
         {
             ucb::InsertCommandArgument arg;
             if ( !( aCommand.Argument >>= arg ) )
                     ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
             insert( arg.Data, arg.ReplaceExisting, xEnv );
         }
-        else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "delete" ) ))
+        else if ( aCommand.Name == "delete" )
         {
             sal_Bool bDeletePhysical = sal_False;
             aCommand.Argument >>= bDeletePhysical;
@@ -575,9 +575,9 @@ namespace cmis
         bool create_document;
         const char *name;
 
-        if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( CMIS_FILE_TYPE ) ) )
+        if ( Info.Type == CMIS_FILE_TYPE )
             create_document = true;
-        else if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( CMIS_FOLDER_TYPE ) ) )
+        else if ( Info.Type == CMIS_FOLDER_TYPE )
             create_document = false;
         else
         {
diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx
index ed959bc74d4f..5138eabf5dc6 100644
--- a/ucb/source/ucp/ext/ucpext_content.cxx
+++ b/ucb/source/ucp/ext/ucpext_content.cxx
@@ -217,7 +217,7 @@ namespace ucb { namespace ucp { namespace ext
     {
         Any aRet;
 
-        if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ) )
+        if ( aCommand.Name == "getPropertyValues" )
         {
             Sequence< Property > Properties;
             if ( !( aCommand.Argument >>= Properties ) )
@@ -230,7 +230,7 @@ namespace ucb { namespace ucp { namespace ext
 
             aRet <<= getPropertyValues( Properties, i_rEvironment );
         }
-        else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ) )
+        else if ( aCommand.Name == "setPropertyValues" )
         {
             Sequence< PropertyValue > aProperties;
             if ( !( aCommand.Argument >>= aProperties ) )
@@ -251,17 +251,17 @@ namespace ucb { namespace ucp { namespace ext
 
             aRet <<= setPropertyValues( aProperties, i_rEvironment );
         }
-        else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ) )
+        else if ( aCommand.Name == "getPropertySetInfo" )
         {
             // implemented by base class.
             aRet <<= getPropertySetInfo( i_rEvironment );
         }
-        else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ) )
+        else if ( aCommand.Name == "getCommandInfo" )
         {
             // implemented by base class.
             aRet <<= getCommandInfo( i_rEvironment );
         }
-        else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "open" ) ) )
+        else if ( aCommand.Name == "open" )
         {
             OpenCommandArgument2 aOpenCommand;
               if ( !( aCommand.Argument >>= aOpenCommand ) )
@@ -423,19 +423,19 @@ namespace ucb { namespace ucp { namespace ext
                 const Property& rProp = pProps[ n ];
 
                 // Process Core properties.
-                if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) )
+                if ( rProp.Name == "ContentType" )
                 {
                     xRow->appendString ( rProp, ContentProvider::getArtificialNodeContentType() );
                 }
-                else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+                else if ( rProp.Name == "Title" )
                 {
                     xRow->appendString ( rProp, i_rTitle );
                 }
-                else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
+                else if ( rProp.Name == "IsDocument" )
                 {
                     xRow->appendBoolean( rProp, sal_False );
                 }
-                else if ( rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
+                else if ( rProp.Name == "IsFolder" )
                 {
                     xRow->appendBoolean( rProp, sal_True );
                 }
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index 4303c59a9baf..8b0ff7d918b2 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -414,7 +414,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo *
     {
         const beans::Property& rProp = pProps[ n ];
 
-        if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
+        if ( rProp.Name == "IsDocument" )
         {
             if (g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE))
                 xRow->appendBoolean( rProp, ( g_file_info_get_file_type( pInfo ) == G_FILE_TYPE_REGULAR ||
@@ -422,14 +422,14 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo *
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
+        else if ( rProp.Name == "IsFolder" )
         {
             if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_TYPE) )
                 xRow->appendBoolean( rProp, ( g_file_info_get_file_type( pInfo ) == G_FILE_TYPE_DIRECTORY ));
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+        else if ( rProp.Name == "Title" )
         {
             if (g_file_info_has_attribute(pInfo, G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME))
             {
@@ -439,65 +439,65 @@ uno::Reference< sdbc::XRow > Content::getPropertyValuesFromGFileInfo(GFileInfo *
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsReadOnly" ) ) )
+        else if ( rProp.Name == "IsReadOnly" )
         {
             if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE ) )
                 xRow->appendBoolean( rProp, !g_file_info_get_attribute_boolean( pInfo, G_FILE_ATTRIBUTE_ACCESS_CAN_WRITE) );
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) )
+        else if ( rProp.Name == "DateCreated" )
         {
             if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_TIME_CREATED ) )
                 xRow->appendTimestamp( rProp, getDateFromUnix(g_file_info_get_attribute_uint64(pInfo, G_FILE_ATTRIBUTE_TIME_CREATED)) );
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) )
+        else if ( rProp.Name == "DateModified" )
         {
             if( g_file_info_has_attribute( pInfo,  G_FILE_ATTRIBUTE_TIME_CHANGED ) )
                 xRow->appendTimestamp( rProp, getDateFromUnix(g_file_info_get_attribute_uint64(pInfo, G_FILE_ATTRIBUTE_TIME_CHANGED)) );
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
+        else if ( rProp.Name == "Size" )
         {
             if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_SIZE) )
                 xRow->appendLong( rProp, ( g_file_info_get_size( pInfo ) ));
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsVolume" ) ) )
+        else if ( rProp.Name == "IsVolume" )
         {
             //What do we use this for ?
             xRow->appendBoolean( rProp, sal_False );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsCompactDisc" ) ) )
+        else if ( rProp.Name == "IsCompactDisc" )
         {
             if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT ) )
                 xRow->appendBoolean( rProp, g_file_info_get_attribute_boolean(pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_EJECT) );
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsRemoveable" ) ) )
+        else if ( rProp.Name == "IsRemoveable" )
         {
             if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT ) )
                 xRow->appendBoolean( rProp, g_file_info_get_attribute_boolean(pInfo, G_FILE_ATTRIBUTE_MOUNTABLE_CAN_UNMOUNT ) );
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsFloppy" ) ) )
+        else if ( rProp.Name == "IsFloppy" )
         {
             xRow->appendBoolean( rProp, sal_False );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsHidden" ) ) )
+        else if ( rProp.Name == "IsHidden" )
         {
             if( g_file_info_has_attribute( pInfo, G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN) )
                 xRow->appendBoolean( rProp, ( g_file_info_get_is_hidden ( pInfo ) ) );
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) )
+        else if ( rProp.Name == "CreatableContentsInfo" )
         {
             xRow->appendObject( rProp, uno::makeAny( queryCreatableContentsInfo( xEnv ) ) );
         }
@@ -670,7 +670,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         {
             aRet[ n ] <<= getReadOnlyException( static_cast< cppu::OWeakObject * >(this) );
         }
-        else if ( rValue.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+        else if ( rValue.Name == "Title" )
         {
             rtl::OUString aNewTitle;
             if (!( rValue.Value >>= aNewTitle ))
@@ -915,32 +915,32 @@ uno::Any SAL_CALL Content::execute(
 #endif
     uno::Any aRet;
 
-    if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ))
+    if ( aCommand.Name == "getPropertyValues" )
     {
         uno::Sequence< beans::Property > Properties;
         if ( !( aCommand.Argument >>= Properties ) )
             ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
         aRet <<= getPropertyValues( Properties, xEnv );
     }
-    else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ))
+    else if ( aCommand.Name == "getPropertySetInfo" )
         aRet <<= getPropertySetInfo( xEnv, sal_False );
-    else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ))
+    else if ( aCommand.Name == "getCommandInfo" )
         aRet <<= getCommandInfo( xEnv, sal_False );
-    else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "open" ) ))
+    else if ( aCommand.Name == "open" )
     {
         ucb::OpenCommandArgument2 aOpenCommand;
         if ( !( aCommand.Argument >>= aOpenCommand ) )
             ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
         aRet = open( aOpenCommand, xEnv );
     }
-    else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "transfer" ) ))
+    else if ( aCommand.Name == "transfer" )
     {
         ucb::TransferInfo transferArgs;
         if ( !( aCommand.Argument >>= transferArgs ) )
             ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
         transfer( transferArgs, xEnv );
     }
-    else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ))
+    else if ( aCommand.Name == "setPropertyValues" )
     {
         uno::Sequence< beans::PropertyValue > aProperties;
         if ( !( aCommand.Argument >>= aProperties ) || !aProperties.getLength() )
@@ -955,14 +955,14 @@ uno::Any SAL_CALL Content::execute(
                 ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
         aRet <<= createNewContent( arg );
     }
-    else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "insert" ) ))
+    else if ( aCommand.Name == "insert" )
     {
         ucb::InsertCommandArgument arg;
         if ( !( aCommand.Argument >>= arg ) )
                 ucbhelper::cancelCommandExecution ( getBadArgExcept (), xEnv );
         insert( arg.Data, arg.ReplaceExisting, xEnv );
     }
-    else if (aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "delete" ) ))
+    else if ( aCommand.Name == "delete" )
     {
         sal_Bool bDeletePhysical = sal_False;
         aCommand.Argument >>= bDeletePhysical;
@@ -1142,9 +1142,9 @@ uno::Reference< ucb::XContent >
     bool create_document;
     const char *name;
 
-    if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( GIO_FILE_TYPE ) ) )
+    if ( Info.Type == GIO_FILE_TYPE )
         create_document = true;
-    else if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( GIO_FOLDER_TYPE ) ) )
+    else if ( Info.Type == GIO_FOLDER_TYPE )
         create_document = false;
     else
     {
diff --git a/ucb/source/ucp/gvfs/gvfs_content.cxx b/ucb/source/ucp/gvfs/gvfs_content.cxx
index af5a698ac460..13f764088edb 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.cxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.cxx
@@ -496,9 +496,9 @@ Content::createNewContent( const ucb::ContentInfo& Info )
     bool create_document;
     const char *name;
 
-        if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( GVFS_FILE_TYPE ) ) )
+        if ( Info.Type == GVFS_FILE_TYPE )
         create_document = true;
-    else if ( Info.Type.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( GVFS_FOLDER_TYPE ) ) )
+    else if ( Info.Type == GVFS_FOLDER_TYPE )
         create_document = false;
     else {
 #ifdef DEBUG
@@ -616,7 +616,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             xRow->appendString( rProp, GnomeToOUString( m_info.name ) );
         }
 
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) )
+        else if ( rProp.Name == "ContentType" )
             xRow->appendString( rProp, getContentType () );
 
         else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) ) {
@@ -658,7 +658,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             else
                 xRow->appendVoid( rProp );
         }
-        else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsHidden" ) ) )
+        else if ( rProp.Name == "IsHidden" )
             xRow->appendBoolean( rProp, ( m_info.name && m_info.name[0] == '.' ) );
 
         else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "IsVolume" ) ) ||
@@ -685,7 +685,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
             g_warning ("FIXME: Requested mime-type - an expensive op. indeed!");
 #endif
             xRow->appendVoid( rProp );
-        } else if (rProp.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) )
+        } else if ( rProp.Name == "CreatableContentsInfo" )
             xRow->appendObject( rProp, uno::makeAny( queryCreatableContentsInfo( xEnv ) ) );
 
         else {
diff --git a/ucb/source/ucp/odma/odma_content.cxx b/ucb/source/ucp/odma/odma_content.cxx
index 85819a482bda..687aacf41baa 100644
--- a/ucb/source/ucp/odma/odma_content.cxx
+++ b/ucb/source/ucp/odma/odma_content.cxx
@@ -419,11 +419,11 @@ uno::Any SAL_CALL Content::execute(
               }
         }
     }
-    else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "close" ) ) )
+    else if ( aCommand.Name == "close" )
     {
         getContentProvider()->closeDocument(m_aProps->m_sDocumentId);
     }
-    else if ( aCommand.Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "delete" ) ) )
+    else if ( aCommand.Name == "delete" )
     {
         //////////////////////////////////////////////////////////////////
         // delete
@@ -828,7 +828,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
     {
         const beans::PropertyValue& rValue = pValues[ n ];
 
-        if ( rValue.Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+        if ( rValue.Name == "Title" )
         {
             changePropertyValue(rValue,n,m_aProps->m_sTitle,nChanged,aRet,aChanges);
         }
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index cebd00a27b96..0147bb745e65 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -479,7 +479,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName,
         (*m_xProps)[ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")) ]
             = PropertyValue( rValue, true );
     }
-    else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Content-Type" ) ) )
+    else if ( rName == "Content-Type" )
     {
         // Do NOT map Content-Type entity header to DAV:getcontenttype!
         // Only DAV resources have this property.
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index fab721ef35a8..f5636225fa73 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -1552,7 +1552,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
         // Mandatory props.
         //////////////////////////////////////////////////////////////////
 
-        if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) )
+        if ( rName == "ContentType" )
         {
             // Read-only property!
             aRet[ n ] <<= lang::IllegalAccessException(
@@ -1578,7 +1578,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                                 "Property is read-only!" )),
                             static_cast< cppu::OWeakObject * >( this ) );
         }
-        else if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+        else if ( rName == "Title" )
         {
             rtl::OUString aNewValue;
             if ( rValue.Value >>= aNewValue )
@@ -1653,7 +1653,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                 continue;
             }
 
-            if ( rName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
+            if ( rName == "Size" )
             {
                 // Read-only property!
                 aRet[ n ] <<= lang::IllegalAccessException(
@@ -2581,7 +2581,7 @@ void Content::transfer(
         if ( aTitle.isEmpty() )
             aTitle = sourceURI.GetPathBaseNameUnescaped();
 
-        if ( aTitle.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "/" ) ) )
+        if ( aTitle == "/" )
         {
             // kso: ???
             aTitle = rtl::OUString();