[Libreoffice-commits] core.git: 5 commits - ucb/source
ucb/source/ucp/webdav/DAVResourceAccess.hxx|2 -
ucb/source/ucp/webdav/DateTimeHelper.cxx | 26 -
ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx |2 -
ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx |2 -
ucb/source/ucp/webdav/SerfRequestProcessor.cxx | 16 +++
ucb/source/ucp/webdav/SerfSession.cxx | 16 ---
ucb/source/ucp/webdav/SerfSession.hxx |4 +--
ucb/source/ucp/webdav/SerfUri.cxx |2 -
ucb/source/ucp/webdav/webdavcontent.cxx|6 ++---
ucb/source/ucp/webdav/webdavdatasupplier.cxx |2 -
ucb/source/ucp/webdav/webdavprovider.cxx |2 -
ucb/source/ucp/webdav/webdavresponseparser.cxx |7 +++---
ucb/source/ucp/webdav/webdavservices.cxx |3 --
13 files changed, 42 insertions(+), 48 deletions(-)
New commits:
commit 165c939818b18d68216864600097b99e5d8c2266
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 27 09:21:05 2015 +0200
loplugin:cstylecast
Change-Id: I21fd75b3c891d98f6ad1e4c8af985c2cd21c7db4
diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
index 30b1628..8c9ee4a 100644
--- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx
@@ -102,7 +102,7 @@ void SerfGetReqProcImpl::processChunkOfResponseData( const
char* data,
}
else if ( xOutputStream.is() )
{
-const uno::Sequence sal_Int8 aDataSeq( (sal_Int8 *)data, len );
+const uno::Sequence sal_Int8 aDataSeq( reinterpret_castconst
sal_Int8 *(data), len );
xOutputStream-writeBytes( aDataSeq );
}
}
diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
index 1938fcb..89d4e2f 100644
--- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx
@@ -111,7 +111,7 @@ void SerfPostReqProcImpl::processChunkOfResponseData( const
char* data,
}
else if ( xOutputStream.is() )
{
-const uno::Sequence sal_Int8 aDataSeq( (sal_Int8 *)data, len );
+const uno::Sequence sal_Int8 aDataSeq( reinterpret_castconst
sal_Int8 *(data), len );
xOutputStream-writeBytes( aDataSeq );
}
}
diff --git a/ucb/source/ucp/webdav/SerfSession.cxx
b/ucb/source/ucp/webdav/SerfSession.cxx
index c3d890f..9cb54ad 100644
--- a/ucb/source/ucp/webdav/SerfSession.cxx
+++ b/ucb/source/ucp/webdav/SerfSession.cxx
@@ -462,7 +462,7 @@ apr_status_t SerfSession::verifySerfCertificateChain (
{
uno::Reference security::XCertificateExtension element =
extensions[i];
-const rtl::OString aId ( (const sal_Char
*)element-getExtensionId().getArray(), element-getExtensionId().getLength());
+const rtl::OString aId ( reinterpret_castconst sal_Char
*(const_castconst signed char *(element-getExtensionId().getArray())),
element-getExtensionId().getLength());
if ( aId.equals( OID_SUBJECT_ALTERNATIVE_NAME ) )
{
uno::Reference security::XSanExtension sanExtension (
element, uno::UNO_QUERY );
@@ -1423,9 +1423,7 @@ SerfSession::getDataFromInputStream(
rData.realloc( nPos + nRead );
aBuffer.realloc( nRead );
-memcpy( (void*)( rData.getArray() + nPos ),
-(const void*)aBuffer.getConstArray(),
-nRead );
+memcpy( rData.getArray() + nPos, aBuffer.getConstArray(),
nRead );
nPos += nRead;
aBuffer.realloc( 0 );
diff --git a/ucb/source/ucp/webdav/webdavservices.cxx
b/ucb/source/ucp/webdav/webdavservices.cxx
index 47509dd..6516603 100644
--- a/ucb/source/ucp/webdav/webdavservices.cxx
+++ b/ucb/source/ucp/webdav/webdavservices.cxx
@@ -31,8 +31,7 @@ extern C SAL_DLLPUBLIC_EXPORT void * SAL_CALL
ucpdav1_component_getFactory(
void * pRet = 0;
uno::Reference lang::XMultiServiceFactory xSMgr(
-reinterpret_cast lang::XMultiServiceFactory * (
-pServiceManager ) );
+static_cast lang::XMultiServiceFactory * ( pServiceManager ) );
uno::Reference lang::XSingleServiceFactory xFactory;
commit 58cb14239267d6ab1b0be20bc8aa8f6895e15cb7
Author: Noel Grandin n...@peralex.com
Date: Mon Jul 27 09:10:46 2015 +0200
loplugin:staticmethods
Change-Id: Iab1eda788690366bfc03ba7c4f085cb474fef1b8
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index 52a337b..6e51a42 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
[Libreoffice-commits] core.git: 5 commits - ucb/source
ucb/source/ucp/file/filinsreq.cxx | 119 --
ucb/source/ucp/file/filinsreq.hxx | 84 ++
ucb/source/ucp/file/filprp.cxx| 36 ---
ucb/source/ucp/file/filprp.hxx| 31 -
ucb/source/ucp/file/filrow.cxx| 34 --
ucb/source/ucp/file/filrow.hxx| 31 -
ucb/source/ucp/file/filrset.cxx | 53
ucb/source/ucp/file/filrset.hxx | 48 +++
ucb/source/ucp/file/filstr.cxx| 52
ucb/source/ucp/file/filstr.hxx| 44 ++
10 files changed, 31 insertions(+), 501 deletions(-)
New commits:
commit 76f279a52fdce1d82ecd5e96e7968821e9ec3007
Author: Norbert Thiebaud nthieb...@gmail.com
Date: Sat Mar 8 22:41:20 2014 -0600
de-macroize ucb filstr
Change-Id: I08f7d8360a3abdac1b12bd3cfb157e408b0aabbe
diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx
index 054f2fb..dd439e7 100644
--- a/ucb/source/ucp/file/filstr.cxx
+++ b/ucb/source/ucp/file/filstr.cxx
@@ -40,58 +40,6 @@ using namespace com::sun::star::ucb;
/*
*/
/**/
-
-uno::Any SAL_CALL
-XStream_impl::queryInterface(
-const uno::Type rType )
-throw( uno::RuntimeException, std::exception)
-{
-uno::Any aRet = cppu::queryInterface( rType,
- (static_cast lang::XTypeProvider*
(this)),
- (static_cast io::XStream* (this)),
- (static_cast io::XInputStream*
(this)),
- (static_cast io::XOutputStream*
(this)),
- (static_cast io::XSeekable*
(this)),
- (static_cast io::XTruncate*
(this)),
- (static_cast
io::XAsyncOutputMonitor* (this)) );
-return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-
-void SAL_CALL
-XStream_impl::acquire(
-void )
-throw()
-{
-OWeakObject::acquire();
-}
-
-
-void SAL_CALL
-XStream_impl::release(
-void )
-throw()
-{
-OWeakObject::release();
-}
-
-
-
-// XTypeProvider
-
-
-
-XTYPEPROVIDER_IMPL_7( XStream_impl,
- lang::XTypeProvider,
- io::XStream,
- io::XSeekable,
- io::XInputStream,
- io::XOutputStream,
- io::XTruncate,
- io::XAsyncOutputMonitor )
-
-
-
XStream_impl::XStream_impl( shell* pMyShell,const OUString aUncPath, sal_Bool
bLock )
: m_bInputStreamCalled( false ),
m_bOutputStreamCalled( false ),
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index 66f7f93..f5a870a 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.hxx
@@ -21,10 +21,7 @@
#include osl/mutex.hxx
#include rtl/ustring.hxx
-#include cppuhelper/weak.hxx
-#include ucbhelper/macros.hxx
#include com/sun/star/uno/XInterface.hpp
-#include com/sun/star/lang/XTypeProvider.hpp
#include com/sun/star/io/XSeekable.hpp
#include com/sun/star/io/XTruncate.hpp
#include com/sun/star/io/XInputStream.hpp
@@ -32,6 +29,7 @@
#include com/sun/star/io/XStream.hpp
#include com/sun/star/io/XAsyncOutputMonitor.hpp
#include com/sun/star/ucb/XContentProvider.hpp
+#include cppuhelper/implbase6.hxx
#include filrec.hxx
@@ -40,15 +38,13 @@ namespace fileaccess {
// forward:
class shell;
-class XStream_impl
-: public cppu::OWeakObject,
- public com::sun::star::lang::XTypeProvider,
- public com::sun::star::io::XStream,
- public com::sun::star::io::XSeekable,
- public com::sun::star::io::XInputStream,
- public com::sun::star::io::XOutputStream,
- public com::sun::star::io::XTruncate,
- public com::sun::star::io::XAsyncOutputMonitor
+class XStream_impl : public cppu::WeakImplHelper6
+css::io::XStream,
+css::io::XSeekable,
+css::io::XInputStream,
+css::io::XOutputStream,
+css::io::XTruncate,
+css::io::XAsyncOutputMonitor
{
public:
@@ -64,30 +60,6 @@ namespace fileaccess {
virtual ~XStream_impl();
-
-// OWeakObject
-
-virtual com::sun::star::uno::Any SAL_CALL
-queryInterface(
-const com::sun::star::uno::Type rType )
-throw( com::sun::star::uno::RuntimeException, std::exception);
-
-virtual void SAL_CALL
-acquire(
-void )
-throw();
-
-virtual void SAL_CALL
-release(
-void )
-throw();
-
-
-// XTypeProvider
-
-XTYPEPROVIDER_DECL()
-
-
// XStream
virtual com::sun::star::uno::Reference
