diff options
-rw-r--r-- | solenv/clang-format/excludelist | 10 | ||||
-rw-r--r-- | ucb/source/core/identify.cxx | 26 | ||||
-rw-r--r-- | ucb/source/core/identify.hxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpcfunc.hxx | 7 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpintreq.cxx | 26 | ||||
-rw-r--r-- | ucb/source/ucp/gio/gio_provider.hxx | 25 | ||||
-rw-r--r-- | ucb/source/ucp/gio/gio_seekable.hxx | 16 | ||||
-rw-r--r-- | ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx | 18 | ||||
-rw-r--r-- | ucb/source/ucp/webdav-neon/LockEntrySequence.hxx | 6 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/DAVSessionFactory.hxx | 19 | ||||
-rw-r--r-- | ucb/source/ucp/webdav/webdavresponseparser.hxx | 11 |
11 files changed, 61 insertions, 109 deletions
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 04317cf9cd4a..671f9ebf6eed 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -15299,8 +15299,6 @@ ucb/source/cacher/dynamicresultsetwrapper.hxx ucb/source/core/FileAccess.cxx ucb/source/core/cmdenv.cxx ucb/source/core/cmdenv.hxx -ucb/source/core/identify.cxx -ucb/source/core/identify.hxx ucb/source/core/providermap.hxx ucb/source/core/provprox.cxx ucb/source/core/provprox.hxx @@ -15381,7 +15379,6 @@ ucb/source/ucp/file/filtask.hxx ucb/source/ucp/file/prov.cxx ucb/source/ucp/file/prov.hxx ucb/source/ucp/ftp/ftpcfunc.cxx -ucb/source/ucp/ftp/ftpcfunc.hxx ucb/source/ucp/ftp/ftpcontainer.hxx ucb/source/ucp/ftp/ftpcontent.cxx ucb/source/ucp/ftp/ftpcontent.hxx @@ -15394,7 +15391,6 @@ ucb/source/ucp/ftp/ftpdirp.cxx ucb/source/ucp/ftp/ftpdirp.hxx ucb/source/ucp/ftp/ftpdynresultset.cxx ucb/source/ucp/ftp/ftpdynresultset.hxx -ucb/source/ucp/ftp/ftpintreq.cxx ucb/source/ucp/ftp/ftpintreq.hxx ucb/source/ucp/ftp/ftploaderthread.cxx ucb/source/ucp/ftp/ftploaderthread.hxx @@ -15416,11 +15412,9 @@ ucb/source/ucp/gio/gio_mount.hxx ucb/source/ucp/gio/gio_outputstream.cxx ucb/source/ucp/gio/gio_outputstream.hxx ucb/source/ucp/gio/gio_provider.cxx -ucb/source/ucp/gio/gio_provider.hxx ucb/source/ucp/gio/gio_resultset.cxx ucb/source/ucp/gio/gio_resultset.hxx ucb/source/ucp/gio/gio_seekable.cxx -ucb/source/ucp/gio/gio_seekable.hxx ucb/source/ucp/hierarchy/dynamicresultset.cxx ucb/source/ucp/hierarchy/dynamicresultset.hxx ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -15459,7 +15453,6 @@ ucb/source/ucp/tdoc/tdoc_docmgr.hxx ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx -ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx ucb/source/ucp/tdoc/tdoc_provider.cxx ucb/source/ucp/tdoc/tdoc_provider.hxx ucb/source/ucp/tdoc/tdoc_resultset.cxx @@ -15491,7 +15484,6 @@ ucb/source/ucp/webdav-neon/DateTimeHelper.hxx ucb/source/ucp/webdav-neon/LinkSequence.cxx ucb/source/ucp/webdav-neon/LinkSequence.hxx ucb/source/ucp/webdav-neon/LockEntrySequence.cxx -ucb/source/ucp/webdav-neon/LockEntrySequence.hxx ucb/source/ucp/webdav-neon/LockSequence.cxx ucb/source/ucp/webdav-neon/LockSequence.hxx ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx @@ -15536,7 +15528,6 @@ ucb/source/ucp/webdav/DAVResourceAccess.cxx ucb/source/ucp/webdav/DAVResourceAccess.hxx ucb/source/ucp/webdav/DAVSession.hxx ucb/source/ucp/webdav/DAVSessionFactory.cxx -ucb/source/ucp/webdav/DAVSessionFactory.hxx ucb/source/ucp/webdav/DAVTypes.hxx ucb/source/ucp/webdav/DateTimeHelper.cxx ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -15589,7 +15580,6 @@ ucb/source/ucp/webdav/webdavdatasupplier.hxx ucb/source/ucp/webdav/webdavprovider.cxx ucb/source/ucp/webdav/webdavprovider.hxx ucb/source/ucp/webdav/webdavresponseparser.cxx -ucb/source/ucp/webdav/webdavresponseparser.hxx ucb/source/ucp/webdav/webdavresultset.cxx ucb/source/ucp/webdav/webdavresultset.hxx ucb/source/ucp/webdav/webdavservices.cxx diff --git a/ucb/source/core/identify.cxx b/ucb/source/core/identify.cxx index 912163080154..41f5db735afa 100644 --- a/ucb/source/core/identify.cxx +++ b/ucb/source/core/identify.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - /************************************************************************** TODO ************************************************************************** @@ -30,39 +29,30 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::ucb; - // ContentIdentifier Implementation. -ContentIdentifier::ContentIdentifier( const OUString& ContentId ) - : m_aContentId( ContentId ) +ContentIdentifier::ContentIdentifier(const OUString& ContentId) + : m_aContentId(ContentId) { } - // virtual -ContentIdentifier::~ContentIdentifier() -{ -} - +ContentIdentifier::~ContentIdentifier() {} // XContentIdentifier methods. // virtual -OUString SAL_CALL ContentIdentifier::getContentIdentifier() -{ - return m_aContentId; -} - +OUString SAL_CALL ContentIdentifier::getContentIdentifier() { return m_aContentId; } // virtual OUString SAL_CALL ContentIdentifier::getContentProviderScheme() { - if ( m_aProviderScheme.isEmpty() && !m_aContentId.isEmpty() ) + if (m_aProviderScheme.isEmpty() && !m_aContentId.isEmpty()) { // The content provider scheme is the part before the first ':' // within the content id. - sal_Int32 nPos = m_aContentId.indexOf( ':' ); - if ( nPos != -1 ) + sal_Int32 nPos = m_aContentId.indexOf(':'); + if (nPos != -1) { - OUString aScheme( m_aContentId.copy( 0, nPos ) ); + OUString aScheme(m_aContentId.copy(0, nPos)); m_aProviderScheme = aScheme.toAsciiLowerCase(); } } diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx index 367be847ea7f..cc22969ab3dd 100644 --- a/ucb/source/core/identify.hxx +++ b/ucb/source/core/identify.hxx @@ -23,12 +23,10 @@ #include <com/sun/star/ucb/XContentIdentifier.hpp> #include <cppuhelper/implbase.hxx> - -class ContentIdentifier : public cppu::WeakImplHelper < - css::ucb::XContentIdentifier > +class ContentIdentifier : public cppu::WeakImplHelper<css::ucb::XContentIdentifier> { public: - explicit ContentIdentifier( const OUString& ContentId ); + explicit ContentIdentifier(const OUString& ContentId); virtual ~ContentIdentifier() override; // XContentIdentifier diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx index 118faf517326..24ba1438ca92 100644 --- a/ucb/source/ucp/ftp/ftpcfunc.hxx +++ b/ucb/source/ucp/ftp/ftpcfunc.hxx @@ -27,17 +27,14 @@ #include <stddef.h> - extern "C" { - /** callback for curl_easy_perform(), +/** callback for curl_easy_perform(), * forwarding the written content to the stream. * stream has to be of type oslFileHandle. */ - - int file_write(void *buffer,size_t size,size_t nmemb,void *stream); - +int file_write(void* buffer, size_t size, size_t nmemb, void* stream); } #endif diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index 62c499b168ae..83201e9127c7 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ftpintreq.hxx" #include <comphelper/interaction.hxx> @@ -33,44 +32,33 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::task; using namespace ftp; - XInteractionApproveImpl::XInteractionApproveImpl() : m_bSelected(false) { } -void SAL_CALL XInteractionApproveImpl::select() -{ - m_bSelected = true; -} - +void SAL_CALL XInteractionApproveImpl::select() { m_bSelected = true; } // XInteractionDisapproveImpl -XInteractionDisapproveImpl::XInteractionDisapproveImpl() -{ -} +XInteractionDisapproveImpl::XInteractionDisapproveImpl() {} -void SAL_CALL XInteractionDisapproveImpl::select() -{ -} +void SAL_CALL XInteractionDisapproveImpl::select() {} // XInteractionRequestImpl XInteractionRequestImpl::XInteractionRequestImpl() - : p1( new XInteractionApproveImpl ) + : p1(new XInteractionApproveImpl) { std::vector<uno::Reference<task::XInteractionContinuation>> continuations{ Reference<XInteractionContinuation>(p1), - Reference<XInteractionContinuation>(new XInteractionDisapproveImpl) }; + Reference<XInteractionContinuation>(new XInteractionDisapproveImpl) + }; UnsupportedNameClashException excep; excep.NameClash = NameClash::ERROR; m_xRequest.set(new ::comphelper::OInteractionRequest(Any(excep), continuations)); } -bool XInteractionRequestImpl::approved() const -{ - return p1->isSelected(); -} +bool XInteractionRequestImpl::approved() const { return p1->isSelected(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx index 855590cb42a7..3a8b5c017c69 100644 --- a/ucb/source/ucp/gio/gio_provider.hxx +++ b/ucb/source/ucp/gio/gio_provider.hxx @@ -24,37 +24,32 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <ucbhelper/providerhelper.hxx> - namespace gio { - class ContentProvider : public ::ucbhelper::ContentProviderImplHelper { public: - explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + explicit ContentProvider(const css::uno::Reference<css::uno::XComponentContext>& rxContext); virtual ~ContentProvider() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; - virtual void SAL_CALL acquire() - throw() override; - virtual void SAL_CALL release() - throw() override; + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& rType) override; + virtual void SAL_CALL acquire() throw() override; + virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence<sal_Int8> SAL_CALL getImplementationId() override; + virtual css::uno::Sequence<css::uno::Type> SAL_CALL getTypes() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; // XContentProvider - virtual css::uno::Reference< css::ucb::XContent > SAL_CALL - queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; + virtual css::uno::Reference<css::ucb::XContent> SAL_CALL + queryContent(const css::uno::Reference<css::ucb::XContentIdentifier>& Identifier) override; }; - } #endif diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx index 0d3a62dccde2..ff7ca2995116 100644 --- a/ucb/source/ucp/gio/gio_seekable.hxx +++ b/ucb/source/ucp/gio/gio_seekable.hxx @@ -31,24 +31,22 @@ namespace gio { - -class Seekable : public css::io::XTruncate, - public css::io::XSeekable, - public ::cppu::OWeakObject +class Seekable : public css::io::XTruncate, public css::io::XSeekable, public ::cppu::OWeakObject { private: - GSeekable *mpStream; + GSeekable* mpStream; + public: - explicit Seekable( GSeekable *pStream ); + explicit Seekable(GSeekable* pStream); virtual ~Seekable() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type & type ) override; - virtual void SAL_CALL acquire() throw () override { OWeakObject::acquire(); } + virtual css::uno::Any SAL_CALL queryInterface(const css::uno::Type& type) override; + virtual void SAL_CALL acquire() throw() override { OWeakObject::acquire(); } virtual void SAL_CALL release() throw() override { OWeakObject::release(); } // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) override; + virtual void SAL_CALL seek(sal_Int64 location) override; virtual sal_Int64 SAL_CALL getPosition() override; diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx index 0db24108e8a9..9065e263b90d 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx @@ -24,9 +24,9 @@ #include <ucbhelper/interactionrequest.hxx> -namespace tdoc_ucp { - - /* +namespace tdoc_ucp +{ +/* @usage: uno::Reference< ucb::XCommandEnvironment > Environment = ...; @@ -77,13 +77,11 @@ namespace tdoc_ucp { */ - class DocumentPasswordRequest : public ucbhelper::InteractionRequest - { - public: - DocumentPasswordRequest( - css::task::PasswordRequestMode eMode, - const OUString & rDocumentName ); - }; +class DocumentPasswordRequest : public ucbhelper::InteractionRequest +{ +public: + DocumentPasswordRequest(css::task::PasswordRequestMode eMode, const OUString& rDocumentName); +}; } // namespace tdoc_ucp diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx index 87f173203828..6e5550700f7e 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx @@ -35,14 +35,12 @@ namespace webdav_ucp { - class LockEntrySequence { public: - static bool createFromXML( const OString & rInData, - css::uno::Sequence< css::ucb::LockEntry > & rOutData ); + static bool createFromXML(const OString& rInData, + css::uno::Sequence<css::ucb::LockEntry>& rOutData); }; - } #endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_NEON_LOCKENTRYSEQUENCE_HXX diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx index ec1fcfe3c0c4..623ec9995ad4 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVSESSIONFACTORY_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVSESSIONFACTORY_HXX @@ -34,13 +33,13 @@ using namespace com::sun::star; -namespace com::sun::star::lang { - class XMultiServiceFactory; +namespace com::sun::star::lang +{ +class XMultiServiceFactory; } namespace http_dav_ucp { - class DAVSession; class DAVSessionFactory : public salhelper::SimpleReferenceObject @@ -49,18 +48,18 @@ public: virtual ~DAVSessionFactory() override; /// @throws DAVException - rtl::Reference< DAVSession > - createDAVSession( const OUString & inUri, - const css::uno::Reference< css::uno::XComponentContext >& rxContext ); + rtl::Reference<DAVSession> + createDAVSession(const OUString& inUri, + const css::uno::Reference<css::uno::XComponentContext>& rxContext); private: - typedef std::map< OUString, DAVSession * > Map; + typedef std::map<OUString, DAVSession*> Map; Map m_aMap; osl::Mutex m_aMutex; - std::unique_ptr< ucbhelper::InternetProxyDecider > m_xProxyDecider; + std::unique_ptr<ucbhelper::InternetProxyDecider> m_xProxyDecider; - void releaseElement( DAVSession * pElement ); + void releaseElement(DAVSession* pElement); friend class DAVSession; }; diff --git a/ucb/source/ucp/webdav/webdavresponseparser.hxx b/ucb/source/ucp/webdav/webdavresponseparser.hxx index 546d44dfbb9f..ecf168ea1b2d 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.hxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.hxx @@ -26,15 +26,16 @@ #include "DAVResource.hxx" #include <vector> - namespace http_dav_ucp { - std::vector< css::ucb::Lock > parseWebDAVLockResponse(const css::uno::Reference< css::io::XInputStream >& xInputStream); - std::vector< DAVResource > parseWebDAVPropFindResponse(const css::uno::Reference< css::io::XInputStream >& xInputStream); - std::vector< DAVResourceInfo > parseWebDAVPropNameResponse(const css::uno::Reference< css::io::XInputStream >& xInputStream); +std::vector<css::ucb::Lock> +parseWebDAVLockResponse(const css::uno::Reference<css::io::XInputStream>& xInputStream); +std::vector<DAVResource> +parseWebDAVPropFindResponse(const css::uno::Reference<css::io::XInputStream>& xInputStream); +std::vector<DAVResourceInfo> +parseWebDAVPropNameResponse(const css::uno::Reference<css::io::XInputStream>& xInputStream); } // namespace http_dav_ucp - #endif // INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVRESPONSEPARSER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |