Remove RTL_CONSTASCII_STRINGPARAM in ucb

Change-Id: Ib450c1463add267ad64707c7a2d71e7f6a9c0849

3 files changed, 58 insertions, 111 deletions

diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx
index f618019d3019..3f98ca13ef19 100644
--- a/ucb/source/ucp/ftp/ftpdirp.cxx
+++ b/ucb/source/ucp/ftp/ftpdirp.cxx
@@ -741,40 +741,40 @@ sal_Bool FTPDirectoryParser::parseVMS (
             ++p;
         }
         if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("JAN")) == 0)
+                pMonth, monthLen, "JAN", monthLen) == 0)
             rEntry.m_aDate.SetMonth(1);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("FEB")) == 0)
+                     pMonth, monthLen, "FEB", monthLen) == 0)
             rEntry.m_aDate.SetMonth(2);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("MAR")) == 0)
+                     pMonth, monthLen, "MAR", monthLen) == 0)
             rEntry.m_aDate.SetMonth(3);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("APR")) == 0)
+                     pMonth, monthLen, "APR", monthLen) == 0)
             rEntry.m_aDate.SetMonth(4);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("MAY")) == 0)
+                     pMonth, monthLen, "MAY", monthLen) == 0)
             rEntry.m_aDate.SetMonth(5);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("JUN")) == 0)
+                     pMonth, monthLen, "JUN", monthLen) == 0)
             rEntry.m_aDate.SetMonth(6);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("JUL")) == 0)
+                     pMonth, monthLen, "JUL", monthLen) == 0)
             rEntry.m_aDate.SetMonth(7);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("AUG")) == 0)
+                     pMonth, monthLen, "AUG", monthLen) == 0)
             rEntry.m_aDate.SetMonth(8);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("SEP")) == 0)
+                     pMonth, monthLen, "SEP", monthLen) == 0)
             rEntry.m_aDate.SetMonth(9);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("OCT")) == 0)
+                     pMonth, monthLen, "OCT", monthLen) == 0)
             rEntry.m_aDate.SetMonth(10);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("NOV")) == 0)
+                     pMonth, monthLen, "NOV", monthLen) == 0)
             rEntry.m_aDate.SetMonth(11);
         else if (rtl_str_compareIgnoreAsciiCase_WithLength(
-                     pMonth, monthLen, RTL_CONSTASCII_STRINGPARAM("DEC")) == 0)
+                     pMonth, monthLen, "DEC", monthLen) == 0)
             rEntry.m_aDate.SetMonth(12);
         else
             return sal_False;
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 0c75ca3fd1e3..ed7d56cfe6f3 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -393,8 +393,7 @@ uno::Any SAL_CALL Content::execute(
 
     uno::Any aRet;
 
-    if ( aCommand.Name.equalsAsciiL(
-             RTL_CONSTASCII_STRINGPARAM( "getPropertyValues" ) ) )
+    if ( aCommand.Name == "getPropertyValues" )
     {
         //////////////////////////////////////////////////////////////////
         // getPropertyValues
@@ -415,8 +414,7 @@ uno::Any SAL_CALL Content::execute(
 
         aRet <<= getPropertyValues( Properties, Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "setPropertyValues" ) ) )
+    else if ( aCommand.Name == "setPropertyValues" )
     {
         //////////////////////////////////////////////////////////////////
         // setPropertyValues
@@ -449,8 +447,7 @@ uno::Any SAL_CALL Content::execute(
 
         aRet <<= setPropertyValues( aProperties, Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "getPropertySetInfo" ) ) )
+    else if ( aCommand.Name == "getPropertySetInfo" )
     {
         //////////////////////////////////////////////////////////////////
         // getPropertySetInfo
@@ -460,8 +457,7 @@ uno::Any SAL_CALL Content::execute(
         aRet <<= getPropertySetInfo( Environment,
                                      sal_False /* don't cache data */ );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "getCommandInfo" ) ) )
