diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 18:16:42 +1100 |
---|---|---|
committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-02-09 08:18:05 +0000 |
commit | a238b1f8d304bf1e2ffb357937f3ec888ee8ac89 (patch) | |
tree | 083c0582d4bf80e313ed256ca476ba8f69c7f7a6 /ucb/source/ucp/webdav | |
parent | 538f276ae0414ea34ede6090b5f56e8fecd6fc65 (diff) |
Remove excess newlines
A ridiculously fast way of doing this is:
for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \
--exclude-dir=workdir --exclude-dir=instdir '^
{3,}' .)
do
perl -0777 -i -pe 's/^
{3,}/
/gm' $i
done
Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c
Reviewed-on: https://gerrit.libreoffice.org/22224
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'ucb/source/ucp/webdav')
25 files changed, 0 insertions, 100 deletions
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index b63c51ba1448..cb30d9affd5d 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -65,13 +65,9 @@ Important: HTTP headers will not be mapped to DAV properties; only to UCB */ - - // ContentProperties Implementation. - - // static member! uno::Any ContentProperties::m_aEmptyAny; @@ -535,13 +531,9 @@ void ContentProperties::addProperty( const OUString & rName, } - - // CachableContentProperties Implementation. - - namespace { bool isCachable( OUString const & rName, diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 0287f09f45bd..5092a4f0be28 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_CONTENTPROPERTIES_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_CONTENTPROPERTIES_HXX diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx index 877b88712522..3179407c8b21 100644 --- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVAUTHLISTENERIMPL_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVAUTHLISTENERIMPL_HXX @@ -29,16 +28,9 @@ namespace http_dav_ucp { - - - - // class DAVAuthListenerImpl. - - - class DAVAuthListener_Impl : public DAVAuthListener { public: diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx index 6aac85f452cf..74fc3f78b380 100644 --- a/ucb/source/ucp/webdav/DAVException.hxx +++ b/ucb/source/ucp/webdav/DAVException.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVEXCEPTION_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVEXCEPTION_HXX @@ -94,7 +93,6 @@ const sal_uInt16 SC_HTTP_VERSION_NOT_SUPPORTED = 505; const sal_uInt16 SC_INSUFFICIENT_STORAGE = 507; - class DAVException : public std::exception { public: diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx index 5e91ba43382d..aca9f38465dd 100644 --- a/ucb/source/ucp/webdav/DAVResource.hxx +++ b/ucb/source/ucp/webdav/DAVResource.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVRESOURCE_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVRESOURCE_HXX diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index b18a50456a06..87447f2dcf2c 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -32,14 +32,9 @@ using namespace http_dav_ucp; using namespace com::sun::star; - - // DAVAuthListener_Impl Implementation. - - - // virtual int DAVAuthListener_Impl::authenticate( const OUString & inRealm, @@ -122,14 +117,9 @@ int DAVAuthListener_Impl::authenticate( } - - // DAVResourceAccess Implementation. - - - DAVResourceAccess::DAVResourceAccess( const uno::Reference< uno::XComponentContext > & rContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index b2f1af6a8c61..72c55149d43d 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVRESOURCEACCESS_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVRESOURCEACCESS_HXX diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index 83caf7c92c51..fc6e4c18a4e8 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVSESSION_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVSESSION_HXX diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx index e0130ab995a9..3cce18abb724 100644 --- a/ucb/source/ucp/webdav/DAVTypes.hxx +++ b/ucb/source/ucp/webdav/DAVTypes.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVTYPES_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DAVTYPES_HXX diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx index 91d1e2be9bc5..32beb736ee24 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_DATETIMEHELPER_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_DATETIMEHELPER_HXX diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx index 63f345810a02..7438566f732f 100644 --- a/ucb/source/ucp/webdav/PropertyMap.hxx +++ b/ucb/source/ucp/webdav/PropertyMap.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_PROPERTYMAP_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_PROPERTYMAP_HXX diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx index 66ef8bb8c20f..2575cb08227e 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.cxx +++ b/ucb/source/ucp/webdav/SerfInputStream.cxx @@ -29,7 +29,6 @@ using namespace com::sun::star::uno; using namespace http_dav_ucp; - // Constructor SerfInputStream::SerfInputStream() diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 0535db45b4b8..29262d650d1b 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -213,7 +213,6 @@ char* SerfSession::getHostinfo() } - // virtual bool SerfSession::CanUse( const OUString & inUri ) { @@ -771,7 +770,6 @@ SerfSession::GET( const OUString & inPath, } - // GET void SerfSession::GET( const OUString & inPath, diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index bf0ee4f0d99e..688db55b5d4b 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_SERFSESSION_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_SERFSESSION_HXX diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx index c1cd5addfd9c..dc066f48afee 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_UCBDEADPROPERTYVALUE_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_UCBDEADPROPERTYVALUE_HXX diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index f35c3d99a6bb..c5b033e78f46 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -188,14 +188,9 @@ static void lcl_sendPartialGETRequest( bool &bError, } - - // Content Implementation. - - - // ctr for content on an existing webdav resource Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, @@ -266,11 +261,9 @@ Content::~Content() } - // XInterface methods. - // virtual void SAL_CALL Content::acquire() throw( ) @@ -335,11 +328,9 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( Content ); @@ -433,11 +424,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) @@ -455,11 +444,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) @@ -485,11 +472,9 @@ OUString SAL_CALL Content::getContentType() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, @@ -842,11 +827,9 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) } - // XPropertyContainer methods. - void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( beans::PropertyExistException, @@ -1118,11 +1101,9 @@ void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() @@ -1242,11 +1223,9 @@ OUString Content::getParentURL() } - // Non-interface methods. - // static uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Reference< uno::XComponentContext >& rxContext, diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index 5aa918015156..3b6cf4c202ef 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVCONTENT_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVCONTENT_HXX @@ -55,12 +54,10 @@ namespace http_dav_ucp { - // UNO service name for the content. #define WEBDAV_CONTENT_SERVICE_NAME "com.sun.star.ucb.WebDAVContent" - class ContentProvider; class ContentProperties; class CachableContentProperties; diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 6723d459696f..08e95e2fa051 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -41,11 +41,9 @@ using namespace com::sun::star; using namespace http_dav_ucp; - // ContentProvider implementation. - bool ContentProvider::getProperty( const OUString & rPropName, beans::Property & rProp, bool bStrict ) { @@ -261,11 +259,9 @@ bool ContentProvider::getProperty( } - // Content implementation. - // virtual uno::Sequence< beans::Property > Content::getProperties( const uno::Reference< ucb::XCommandEnvironment > & xEnv ) diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index c2ad2a1cbd61..05566de0e5ff 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -34,11 +34,9 @@ namespace http_dav_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aId; @@ -52,19 +50,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector< ResultListEntry* > ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; @@ -100,13 +94,9 @@ DataSupplier_Impl::~DataSupplier_Impl() } - - // DataSupplier Implementation. - - DataSupplier::DataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx index b22f110d90d7..50a7fc7cff09 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVDATASUPPLIER_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVDATASUPPLIER_HXX diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 9d1a71ba6321..27250824741e 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -34,8 +34,6 @@ using namespace http_dav_ucp; // ContentProvider Implementation. - - ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rContext ) : ::ucbhelper::ContentProviderImplHelper( rContext ), @@ -52,7 +50,6 @@ ContentProvider::~ContentProvider() } - // XInterface methods. void SAL_CALL ContentProvider::acquire() throw() @@ -80,36 +77,29 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r // XTypeProvider methods. - XTYPEPROVIDER_IMPL_3( ContentProvider, lang::XTypeProvider, lang::XServiceInfo, ucb::XContentProvider ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.WebDAVContentProvider" ), WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); - // XContentProvider methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index 47521d6ae468..bfe65511fa62 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVPROVIDER_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVPROVIDER_HXX @@ -31,7 +30,6 @@ namespace http_dav_ucp { - // UNO service name for the provider. This name will be used by the UCB to // create instances of the provider. #define WEBDAV_CONTENT_PROVIDER_SERVICE_NAME "com.sun.star.ucb.WebDAVContentProvider" @@ -61,7 +59,6 @@ namespace http_dav_ucp { #define WEBDAV_COLLECTION_TYPE "application/" WEBDAV_URL_SCHEME "-collection" - class ContentProvider : public ::ucbhelper::ContentProviderImplHelper { rtl::Reference< DAVSessionFactory > m_xDAVSessionFactory; diff --git a/ucb/source/ucp/webdav/webdavresultset.cxx b/ucb/source/ucp/webdav/webdavresultset.cxx index 42b5874dc6be..cc19f191151a 100644 --- a/ucb/source/ucp/webdav/webdavresultset.cxx +++ b/ucb/source/ucp/webdav/webdavresultset.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; using namespace http_dav_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, @@ -53,11 +49,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav/webdavresultset.hxx index 31b1a01c3d96..cb1b7c0f5c97 100644 --- a/ucb/source/ucp/webdav/webdavresultset.hxx +++ b/ucb/source/ucp/webdav/webdavresultset.hxx @@ -18,7 +18,6 @@ */ - #ifndef INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVRESULTSET_HXX #define INCLUDED_UCB_SOURCE_UCP_WEBDAV_WEBDAVRESULTSET_HXX diff --git a/ucb/source/ucp/webdav/webdavservices.cxx b/ucb/source/ucp/webdav/webdavservices.cxx index 6516603bf1d7..1b849e15c660 100644 --- a/ucb/source/ucp/webdav/webdavservices.cxx +++ b/ucb/source/ucp/webdav/webdavservices.cxx @@ -45,7 +45,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); |