From d751af3f84909996d44b9354ce9ed34891d374e1 Mon Sep 17 00:00:00 2001 From: Giuseppe Castagno Date: Sat, 1 Oct 2016 12:35:57 +0200 Subject: tdf#101094 (34): Fix test and missing field value in comparision operator Change-Id: I6be4a7861f2a978c260defd54dcbc8d124017439 Reviewed-on: https://gerrit.libreoffice.org/29431 Tested-by: Jenkins Reviewed-by: Giuseppe Castagno --- ucb/source/ucp/webdav-neon/DAVTypes.cxx | 1 + ucb/source/ucp/webdav-neon/DAVTypes.hxx | 24 ++++++++++++------------ ucb/source/ucp/webdav-neon/NeonSession.cxx | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) (limited to 'ucb/source') diff --git a/ucb/source/ucp/webdav-neon/DAVTypes.cxx b/ucb/source/ucp/webdav-neon/DAVTypes.cxx index 875699418f2c..bd723e53249f 100644 --- a/ucb/source/ucp/webdav-neon/DAVTypes.cxx +++ b/ucb/source/ucp/webdav-neon/DAVTypes.cxx @@ -62,6 +62,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-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx index 9d4acd1a41fb..5721619b6360 100644 --- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx @@ -101,13 +101,13 @@ namespace webdav_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; }; @@ -119,20 +119,20 @@ namespace webdav_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; diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 9c285c37d7e0..8519cb3b7ec9 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -849,7 +849,7 @@ void NeonSession::OPTIONS( const OUString & inPath, SAL_INFO( "ucb.ucp.webdav", "OPTIONS - relative URL <" << inPath << ">" ); - rOptions.reset(); + rOptions.init(); Init( rEnv ); int theRetVal; -- cgit