Kaydet (Commit) 3a349b7c authored tarafından Tor Lillqvist's avatar Tor Lillqvist

loplugin:refcounting

Change-Id: I5ca4c1599a1abc4281bac9a4d0164d4b0cb3e24a
üst 54491dce
...@@ -26,7 +26,7 @@ namespace http_dav_ucp ...@@ -26,7 +26,7 @@ namespace http_dav_ucp
SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders, const DAVRequestHeaders& inRequestHeaders,
const css::uno::Reference< SerfInputStream > & xioInStrm ) const rtl::Reference< SerfInputStream > & xioInStrm )
: SerfRequestProcessorImpl( inPath, inRequestHeaders ) : SerfRequestProcessorImpl( inPath, inRequestHeaders )
, xInputStream( xioInStrm ) , xInputStream( xioInStrm )
, xOutputStream() , xOutputStream()
...@@ -37,7 +37,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, ...@@ -37,7 +37,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders, const DAVRequestHeaders& inRequestHeaders,
const css::uno::Reference< SerfInputStream > & xioInStrm, const rtl::Reference< SerfInputStream > & xioInStrm,
const std::vector< OUString > & inHeaderNames, const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource ) DAVResource & ioResource )
: SerfRequestProcessorImpl( inPath, inRequestHeaders ) : SerfRequestProcessorImpl( inPath, inRequestHeaders )
......
...@@ -37,11 +37,11 @@ class SerfGetReqProcImpl : public SerfRequestProcessorImpl ...@@ -37,11 +37,11 @@ class SerfGetReqProcImpl : public SerfRequestProcessorImpl
public: public:
SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders, const DAVRequestHeaders& inRequestHeaders,
const css::uno::Reference< SerfInputStream > & xioInStrm ); const rtl::Reference< SerfInputStream > & xioInStrm );
SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders, const DAVRequestHeaders& inRequestHeaders,
const css::uno::Reference< SerfInputStream > & xioInStrm, const rtl::Reference< SerfInputStream > & xioInStrm,
const std::vector< OUString > & inHeaderNames, const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource ); DAVResource & ioResource );
...@@ -71,7 +71,7 @@ protected: ...@@ -71,7 +71,7 @@ protected:
void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override;
private: private:
css::uno::Reference< SerfInputStream > xInputStream; rtl::Reference< SerfInputStream > xInputStream;
css::uno::Reference< css::io::XOutputStream > xOutputStream; css::uno::Reference< css::io::XOutputStream > xOutputStream;
const std::vector< OUString > * mpHeaderNames; const std::vector< OUString > * mpHeaderNames;
DAVResource* mpResource; DAVResource* mpResource;
......
...@@ -57,7 +57,7 @@ private: ...@@ -57,7 +57,7 @@ private:
// if m_plastChanceToSendRefreshRequest is not 0 we are sending just refresh request // if m_plastChanceToSendRefreshRequest is not 0 we are sending just refresh request
sal_Int32* m_plastChanceToSendRefreshRequest; sal_Int32* m_plastChanceToSendRefreshRequest;
TimeValue m_aStartCall; TimeValue m_aStartCall;
css::uno::Reference< SerfInputStream > m_xInputStream; rtl::Reference< SerfInputStream > m_xInputStream;
}; };
} // namespace http_dav_ucp } // namespace http_dav_ucp
......
...@@ -32,7 +32,7 @@ SerfPostReqProcImpl::SerfPostReqProcImpl( const char* inPath, ...@@ -32,7 +32,7 @@ SerfPostReqProcImpl::SerfPostReqProcImpl( const char* inPath,
apr_size_t inDataLen, apr_size_t inDataLen,
const char* inContentType, const char* inContentType,
const char* inReferer, const char* inReferer,
const css::uno::Reference< SerfInputStream > & xioInStrm ) const rtl::Reference< SerfInputStream > & xioInStrm )
: SerfRequestProcessorImpl( inPath, inRequestHeaders ) : SerfRequestProcessorImpl( inPath, inRequestHeaders )
, mpPostData( inData ) , mpPostData( inData )
, mnPostDataLen( inDataLen ) , mnPostDataLen( inDataLen )
......
...@@ -37,7 +37,7 @@ public: ...@@ -37,7 +37,7 @@ public:
apr_size_t inDataLen, apr_size_t inDataLen,
const char* inContentType, const char* inContentType,
const char* inReferer, const char* inReferer,
const css::uno::Reference< SerfInputStream > & xioInStrm ); const rtl::Reference< SerfInputStream > & xioInStrm );
SerfPostReqProcImpl( const char* inPath, SerfPostReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders, const DAVRequestHeaders& inRequestHeaders,
...@@ -64,7 +64,7 @@ private: ...@@ -64,7 +64,7 @@ private:
apr_size_t mnPostDataLen; apr_size_t mnPostDataLen;
const char* mpContentType; const char* mpContentType;
const char* mpReferer; const char* mpReferer;
css::uno::Reference< SerfInputStream > xInputStream; rtl::Reference< SerfInputStream > xInputStream;
css::uno::Reference< css::io::XOutputStream > xOutputStream; css::uno::Reference< css::io::XOutputStream > xOutputStream;
}; };
......
...@@ -67,7 +67,7 @@ private: ...@@ -67,7 +67,7 @@ private:
std::vector< DAVResourceInfo > * mpResInfo; std::vector< DAVResourceInfo > * mpResInfo;
const bool mbOnlyPropertyNames; const bool mbOnlyPropertyNames;
css::uno::Reference< SerfInputStream > xInputStream; rtl::Reference< SerfInputStream > xInputStream;
}; };
} // namespace http_dav_ucp } // namespace http_dav_ucp
......
...@@ -129,7 +129,7 @@ bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue > ...@@ -129,7 +129,7 @@ bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue >
} }
// GET // GET
bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, bool SerfRequestProcessor::processGet( const rtl::Reference< SerfInputStream >& xioInStrm,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mpProcImpl = new SerfGetReqProcImpl( mPathStr, mpProcImpl = new SerfGetReqProcImpl( mPathStr,
...@@ -141,7 +141,7 @@ bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStrea ...@@ -141,7 +141,7 @@ bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStrea
} }
// GET inclusive header fields // GET inclusive header fields
bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, bool SerfRequestProcessor::processGet( const rtl::Reference< SerfInputStream >& xioInStrm,
const std::vector< OUString > & inHeaderNames, const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource, DAVResource & ioResource,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
...@@ -223,7 +223,7 @@ bool SerfRequestProcessor::processPost( const char* inData, ...@@ -223,7 +223,7 @@ bool SerfRequestProcessor::processPost( const char* inData,
apr_size_t inDataLen, apr_size_t inDataLen,
const OUString & inContentType, const OUString & inContentType,
const OUString & inReferer, const OUString & inReferer,
const css::uno::Reference< SerfInputStream >& xioInStrm, const rtl::Reference< SerfInputStream >& xioInStrm,
apr_status_t& outSerfStatus ) apr_status_t& outSerfStatus )
{ {
mContentType = apr_pstrdup( SerfSession::getAprPool(), mContentType = apr_pstrdup( SerfSession::getAprPool(),
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/ucb/Lock.hpp> #include <com/sun/star/ucb/Lock.hpp>
#include <rtl/ref.hxx>
namespace http_dav_ucp namespace http_dav_ucp
{ {
...@@ -64,11 +66,11 @@ public: ...@@ -64,11 +66,11 @@ public:
apr_status_t& outSerfStatus ); apr_status_t& outSerfStatus );
// GET // GET
bool processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, bool processGet( const rtl::Reference< SerfInputStream >& xioInStrm,
apr_status_t& outSerfStatus ); apr_status_t& outSerfStatus );
// GET inclusive header fields // GET inclusive header fields
bool processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, bool processGet( const rtl::Reference< SerfInputStream >& xioInStrm,
const std::vector< OUString > & inHeaderNames, const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource, DAVResource & ioResource,
apr_status_t& outSerfStatus ); apr_status_t& outSerfStatus );
...@@ -98,7 +100,7 @@ public: ...@@ -98,7 +100,7 @@ public:
apr_size_t inDataLen, apr_size_t inDataLen,
const OUString & inContentType, const OUString & inContentType,
const OUString & inReferer, const OUString & inReferer,
const css::uno::Reference< SerfInputStream >& xioInStrm, const rtl::Reference< SerfInputStream >& xioInStrm,
apr_status_t& outSerfStatus ); apr_status_t& outSerfStatus );
// POST // POST
......
...@@ -709,7 +709,7 @@ SerfSession::GET( const OUString & inPath, ...@@ -709,7 +709,7 @@ SerfSession::GET( const OUString & inPath,
Init( rEnv ); Init( rEnv );
uno::Reference< SerfInputStream > xInputStream( new SerfInputStream ); rtl::Reference< SerfInputStream > xInputStream( new SerfInputStream );
apr_status_t status = APR_SUCCESS; apr_status_t status = APR_SUCCESS;
std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) ); std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
aReqProc->processGet( xInputStream, aReqProc->processGet( xInputStream,
...@@ -755,7 +755,7 @@ SerfSession::GET( const OUString & inPath, ...@@ -755,7 +755,7 @@ SerfSession::GET( const OUString & inPath,
Init( rEnv ); Init( rEnv );
std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) ); std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
uno::Reference< SerfInputStream > xInputStream( new SerfInputStream ); rtl::Reference< SerfInputStream > xInputStream( new SerfInputStream );
ioResource.uri = inPath; ioResource.uri = inPath;
ioResource.properties.clear(); ioResource.properties.clear();
apr_status_t status = APR_SUCCESS; apr_status_t status = APR_SUCCESS;
...@@ -841,7 +841,7 @@ SerfSession::POST( const OUString & inPath, ...@@ -841,7 +841,7 @@ SerfSession::POST( const OUString & inPath,
Init( rEnv ); Init( rEnv );
std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) ); std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
uno::Reference< SerfInputStream > xInputStream( new SerfInputStream ); rtl::Reference< SerfInputStream > xInputStream( new SerfInputStream );
apr_status_t status = APR_SUCCESS; apr_status_t status = APR_SUCCESS;
aReqProc->processPost( reinterpret_cast< const char * >( aDataToSend.getConstArray() ), aReqProc->processPost( reinterpret_cast< const char * >( aDataToSend.getConstArray() ),
aDataToSend.getLength(), aDataToSend.getLength(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment