diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2022-04-20 11:32:09 +0200 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2022-04-20 13:37:44 +0200 |
| commit | 6a868fff7a947a630ef1e1573a165f8fe690fad0 (patch) | |
| tree | 6467bc424f15caa940b640d0f2e2a767869fcaf0 | |
| parent | tdf#148630 fix text layout and cursor position for IVS+spacing (diff) | |
| download | core-6a868fff7a947a630ef1e1573a165f8fe690fad0.tar.gz core-6a868fff7a947a630ef1e1573a165f8fe690fad0.zip | |
ucb: webdav-curl: restore CppunitTest_ucb_webdav_core
First commit 2177f48b16b8cd68c0ef4ec817ca391f28324418 forgot to adapt
one use of WITH_WEBDAV so the test didn't run and then commit
2cbf83e20889351e2d2a6e29e5c7d9250af58647 removed some functions that
were only called by the test.
Change-Id: I46c8b065d37aa072a8966cce30d9e63d63b1145c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/133206
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
| -rw-r--r-- | ucb/CppunitTest_ucb_webdav_core.mk | 1 | ||||
| -rw-r--r-- | ucb/Module_ucb.mk | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-curl/DAVTypes.hxx | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/ucb/CppunitTest_ucb_webdav_core.mk b/ucb/CppunitTest_ucb_webdav_core.mk index fbd3f59f55f6..0df1feefff21 100644 --- a/ucb/CppunitTest_ucb_webdav_core.mk +++ b/ucb/CppunitTest_ucb_webdav_core.mk @@ -19,6 +19,7 @@ $(eval $(call gb_CppunitTest_use_libraries,ucb_webdav_core, \ cppuhelper \ sal \ salhelper \ + svl \ test \ ucbhelper \ tl \ diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk index aebc961aa9dd..7bbcc925e28d 100644 --- a/ucb/Module_ucb.mk +++ b/ucb/Module_ucb.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,ucb,\ )) endif -ifeq ($(WITH_WEBDAV),curl) +ifneq ($(WITH_WEBDAV),) $(eval $(call gb_Module_add_check_targets,ucb,\ CppunitTest_ucb_webdav_core \ diff --git a/ucb/source/ucp/webdav-curl/DAVTypes.hxx b/ucb/source/ucp/webdav-curl/DAVTypes.hxx index f09bb6b2e0a0..8e6160333c7c 100644 --- a/ucb/source/ucp/webdav-curl/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-curl/DAVTypes.hxx @@ -109,6 +109,7 @@ namespace http_dav_ucp void setStaleTime( const sal_uInt32 nStaleTime ) { m_nStaleTime = nStaleTime; }; sal_uInt32 getRequestedTimeLife() const { return m_nRequestedTimeLife; }; + void setRequestedTimeLife( const sal_uInt32 nRequestedTimeLife ) { m_nRequestedTimeLife = nRequestedTimeLife; }; const OUString & getURL() const { return m_sURL; }; void setURL( const OUString & sURL ) { m_sURL = sURL; }; @@ -117,6 +118,7 @@ namespace http_dav_ucp void setRedirectedURL( const OUString & sRedirectedURL ) { m_sRedirectedURL = sRedirectedURL; }; void setAllowedMethods( const OUString & aAllowedMethods ) { m_aAllowedMethods = aAllowedMethods; } ; + const OUString & getAllowedMethods() const { return m_aAllowedMethods; } ; bool isLockAllowed() const { return ( m_aAllowedMethods.indexOf( "LOCK" ) != -1 ); }; void setLocked( bool locked = true ) { m_isLocked = locked; } ; |