From 58cb14239267d6ab1b0be20bc8aa8f6895e15cb7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 27 Jul 2015 09:10:46 +0200 Subject: loplugin:staticmethods Change-Id: Iab1eda788690366bfc03ba7c4f085cb474fef1b8 --- ucb/source/ucp/webdav/DAVResourceAccess.hxx | 2 +- ucb/source/ucp/webdav/SerfRequestProcessor.cxx | 16 ++++++++-------- ucb/source/ucp/webdav/SerfSession.hxx | 4 ++-- ucb/source/ucp/webdav/webdavcontent.cxx | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'ucb') diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index 52a337b797d3..6e51a42f99e7 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -219,7 +219,7 @@ public: throw ( DAVException ); void - abort() + static abort() throw ( DAVException ); // helper diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx index 06088d20a99f..cb3ab7e48d9d 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -61,7 +61,7 @@ SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession, , mbAcceptSerfResponseCalled( false ) , mbHandleSerfResponseCalled( false ) { - mPathStr = apr_pstrdup( mrSerfSession.getAprPool(), + mPathStr = apr_pstrdup( SerfSession::getAprPool(), OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -226,9 +226,9 @@ bool SerfRequestProcessor::processPost( const char* inData, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ) { - mContentType = apr_pstrdup( mrSerfSession.getAprPool(), + mContentType = apr_pstrdup( SerfSession::getAprPool(), OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() ); - mReferer = apr_pstrdup( mrSerfSession.getAprPool(), + mReferer = apr_pstrdup( SerfSession::getAprPool(), OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() ); mpProcImpl = new SerfPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, @@ -250,9 +250,9 @@ bool SerfRequestProcessor::processPost( const char* inData, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ) { - mContentType = apr_pstrdup( mrSerfSession.getAprPool(), + mContentType = apr_pstrdup( SerfSession::getAprPool(), OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ).getStr() ); - mReferer = apr_pstrdup( mrSerfSession.getAprPool(), + mReferer = apr_pstrdup( SerfSession::getAprPool(), OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ).getStr() ); mpProcImpl = new SerfPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, @@ -291,7 +291,7 @@ bool SerfRequestProcessor::processCopy( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ) { - mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), + mDestPathStr = apr_pstrdup( SerfSession::getAprPool(), OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() ); mpProcImpl = new SerfCopyReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, @@ -307,7 +307,7 @@ bool SerfRequestProcessor::processMove( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ) { - mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), + mDestPathStr = apr_pstrdup( SerfSession::getAprPool(), OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ).getStr() ); mpProcImpl = new SerfMoveReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, @@ -365,7 +365,7 @@ apr_status_t SerfRequestProcessor::runProcessor() mbProcessingDone = false; apr_status_t status = APR_SUCCESS; serf_context_t* pSerfContext = mrSerfSession.getSerfContext(); - apr_pool_t* pAprPool = mrSerfSession.getAprPool(); + apr_pool_t* pAprPool = SerfSession::getAprPool(); while ( true ) { status = serf_context_run( pSerfContext, diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index a2f5402059ce..2d5abea796e1 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -102,7 +102,7 @@ public: apr_pool_t* inAprPool ); // Serf-related data structures - apr_pool_t* getAprPool(); + static apr_pool_t* getAprPool(); serf_bucket_alloc_t* getSerfBktAlloc(); serf_context_t* getSerfContext(); serf_connection_t* getSerfConnection(); @@ -264,7 +264,7 @@ private: const ucbhelper::InternetProxyServer & getProxySettings() const; - bool removeExpiredLocktoken( const OUString & inURL, + static bool removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ); // refresh lock, called by SerfLockStore::refreshLocks diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index c61511b14044..32ca2dba96aa 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -830,7 +830,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) osl::MutexGuard aGuard( m_aMutex ); xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); } - xResAccess->abort(); + DAVResourceAccess::abort(); { osl::Guard< osl::Mutex > aGuard( m_aMutex ); m_xResAccess.reset( new DAVResourceAccess( *xResAccess.get() ) ); -- cgit