diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 22:38:20 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 07:31:08 -0600 |
commit | 060ab521fa0d5d6b9fcb97eab4718c04e8aec944 (patch) | |
tree | 398b92af90dbe2130f45969d2fd86a0922c0e2b9 /ucb/source/ucp/ftp | |
parent | 482ab0d09620f92eb3618125930dc7c4c8335b5e (diff) |
Remove visual noise from ucb
Conflicts:
ucb/source/ucp/webdav/webdavdatasupplier.cxx
ucb/source/ucp/webdav/webdavresponseparser.cxx
Change-Id: I96b69f4867bbaaf42c3d5fd159cbb3e4fe80a4db
Reviewed-on: https://gerrit.libreoffice.org/8329
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'ucb/source/ucp/ftp')
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.cxx | 62 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontent.hxx | 4 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontentcaps.cxx | 14 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpcontentprovider.cxx | 54 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpdynresultset.cxx | 22 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpintreq.cxx | 12 | ||||
-rw-r--r-- | ucb/source/ucp/ftp/ftpservices.cxx | 6 |
7 files changed, 87 insertions, 87 deletions
diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index 4f456d18799d..c798c41e0e59 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -81,13 +81,13 @@ using namespace com::sun::star::sdbc; -//========================================================================= -//========================================================================= -// + + + // Content Implementation. -// -//========================================================================= -//========================================================================= + + + FTPContent::FTPContent( const Reference< XComponentContext >& rxContext, FTPContentProvider* pProvider, @@ -119,18 +119,18 @@ FTPContent::FTPContent( const Reference< XComponentContext >& rxContext, -//========================================================================= + FTPContent::~FTPContent() { } -//========================================================================= -// + + // XInterface methods. -// -//========================================================================= + + XINTERFACE_IMPL_6( FTPContent, XTypeProvider, @@ -140,11 +140,11 @@ XINTERFACE_IMPL_6( FTPContent, XContentCreator, XChild); -//========================================================================= -// + + // XTypeProvider methods. -// -//========================================================================= + + XTYPEPROVIDER_IMPL_6( FTPContent, XTypeProvider, @@ -154,11 +154,11 @@ XTYPEPROVIDER_IMPL_6( FTPContent, XContentCreator, XChild); -//========================================================================= -// + + // XServiceInfo methods. -// -//========================================================================= + + // needed, because the service shall not be creatable!! #undef XSERVICEINFO_CREATE_INSTANCE_IMPL @@ -170,11 +170,11 @@ XSERVICEINFO_IMPL_1( FTPContent, -//========================================================================= -// + + // XContent methods. -// -//========================================================================= + + // virtual OUString SAL_CALL FTPContent::getContentType() @@ -184,11 +184,11 @@ OUString SAL_CALL FTPContent::getContentType() } -//========================================================================= -// + + // XCommandProcessor methods. -// -//========================================================================= + + //virtual @@ -248,11 +248,11 @@ public: -//========================================================================= -// + + // XCommandProcessor methods. -// -//========================================================================= + + enum ACTION { NOACTION, THROWAUTHENTICATIONREQUEST, diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx index 4573c41b5779..1023c35c4bc2 100644 --- a/ucb/source/ucp/ftp/ftpcontent.hxx +++ b/ucb/source/ucp/ftp/ftpcontent.hxx @@ -39,11 +39,11 @@ namespace com { namespace sun { namespace star { namespace sdbc { namespace ftp { -//========================================================================= + class FTPContentProvider; -//========================================================================= + class FTPContent : public ::ucbhelper::ContentImplHelper, diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index eb33079a6179..ce8bbc1b910a 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -103,26 +103,26 @@ uno::Sequence< beans::Property > FTPContent::getProperties( return uno::Sequence< beans::Property >( aPropsInfoTable, PROPS_COUNT ); } -//========================================================================= + // virtual uno::Sequence< ucb::CommandInfo > FTPContent::getCommands( const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) { // osl::MutexGuard aGuard( m_aMutex ); - //================================================================= - // + + // Supported commands - // - //================================================================= + + #define COMMAND_COUNT 8 static const ucb::CommandInfo aCommandInfoTable[] = { - /////////////////////////////////////////////////////////////// + // Required commands - /////////////////////////////////////////////////////////////// + ucb::CommandInfo( OUString( "getCommandInfo" ), -1, diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index c31482409edc..982f1c39d331 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -41,13 +41,13 @@ using namespace com::sun::star::beans; -//========================================================================= -//========================================================================= -// + + + // ContentProvider Implementation. -// -//========================================================================= -//========================================================================= + + + FTPContentProvider::FTPContentProvider( const Reference< XComponentContext >& rxContext) @@ -57,7 +57,7 @@ FTPContentProvider::FTPContentProvider( { } -//========================================================================= + // virtual FTPContentProvider::~FTPContentProvider() { @@ -65,53 +65,53 @@ FTPContentProvider::~FTPContentProvider() delete m_pProxyDecider; } -//========================================================================= -// + + // XInterface methods. -// -//========================================================================= + + XINTERFACE_IMPL_3(FTPContentProvider, XTypeProvider, XServiceInfo, XContentProvider) -//========================================================================= -// + + // XTypeProvider methods. -// -//========================================================================= + + XTYPEPROVIDER_IMPL_3(FTPContentProvider, XTypeProvider, XServiceInfo, XContentProvider) -//========================================================================= -// + + // XServiceInfo methods. -// -//========================================================================= + + XSERVICEINFO_IMPL_1_CTX( FTPContentProvider, OUString("com.sun.star.comp.FTPContentProvider"), OUString(FTP_CONTENT_PROVIDER_SERVICE_NAME)); -//========================================================================= -// + + // Service factory implementation. -// -//========================================================================= + + ONE_INSTANCE_SERVICE_FACTORY_IMPL(FTPContentProvider); -//========================================================================= -// + + // XContentProvider methods. -// -//========================================================================= + + // virtual Reference<XContent> SAL_CALL diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx index 512178c2c4bf..b53fc90f18e5 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.cxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx @@ -29,13 +29,13 @@ using namespace com::sun::star::uno; using namespace ftp; -//========================================================================= -//========================================================================= -// + + + // DynamicResultSet Implementation. -// -//========================================================================= -//========================================================================= + + + DynamicResultSet::DynamicResultSet( const Reference< XComponentContext >& rxContext, @@ -55,18 +55,18 @@ DynamicResultSet::~DynamicResultSet() delete m_pFactory; } -//========================================================================= -// + + // Non-interface methods. -// -//========================================================================= + + void DynamicResultSet::initStatic() { m_xResultSet1 = Reference< XResultSet >( m_pFactory->createResultSet() ); } -//========================================================================= + void DynamicResultSet::initDynamic() { m_xResultSet1 = Reference< XResultSet >( m_pFactory->createResultSet() ); diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index ec88b897c532..fff1d3d3ed39 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -66,9 +66,9 @@ XInteractionApproveImpl::queryInterface( const Type& rType ) } -////////////////////////////////////////////////////////////////////////////// + // XTypeProvider -////////////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_IMPL_2( XInteractionApproveImpl, XTypeProvider, @@ -125,9 +125,9 @@ XInteractionDisapproveImpl::queryInterface( const Type& rType ) } -////////////////////////////////////////////////////////////////////////////// + // XTypeProvider -////////////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_IMPL_2( XInteractionDisapproveImpl, XTypeProvider, @@ -185,9 +185,9 @@ XInteractionRequestImpl::queryInterface( const Type& rType ) } -////////////////////////////////////////////////////////////////////////////// + // XTypeProvider -///////////////////////////////////////////////////////////////////////////// + XTYPEPROVIDER_IMPL_2( XInteractionRequestImpl, XTypeProvider, diff --git a/ucb/source/ucp/ftp/ftpservices.cxx b/ucb/source/ucp/ftp/ftpservices.cxx index 9f625a624cb9..7eed0e37c80d 100644 --- a/ucb/source/ucp/ftp/ftpservices.cxx +++ b/ucb/source/ucp/ftp/ftpservices.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star; using namespace ftp; -//========================================================================= + extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpftp1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * /*pRegistryKey*/ ) { @@ -36,9 +36,9 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpftp1_component_getFactory( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; - ////////////////////////////////////////////////////////////////////// + // FTP Content Provider. - ////////////////////////////////////////////////////////////////////// + if ( FTPContentProvider::getImplementationName_Static(). equalsAscii( pImplName ) ) |