diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-10-01 12:35:57 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-11-01 18:49:21 +0100 |
| commit | c7d95240b90001c7e253aa65ed8dc804a2719849 (patch) | |
| tree | da1a313c5d08fb3a491705f3564a70f0a7eb31a5 /ucb | |
| parent | b3fc6caf392809d844e84f6a36db6a0fe3111c39 (diff) | |
ucb: webdav-curl: tdf#101094 (34): Fix test and missing field value in comparision operator
[ port of commit d751af3f84909996d44b9354ce9ed34891d374e1 ]
Change-Id: I2b425741672e09eec3e42eb7af34cac9c20164eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123493
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/webdav-curl/CurlSession.cxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-curl/DAVTypes.cxx | 1 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-curl/DAVTypes.hxx | 24 |
3 files changed, 14 insertions, 13 deletions
diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx index eab01e77d07b..9700540d6565 100644 --- a/ucb/source/ucp/webdav-curl/CurlSession.cxx +++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx @@ -1113,7 +1113,7 @@ auto CurlSession::OPTIONS(OUString const& rURIReference, { SAL_INFO("ucb.ucp.webdav.curl", "OPTIONS: " << rURIReference); - rOptions.reset(); + rOptions.init(); ::std::vector<OUString> const headerNames{ "allow", "dav" }; DAVResource result; diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.cxx b/ucb/source/ucp/webdav-curl/DAVTypes.cxx index 6e5e51ef25d5..39543c3dcf98 100644 --- a/ucb/source/ucp/webdav-curl/DAVTypes.cxx +++ b/ucb/source/ucp/webdav-curl/DAVTypes.cxx @@ -64,6 +64,7 @@ bool DAVOptions::operator==( const DAVOptions& rOpts ) const m_isClass2 == rOpts.m_isClass2 && m_isClass3 == rOpts.m_isClass3 && m_isLocked == rOpts.m_isLocked && + m_isHeadAllowed == rOpts.m_isHeadAllowed && m_aAllowedMethods == rOpts.m_aAllowedMethods && m_nStaleTime == rOpts.m_nStaleTime && m_sURL == rOpts.m_sURL && diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.hxx b/ucb/source/ucp/webdav-curl/DAVTypes.hxx index 23cdd9f694d0..7959cf150bce 100644 --- a/ucb/source/ucp/webdav-curl/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-curl/DAVTypes.hxx @@ -91,13 +91,13 @@ namespace http_dav_ucp virtual ~DAVOptions(); - bool isResourceFound() const { return m_isResourceFound; }; + bool isResourceFound() { return m_isResourceFound; }; void setResourceFound( bool ResourceFound = true ) { m_isResourceFound = ResourceFound; }; - bool isClass1() const { return m_isClass1; }; + bool isClass1() { return m_isClass1; }; void setClass1( bool Class1 = true ) { m_isClass1 = Class1; }; - bool isClass2() const { return m_isClass2; }; + bool isClass2() { return m_isClass2; }; void setClass2( bool Class2 = true ) { m_isClass2 = Class2; }; bool isClass3() { return m_isClass3; }; @@ -109,20 +109,20 @@ namespace http_dav_ucp sal_uInt32 getStaleTime() const { return m_nStaleTime ; }; void setStaleTime( const sal_uInt32 nStaleTime ) { m_nStaleTime = nStaleTime; }; - OUString & getURL() { return m_sURL; }; - void setURL( OUString & sURL ) { m_sURL = sURL; }; + const OUString & getURL() { return m_sURL; }; + void setURL( const OUString & sURL ) { m_sURL = sURL; }; - OUString & getRedirectedURL() { return m_sRedirectedURL; }; - void setRedirectedURL( OUString & sRedirectedURL ) { m_sRedirectedURL = sRedirectedURL; }; + const OUString & getRedirectedURL() { return m_sRedirectedURL; }; + void setRedirectedURL( const OUString & sRedirectedURL ) { m_sRedirectedURL = sRedirectedURL; }; - void setAllowedMethods( OUString & aAllowedMethods ) { m_aAllowedMethods = aAllowedMethods; } ; - OUString & getAllowedMethods() { return m_aAllowedMethods; } ; - bool isLockAllowed() const { return ( m_aAllowedMethods.indexOf( "LOCK" ) != -1 ); }; + void setAllowedMethods( const OUString & aAllowedMethods ) { m_aAllowedMethods = aAllowedMethods; } ; + const OUString & getAllowedMethods() { return m_aAllowedMethods; } ; + bool isLockAllowed() { return ( m_aAllowedMethods.indexOf( "LOCK" ) != -1 ); }; void setLocked( bool locked = true ) { m_isLocked = locked; } ; - bool isLocked() const { return m_isLocked; }; + bool isLocked() { return m_isLocked; }; - void reset() { + void init() { m_isResourceFound = false; m_isClass1 = false; m_isClass2 = false; |