webdav: fix remaining build issues

Change-Id: I9416551ba78a6a27071fdf92a6c36c271a1032b7

7 files changed, 25 insertions, 25 deletions

diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx
index d04aa071077f..64106e14694e 100644
--- a/ucb/source/ucp/webdav/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav/ContentProperties.cxx
@@ -424,7 +424,7 @@ void ContentProperties::addProperty( const OUString & rName,
                                      const com::sun::star::uno::Any & rValue,
                                      bool bIsCaseSensitive )
 {
-    if ( rName == DAVProperties::CREATIONDATE ) )
+    if ( rName == DAVProperties::CREATIONDATE )
     {
         // Map DAV:creationdate to UCP:DateCreated
         OUString aValue;
@@ -441,7 +441,7 @@ void ContentProperties::addProperty( const OUString & rName,
     //  else if ( rName.equals( DAVProperties::GETCONTENTLANGUAGE ) )
     //  {
     //  }
-    else if ( rName == DAVProperties::GETCONTENTLENGTH ) )
+    else if ( rName == DAVProperties::GETCONTENTLENGTH )
     {
         // Map DAV:getcontentlength to UCP:Size
         OUString aValue;
@@ -462,7 +462,7 @@ void ContentProperties::addProperty( const OUString & rName,
         (*m_xProps)[ OUString( "Size" ) ]
             = PropertyValue( uno::makeAny( aValue.toInt64() ), true );
     }
-    else if ( rName == DAVProperties::GETCONTENTTYPE ) )
+    else if ( rName == DAVProperties::GETCONTENTTYPE )
     {
         // Map DAV:getcontenttype to UCP:MediaType (1:1)
         (*m_xProps)[ OUString( "MediaType" ) ]
@@ -508,7 +508,7 @@ void ContentProperties::addProperty( const OUString & rName,
     //  else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) )
     //  {
     //  }
-    else if ( rName == DAVProperties::RESOURCETYPE ) )
+    else if ( rName == DAVProperties::RESOURCETYPE )
     {
         OUString aValue;
         rValue >>= aValue;
diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx
index eabe6b448733..34537d29e663 100644
--- a/ucb/source/ucp/webdav/DAVProperties.cxx
+++ b/ucb/source/ucp/webdav/DAVProperties.cxx
@@ -198,7 +198,7 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU
         return false;
 
     // TODO skip whitespaces?
-    if ( !rFullName.startsWith( "xmlns:prop=\"", ++nEnd ) )
+    if ( !rFullName.match( "xmlns:prop=\"", ++nEnd ) )
         return false;
 
     nStart = nEnd + RTL_CONSTASCII_LENGTH( "xmlns:prop=\"" );
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 83a0da1467a1..fd5850aa58ab 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -1592,7 +1592,7 @@ SerfSession::isDomainMatch( OUString certHostName )
     if (hostName.equalsIgnoreAsciiCase( certHostName ) )
         return sal_True;
 
-    if ( certHostName.startsWith( '*' ) &&
+    if ( certHostName.startsWith( "*" ) &&
          hostName.getLength() >= certHostName.getLength()  )
     {
         OUString cmpStr = certHostName.copy( 1 );
diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
index f8f234f17db9..ca48a107249a 100644
--- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
+++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx
@@ -194,7 +194,7 @@ static OUString encodeValue( const OUString & rValue )
         else
             aResult.append( c );
     }
-    return OUString( aResult );
+    return aResult.makeStringAndClear();
 }
 
 /*
diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx
index 3d5d2aa9f99e..44a1d2c663bb 100644
--- a/ucb/source/ucp/webdav/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav/webdavcontent.cxx
@@ -573,7 +573,7 @@ uno::Any SAL_CALL Content::execute(
         // Note: Implemented by base class.
         aRet <<= getCommandInfo( Environment, sal_False );
     }
-    else if ( aCommand.Name "open" )
+    else if ( aCommand.Name == "open" )
     {
         //////////////////////////////////////////////////////////////////
         // open
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
index 065c5bd38a6b..d70b1619be96 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx
@@ -74,15 +74,15 @@ struct DataSupplier_Impl
     rtl::Reference< Content >                    m_xContent;
     uno::Reference< uno::XComponentContext > m_xContext;
     sal_Int32                                    m_nOpenMode;
-    sal_Bool                                     m_bCountFinal;
-    sal_Bool                                     m_bThrowException;
+    bool                                     m_bCountFinal;
+    bool                                     m_bThrowException;
 
     DataSupplier_Impl(
                 const uno::Reference< uno::XComponentContext >& rxContext,
                 const rtl::Reference< Content >& rContent,
                 sal_Int32 nOpenMode )
     : m_xContent( rContent ), m_xContext( rxContext ), m_nOpenMode( nOpenMode ),
-      m_bCountFinal( sal_False ), m_bThrowException( sal_False ) {}
+      m_bCountFinal( false ), m_bThrowException( false ) {}
     ~DataSupplier_Impl();
 };
 
@@ -229,14 +229,14 @@ DataSupplier::queryContent( sal_uInt32 nIndex )
 
 //=========================================================================
 // virtual
-sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
+bool DataSupplier::getResult( sal_uInt32 nIndex )
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
     if ( m_pImpl->m_aResults.size() > nIndex )
     {
         // Result already present.
-        return sal_True;
+        return true;
     }
 
     // Obtain values...
@@ -245,11 +245,11 @@ sal_Bool DataSupplier::getResult( sal_uInt32 nIndex )
         if ( m_pImpl->m_aResults.size() > nIndex )
         {
             // Result already present.
-            return sal_True;
+            return true;
         }
     }
 
-    return sal_False;
+    return false;
 }
 
 //=========================================================================
@@ -271,7 +271,7 @@ sal_uInt32 DataSupplier::currentCount()
 
 //=========================================================================
 // virtual
-sal_Bool DataSupplier::isCountFinal()
+bool DataSupplier::isCountFinal()
 {
     return m_pImpl->m_bCountFinal;
 }
@@ -336,7 +336,7 @@ void DataSupplier::validate()
 }
 
 //=========================================================================
-sal_Bool DataSupplier::getData()
+bool DataSupplier::getData()
 {
     osl::ClearableGuard< osl::Mutex > aGuard( m_pImpl->m_aMutex );
 
@@ -379,8 +379,8 @@ sal_Bool DataSupplier::getData()
         }
         catch ( DAVException & )
         {
-//          OSL_ENSURE( sal_False, "PROPFIND : DAVException" );
-            m_pImpl->m_bThrowException = sal_True;
+//          OSL_ENSURE( false, "PROPFIND : DAVException" );
+            m_pImpl->m_bThrowException = true;
         }
 
         if ( !m_pImpl->m_bThrowException )
@@ -436,7 +436,7 @@ sal_Bool DataSupplier::getData()
                     {
                     case ucb::OpenMode::FOLDERS:
                         {
-                            sal_Bool bFolder = sal_False;
+                            bool bFolder = false;
 
                             const uno::Any & rValue
                                 = pContentProperties->getValue(
@@ -452,7 +452,7 @@ sal_Bool DataSupplier::getData()
 
                     case ucb::OpenMode::DOCUMENTS:
                         {
-                            sal_Bool bDocument = sal_False;
+                            bool bDocument = false;
 
                             const uno::Any & rValue
                                 = pContentProperties->getValue(
@@ -480,7 +480,7 @@ sal_Bool DataSupplier::getData()
             }
         }
 
-        m_pImpl->m_bCountFinal = sal_True;
+        m_pImpl->m_bCountFinal = true;
 
         // Callback possible, because listeners may be informed!
         aGuard.clear();
diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
index dbeffb2dd6a1..bc1c83768760 100644
--- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx
+++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx
@@ -38,7 +38,7 @@ class DataSupplier : public ucbhelper::ResultSetDataSupplier
     DataSupplier_Impl* m_pImpl;
 
 private:
-    sal_Bool getData();
+    bool getData();
 
 public:
     DataSupplier( const com::sun::star::uno::Reference<
@@ -55,11 +55,11 @@ public:
     virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent >
     queryContent( sal_uInt32 nIndex );
 
-    virtual sal_Bool getResult( sal_uInt32 nIndex );
+    virtual bool getResult( sal_uInt32 nIndex );
 
     virtual sal_uInt32 totalCount();
     virtual sal_uInt32 currentCount();
-    virtual sal_Bool isCountFinal();
+    virtual bool isCountFinal();
 
     virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow >
     queryPropertyValues( sal_uInt32 nIndex  );