diff options
| -rw-r--r-- | ucb/source/ucp/webdav-curl/DAVAuthListener.hxx | 3 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx | 3 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx | 7 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 4 | ||||
| -rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.hxx | 3 |
5 files changed, 8 insertions, 12 deletions
diff --git a/ucb/source/ucp/webdav-curl/DAVAuthListener.hxx b/ucb/source/ucp/webdav-curl/DAVAuthListener.hxx index c3d643bc7d82..f5c2392185c1 100644 --- a/ucb/source/ucp/webdav-curl/DAVAuthListener.hxx +++ b/ucb/source/ucp/webdav-curl/DAVAuthListener.hxx @@ -34,8 +34,7 @@ class DAVAuthListener : public salhelper::SimpleReferenceObject const OUString & inHostName, OUString & inoutUserName, OUString & outPassWord, - bool bCanUseSystemCredentials, - bool bUsePreviousCredentials = true ) = 0; + bool bCanUseSystemCredentials) = 0; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx index 700c7c4c61ae..b0e6302bcf6d 100644 --- a/ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav-curl/DAVAuthListenerImpl.hxx @@ -46,8 +46,7 @@ namespace http_dav_ucp const OUString & inHostName, OUString & inoutUserName, OUString & outPassWord, - bool bCanUseSystemCredentials, - bool bUsePreviousCredentials = true ) override; + bool bCanUseSystemCredentials ) override; private: const css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; diff --git a/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx index c1b775c08f70..dfe78feb2454 100644 --- a/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-curl/DAVResourceAccess.cxx @@ -47,8 +47,7 @@ int DAVAuthListener_Impl::authenticate( const OUString & inHostName, OUString & inoutUserName, OUString & outPassWord, - bool bCanUseSystemCredentials, - bool bUsePreviousCredentials ) + bool bCanUseSystemCredentials ) { if ( m_xEnv.is() ) { @@ -61,10 +60,10 @@ int DAVAuthListener_Impl::authenticate( // container to reject these. Thus, the credential input dialog will be shown again. // #102871# - Supply username and password from previous try. // Password container service depends on this! - if ( inoutUserName.isEmpty() && bUsePreviousCredentials ) + if ( inoutUserName.isEmpty() ) inoutUserName = m_aPrevUsername; - if ( outPassWord.isEmpty() && bUsePreviousCredentials ) + if ( outPassWord.isEmpty() ) outPassWord = m_aPrevPassword; rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 8cb0e8205d34..cda28879b237 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -998,10 +998,10 @@ void UcbLockBytes::setStream( const Reference<XStream>& aStream ) } } -bool UcbLockBytes::setInputStream( const Reference<XInputStream> &rxInputStream, bool bSetXSeekable ) +bool UcbLockBytes::setInputStream( const Reference<XInputStream> &rxInputStream ) { std::unique_lock aGuard( m_aMutex ); - return setInputStreamImpl(aGuard, rxInputStream, bSetXSeekable); + return setInputStreamImpl(aGuard, rxInputStream, /*bSetXSeekable*/true); } bool UcbLockBytes::setInputStreamImpl( std::unique_lock<std::mutex>& /*rGuard*/, const Reference<XInputStream> &rxInputStream, bool bSetXSeekable ) diff --git a/unotools/source/ucbhelper/ucblockbytes.hxx b/unotools/source/ucbhelper/ucblockbytes.hxx index d866015b250f..efaa66830cc7 100644 --- a/unotools/source/ucbhelper/ucblockbytes.hxx +++ b/unotools/source/ucbhelper/ucblockbytes.hxx @@ -105,8 +105,7 @@ public: // calling this method delegates the responsibility to call closeinput to the caller! css::uno::Reference < css::io::XInputStream > getInputStream(); - bool setInputStream( const css::uno::Reference < css::io::XInputStream > &rxInputStream, - bool bSetXSeekable = true ); + bool setInputStream( const css::uno::Reference < css::io::XInputStream > &rxInputStream ); void setStream( const css::uno::Reference < css::io::XStream > &rxStream ); void terminate(); |