+    else if ( aCommand.Name == "getCommandInfo" )
     {
         //////////////////////////////////////////////////////////////////
         // getCommandInfo
@@ -470,8 +466,7 @@ uno::Any SAL_CALL Content::execute(
         // Note: Implemented by base class.
         aRet <<= getCommandInfo( Environment, sal_False );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "open" ) ) )
+    else if ( aCommand.Name "open" )
     {
         //////////////////////////////////////////////////////////////////
         // open
@@ -492,8 +487,7 @@ uno::Any SAL_CALL Content::execute(
 
         aRet = open( aOpenCommand, Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "insert" ) ) )
+    else if ( aCommand.Name == "insert" )
     {
         //////////////////////////////////////////////////////////////////
         // insert
@@ -514,8 +508,7 @@ uno::Any SAL_CALL Content::execute(
 
         insert( arg.Data, arg.ReplaceExisting, Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "delete" ) ) )
+    else if ( aCommand.Name == "delete" )
     {
         //////////////////////////////////////////////////////////////////
         // delete
@@ -555,9 +548,7 @@ uno::Any SAL_CALL Content::execute(
         // Remove own and all children's Additional Core Properties.
         removeAdditionalPropertySet( sal_True );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "transfer" ) )
-              && isFolder( Environment ) )
+    else if ( aCommand.Name == "transfer" && isFolder( Environment ) )
     {
         //////////////////////////////////////////////////////////////////
         // transfer
@@ -579,8 +570,7 @@ uno::Any SAL_CALL Content::execute(
 
         transfer( transferArgs, Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "post" ) ) )
