summaryrefslogtreecommitdiff
path: root/ucb
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2016-12-13 16:04:08 +0200
committerTor Lillqvist <tml@collabora.com>2016-12-13 18:31:28 +0200
commit3a349b7ccf9b31ec699bf1a4bfc7d0339c1ee916 (patch)
tree4ed0ea6d599a5888fe95dc750dd48506c591ac03 /ucb
parent54491dce60ddce0cca509d030b0c38093a8be535 (diff)
loplugin:refcounting
Change-Id: I5ca4c1599a1abc4281bac9a4d0164d4b0cb3e24a
Diffstat (limited to 'ucb')
-rw-r--r--ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx4
-rw-r--r--ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx6
-rw-r--r--ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx2
-rw-r--r--ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx4
-rw-r--r--ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx2
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessor.cxx6
-rw-r--r--ucb/source/ucp/webdav/SerfRequestProcessor.hxx8
-rw-r--r--ucb/source/ucp/webdav/SerfSession.cxx6
9 files changed, 21 insertions, 19 deletions
diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
index 07d12c57a8e6..17dcb24531b8 100644
--- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
@@ -26,7 +26,7 @@ namespace http_dav_ucp
SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
- const css::uno::Reference< SerfInputStream > & xioInStrm )
+ const rtl::Reference< SerfInputStream > & xioInStrm )
: SerfRequestProcessorImpl( inPath, inRequestHeaders )
, xInputStream( xioInStrm )
, xOutputStream()
@@ -37,7 +37,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
- const css::uno::Reference< SerfInputStream > & xioInStrm,
+ const rtl::Reference< SerfInputStream > & xioInStrm,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource )
: SerfRequestProcessorImpl( inPath, inRequestHeaders )
diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx
index f463f422a4f8..d043f3087e36 100644
--- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx
@@ -37,11 +37,11 @@ class SerfGetReqProcImpl : public SerfRequestProcessorImpl
public:
SerfGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
- const css::uno::Reference< SerfInputStream > & xioInStrm );
+ const rtl::Reference< SerfInputStream > & xioInStrm );
SerfGetReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
- const css::uno::Reference< SerfInputStream > & xioInStrm,
+ const rtl::Reference< SerfInputStream > & xioInStrm,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource );
@@ -71,7 +71,7 @@ protected:
void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override;
private:
- css::uno::Reference< SerfInputStream > xInputStream;
+ rtl::Reference< SerfInputStream > xInputStream;
css::uno::Reference< css::io::XOutputStream > xOutputStream;
const std::vector< OUString > * mpHeaderNames;
DAVResource* mpResource;
diff --git a/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
index 1c8b5ff552ca..29d1361ebd66 100644
--- a/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfLockReqProcImpl.hxx
@@ -57,7 +57,7 @@ private:
// if m_plastChanceToSendRefreshRequest is not 0 we are sending just refresh request
sal_Int32* m_plastChanceToSendRefreshRequest;
TimeValue m_aStartCall;
- css::uno::Reference< SerfInputStream > m_xInputStream;
+ rtl::Reference< SerfInputStream > m_xInputStream;
};
} // namespace http_dav_ucp
diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
index 3d19f9384e97..bbef1970e8a3 100644
--- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
@@ -32,7 +32,7 @@ SerfPostReqProcImpl::SerfPostReqProcImpl( const char* inPath,
apr_size_t inDataLen,
const char* inContentType,
const char* inReferer,
- const css::uno::Reference< SerfInputStream > & xioInStrm )
+ const rtl::Reference< SerfInputStream > & xioInStrm )
: SerfRequestProcessorImpl( inPath, inRequestHeaders )
, mpPostData( inData )
, mnPostDataLen( inDataLen )
diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx
index 4696f7fe5898..d6cc1caf6795 100644
--- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx
@@ -37,7 +37,7 @@ public:
apr_size_t inDataLen,
const char* inContentType,
const char* inReferer,
- const css::uno::Reference< SerfInputStream > & xioInStrm );
+ const rtl::Reference< SerfInputStream > & xioInStrm );
SerfPostReqProcImpl( const char* inPath,
const DAVRequestHeaders& inRequestHeaders,
@@ -64,7 +64,7 @@ private:
apr_size_t mnPostDataLen;
const char* mpContentType;
const char* mpReferer;
- css::uno::Reference< SerfInputStream > xInputStream;
+ rtl::Reference< SerfInputStream > xInputStream;
css::uno::Reference< css::io::XOutputStream > xOutputStream;
};
diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx
index 4c3db5db7c92..53a102f79e89 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx
@@ -67,7 +67,7 @@ private:
std::vector< DAVResourceInfo > * mpResInfo;
const bool mbOnlyPropertyNames;
- css::uno::Reference< SerfInputStream > xInputStream;
+ rtl::Reference< SerfInputStream > xInputStream;
};
} // namespace http_dav_ucp
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
index 12ee0760b8d1..21cc15ec0821 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx
@@ -129,7 +129,7 @@ bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue >
}
// GET
-bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStream >& xioInStrm,
+bool SerfRequestProcessor::processGet( const rtl::Reference< SerfInputStream >& xioInStrm,
apr_status_t& outSerfStatus )
{
mpProcImpl = new SerfGetReqProcImpl( mPathStr,
@@ -141,7 +141,7 @@ bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStrea
}
// 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,
DAVResource & ioResource,
apr_status_t& outSerfStatus )
@@ -223,7 +223,7 @@ bool SerfRequestProcessor::processPost( const char* inData,
apr_size_t inDataLen,
const OUString & inContentType,
const OUString & inReferer,
- const css::uno::Reference< SerfInputStream >& xioInStrm,
+ const rtl::Reference< SerfInputStream >& xioInStrm,
apr_status_t& outSerfStatus )
{
mContentType = apr_pstrdup( SerfSession::getAprPool(),
diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
index 01ba79095c92..dea753fed820 100644
--- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
+++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx
@@ -34,6 +34,8 @@
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/ucb/Lock.hpp>
+#include <rtl/ref.hxx>
+
namespace http_dav_ucp
{
@@ -64,11 +66,11 @@ public:
apr_status_t& outSerfStatus );
// GET
- bool processGet( const css::uno::Reference< SerfInputStream >& xioInStrm,
+ bool processGet( const rtl::Reference< SerfInputStream >& xioInStrm,
apr_status_t& outSerfStatus );
// GET inclusive header fields
- bool processGet( const css::uno::Reference< SerfInputStream >& xioInStrm,
+ bool processGet( const rtl::Reference< SerfInputStream >& xioInStrm,
const std::vector< OUString > & inHeaderNames,
DAVResource & ioResource,
apr_status_t& outSerfStatus );
@@ -98,7 +100,7 @@ public:
apr_size_t inDataLen,
const OUString & inContentType,
const OUString & inReferer,
- const css::uno::Reference< SerfInputStream >& xioInStrm,
+ const rtl::Reference< SerfInputStream >& xioInStrm,
apr_status_t& outSerfStatus );
// POST
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx
index 6b93ae513e6f..37e6e455a197 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -709,7 +709,7 @@ SerfSession::GET( const OUString & inPath,
Init( rEnv );
- uno::Reference< SerfInputStream > xInputStream( new SerfInputStream );
+ rtl::Reference< SerfInputStream > xInputStream( new SerfInputStream );
apr_status_t status = APR_SUCCESS;
std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
aReqProc->processGet( xInputStream,
@@ -755,7 +755,7 @@ SerfSession::GET( const OUString & inPath,
Init( rEnv );
std::shared_ptr<SerfRequestProcessor> aReqProc( createReqProc( inPath ) );
- uno::Reference< SerfInputStream > xInputStream( new SerfInputStream );
+ rtl::Reference< SerfInputStream > xInputStream( new SerfInputStream );
ioResource.uri = inPath;
ioResource.properties.clear();
apr_status_t status = APR_SUCCESS;
@@ -841,7 +841,7 @@ SerfSession::POST( const OUString & inPath,
Init( rEnv );
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;
aReqProc->processPost( reinterpret_cast< const char * >( aDataToSend.getConstArray() ),
aDataToSend.getLength(),