+    else if ( aCommand.Name == "post" )
     {
         //////////////////////////////////////////////////////////////////
         // post
@@ -601,8 +591,7 @@ uno::Any SAL_CALL Content::execute(
 
         post( aArg, Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "lock" ) ) &&
+    else if ( aCommand.Name == "lock" &&
               supportsExclusiveWriteLock( Environment ) )
     {
         //////////////////////////////////////////////////////////////////
@@ -611,8 +600,7 @@ uno::Any SAL_CALL Content::execute(
 
         lock( Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "unlock" ) ) &&
+    else if ( aCommand.Name == "unlock" &&
               supportsExclusiveWriteLock( Environment ) )
     {
         //////////////////////////////////////////////////////////////////
@@ -621,8 +609,7 @@ uno::Any SAL_CALL Content::execute(
 
         unlock( Environment );
     }
-    else if ( aCommand.Name.equalsAsciiL(
-                  RTL_CONSTASCII_STRINGPARAM( "createNewContent" ) ) &&
+    else if ( aCommand.Name == "createNewContent" &&
               isFolder( Environment ) )
     {
         //////////////////////////////////////////////////////////////////
@@ -707,7 +694,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name,
 //    if ( m_bTransient )
 //   @@@ ???
 
-    if ( !Name.getLength() )
+    if ( Name.isEmpty() )
         throw lang::IllegalArgumentException();
 
     // Check property type.
@@ -989,24 +976,21 @@ Content::createNewContent( const ucb::ContentInfo& Info )
     if ( !Info.Type.getLength() )
         return uno::Reference< ucb::XContent >();
 
-    if ( ( !Info.Type.equalsAsciiL(
-               RTL_CONSTASCII_STRINGPARAM( WEBDAV_COLLECTION_TYPE ) ) )
+    if ( ( Info.Type != WEBDAV_COLLECTION_TYPE )
          &&
-         ( !Info.Type.equalsAsciiL(
-             RTL_CONSTASCII_STRINGPARAM( WEBDAV_CONTENT_TYPE ) ) ) )
+         ( Info.Type != WEBDAV_CONTENT_TYPE ) )
         return uno::Reference< ucb::XContent >();
 
     rtl::OUString aURL = m_xIdentifier->getContentIdentifier();
 
-    OSL_ENSURE( aURL.getLength() > 0,
+    OSL_ENSURE( !aURL.isEmpty(),
                 "WebdavContent::createNewContent - empty identifier!" );
 
     if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() )
         aURL += rtl::OUString::createFromAscii( "/" );
 
     sal_Bool isCollection;
-    if ( Info.Type.equalsAsciiL(
-             RTL_CONSTASCII_STRINGPARAM( WEBDAV_COLLECTION_TYPE ) ) )
+    if ( Info.Type == WEBDAV_COLLECTION_TYPE )
     {
         aURL += rtl::OUString::createFromAscii( "New_Collection" );
         isCollection = sal_True;
@@ -1419,8 +1403,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
     for ( sal_Int32 n = 0; n < nCount; ++n )
     {
         const rtl::OUString rName = rProperties[ n ].Name;
-        if ( rName.equalsAsciiL(
-                      RTL_CONSTASCII_STRINGPARAM( "BaseURI" ) ) )
+        if ( rName == "BaseURI" )
         {
             // Add BaseURI property, if requested.
             xProps->addProperty(
@@ -1428,8 +1411,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                  uno::makeAny( getBaseURI( xResAccess ) ),
                  true );
         }
-        else if ( rName.equalsAsciiL(
-                      RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) )
+        else if ( rName == "CreatableContentsInfo" )
         {
             // Add CreatableContentsInfo property, if requested.
             sal_Bool bFolder = sal_False;
@@ -1538,7 +1520,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(
@@ -1546,8 +1528,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     "Property is read-only!" ),
                 static_cast< cppu::OWeakObject * >( this ) );
         }
-        else if ( rName.equalsAsciiL(
-                      RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
+        else if ( rName == "IsDocument" )
         {
             // Read-only property!
             aRet[ n ] <<= lang::IllegalAccessException(
@@ -1555,8 +1536,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                     "Property is read-only!" ),
                 static_cast< cppu::OWeakObject * >( this ) );
         }
-        else if ( rName.equalsAsciiL(
-                      RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
+        else if ( rName == "IsFolder" )
         {
             // Read-only property!
             aRet[ n ] <<= lang::IllegalAccessException(
@@ -1564,7 +1544,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 )
@@ -1639,7 +1619,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(
@@ -1647,8 +1627,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                                     "Property is read-only!" ),
                                 static_cast< cppu::OWeakObject * >( this ) );
             }
-            else if ( rName.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) )
+            else if ( rName == "DateCreated" )
             {
                 // Read-only property!
                 aRet[ n ] <<= lang::IllegalAccessException(
@@ -1656,8 +1635,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                                     "Property is read-only!" ),
                                 static_cast< cppu::OWeakObject * >( this ) );
             }
-            else if ( rName.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) )
+            else if ( rName == "DateModified" )
             {
                 // Read-only property!
                 aRet[ n ] <<= lang::IllegalAccessException(
@@ -1665,8 +1643,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                                     "Property is read-only!" ),
                                 static_cast< cppu::OWeakObject * >( this ) );
             }
-            else if ( rName.equalsAsciiL(
-                        RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
+            else if ( rName == "MediaType" )
             {
                 // Read-only property!
                 // (but could be writable, if 'getcontenttype' would be)
@@ -1675,8 +1652,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues(
                                     "Property is read-only!" ),
                                 static_cast< cppu::OWeakObject * >( this ) );
             }
-            if ( rName.equalsAsciiL(
-                     RTL_CONSTASCII_STRINGPARAM( "CreatableContentsInfo" ) ) )
+            if ( rName == "CreatableContentsInfo" )
             {
                 // Read-only property!
                 aRet[ n ] <<= lang::IllegalAccessException(
@@ -2477,30 +2453,24 @@ void Content::transfer(
         // Check source's and target's URL scheme
         //
         const rtl::OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase();
-        if ( aScheme.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
+        if ( aScheme == WEBDAV_URL_SCHEME )
         {
             sourceURI.SetScheme(
                 rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
         }
-        else if ( aScheme.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+        else if ( aScheme == DAV_URL_SCHEME )
         {
             sourceURI.SetScheme(
                 rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
         }
-        else if ( aScheme.equalsAsciiL(
-                RTL_CONSTASCII_STRINGPARAM( DAVS_URL_SCHEME ) ) )
+        else if ( aScheme == DAVS_URL_SCHEME )
         {
             sourceURI.SetScheme(
                 rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) );
         }
         else
         {
-            if ( !aScheme.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM( HTTP_URL_SCHEME ) ) &&
-                 !aScheme.equalsAsciiL(
-                    RTL_CONSTASCII_STRINGPARAM( HTTPS_URL_SCHEME ) ) )
+            if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME )
             {
                 ucbhelper::cancelCommandExecution(
                     uno::makeAny(
@@ -2513,12 +2483,10 @@ void Content::transfer(
             }
         }
 
-        if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
-                 RTL_CONSTASCII_STRINGPARAM( WEBDAV_URL_SCHEME ) ) )
+        if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME )
             targetURI.SetScheme(
                 rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
-        else if ( targetURI.GetScheme().toAsciiLowerCase().equalsAsciiL(
-                 RTL_CONSTASCII_STRINGPARAM( DAV_URL_SCHEME ) ) )
+        else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME )
             targetURI.SetScheme(
                 rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) );
 
@@ -2542,10 +2510,10 @@ void Content::transfer(
 
         rtl::OUString aTitle = rArgs.NewTitle;
 
-        if ( !aTitle.getLength() )
+        if ( aTitle.isEmpty() )
             aTitle = sourceURI.GetPathBaseNameUnescaped();
 
-        if ( aTitle.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "/" ) ) )
+        if ( aTitle == "/" )
         {
             // kso: ???
             aTitle = rtl::OUString();
diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
index 982a2a19b9e0..8a0e57ae90a8 100644
--- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx
+++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx
@@ -354,64 +354,43 @@ uno::Sequence< beans::Property > Content::getProperties(
             {
                 bHasGetContentLength = sal_True;
             }
-            else if ( !bHasContentType &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "ContentType" ) ) )
+            else if ( !bHasContentType && (*it) == "ContentType" )
             {
                 bHasContentType = sal_True;
             }
-            else if ( !bHasIsDocument &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "IsDocument" ) ) )
+            else if ( !bHasIsDocument && (*it) == "IsDocument" )
             {
                 bHasIsDocument = sal_True;
             }
-            else if ( !bHasIsFolder &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "IsFolder" ) ) )
+            else if ( !bHasIsFolder && (*it) == "IsFolder" )
             {
                 bHasIsFolder = sal_True;
             }
-            else if ( !bHasTitle &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "Title" ) ) )
+            else if ( !bHasTitle && (*it) == "Title" )
             {
                 bHasTitle = sal_True;
             }
-            else if ( !bHasBaseURI &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "BaseURI" ) ) )
+            else if ( !bHasBaseURI && (*it) == "BaseURI" )
             {
                 bHasBaseURI = sal_True;
             }
-            else if ( !bHasDateCreated &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "DateCreated" ) ) )
+            else if ( !bHasDateCreated && (*it) == "DateCreated" )
             {
                 bHasDateCreated = sal_True;
             }
-            else if ( !bHasDateModified &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "DateModified" ) ) )
+            else if ( !bHasDateModified && (*it) == "DateModified" )
             {
                 bHasDateModified = sal_True;
             }
-            else if ( !bHasMediaType &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "MediaType" ) ) )
+            else if ( !bHasMediaType && (*it) == "MediaType" )
             {
                 bHasMediaType = sal_True;
             }
-            else if ( !bHasSize &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM( "Size" ) ) )
+            else if ( !bHasSize && (*it) == "Size" )
             {
                 bHasSize = sal_True;
             }
-            else if ( !bHasCreatableInfos &&
-                      (*it).equalsAsciiL(
-                            RTL_CONSTASCII_STRINGPARAM(
-                                "CreatableContentsInfo" ) ) )
+            else if ( !bHasCreatableInfos && (*it) == "CreatableContentsInfo" )
             {
                 bHasCreatableInfos = sal_True;
             }