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 | |
| 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')
146 files changed, 0 insertions, 1026 deletions
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 488fecdcb4a3..7a9274d34744 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -110,11 +110,9 @@ template<typename T> T CachedContentResultSet::rowOriginGet( } - // CCRS_Cache methods - CachedContentResultSet::CCRS_Cache::CCRS_Cache( const Reference< XContentIdentifierMapping > & xMapping ) : m_pResult( nullptr ) @@ -367,11 +365,9 @@ const Reference< XContent >& SAL_CALL CachedContentResultSet::CCRS_Cache } - // class CCRS_PropertySetInfo - class CCRS_PropertySetInfo : public cppu::OWeakObject, public css::lang::XTypeProvider, @@ -660,11 +656,9 @@ sal_Int32 SAL_CALL CCRS_PropertySetInfo } - // class CachedContentResultSet - CachedContentResultSet::CachedContentResultSet( const Reference< XComponentContext > & rxContext , const Reference< XResultSet > & xOrigin @@ -827,11 +821,9 @@ bool SAL_CALL CachedContentResultSet }; - //define for fetching data - #define FETCH_XXX( aCache, fetchInterface, fetchMethod ) \ bool bDirection = !!( \ nFetchDirection != FetchDirection::REVERSE ); \ @@ -2196,11 +2188,9 @@ const Reference< XTypeConverter >& CachedContentResultSet::getTypeConverter() } - // class CachedContentResultSetFactory - CachedContentResultSetFactory::CachedContentResultSetFactory( const Reference< XComponentContext > & rxContext ) { diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx index ba5c80d5fdbb..3e8d274b824a 100644 --- a/ucb/source/cacher/cachedcontentresultset.hxx +++ b/ucb/source/cacher/cachedcontentresultset.hxx @@ -33,7 +33,6 @@ #define CACHED_CONTENT_RESULTSET_FACTORY_NAME "com.sun.star.ucb.CachedContentResultSetFactory" - namespace com { namespace sun { namespace star { namespace script { class XTypeConverter; } } } } @@ -126,7 +125,6 @@ class CachedContentResultSet CCRS_PropertySetInfo* m_pMyPropSetInfo; - css::uno::Reference< css::ucb::XContentIdentifierMapping > m_xContentIdentifierMapping;// can be used for remote optimized ContentAccess @@ -159,7 +157,6 @@ private: virtual void SAL_CALL impl_initPropertySetInfo() override; - bool SAL_CALL applyPositionToOrigin( sal_Int32 nRow ) throw( css::sdbc::SQLException, @@ -465,7 +462,6 @@ private: }; - class CachedContentResultSetFactory : public cppu::OWeakObject , public css::lang::XTypeProvider diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index ee8b470b600d..8064360140fb 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -490,11 +490,9 @@ FetchResult SAL_CALL CachedContentResultSetStub } - // class CachedContentResultSetStubFactory - CachedContentResultSetStubFactory::CachedContentResultSetStubFactory( const Reference< XMultiServiceFactory > & rSMgr ) { diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx index 72fa1702b318..9157d9791c4c 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.hxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx @@ -31,7 +31,6 @@ #define CACHED_CRS_STUB_FACTORY_NAME "com.sun.star.ucb.CachedContentResultSetStubFactory" - class CachedContentResultSetStub : public ContentResultSetWrapper , public css::lang::XTypeProvider @@ -90,7 +89,6 @@ public: virtual ~CachedContentResultSetStub(); - // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw( css::uno::RuntimeException, std::exception ) override; @@ -156,7 +154,6 @@ public: }; - class CachedContentResultSetStubFactory : public cppu::OWeakObject , public css::lang::XTypeProvider diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index 1cf3da67d0f4..add46c27eabf 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -136,11 +136,9 @@ void SAL_CALL CachedDynamicResultSet } - // class CachedDynamicResultSetFactory - CachedDynamicResultSetFactory::CachedDynamicResultSetFactory( const Reference< XComponentContext > & xContext ) { diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx index 0a65f3bd367a..4df3b2131b69 100644 --- a/ucb/source/cacher/cacheddynamicresultset.hxx +++ b/ucb/source/cacher/cacheddynamicresultset.hxx @@ -28,7 +28,6 @@ #define CACHED_DRS_FACTORY_NAME "com.sun.star.ucb.CachedDynamicResultSetFactory" - class CachedDynamicResultSet : public DynamicResultSetWrapper , public css::lang::XTypeProvider @@ -86,7 +85,6 @@ public: }; - class CachedDynamicResultSetFactory : public cppu::OWeakObject , public css::lang::XTypeProvider diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index 991f8eaa8d67..b75832218944 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -126,11 +126,9 @@ XSERVICEINFO_NOFACTORY_IMPL_1( CachedDynamicResultSetStub, CACHED_DRS_STUB_SERVICE_NAME ); - // class CachedDynamicResultSetStubFactory - CachedDynamicResultSetStubFactory::CachedDynamicResultSetStubFactory( const Reference< XComponentContext > & rxContext ) { diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx index bd619cb43f28..7d46d962222a 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx @@ -27,7 +27,6 @@ #define CACHED_DRS_STUB_FACTORY_NAME "com.sun.star.ucb.CachedDynamicResultSetStubFactory" - class CachedDynamicResultSetStub : public DynamicResultSetWrapper , public css::lang::XTypeProvider @@ -75,7 +74,6 @@ public: }; - class CachedDynamicResultSetStubFactory : public cppu::OWeakObject , public css::lang::XTypeProvider diff --git a/ucb/source/cacher/cacheserv.cxx b/ucb/source/cacher/cacheserv.cxx index 47c149582f60..dda278fdb99c 100644 --- a/ucb/source/cacher/cacheserv.cxx +++ b/ucb/source/cacher/cacheserv.cxx @@ -30,7 +30,6 @@ using namespace com::sun::star::lang; using namespace com::sun::star::registry; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { @@ -81,7 +80,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL cached1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index af67d8294ec8..95203c023582 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -37,12 +37,9 @@ using namespace comphelper; using namespace cppu; - - // class ContentResultSetWrapper - ContentResultSetWrapper::ContentResultSetWrapper( Reference< XResultSet > xOrigin ) : m_xResultSetOrigin( xOrigin ) @@ -488,7 +485,6 @@ Reference< XResultSetMetaData > SAL_CALL ContentResultSetWrapper::getMetaData() } - // XPropertySet methods. // virtual @@ -1314,11 +1310,9 @@ Reference< XArray > SAL_CALL ContentResultSetWrapper::getArray( sal_Int32 column } - // class ContentResultSetWrapperListener - ContentResultSetWrapperListener::ContentResultSetWrapperListener( ContentResultSetWrapper* pOwner ) : m_pOwner( pOwner ) diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx index 2570429eea7a..65cdd071291f 100644 --- a/ucb/source/cacher/contentresultsetwrapper.hxx +++ b/ucb/source/cacher/contentresultsetwrapper.hxx @@ -36,7 +36,6 @@ #include <comphelper/interfacecontainer2.hxx> - class ContentResultSetWrapperListener; class ContentResultSetWrapper : public cppu::OWeakObject @@ -489,7 +488,6 @@ public: }; - class ContentResultSetWrapperListener : public cppu::OWeakObject , public css::beans::XPropertyChangeListener diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index 27024a6674bd..5b1e1ae2a8a4 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -33,12 +33,9 @@ using namespace com::sun::star::uno; using namespace comphelper; - - // class DynamicResultSetWrapper - DynamicResultSetWrapper::DynamicResultSetWrapper( Reference< XDynamicResultSet > xOrigin , const Reference< XComponentContext > & rxContext ) @@ -437,11 +434,9 @@ sal_Int16 SAL_CALL DynamicResultSetWrapper::getCapabilities() } - // class DynamicResultSetWrapperListener - DynamicResultSetWrapperListener::DynamicResultSetWrapperListener( DynamicResultSetWrapper* pOwner ) : m_pOwner( pOwner ) diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx index 70e481cee331..a054e67b2c6d 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.hxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx @@ -35,7 +35,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> - class DynamicResultSetWrapperListener; class DynamicResultSetWrapper : public cppu::OWeakObject @@ -165,7 +164,6 @@ public: }; - class DynamicResultSetWrapperListener : public cppu::OWeakObject , public css::ucb::XDynamicResultSetListener diff --git a/ucb/source/core/cmdenv.cxx b/ucb/source/core/cmdenv.cxx index f412435f3e84..51ea866f1113 100644 --- a/ucb/source/core/cmdenv.cxx +++ b/ucb/source/core/cmdenv.cxx @@ -33,13 +33,9 @@ using namespace com::sun::star; using namespace ucb_cmdenv; - - // UcbCommandEnvironment Implementation. - - UcbCommandEnvironment::UcbCommandEnvironment( const uno::Reference< lang::XMultiServiceFactory >& /*xSMgr*/ ) //: m_xSMgr( xSMgr ) @@ -53,11 +49,9 @@ UcbCommandEnvironment::~UcbCommandEnvironment() } - // XInitialization methods. - // virtual void SAL_CALL UcbCommandEnvironment::initialize( const uno::Sequence< uno::Any >& aArguments ) @@ -71,11 +65,9 @@ void SAL_CALL UcbCommandEnvironment::initialize( } - // XServiceInfo methods. - // virtual OUString SAL_CALL UcbCommandEnvironment::getImplementationName() throw ( uno::RuntimeException, std::exception ) @@ -118,11 +110,9 @@ UcbCommandEnvironment::getSupportedServiceNames_Static() } - // XCommandInfo methods. - // virtual uno::Reference< task::XInteractionHandler > SAL_CALL UcbCommandEnvironment::getInteractionHandler() @@ -141,11 +131,9 @@ UcbCommandEnvironment::getProgressHandler() } - // Service factory implementation. - static uno::Reference< uno::XInterface > SAL_CALL UcbCommandEnvironment_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 438f0c8c7959..e1df4274b744 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -28,14 +28,9 @@ using namespace com::sun::star::ucb; using namespace com::sun::star::uno; - - - // UcbContentProviderProxyFactory Implementation. - - UcbContentProviderProxyFactory::UcbContentProviderProxyFactory( const Reference< XMultiServiceFactory >& rxSMgr ) : m_xSMgr( rxSMgr ) @@ -51,25 +46,20 @@ UcbContentProviderProxyFactory::~UcbContentProviderProxyFactory() // XServiceInfo methods. - XSERVICEINFO_IMPL_1( UcbContentProviderProxyFactory, OUString( "com.sun.star.comp.ucb.UcbContentProviderProxyFactory" ), "com.sun.star.ucb.ContentProviderProxyFactory" ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbContentProviderProxyFactory ); - // XContentProviderFactory methods. - // virtual Reference< XContentProvider > SAL_CALL UcbContentProviderProxyFactory::createContentProvider( @@ -81,13 +71,9 @@ UcbContentProviderProxyFactory::createContentProvider( } - - // UcbContentProviderProxy Implementation. - - UcbContentProviderProxy::UcbContentProviderProxy( const Reference< XMultiServiceFactory >& rxSMgr, const OUString& Service ) @@ -146,15 +132,12 @@ UcbContentProviderProxy::queryInterface( const Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( UcbContentProviderProxy ); - Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() \ throw( RuntimeException, std::exception ) { @@ -178,11 +161,9 @@ Sequence< Type > SAL_CALL UcbContentProviderProxy::getTypes() } - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy, OUString( "com.sun.star.comp.ucb.UcbContentProviderProxy" ), "com.sun.star.ucb.ContentProviderProxy" ); @@ -191,7 +172,6 @@ XSERVICEINFO_NOFACTORY_IMPL_1( UcbContentProviderProxy, // XContentProvider methods. - // virtual Reference< XContent > SAL_CALL UcbContentProviderProxy::queryContent( const Reference< XContentIdentifier >& Identifier ) @@ -230,11 +210,9 @@ sal_Int32 SAL_CALL UcbContentProviderProxy::compareContentIds( } - // XParameterizedContentProvider methods. - // virtual Reference< XContentProvider > SAL_CALL UcbContentProviderProxy::registerInstance( const OUString& Template, @@ -295,11 +273,9 @@ UcbContentProviderProxy::deregisterInstance( const OUString& Template, } - // XContentProviderSupplier methods. - // virtual Reference< XContentProvider > SAL_CALL UcbContentProviderProxy::getContentProvider() diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx index 073d0ab690a8..02f916f42aa2 100644 --- a/ucb/source/core/provprox.hxx +++ b/ucb/source/core/provprox.hxx @@ -33,12 +33,9 @@ #include <cppuhelper/implbase.hxx> - - // class UcbContentProviderProxyFactory. - class UcbContentProviderProxyFactory : public cppu::WeakImplHelper < css::lang::XServiceInfo, css::ucb::XContentProviderFactory > @@ -73,11 +70,9 @@ public: }; - // class UcbContentProviderProxy. - class UcbContentProviderProxy : public cppu::OWeakObject, public css::lang::XTypeProvider, diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 0798bb060e55..43750567dd7b 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -221,11 +221,9 @@ bool createContentProviderData( } - // UniversalContentBroker Implementation. - UniversalContentBroker::UniversalContentBroker( const Reference< css::uno::XComponentContext >& xContext ) : m_xContext( xContext ), @@ -244,7 +242,6 @@ UniversalContentBroker::~UniversalContentBroker() } - // XInterface methods. void SAL_CALL UniversalContentBroker::acquire() throw() @@ -278,7 +275,6 @@ css::uno::Any SAL_CALL UniversalContentBroker::queryInterface( const css::uno::T // XTypeProvider methods. - XTYPEPROVIDER_IMPL_9( UniversalContentBroker, XUniversalContentBroker, XTypeProvider, @@ -291,11 +287,9 @@ XTYPEPROVIDER_IMPL_9( UniversalContentBroker, XCommandProcessor ); - // XComponent methods. - // virtual void SAL_CALL UniversalContentBroker::dispose() throw( css::uno::RuntimeException, std::exception ) @@ -336,29 +330,23 @@ void SAL_CALL UniversalContentBroker::removeEventListener( } - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( UniversalContentBroker, OUString( "com.sun.star.comp.ucb.UniversalContentBroker" ), UCB_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( UniversalContentBroker ); - // XInitialization methods. - // virtual void SAL_CALL UniversalContentBroker::initialize( const css::uno::Sequence< Any >& aArguments ) throw( css::uno::Exception, @@ -395,11 +383,9 @@ void SAL_CALL UniversalContentBroker::initialize( const css::uno::Sequence< Any } - // XContentProviderManager methods. - // virtual Reference< XContentProvider > SAL_CALL UniversalContentBroker::registerContentProvider( @@ -523,11 +509,9 @@ Reference< XContentProvider > SAL_CALL } - // XContentProvider methods. - // virtual Reference< XContent > SAL_CALL UniversalContentBroker::queryContent( const Reference< XContentIdentifier >& Identifier ) @@ -574,11 +558,9 @@ sal_Int32 SAL_CALL UniversalContentBroker::compareContentIds( } - // XContentIdentifierFactory methods. - // virtual Reference< XContentIdentifier > SAL_CALL UniversalContentBroker::createContentIdentifier( @@ -610,11 +592,9 @@ Reference< XContentIdentifier > SAL_CALL } - // XCommandProcessor methods. - // virtual sal_Int32 SAL_CALL UniversalContentBroker::createCommandIdentifier() throw( RuntimeException, std::exception ) @@ -712,11 +692,9 @@ Any SAL_CALL UniversalContentBroker::execute( } - // XCommandProcessor2 methods. - // virtual void SAL_CALL UniversalContentBroker::releaseCommandIdentifier(sal_Int32 /*aCommandId*/) throw( RuntimeException, std::exception ) @@ -733,7 +711,6 @@ void SAL_CALL UniversalContentBroker::abort( sal_Int32 ) } - // XChangesListener methods @@ -780,7 +757,6 @@ void SAL_CALL UniversalContentBroker::changesOccurred( const util::ChangesEvent& } - // XEventListener methods @@ -798,11 +774,9 @@ void SAL_CALL UniversalContentBroker::disposing(const lang::EventObject&) } - // Non-interface methods - Reference< XContentProvider > UniversalContentBroker::queryContentProvider( const OUString& Identifier, bool bResolved ) @@ -964,11 +938,9 @@ bool UniversalContentBroker::getContentProviderData( } - // ProviderListEntry_Impl implementation. - Reference< XContentProvider > ProviderListEntry_Impl::resolveProvider() const { if ( !m_xResolvedProvider.is() ) diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx index e8ee6d871628..5904d7ca411b 100644 --- a/ucb/source/core/ucb.hxx +++ b/ucb/source/core/ucb.hxx @@ -45,7 +45,6 @@ #define UCB_SERVICE_NAME "com.sun.star.ucb.UniversalContentBroker" - namespace comphelper { class OInterfaceContainerHelper2; } namespace com { namespace sun { namespace star { namespace ucb { diff --git a/ucb/source/core/ucbcmds.cxx b/ucb/source/core/ucbcmds.cxx index 10f97d50f950..2565548fdefd 100644 --- a/ucb/source/core/ucbcmds.cxx +++ b/ucb/source/core/ucbcmds.cxx @@ -64,11 +64,9 @@ namespace { - // struct TransferCommandContext. - struct TransferCommandContext { uno::Reference< uno::XComponentContext > m_xContext; @@ -88,11 +86,9 @@ struct TransferCommandContext }; - // class InteractionHandlerProxy. - class InteractionHandlerProxy : public cppu::WeakImplHelper< task::XInteractionHandler > { @@ -162,11 +158,9 @@ void SAL_CALL InteractionHandlerProxy::handle( } - // class ActiveDataSink. - class ActiveDataSink : public cppu::WeakImplHelper< io::XActiveDataSink > { uno::Reference< io::XInputStream > m_xStream; @@ -198,11 +192,9 @@ uno::Reference< io::XInputStream > SAL_CALL ActiveDataSink::getInputStream() } - // class CommandProcessorInfo. - class CommandProcessorInfo : public cppu::WeakImplHelper< ucb::XCommandInfo > { @@ -325,9 +317,6 @@ sal_Bool SAL_CALL CommandProcessorInfo::hasCommandByHandle( sal_Int32 Handle ) } - - - OUString createDesiredName( const OUString & rSourceURL, const OUString & rNewTitle ) { @@ -526,7 +515,6 @@ uno::Reference< ucb::XContent > createNew( // (1) Obtain creatable types from target. - // First, try it using "CreatabeleContentsInfo" property and // "createNewContent" command -> the "new" way. @@ -622,11 +610,9 @@ uno::Reference< ucb::XContent > createNew( } - // (2) Try to find a matching target type for the source object. - uno::Reference< ucb::XContent > xNew; for ( sal_Int32 n = 0; n < nCount; ++n ) { @@ -696,7 +682,6 @@ uno::Reference< ucb::XContent > createNew( // (3) Create a new, empty object of matched type. - if ( !xCreator.is() ) { // First, try it using "CreatabeleContentsInfo" property and @@ -909,11 +894,9 @@ uno::Reference< io::XInputStream > getInputStream( uno::Reference< io::XInputStream > xInputStream; - // (1) Try to get data as XInputStream via XActiveDataSink. - try { uno::Reference< io::XActiveDataSink > xSink = new ActiveDataSink; @@ -948,7 +931,6 @@ uno::Reference< io::XInputStream > getInputStream( // (2) Try to get data via XOutputStream. - try { uno::Reference< io::XOutputStream > xOutputStream( io::Pipe::create(rContext.m_xContext), uno::UNO_QUERY_THROW ); @@ -1238,12 +1220,10 @@ void globalTransfer_( bool bSourceIsLink = !xSourceProps->getString( 3 ).isEmpty(); - // (1) Try to find a matching target type for the source object and // create a new, empty object of that type. - uno::Reference< ucb::XContent > xNew = createNew( rContext, xTarget, bSourceIsFolder, @@ -1267,11 +1247,9 @@ void globalTransfer_( } - // (2) Transfer property values from source to new object. - uno::Reference< ucb::XCommandProcessor > xCommandProcessorN( xNew, uno::UNO_QUERY ); if ( !xCommandProcessorN.is() ) @@ -1317,11 +1295,9 @@ void globalTransfer_( transferProperties( rContext, xCommandProcessorS, xCommandProcessorN ); - // (3) Try to obtain a data stream from source. - uno::Reference< io::XInputStream > xInputStream; if ( bSourceIsDocument && ( rContext.aArg.Operation @@ -1329,11 +1305,9 @@ void globalTransfer_( xInputStream = getInputStream( rContext, xCommandProcessorS ); - // (4) Try to obtain a resultset (children) from source. - uno::Reference< sdbc::XResultSet > xResultSet; if ( bSourceIsFolder && ( rContext.aArg.Operation @@ -1341,11 +1315,9 @@ void globalTransfer_( xResultSet = getResultSet( rContext, xCommandProcessorS ); - // (5) Insert (store) new content. - ucb::InsertCommandArgument2 aArg; aArg.Data = xInputStream; aArg.MimeType = rContext.aArg.MimeType; @@ -1538,11 +1510,9 @@ void globalTransfer_( while ( bRetry ); - // (6) Process children of source. - if ( xResultSet.is() ) { try @@ -1668,11 +1638,9 @@ void globalTransfer_( } /* namescpace */ - // UniversalContentBroker implementation ( XCommandProcessor commands ). - uno::Reference< ucb::XCommandInfo > UniversalContentBroker::getCommandInfo() { @@ -1698,11 +1666,9 @@ void UniversalContentBroker::globalTransfer( } - // (1) Try to transfer the content using 'transfer' command. - uno::Reference< ucb::XContent > xTarget; uno::Reference< ucb::XContentIdentifier > xId = createContentIdentifier( rArg.TargetURL ); @@ -1885,11 +1851,9 @@ void UniversalContentBroker::globalTransfer( } - // (2) Try to transfer the content "manually". - uno::Reference< ucb::XContent > xSource; try { @@ -1995,11 +1959,9 @@ void UniversalContentBroker::globalTransfer( globalTransfer_( aTransferCtx, xSource, xTarget, xRow ); - // (3) Delete source, if operation is MOVE. - if ( rArg.Operation == ucb::TransferCommandOperation_MOVE ) { try diff --git a/ucb/source/core/ucbcmds.hxx b/ucb/source/core/ucbcmds.hxx index 89a7d6104519..782154537818 100644 --- a/ucb/source/core/ucbcmds.hxx +++ b/ucb/source/core/ucbcmds.hxx @@ -21,11 +21,9 @@ #define INCLUDED_UCB_SOURCE_CORE_UCBCMDS_HXX - // Definitions for the commands supported by the UCB. - #define GETCOMMANDINFO_NAME "getCommandInfo" #define GETCOMMANDINFO_HANDLE 1024 diff --git a/ucb/source/core/ucbprops.cxx b/ucb/source/core/ucbprops.cxx index 6f0c49bd2a85..9c3eddaf5967 100644 --- a/ucb/source/core/ucbprops.cxx +++ b/ucb/source/core/ucbprops.cxx @@ -193,29 +193,23 @@ UcbPropertiesManager::~UcbPropertiesManager() } - // XServiceInfo methods. - XSERVICEINFO_IMPL_1( UcbPropertiesManager, OUString( "com.sun.star.comp.ucb.UcbPropertiesManager" ), PROPERTIES_MANAGER_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbPropertiesManager ); - // XPropertySetInfo methods. - // virtual Sequence< Property > SAL_CALL UcbPropertiesManager::getProperties() throw( RuntimeException, std::exception ) @@ -245,11 +239,9 @@ sal_Bool SAL_CALL UcbPropertiesManager::hasPropertyByName( const OUString& Name } - // Non-Interface methods. - bool UcbPropertiesManager::queryProperty( const OUString& rName, Property& rProp ) { diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx index 5f5d257343b4..dfe8137a554a 100644 --- a/ucb/source/core/ucbprops.hxx +++ b/ucb/source/core/ucbprops.hxx @@ -29,15 +29,12 @@ #include <cppuhelper/implbase.hxx> - #define PROPERTIES_MANAGER_SERVICE_NAME "com.sun.star.ucb.PropertiesManager" - // class UcbPropertiesManager. - class UcbPropertiesManager : public cppu::WeakImplHelper < css::lang::XServiceInfo, css::beans::XPropertySetInfo > diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index 57e73057aba7..04d28a2aa3ae 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -52,7 +52,6 @@ using namespace comphelper; using namespace cppu; - OUString makeHierarchalNameSegment( const OUString & rIn ) { OUStringBuffer aBuffer; @@ -133,11 +132,9 @@ public: }; - // UcbStore_Impl. - struct UcbStore_Impl { osl::Mutex m_aMutex; @@ -146,15 +143,9 @@ struct UcbStore_Impl }; - - - // UcbStore Implementation. - - - UcbStore::UcbStore( const Reference< XComponentContext >& xContext ) : m_xContext( xContext ), m_pImpl( new UcbStore_Impl() ) @@ -173,19 +164,15 @@ XSERVICEINFO_IMPL_1_CTX( UcbStore, STORE_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( UcbStore ); - // XPropertySetRegistryFactory methods. - // virtual Reference< XPropertySetRegistry > SAL_CALL UcbStore::createPropertySetRegistry( const OUString& ) @@ -205,11 +192,9 @@ UcbStore::createPropertySetRegistry( const OUString& ) } - // XInitialization methods. - // virtual void SAL_CALL UcbStore::initialize( const Sequence< Any >& aArguments ) throw( Exception, RuntimeException, std::exception ) @@ -225,11 +210,9 @@ const Sequence< Any >& UcbStore::getInitArgs() const } - // PropertySetRegistry_Impl. - struct PropertySetRegistry_Impl { const Sequence< Any > m_aInitArgs; @@ -252,9 +235,6 @@ struct PropertySetRegistry_Impl // PropertySetRegistry Implementation. - - - PropertySetRegistry::PropertySetRegistry( const Reference< XComponentContext >& xContext, const Sequence< Any > &rInitArgs ) @@ -270,21 +250,17 @@ PropertySetRegistry::~PropertySetRegistry() } - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( PropertySetRegistry, OUString( "com.sun.star.comp.ucb.PropertySetRegistry" ), PROPSET_REG_SERVICE_NAME ); - // XPropertySetRegistry methods. - // virtual Reference< XPersistentPropertySet > SAL_CALL PropertySetRegistry::openPropertySet( const OUString& key, sal_Bool create ) @@ -468,11 +444,9 @@ void SAL_CALL PropertySetRegistry::removePropertySet( const OUString& key ) } - // XElementAccess methods. - // virtual css::uno::Type SAL_CALL PropertySetRegistry::getElementType() throw( RuntimeException, std::exception ) @@ -496,11 +470,9 @@ sal_Bool SAL_CALL PropertySetRegistry::hasElements() } - // XNameAccess methods. - // virtual Any SAL_CALL PropertySetRegistry::getByName( const OUString& aName ) throw( NoSuchElementException, WrappedTargetException, RuntimeException, std::exception ) @@ -1123,15 +1095,9 @@ struct PersistentPropertySet_Impl }; - - - // PersistentPropertySet Implementation. - - - PersistentPropertySet::PersistentPropertySet( PropertySetRegistry& rCreator, const OUString& rKey ) @@ -1152,17 +1118,14 @@ PersistentPropertySet::~PersistentPropertySet() // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_1( PersistentPropertySet, OUString( "com.sun.star.comp.ucb.PersistentPropertySet" ), PERS_PROPSET_SERVICE_NAME ); - // XComponent methods. - // virtual void SAL_CALL PersistentPropertySet::dispose() throw( RuntimeException, std::exception ) @@ -1217,11 +1180,9 @@ void SAL_CALL PersistentPropertySet::removeEventListener( } - // XPropertySet methods. - // virtual Reference< XPropertySetInfo > SAL_CALL PersistentPropertySet::getPropertySetInfo() throw( RuntimeException, std::exception ) @@ -1442,11 +1403,9 @@ void SAL_CALL PersistentPropertySet::removeVetoableChangeListener( } - // XPersistentPropertySet methods. - // virtual Reference< XPropertySetRegistry > SAL_CALL PersistentPropertySet::getRegistry() throw( RuntimeException, std::exception ) @@ -1463,11 +1422,9 @@ OUString SAL_CALL PersistentPropertySet::getKey() } - // XNamed methods. - // virtual OUString SAL_CALL PersistentPropertySet::getName() throw( RuntimeException, std::exception ) @@ -1486,11 +1443,9 @@ void SAL_CALL PersistentPropertySet::setName( const OUString& aName ) } - // XPropertyContainer methods. - // virtual void SAL_CALL PersistentPropertySet::addProperty( const OUString& Name, sal_Int16 Attributes, const Any& DefaultValue ) @@ -1803,11 +1758,9 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name ) } - // XPropertySetInfoChangeNotifier methods. - // virtual void SAL_CALL PersistentPropertySet::addPropertySetInfoChangeListener( const Reference< XPropertySetInfoChangeListener >& Listener ) @@ -1831,11 +1784,9 @@ void SAL_CALL PersistentPropertySet::removePropertySetInfoChangeListener( } - // XPropertyAccess methods. - // virtual Sequence< PropertyValue > SAL_CALL PersistentPropertySet::getPropertyValues() throw( RuntimeException, std::exception ) @@ -2096,11 +2047,9 @@ void SAL_CALL PersistentPropertySet::setPropertyValues( } - // Non-interface methods - void PersistentPropertySet::notifyPropertyChangeEvent( const PropertyChangeEvent& rEvent ) const { @@ -2182,13 +2131,9 @@ PropertySetRegistry& PersistentPropertySet::getPropertySetRegistry() } - - // PropertySetInfo_Impl Implementation. - - PropertySetInfo_Impl::PropertySetInfo_Impl( PersistentPropertySet* pOwner ) : m_pProps( nullptr ), @@ -2208,7 +2153,6 @@ PropertySetInfo_Impl::~PropertySetInfo_Impl() // XPropertySetInfo methods. - // virtual Sequence< Property > SAL_CALL PropertySetInfo_Impl::getProperties() throw( RuntimeException, std::exception ) diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx index 6a35e67e48df..9641b8998b90 100644 --- a/ucb/source/core/ucbstore.hxx +++ b/ucb/source/core/ucbstore.hxx @@ -44,7 +44,6 @@ #define PERS_PROPSET_SERVICE_NAME "com.sun.star.ucb.PersistentPropertySet" - struct UcbStore_Impl; class UcbStore : public cppu::WeakImplHelper < @@ -90,7 +89,6 @@ public: }; - struct PropertySetRegistry_Impl; class PersistentPropertySet; @@ -169,7 +167,6 @@ public: }; - struct PersistentPropertySet_Impl; class PersistentPropertySet : public cppu::WeakImplHelper < diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx index 279c677743e8..bf74e2aa959b 100644 --- a/ucb/source/inc/regexpmap.hxx +++ b/ucb/source/inc/regexpmap.hxx @@ -55,7 +55,6 @@ private: }; - template< typename Val > struct Entry { diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 76688d3f103e..f2c53e8691c7 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -31,11 +31,9 @@ using namespace com::sun::star; using namespace ucb_impl; - // Regexp - inline Regexp::Regexp(Kind eTheKind, OUString const & rThePrefix, bool bTheEmptyDomain, OUString const & rTheInfix, bool bTheTranslation, diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx index 6931eaa237ad..1ec826e9575d 100644 --- a/ucb/source/sorter/sortdynres.hxx +++ b/ucb/source/sorter/sortdynres.hxx @@ -159,7 +159,6 @@ public: }; - class SortedDynamicResultSetFactory: public cppu::WeakImplHelper < css::lang::XServiceInfo, css::ucb::XSortedDynamicResultSetFactory > diff --git a/ucb/source/sorter/sortmain.cxx b/ucb/source/sorter/sortmain.cxx index 83300d8a1a93..b11ca1887141 100644 --- a/ucb/source/sorter/sortmain.cxx +++ b/ucb/source/sorter/sortmain.cxx @@ -25,7 +25,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; - extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL srtrs1_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * ) { @@ -46,7 +45,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL srtrs1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/sorter/sortresult.cxx b/ucb/source/sorter/sortresult.cxx index f113cc9fffce..627dcdf337aa 100644 --- a/ucb/source/sorter/sortresult.cxx +++ b/ucb/source/sorter/sortresult.cxx @@ -45,8 +45,6 @@ using namespace comphelper; using namespace cppu; - - // The mutex to synchronize access to containers. static osl::Mutex& getContainerMutex() { @@ -65,7 +63,6 @@ static osl::Mutex& getContainerMutex() } - struct SortInfo { bool mbUseOwnCompare; @@ -78,7 +75,6 @@ struct SortInfo }; - struct SortListData { bool mbModified; @@ -89,11 +85,9 @@ struct SortListData }; - // class SRSPropertySetInfo. - class SRSPropertySetInfo : public cppu::WeakImplHelper < XPropertySetInfo > { @@ -287,7 +281,6 @@ SortedResultSet::queryContent() } - // XResultSet methods. sal_Bool SAL_CALL SortedResultSet::next() @@ -807,7 +800,6 @@ Reference< XArray > SAL_CALL SortedResultSet::getArray( sal_Int32 columnIndex ) } - // XCloseable methods. @@ -830,7 +822,6 @@ Reference< XResultSetMetaData > SAL_CALL SortedResultSet::getMetaData() } - // XPropertySet methods. @@ -1340,8 +1331,6 @@ void SortedResultSet::PropertyChanged( const PropertyChangeEvent& rEvt ) } - - // public methods @@ -1800,7 +1789,6 @@ void SortedResultSet::ResortNew( EventList* pList ) } - // SortListData @@ -1812,7 +1800,6 @@ SortListData::SortListData( sal_IntPtr nPos, bool bModified ) }; - void SortedEntryList::Clear() { for ( std::deque< ListAction* >::size_type i = 0; @@ -1888,8 +1875,6 @@ sal_IntPtr SortedEntryList::operator [] ( sal_IntPtr nPos ) const } - - void SimpleList::Remove( sal_uInt32 nPos ) { if ( nPos < (sal_uInt32) maData.size() ) @@ -1943,11 +1928,9 @@ void SimpleList::Replace( void* pData, sal_uInt32 nPos ) } - // class SRSPropertySetInfo. - SRSPropertySetInfo::SRSPropertySetInfo() { maProps[0].Name = "RowCount"; diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index c93863d1e893..9681ce374cf4 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/ucb/source/sorter/sortresult.hxx @@ -67,7 +67,6 @@ public: }; - class EventList { std::deque < css::ucb::ListAction* > maData; @@ -85,7 +84,6 @@ public: }; - class SimpleList { std::deque < void* > maData; @@ -108,11 +106,9 @@ public: }; - #define RESULTSET_SERVICE_NAME "com.sun.star.ucb.SortedResultSet" - class SortedResultSet: public cppu::WeakImplHelper < css::lang::XServiceInfo, css::lang::XComponent, diff --git a/ucb/source/ucp/cmis/cmis_url.cxx b/ucb/source/ucp/cmis/cmis_url.cxx index 103ccad2dbb6..151b85c22323 100644 --- a/ucb/source/ucp/cmis/cmis_url.cxx +++ b/ucb/source/ucp/cmis/cmis_url.cxx @@ -40,9 +40,6 @@ namespace cmis } - - - void URL::setObjectPath( const OUString& sPath ) { m_sPath = sPath; diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index fcd0a433d92e..aad3588119e5 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -34,7 +34,6 @@ namespace ucb { namespace ucp { namespace ext { - //= ExtensionContentType enum ExtensionContentType diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 1c23942e0894..8ecda7995f23 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -118,7 +118,6 @@ namespace ucb { namespace ucp { namespace ext } - //= DataSupplier diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index 6bf33eee1e70..e803e20d6878 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -27,7 +27,6 @@ namespace ucb { namespace ucp { namespace ext { - //= ContentProvider typedef ::ucbhelper::ContentProviderImplHelper ContentProvider_Base; diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 68ae2bd50310..752d2b6d351a 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -96,7 +96,6 @@ BaseContent::BaseContent( shell* pMyShell, } - // Constructor for full featured Contents BaseContent::BaseContent( shell* pMyShell, @@ -133,7 +132,6 @@ BaseContent::~BaseContent( ) } - // XInterface @@ -172,9 +170,6 @@ BaseContent::queryInterface( const Type& rType ) } - - - // XComponent @@ -287,7 +282,6 @@ XTYPEPROVIDER_IMPL_10( BaseContent, beans::XPropertySetInfoChangeNotifier ) - // XCommandProcessor @@ -426,7 +420,6 @@ BaseContent::execute( const Command& aCommand, } - void SAL_CALL BaseContent::addPropertiesChangeListener( const Sequence< OUString >& PropertyNames, @@ -474,7 +467,6 @@ BaseContent::removePropertiesChangeListener( const Sequence< OUString >& Propert } - // XContent @@ -535,7 +527,6 @@ BaseContent::getContentType() } - void SAL_CALL BaseContent::addContentEventListener( const Reference< XContentEventListener >& Listener ) @@ -564,12 +555,9 @@ BaseContent::removeContentEventListener( } - - // XPropertyContainer - void SAL_CALL BaseContent::addProperty( const OUString& Name, @@ -676,11 +664,9 @@ BaseContent::createNewContent( } - // XPropertySetInfoChangeNotifier - void SAL_CALL BaseContent::addPropertySetInfoChangeListener( const Reference< beans::XPropertySetInfoChangeListener >& Listener ) @@ -706,7 +692,6 @@ BaseContent::removePropertySetInfoChangeListener( } - // XChild @@ -747,11 +732,9 @@ BaseContent::setParent( } - // Private Methods - Reference< XCommandInfo > SAL_CALL BaseContent::getCommandInfo() throw( RuntimeException ) @@ -962,7 +945,6 @@ BaseContent::setPropertyValues( } - Reference< XDynamicResultSet > SAL_CALL BaseContent::open( sal_Int32 nMyCommandIdentifier, @@ -1039,7 +1021,6 @@ BaseContent::open( } - void SAL_CALL BaseContent::deleteContent( sal_Int32 nMyCommandIdentifier ) { @@ -1054,7 +1035,6 @@ BaseContent::deleteContent( sal_Int32 nMyCommandIdentifier ) } - void SAL_CALL BaseContent::transfer( sal_Int32 nMyCommandIdentifier, const TransferInfo& aTransferInfo ) @@ -1125,8 +1105,6 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, } - - void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, const InsertCommandArgument& aInsertArgument ) { @@ -1244,7 +1222,6 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, } - void SAL_CALL BaseContent::endTask( sal_Int32 CommandId ) { // This is the only function allowed to throw an exception @@ -1252,7 +1229,6 @@ void SAL_CALL BaseContent::endTask( sal_Int32 CommandId ) } - ContentEventNotifier* BaseContent::cDEL() { @@ -1324,7 +1300,6 @@ BaseContent::cPSL() } - PropertyChangeNotifier* BaseContent::cPCL() { diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index ed6224436020..4487a3d56f20 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -41,7 +41,6 @@ XCommandInfo_impl::~XCommandInfo_impl() } - void SAL_CALL XCommandInfo_impl::acquire( void ) diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 72267c3b9d97..1f34f8fdea68 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -148,7 +148,6 @@ namespace { } - namespace fileaccess { diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 5d314e989752..c672840d9f2a 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -75,14 +75,12 @@ XInputStream_impl::~XInputStream_impl() // XTypeProvider - XTYPEPROVIDER_IMPL_3( XInputStream_impl, lang::XTypeProvider, io::XSeekable, io::XInputStream ) - uno::Any SAL_CALL XInputStream_impl::queryInterface( const uno::Type& rType ) @@ -114,7 +112,6 @@ XInputStream_impl::release( } - sal_Int32 SAL_CALL XInputStream_impl::readBytes( uno::Sequence< sal_Int8 >& aData, diff --git a/ucb/source/ucp/file/filinsreq.cxx b/ucb/source/ucp/file/filinsreq.cxx index 664c45cb06af..e96b6044c430 100644 --- a/ucb/source/ucp/file/filinsreq.cxx +++ b/ucb/source/ucp/file/filinsreq.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> - using namespace cppu; using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx index 511d8f2daf50..6d2196742d74 100644 --- a/ucb/source/ucp/file/filinsreq.hxx +++ b/ucb/source/ucp/file/filinsreq.hxx @@ -74,7 +74,6 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< }; - class XInteractionAbortImpl : public cppu::WeakImplHelper< css::task::XInteractionAbort > { @@ -103,7 +102,6 @@ class XInteractionSupplyNameImpl : public cppu::WeakImplHelper< }; - class XInteractionRequestImpl { public: diff --git a/ucb/source/ucp/file/filnot.cxx b/ucb/source/ucp/file/filnot.cxx index 7c2958d7ccec..35e703697c8f 100644 --- a/ucb/source/ucp/file/filnot.cxx +++ b/ucb/source/ucp/file/filnot.cxx @@ -26,7 +26,6 @@ #include "prov.hxx" - using namespace fileaccess; using namespace com::sun::star; using namespace com::sun::star::ucb; @@ -58,7 +57,6 @@ ContentEventNotifier::ContentEventNotifier( shell* pMyShell, } - void ContentEventNotifier::notifyChildInserted( const OUString& aChildName ) { FileContentIdentifier* p = new FileContentIdentifier( aChildName ); @@ -97,7 +95,6 @@ void ContentEventNotifier::notifyDeleted() } - void ContentEventNotifier::notifyRemoved( const OUString& aChildName ) { FileContentIdentifier* p = new FileContentIdentifier( aChildName ); diff --git a/ucb/source/ucp/file/filprp.cxx b/ucb/source/ucp/file/filprp.cxx index 2b0cf40e0a3c..29b181ec2db1 100644 --- a/ucb/source/ucp/file/filprp.cxx +++ b/ucb/source/ucp/file/filprp.cxx @@ -87,7 +87,6 @@ XPropertySetInfo_impl::getPropertyByName( } - Sequence< beans::Property > SAL_CALL XPropertySetInfo_impl::getProperties( void ) diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index 03ecedd53eb8..3fdfe61eab71 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -91,12 +91,6 @@ XResultSet_impl::~XResultSet_impl() } - - - - - - void SAL_CALL XResultSet_impl::disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) @@ -132,7 +126,6 @@ XResultSet_impl::removeEventListener( } - void SAL_CALL XResultSet_impl::dispose() throw( uno::RuntimeException, std::exception ) @@ -157,7 +150,6 @@ XResultSet_impl::dispose() } - void XResultSet_impl::rowCountChanged() { sal_Int32 aOldValue,aNewValue; @@ -291,9 +283,6 @@ XResultSet_impl::OneMore( } - - - sal_Bool SAL_CALL XResultSet_impl::next( void ) @@ -411,7 +400,6 @@ XResultSet_impl::getRow( } - sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row ) throw( sdbc::SQLException, uno::RuntimeException, std::exception) { @@ -434,8 +422,6 @@ sal_Bool SAL_CALL XResultSet_impl::absolute( sal_Int32 row ) } - - sal_Bool SAL_CALL XResultSet_impl::relative( sal_Int32 row ) @@ -453,7 +439,6 @@ XResultSet_impl::relative( } - sal_Bool SAL_CALL XResultSet_impl::previous( void ) @@ -535,7 +520,6 @@ XResultSet_impl::close( } - OUString SAL_CALL XResultSet_impl::queryContentIdentifierString( void ) @@ -721,7 +705,6 @@ XResultSet_impl::getMetaData( } - // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL XResultSet_impl::getPropertySetInfo() @@ -745,7 +728,6 @@ XResultSet_impl::getPropertySetInfo() } - void SAL_CALL XResultSet_impl::setPropertyValue( const OUString& aPropertyName, const uno::Any& ) throw( beans::UnknownPropertyException, diff --git a/ucb/source/ucp/file/filstr.cxx b/ucb/source/ucp/file/filstr.cxx index 1eaa8c5a5cc5..da75d5000226 100644 --- a/ucb/source/ucp/file/filstr.cxx +++ b/ucb/source/ucp/file/filstr.cxx @@ -83,12 +83,6 @@ XStream_impl::~XStream_impl() } - - - - - - uno::Reference< io::XInputStream > SAL_CALL XStream_impl::getInputStream( ) throw( uno::RuntimeException, std::exception) @@ -124,8 +118,6 @@ void SAL_CALL XStream_impl::truncate() } - - // XStream_impl private non interface methods diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx index adc5bde2367c..620a33ec8256 100644 --- a/ucb/source/ucp/file/filstr.hxx +++ b/ucb/source/ucp/file/filstr.hxx @@ -153,7 +153,6 @@ class XStream_impl : public cppu::WeakImplHelper< css::uno::RuntimeException, std::exception) override; - void SAL_CALL flush() throw( css::io::NotConnectedException, diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx index 35bd200b0b7b..22cc98fdff98 100644 --- a/ucb/source/ucp/file/filtask.cxx +++ b/ucb/source/ucp/file/filtask.cxx @@ -33,20 +33,17 @@ using namespace com::sun::star::uno; using namespace com::sun::star::ucb; - TaskManager::TaskManager() : m_nCommandId( 0 ) { } - TaskManager::~TaskManager() { } - void SAL_CALL TaskManager::startTask( sal_Int32 CommandId, @@ -63,7 +60,6 @@ TaskManager::startTask( } - void SAL_CALL TaskManager::endTask( sal_Int32 CommandId, const OUString& aUncPath, @@ -94,7 +90,6 @@ TaskManager::endTask( sal_Int32 CommandId, } - void SAL_CALL TaskManager::abort( sal_Int32 CommandId ) { @@ -133,7 +128,6 @@ void SAL_CALL TaskManager::retrieveError( sal_Int32 CommandId, } - void SAL_CALL TaskManager::installError( sal_Int32 CommandId, sal_Int32 ErrorCode, sal_Int32 MinorCode ) @@ -145,7 +139,6 @@ void SAL_CALL TaskManager::installError( sal_Int32 CommandId, } - sal_Int32 SAL_CALL TaskManager::getCommandId() { @@ -154,7 +147,6 @@ TaskManager::getCommandId() } - void SAL_CALL TaskManager::handleTask( sal_Int32 CommandId, const uno::Reference< task::XInteractionRequest >& request ) diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index 96db2c759a31..5eb00115f356 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -67,7 +67,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpfile_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); @@ -162,12 +161,9 @@ FileProvider::CreateInstance( } - - // XContent - Reference< XContent > SAL_CALL FileProvider::queryContent( const Reference< XContentIdentifier >& xIdentifier ) @@ -186,7 +182,6 @@ FileProvider::queryContent( } - sal_Int32 SAL_CALL FileProvider::compareContentIds( const Reference< XContentIdentifier >& Id1, @@ -245,7 +240,6 @@ FileProvider::compareContentIds( } - Reference< XContentIdentifier > SAL_CALL FileProvider::createContentIdentifier( const OUString& ContentId ) @@ -257,7 +251,6 @@ FileProvider::createContentIdentifier( } - //XPropertySetInfoImpl class XPropertySetInfoImpl2 @@ -375,7 +368,6 @@ XPropertySetInfoImpl2::getPropertyByName( } - Sequence< Property > SAL_CALL XPropertySetInfoImpl2::getProperties( void ) @@ -397,9 +389,6 @@ XPropertySetInfoImpl2::hasPropertyByName( } - - - void SAL_CALL FileProvider::initProperties() { osl::MutexGuard aGuard( m_aMutex ); @@ -457,7 +446,6 @@ FileProvider::setPropertyValue( const OUString& aPropertyName, } - Any SAL_CALL FileProvider::getPropertyValue( const OUString& aPropertyName ) @@ -536,7 +524,6 @@ FileProvider::removeVetoableChangeListener( } - // XFileIdentifierConverter sal_Int32 SAL_CALL diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx index d65aedd19ca7..0f0756f8236c 100644 --- a/ucb/source/ucp/file/prov.hxx +++ b/ucb/source/ucp/file/prov.hxx @@ -40,7 +40,6 @@ // FileProvider - namespace fileaccess { // Forward declaration diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index a10d2020371b..42e4ab59c219 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -434,7 +434,6 @@ shell::registerNotifier( const OUString& aUnqPath, Notifier* pNotifier ) } - void SAL_CALL shell::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ) { @@ -451,7 +450,6 @@ shell::deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ) } - /*********************************************************************************/ /* */ /* de/associate-Implementation */ @@ -505,8 +503,6 @@ shell::associate( const OUString& aUnqPath, } - - void SAL_CALL shell::deassociate( const OUString& aUnqPath, const OUString& PropertyName ) @@ -554,8 +550,6 @@ shell::deassociate( const OUString& aUnqPath, } - - /*********************************************************************************/ /* */ /* page-Implementation */ @@ -566,7 +560,6 @@ shell::deassociate( const OUString& aUnqPath, // URL aUnqPath into the XOutputStream - void SAL_CALL shell::page( sal_Int32 CommandId, const OUString& aUnqPath, const uno::Reference< io::XOutputStream >& xOutputStream ) @@ -655,7 +648,6 @@ void SAL_CALL shell::page( sal_Int32 CommandId, // Given a file URL aUnqPath, this methods returns a XInputStream which reads from the open file. - uno::Reference< io::XInputStream > SAL_CALL shell::open( sal_Int32 CommandId, const OUString& aUnqPath, @@ -679,8 +671,6 @@ shell::open( sal_Int32 CommandId, } - - /*********************************************************************************/ /* */ /* open for read/write access-Implementation */ @@ -691,7 +681,6 @@ shell::open( sal_Int32 CommandId, // to read and write from/to the file. - uno::Reference< io::XStream > SAL_CALL shell::open_rw( sal_Int32 CommandId, const OUString& aUnqPath, @@ -714,7 +703,6 @@ shell::open_rw( sal_Int32 CommandId, } - /*********************************************************************************/ /* */ /* ls-Implementation */ @@ -725,7 +713,6 @@ shell::open_rw( sal_Int32 CommandId, // to file URL aUnqPath - uno::Reference< XDynamicResultSet > SAL_CALL shell::ls( sal_Int32 CommandId, const OUString& aUnqPath, @@ -751,8 +738,6 @@ shell::ls( sal_Int32 CommandId, } - - /*********************************************************************************/ /* */ /* info_c implementation */ @@ -768,8 +753,6 @@ shell::info_c() } - - /*********************************************************************************/ /* */ /* info_p-Implementation */ @@ -786,8 +769,6 @@ shell::info_p( const OUString& aUnqPath ) } - - /*********************************************************************************/ /* */ /* setv-Implementation */ @@ -797,7 +778,6 @@ shell::info_p( const OUString& aUnqPath ) // Sets the values of the properties belonging to fileURL aUnqPath - uno::Sequence< uno::Any > SAL_CALL shell::setv( const OUString& aUnqPath, const uno::Sequence< beans::PropertyValue >& values ) @@ -1032,7 +1012,6 @@ shell::setv( const OUString& aUnqPath, // Returns an XRow object containing the values in the requested order. - uno::Reference< sdbc::XRow > SAL_CALL shell::getv( sal_Int32 CommandId, const OUString& aUnqPath, @@ -1274,7 +1253,6 @@ shell::move( sal_Int32 CommandId, } - /********************************************************************************/ /* */ /* copy-implementation */ @@ -1470,7 +1448,6 @@ shell::copy( } - /********************************************************************************/ /* */ /* remove-implementation */ @@ -1481,7 +1458,6 @@ shell::copy( // Return: success of operation - bool SAL_CALL shell::remove( sal_Int32 CommandId, const OUString& aUnqPath, @@ -1888,7 +1864,6 @@ shell::write( sal_Int32 CommandId, } - /*********************************************************************************/ /* */ /* insertDefaultProperties-Implementation */ @@ -1924,8 +1899,6 @@ void SAL_CALL shell::insertDefaultProperties( const OUString& aUnqPath ) } - - /******************************************************************************/ /* */ /* mapping of file urls */ @@ -1955,7 +1928,6 @@ bool SAL_CALL shell::getUnqFromUrl( const OUString& Url, OUString& Unq ) } - bool SAL_CALL shell::getUrlFromUnq( const OUString& Unq,OUString& Url ) { bool err = osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL( Unq,Url ); @@ -1966,7 +1938,6 @@ bool SAL_CALL shell::getUrlFromUnq( const OUString& Unq,OUString& Url ) } - // Helper function for public copy osl::FileBase::RC SAL_CALL @@ -2036,7 +2007,6 @@ shell::copy_recursive( const OUString& srcUnqPath, } - // Helper function for mkfil,mkdir and write // Creates whole path // returns success of the operation @@ -2123,15 +2093,11 @@ bool SAL_CALL shell::ensuredir( sal_Int32 CommandId, } - - - // Given a sequence of properties seq, this method determines the mask // used to instantiate a osl::FileStatus, so that a call to // osl::DirectoryItem::getFileStatus fills the required fields. - void SAL_CALL shell::getMaskFromProperties( sal_Int32& n_Mask, @@ -2165,7 +2131,6 @@ shell::getMaskFromProperties( } - /*********************************************************************************/ /* */ /* load-Implementation */ @@ -2224,8 +2189,6 @@ shell::load( const ContentMap::iterator& it, bool create ) } - - /*********************************************************************************/ /* */ /* commit-Implementation */ @@ -2534,10 +2497,6 @@ shell::getv( } - - - - // EventListener @@ -2567,7 +2526,6 @@ shell::getContentEventListeners( const OUString& aName ) } - std::list< ContentEventNotifier* >* SAL_CALL shell::getContentDeletedEventListeners( const OUString& aName ) { @@ -2637,8 +2595,6 @@ shell::notifyContentRemoved( std::list< ContentEventNotifier* >* listeners, } - - std::list< PropertySetInfoChangeNotifier* >* SAL_CALL shell::getPropertySetListeners( const OUString& aName ) { @@ -2695,7 +2651,6 @@ shell::notifyPropertyRemoved( std::list< PropertySetInfoChangeNotifier* >* liste } - std::vector< std::list< ContentEventNotifier* >* >* SAL_CALL shell::getContentExchangedEventListeners( const OUString& aOldPrefix, const OUString& aNewPrefix, @@ -2799,7 +2754,6 @@ shell::getContentExchangedEventListeners( const OUString& aOldPrefix, } - void SAL_CALL shell::notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* >* listeners_vec ) { @@ -2820,7 +2774,6 @@ shell::notifyContentExchanged( std::vector< std::list< ContentEventNotifier* >* } - std::list< PropertyChangeNotifier* >* SAL_CALL shell::getPropertyChangeNotifier( const OUString& aName ) { @@ -2861,8 +2814,6 @@ void SAL_CALL shell::notifyPropertyChanges( std::list< PropertyChangeNotifier* > } - - /********************************************************************************/ /* remove persistent propertyset */ /********************************************************************************/ @@ -2921,8 +2872,6 @@ shell::erasePersistentSet( const OUString& aUnqPath, } - - /********************************************************************************/ /* copy persistent propertyset */ /* from srcUnqPath to dstUnqPath */ diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx index 4b5e3162acb5..b6e2e05056ad 100644 --- a/ucb/source/ucp/file/shell.hxx +++ b/ucb/source/ucp/file/shell.hxx @@ -159,7 +159,6 @@ namespace fileaccess { virtual ~shell(); - /** * This two methods register and deregister a change listener for the content belonging * to URL aUnqPath @@ -170,7 +169,6 @@ namespace fileaccess { void SAL_CALL deregisterNotifier( const OUString& aUnqPath,Notifier* pNotifier ); - /** * Used to associate and deassociate a new property with * the content belonging to URL UnqPath. @@ -193,13 +191,10 @@ namespace fileaccess { css::uno::RuntimeException); - - // Every method having a command id is not allowed to throw anything, // but instead must install every error code in the task handler - /** * Given an xOutputStream, this method writes the content of the file belonging to * URL aUnqPath into the XOutputStream @@ -354,7 +349,6 @@ namespace fileaccess { const css::uno::Reference< css::io::XInputStream >& aInputStream ); - void SAL_CALL insertDefaultProperties( const OUString& aUnqPath ); css::uno::Sequence< css::ucb::ContentInfo > diff --git a/ucb/source/ucp/ftp/ftpcontent.cxx b/ucb/source/ucp/ftp/ftpcontent.cxx index e1c0cdbd1550..3fd5c366893a 100644 --- a/ucb/source/ucp/ftp/ftpcontent.cxx +++ b/ucb/source/ucp/ftp/ftpcontent.cxx @@ -173,7 +173,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContent::getTypes() } - // XServiceInfo methods. OUString SAL_CALL FTPContent::getImplementationName() @@ -206,9 +205,6 @@ css::uno::Sequence< OUString > FTPContent::getSupportedServiceNames_Static() } - - - // XContent methods. // virtual @@ -674,8 +670,6 @@ FTPContent::createNewContent( const ContentInfo& Info ) } - - Reference<XInterface > SAL_CALL FTPContent::getParent( ) throw (RuntimeException, std::exception) @@ -695,7 +689,6 @@ FTPContent::setParent(const Reference<XInterface >& /*Parent*/ ) } - OUString FTPContent::getParentURL() { return m_aFTPURL.parent(); @@ -720,7 +713,6 @@ private: }; - sal_Int32 InsertData::read(sal_Int8 *dest,sal_Int32 nBytesRequested) { sal_Int32 m = 0; @@ -811,7 +803,6 @@ void FTPContent::insert(const InsertCommandArgument& aInsertCommand, } - Reference< XRow > FTPContent::getPropertyValues( const Sequence< Property >& seqProp, const Reference<XCommandEnvironment>& /*environment*/ @@ -863,7 +854,6 @@ Reference< XRow > FTPContent::getPropertyValues( } - Sequence<Any> FTPContent::setPropertyValues( const Sequence<PropertyValue>& seqPropVal) { diff --git a/ucb/source/ucp/ftp/ftpcontentcaps.cxx b/ucb/source/ucp/ftp/ftpcontentcaps.cxx index 42dd98e863d2..2f35f170a302 100644 --- a/ucb/source/ucp/ftp/ftpcontentcaps.cxx +++ b/ucb/source/ucp/ftp/ftpcontentcaps.cxx @@ -110,11 +110,9 @@ uno::Sequence< ucb::CommandInfo > FTPContent::getCommands( // osl::MutexGuard aGuard( m_aMutex ); - // Supported commands - #define COMMAND_COUNT 8 static const ucb::CommandInfo aCommandInfoTable[] = diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 9b9827a2f6a3..f2e5ecb84c73 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -122,8 +122,4 @@ FTPContentIdentifier::getContentProviderScheme( } - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index c6bc270ddb06..caa2a34fec53 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -109,7 +109,6 @@ css::uno::Sequence< css::uno::Type > SAL_CALL FTPContentProvider::getTypes() } - // XServiceInfo methods. OUString SAL_CALL FTPContentProvider::getImplementationName() @@ -290,7 +289,6 @@ bool FTPContentProvider::setHost( const OUString& host, } - Reference<XContentProvider> FTPContentProvider::getHttpProvider() throw(RuntimeException) { diff --git a/ucb/source/ucp/ftp/ftpdirp.cxx b/ucb/source/ucp/ftp/ftpdirp.cxx index 08e10a14fab0..032f96927f2b 100644 --- a/ucb/source/ucp/ftp/ftpdirp.cxx +++ b/ucb/source/ucp/ftp/ftpdirp.cxx @@ -37,7 +37,6 @@ inline bool ascii_isWhitespace( sal_Unicode ch ) } - /*======================================================================== * * FTPDirectoryParser implementation. diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx index 13b344464be4..69567b30e22d 100644 --- a/ucb/source/ucp/ftp/ftpdirp.hxx +++ b/ucb/source/ucp/ftp/ftpdirp.hxx @@ -71,7 +71,6 @@ namespace ftp { }; - /*======================================================================== * * the directory information structure diff --git a/ucb/source/ucp/ftp/ftpdynresultset.cxx b/ucb/source/ucp/ftp/ftpdynresultset.cxx index c3c1fbfcfe12..dbdb4bbcf203 100644 --- a/ucb/source/ucp/ftp/ftpdynresultset.cxx +++ b/ucb/source/ucp/ftp/ftpdynresultset.cxx @@ -30,13 +30,9 @@ using namespace com::sun::star::uno; using namespace ftp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const Reference< XComponentContext >& rxContext, const OpenCommandArgument2& rCommand, @@ -52,11 +48,9 @@ DynamicResultSet::~DynamicResultSet() } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1.set( m_pFactory->createResultSet() ); @@ -71,6 +65,4 @@ void DynamicResultSet::initDynamic() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/ftpintreq.cxx b/ucb/source/ucp/ftp/ftpintreq.cxx index 9698080bb8db..35a51c18f2f9 100644 --- a/ucb/source/ucp/ftp/ftpintreq.cxx +++ b/ucb/source/ucp/ftp/ftpintreq.cxx @@ -47,8 +47,6 @@ void SAL_CALL XInteractionApproveImpl::select() } - - // XInteractionDisapproveImpl XInteractionDisapproveImpl::XInteractionDisapproveImpl() diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx index 8088755ba06c..a00feb520dfd 100644 --- a/ucb/source/ucp/ftp/ftpintreq.hxx +++ b/ucb/source/ucp/ftp/ftpintreq.hxx @@ -52,8 +52,6 @@ namespace ftp { }; - - class XInteractionDisapproveImpl : public cppu::WeakImplHelper < css::task::XInteractionDisapprove > { @@ -70,7 +68,6 @@ namespace ftp { }; - class XInteractionRequestImpl { public: diff --git a/ucb/source/ucp/ftp/ftploaderthread.cxx b/ucb/source/ucp/ftp/ftploaderthread.cxx index 888219c1929e..25bc26d55428 100644 --- a/ucb/source/ucp/ftp/ftploaderthread.cxx +++ b/ucb/source/ucp/ftp/ftploaderthread.cxx @@ -71,13 +71,11 @@ FTPLoaderThread::FTPLoaderThread() } - FTPLoaderThread::~FTPLoaderThread() { osl_destroyThreadKey(m_threadKey); } - CURL* FTPLoaderThread::handle() { CURL* ret = osl_getThreadKeyData(m_threadKey); if(!ret) { diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index fde89797120e..baa69a2c0f8e 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -74,7 +74,6 @@ ResultSetBase::release( } - uno::Any SAL_CALL ResultSetBase::queryInterface( const uno::Type& rType ) @@ -92,7 +91,6 @@ ResultSetBase::queryInterface( } - // XComponent @@ -123,7 +121,6 @@ ResultSetBase::removeEventListener( } - void SAL_CALL ResultSetBase::dispose() throw( uno::RuntimeException, std::exception ) @@ -148,7 +145,6 @@ ResultSetBase::dispose() } - // XResultSet sal_Bool SAL_CALL @@ -282,8 +278,6 @@ sal_Bool SAL_CALL ResultSetBase::absolute( sal_Int32 row ) } - - sal_Bool SAL_CALL ResultSetBase::relative( sal_Int32 row ) @@ -304,7 +298,6 @@ ResultSetBase::relative( } - sal_Bool SAL_CALL ResultSetBase::previous( void ) @@ -426,7 +419,6 @@ ResultSetBase::queryContent( } - class XPropertySetInfoImpl : public cppu::OWeakObject, public beans::XPropertySetInfo @@ -491,7 +483,6 @@ private: }; - // XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL ResultSetBase::getPropertySetInfo() @@ -514,7 +505,6 @@ ResultSetBase::getPropertySetInfo() } - void SAL_CALL ResultSetBase::setPropertyValue( const OUString& aPropertyName, const uno::Any& /*aValue*/ ) throw( beans::UnknownPropertyException, @@ -628,7 +618,6 @@ void SAL_CALL ResultSetBase::removeVetoableChangeListener( } - // XResultSetMetaDataSupplier uno::Reference< sdbc::XResultSetMetaData > SAL_CALL ResultSetBase::getMetaData( @@ -642,6 +631,4 @@ ResultSetBase::getMetaData( } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx index a87c71ecf66b..30cb9a46b1e1 100644 --- a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx +++ b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx @@ -28,7 +28,6 @@ #include "ftpresultsetbase.hxx" - namespace ftp { class ResultSetBase; @@ -45,7 +44,6 @@ namespace ftp { } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index f865d9aeeb2c..b415350fe7d2 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -355,7 +355,6 @@ OUString FTPURL::child() const } - /** Listing of a directory. */ @@ -670,7 +669,6 @@ void FTPURL::insert(bool replaceExisting,void* stream) const } - void FTPURL::mkdir(bool ReplaceExisting) const throw (curl_exception, malformed_exception, std::exception) { @@ -764,7 +762,6 @@ OUString FTPURL::ren(const OUString& NewTitle) } - void FTPURL::del() const throw(curl_exception, malformed_exception, std::exception) { diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.cxx b/ucb/source/ucp/hierarchy/dynamicresultset.cxx index f29b7008f9bc..dfa842af06e1 100644 --- a/ucb/source/ucp/hierarchy/dynamicresultset.cxx +++ b/ucb/source/ucp/hierarchy/dynamicresultset.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< HierarchyContent >& rxContent, @@ -51,11 +47,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index 1961ff559784..718de574a830 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -74,13 +74,9 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - - // HierarchyContent Implementation. - - // static ( "virtual" ctor ) HierarchyContent* HierarchyContent::create( const uno::Reference< uno::XComponentContext >& rxContext, @@ -151,11 +147,9 @@ HierarchyContent::~HierarchyContent() } - // XInterface methods. - // virtual void SAL_CALL HierarchyContent::acquire() throw( ) @@ -195,11 +189,9 @@ uno::Any SAL_CALL HierarchyContent::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( HierarchyContent ); @@ -279,11 +271,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyContent::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL HierarchyContent::getImplementationName() throw( uno::RuntimeException, std::exception ) @@ -310,11 +300,9 @@ HierarchyContent::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL HierarchyContent::getContentType() throw( uno::RuntimeException, std::exception ) @@ -339,11 +327,9 @@ HierarchyContent::getIdentifier() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL HierarchyContent::execute( const ucb::Command& aCommand, @@ -572,11 +558,9 @@ void SAL_CALL HierarchyContent::abort( sal_Int32 /*CommandId*/ ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL HierarchyContent::queryCreatableContentsInfo() @@ -1847,13 +1831,9 @@ void HierarchyContent::transfer( } - - // HierarchyContentProperties Implementation. - - uno::Sequence< ucb::ContentInfo > HierarchyContentProperties::getCreatableContentsInfo() const { diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx index ff2d46cd66c8..19d813fdb9a0 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx @@ -44,7 +44,6 @@ namespace hierarchy_ucp { - class HierarchyContentProperties { public: @@ -92,7 +91,6 @@ private: }; - class HierarchyContentProvider; class HierarchyContent : public ::ucbhelper::ContentImplHelper, diff --git a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx index 1d053d2ac3f9..b30465ed1076 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontentcaps.cxx @@ -62,11 +62,9 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - // HierarchyContent implementation. - #define MAKEPROPSEQUENCE( a ) \ uno::Sequence< beans::Property >( a, sizeof( a ) / sizeof( a[ 0 ] ) ) @@ -74,12 +72,10 @@ using namespace hierarchy_ucp; uno::Sequence< ucb::CommandInfo >( a, sizeof( a ) / sizeof( a[ 0 ] ) ) - // IMPORTANT: If any property data ( name / type / ... ) are changed, then // HierarchyContent::getPropertyValues(...) must be adapted too! - // virtual uno::Sequence< beans::Property > HierarchyContent::getProperties( const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) @@ -93,7 +89,6 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Link: Supported properties - if ( isReadOnly() ) { static const beans::Property aLinkPropertyInfoTable[] = @@ -216,7 +211,6 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Folder: Supported properties - if ( isReadOnly() ) { static const beans::Property aFolderPropertyInfoTable[] = @@ -326,7 +320,6 @@ uno::Sequence< beans::Property > HierarchyContent::getProperties( // Root Folder: Supported properties - // Currently no difference between read-only/read-write // -> all props ar read-only @@ -395,7 +388,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Link: Supported commands - if ( isReadOnly() ) { static const ucb::CommandInfo aLinkCommandInfoTable[] = @@ -427,7 +419,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Optional standard commands - // New commands }; @@ -487,7 +478,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Folder: Supported commands - if ( isReadOnly() ) { static const ucb::CommandInfo aFolderCommandInfoTable[] = @@ -598,7 +588,6 @@ uno::Sequence< ucb::CommandInfo > HierarchyContent::getCommands( // Root Folder: Supported commands - if ( isReadOnly() ) { static const ucb::CommandInfo aRootFolderCommandInfoTable[] = diff --git a/ucb/source/ucp/hierarchy/hierarchydata.cxx b/ucb/source/ucp/hierarchy/hierarchydata.cxx index 199ca0332e58..c027ec46f0dc 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.cxx @@ -94,13 +94,9 @@ void makeXMLName( const OUString & rIn, OUStringBuffer & rBuffer ) } - - // HierarchyEntry Implementation. - - #define READ_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadAccess" #define READWRITE_SERVICE_NAME "com.sun.star.ucb.HierarchyDataReadWriteAccess" @@ -1061,13 +1057,9 @@ HierarchyEntry::getRootReadAccess() } - - // HierarchyEntry::iterator Implementation. - - HierarchyEntry::iterator::iterator() : m_pImpl( new iterator_Impl ) { diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx index d3800b139ed1..badca56297c6 100644 --- a/ucb/source/ucp/hierarchy/hierarchydata.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx @@ -39,7 +39,6 @@ namespace hierarchy_ucp { - class HierarchyEntryData { public: @@ -72,7 +71,6 @@ private: }; - class HierarchyContentProvider; class HierarchyUri; diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index d9b9e8ce2e53..4739574f02b3 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -43,7 +43,6 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - // describe path of cfg entry #define CFGPROPERTY_NODEPATH "nodepath" // true->async. update; false->sync. update @@ -56,16 +55,13 @@ using namespace hierarchy_ucp; "/org.openoffice.ucb.Hierarchy/Root" - namespace hcp_impl { - // HierarchyDataReadAccess Implementation. - class HierarchyDataAccess : public cppu::OWeakObject, public lang::XServiceInfo, public lang::XTypeProvider, @@ -217,13 +213,9 @@ public: using namespace hcp_impl; - - // HierarchyDataSource Implementation. - - HierarchyDataSource::HierarchyDataSource( const uno::Reference< uno::XComponentContext > & rxContext ) : m_xContext( rxContext ), @@ -239,7 +231,6 @@ HierarchyDataSource::~HierarchyDataSource() } - // XInterface methods. void SAL_CALL HierarchyDataSource::acquire() throw() @@ -268,7 +259,6 @@ css::uno::Any SAL_CALL HierarchyDataSource::queryInterface( const css::uno::Type // XTypeProvider methods. - XTYPEPROVIDER_IMPL_4( HierarchyDataSource, lang::XTypeProvider, lang::XServiceInfo, @@ -276,11 +266,9 @@ XTYPEPROVIDER_IMPL_4( HierarchyDataSource, lang::XMultiServiceFactory ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_0_CTX( HierarchyDataSource, OUString( "com.sun.star.comp.ucb.HierarchyDataSource" ) ) { @@ -293,11 +281,9 @@ XSERVICEINFO_IMPL_0_CTX( HierarchyDataSource, ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyDataSource ); - // XComponent methods. - // virtual void SAL_CALL HierarchyDataSource::dispose() throw( uno::RuntimeException, std::exception ) @@ -340,11 +326,9 @@ void SAL_CALL HierarchyDataSource::removeEventListener( } - // XMultiServiceFactory methods. - // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstance( const OUString & aServiceSpecifier ) @@ -386,11 +370,9 @@ HierarchyDataSource::getAvailableServiceNames() } - // Non-interface methods - uno::Reference< uno::XInterface > SAL_CALL HierarchyDataSource::createInstanceWithArguments( const OUString & ServiceSpecifier, @@ -593,13 +575,9 @@ bool HierarchyDataSource::createConfigPath( } - - // HierarchyDataAccess Implementation. - - #define ENSURE_ORIG_INTERFACE( interface_name, member_name ) \ m_xCfg##member_name; \ if ( !m_xCfg##member_name.is() ) \ @@ -626,7 +604,6 @@ HierarchyDataAccess::~HierarchyDataAccess() } - // XInterface methods. void SAL_CALL HierarchyDataAccess::acquire() throw() @@ -668,11 +645,9 @@ uno::Any SAL_CALL HierarchyDataAccess::queryInterface( const uno::Type & aType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( HierarchyDataAccess ); @@ -745,11 +720,9 @@ uno::Sequence< uno::Type > SAL_CALL HierarchyDataAccess::getTypes() } - // XServiceInfo methods. - XSERVICEINFO_NOFACTORY_IMPL_0( HierarchyDataAccess, OUString( "com.sun.star.comp.ucb.HierarchyDataAccess" ) ) @@ -761,11 +734,9 @@ XSERVICEINFO_NOFACTORY_IMPL_0( } - // XComponent methods. - // virtual void SAL_CALL HierarchyDataAccess::dispose() throw ( uno::RuntimeException, std::exception ) @@ -807,11 +778,9 @@ void SAL_CALL HierarchyDataAccess::removeEventListener( } - // XHierarchicalNameAccess methods. - // virtual uno::Any SAL_CALL HierarchyDataAccess::getByHierarchicalName( const OUString & aName ) @@ -842,11 +811,9 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByHierarchicalName( } - // XNameAccess methods. - // virtual uno::Any SAL_CALL HierarchyDataAccess::getByName( const OUString & aName ) throw ( container::NoSuchElementException, @@ -888,11 +855,9 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasByName( const OUString & aName ) } - // XElementAccess methods. - // virtual uno::Type SAL_CALL HierarchyDataAccess::getElementType() throw ( uno::RuntimeException, std::exception ) @@ -919,11 +884,9 @@ sal_Bool SAL_CALL HierarchyDataAccess::hasElements() } - // XChangesNotifier methods. - // virtual void SAL_CALL HierarchyDataAccess::addChangesListener( const uno::Reference< util::XChangesListener > & aListener ) @@ -952,11 +915,9 @@ void SAL_CALL HierarchyDataAccess::removeChangesListener( } - // XSingleServiceFactory methods. - // virtual uno::Reference< uno::XInterface > SAL_CALL HierarchyDataAccess::createInstance() throw ( uno::Exception, uno::RuntimeException, std::exception ) @@ -985,11 +946,9 @@ HierarchyDataAccess::createInstanceWithArguments( } - // XNameContainer methods. - // virtual void SAL_CALL HierarchyDataAccess::insertByName( const OUString & aName, @@ -1024,11 +983,9 @@ HierarchyDataAccess::removeByName( const OUString & Name ) } - // XNameReplace methods. - // virtual void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, const uno::Any & aElement ) @@ -1046,11 +1003,9 @@ void SAL_CALL HierarchyDataAccess::replaceByName( const OUString & aName, } - // XChangesBatch methods. - // virtual void SAL_CALL HierarchyDataAccess::commitChanges() throw ( lang::WrappedTargetException, uno::RuntimeException, std::exception ) diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx index dc750fc2b0a1..2889bef40f87 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx @@ -34,7 +34,6 @@ namespace comphelper { class OInterfaceContainerHelper2; } namespace hierarchy_ucp { - class HierarchyDataSource : public cppu::OWeakObject, public css::lang::XServiceInfo, public css::lang::XTypeProvider, diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx index 5789f72481c1..3796652a9e79 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx @@ -37,11 +37,9 @@ namespace hierarchy_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aId; @@ -54,19 +52,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector< ResultListEntry* > ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; @@ -107,13 +101,9 @@ DataSupplier_Impl::~DataSupplier_Impl() } - - // HierarchyResultSetDataSupplier Implementation. - - HierarchyResultSetDataSupplier::HierarchyResultSetDataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< HierarchyContent >& rContent, diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index b63fd36ca35b..66a0346744a0 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -41,13 +41,9 @@ using namespace com::sun::star; using namespace hierarchy_ucp; - - // HierarchyContentProvider Implementation. - - HierarchyContentProvider::HierarchyContentProvider( const uno::Reference< uno::XComponentContext >& rxContext ) : ::ucbhelper::ContentProviderImplHelper( rxContext ) @@ -61,7 +57,6 @@ HierarchyContentProvider::~HierarchyContentProvider() } - // XInterface methods. void SAL_CALL HierarchyContentProvider::acquire() @@ -91,7 +86,6 @@ css::uno::Any SAL_CALL HierarchyContentProvider::queryInterface( const css::uno: // XTypeProvider methods. - XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, lang::XTypeProvider, lang::XServiceInfo, @@ -99,29 +93,23 @@ XTYPEPROVIDER_IMPL_4( HierarchyContentProvider, lang::XInitialization ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( HierarchyContentProvider, OUString( "com.sun.star.comp.ucb.HierarchyContentProvider" ), "com.sun.star.ucb.HierarchyContentProvider" ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( HierarchyContentProvider ); - // XContentProvider methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL HierarchyContentProvider::queryContent( @@ -154,11 +142,9 @@ HierarchyContentProvider::queryContent( } - // XInitialization methods. - // virtual void SAL_CALL HierarchyContentProvider::initialize( const uno::Sequence< uno::Any >& aArguments ) @@ -169,11 +155,9 @@ void SAL_CALL HierarchyContentProvider::initialize( } - // Non-interface methods. - uno::Reference< lang::XMultiServiceFactory > HierarchyContentProvider::getConfigProvider( const OUString & rServiceSpecifier ) diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index aa6a93b11e44..d8c3ac184362 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star { namespace hierarchy_ucp { - #define HIERARCHY_URL_SCHEME \ "vnd.sun.star.hier" #define HIERARCHY_URL_SCHEME_LENGTH 17 diff --git a/ucb/source/ucp/hierarchy/hierarchyservices.cxx b/ucb/source/ucp/hierarchy/hierarchyservices.cxx index 16c0405ff28a..76eecc876f1f 100644 --- a/ucb/source/ucp/hierarchy/hierarchyservices.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyservices.cxx @@ -57,7 +57,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucphier1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.cxx b/ucb/source/ucp/hierarchy/hierarchyuri.cxx index 196992db664e..d76440f3a25e 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.cxx @@ -32,18 +32,13 @@ using namespace hierarchy_ucp; - #define DEFAULT_DATA_SOURCE_SERVICE \ "com.sun.star.ucb.DefaultHierarchyDataSource" - - // HierarchyUri Implementation. - - void HierarchyUri::init() const { // Already inited? diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx index fac3a8e1d622..24dfb05f47c5 100644 --- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx @@ -25,12 +25,10 @@ namespace hierarchy_ucp { - #define HIERARCHY_URL_SCHEME "vnd.sun.star.hier" #define HIERARCHY_URL_SCHEME_LENGTH 17 - class HierarchyUri { mutable OUString m_aUri; diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx index 2a2b403615e7..7de35d57f9e6 100644 --- a/ucb/source/ucp/inc/urihelper.hxx +++ b/ucb/source/ucp/inc/urihelper.hxx @@ -25,7 +25,6 @@ #include "rtl/uri.hxx" - namespace ucb_impl { namespace urihelper { inline OUString encodeSegment( const OUString & rSegment ) diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index 7bce4df0fb12..df53c1f7350d 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -77,13 +77,9 @@ using namespace package_ucp; #define ENCRYPTIONKEY_MODIFIED sal_uInt32( 0x08 ) - - // ContentProperties Implementation. - - ContentProperties::ContentProperties( const OUString& rContentType ) : aContentType( rContentType ), nSize( 0 ), @@ -99,7 +95,6 @@ ContentProperties::ContentProperties( const OUString& rContentType ) } - uno::Sequence< ucb::ContentInfo > ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const { @@ -138,13 +133,9 @@ ContentProperties::getCreatableContentsInfo( PackageUri const & rUri ) const } - - // Content Implementation. - - // static ( "virtual" ctor ) Content* Content::create( const uno::Reference< uno::XComponentContext >& rxContext, @@ -279,11 +270,9 @@ Content::~Content() } - // XInterface methods. - // virtual void SAL_CALL Content::acquire() throw( ) @@ -314,11 +303,9 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( Content ); @@ -398,11 +385,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception ) @@ -425,11 +410,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) @@ -438,11 +421,9 @@ OUString SAL_CALL Content::getContentType() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, @@ -695,11 +676,9 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() @@ -749,11 +728,9 @@ Content::createNewContent( const ucb::ContentInfo& Info ) } - // Non-interface methods. - // virtual OUString Content::getParentURL() { diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx index 241b92c03c67..3ab4154d39e3 100644 --- a/ucb/source/ucp/package/pkgcontent.hxx +++ b/ucb/source/ucp/package/pkgcontent.hxx @@ -58,7 +58,6 @@ namespace package_ucp { - struct ContentProperties { OUString aTitle; // Title @@ -84,7 +83,6 @@ struct ContentProperties }; - class ContentProvider; class Content : public ::ucbhelper::ContentImplHelper, diff --git a/ucb/source/ucp/package/pkgcontentcaps.cxx b/ucb/source/ucp/package/pkgcontentcaps.cxx index 45acf60af2d5..1234293b96cf 100644 --- a/ucb/source/ucp/package/pkgcontentcaps.cxx +++ b/ucb/source/ucp/package/pkgcontentcaps.cxx @@ -63,11 +63,9 @@ using namespace com::sun::star; using namespace package_ucp; - // Content implementation. - #define MAKEPROPSEQUENCE( a ) \ uno::Sequence< beans::Property >( a, sizeof( a ) / sizeof( a[ 0 ] ) ) @@ -75,12 +73,10 @@ using namespace package_ucp; uno::Sequence< ucb::CommandInfo >( a, sizeof( a ) / sizeof( a[ 0 ] ) ) - // IMPORTANT: If any property data ( name / type / ... ) are changed, then // Content::getPropertyValues(...) must be adapted too! - // virtual uno::Sequence< beans::Property > Content::getProperties( const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) @@ -96,7 +92,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Root Folder: Supported properties - static const beans::Property aRootFolderPropertyInfoTable[] = { @@ -167,7 +162,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Folder: Supported properties - static const beans::Property aFolderPropertyInfoTable[] = { @@ -231,7 +225,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Stream: Supported properties - static const beans::Property aStreamPropertyInfoTable[] = { @@ -324,7 +317,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Root Folder: Supported commands - static const ucb::CommandInfo aRootFolderCommandInfoTable[] = { @@ -387,7 +379,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Folder: Supported commands - static const ucb::CommandInfo aFolderCommandInfoTable[] = { @@ -461,7 +452,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Stream: Supported commands - static const ucb::CommandInfo aStreamCommandInfoTable[] = { diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index 38e980339a85..1137516fbb6e 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -43,11 +43,9 @@ namespace package_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aURL; @@ -59,19 +57,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector< ResultListEntry* > ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; @@ -108,13 +102,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/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index b4e62b919ab7..0dfebf6b72c0 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -41,11 +41,9 @@ namespace package_ucp { - // class Package. - class Package : public cppu::OWeakObject, public container::XHierarchicalNameAccess { @@ -144,36 +142,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.ucb.PackageContentProvider" ), "com.sun.star.ucb.PackageContentProvider" ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); - // XContentProvider methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( const uno::Reference< ucb::XContentIdentifier >& Identifier ) @@ -210,11 +201,9 @@ uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( } - // Other methods. - uno::Reference< container::XHierarchicalNameAccess > ContentProvider::createPackage( const PackageUri & rURI ) { diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx index c335499c8b99..7350ab9828bf 100644 --- a/ucb/source/ucp/package/pkgprovider.hxx +++ b/ucb/source/ucp/package/pkgprovider.hxx @@ -30,7 +30,6 @@ namespace com { namespace sun { namespace star { namespace container { namespace package_ucp { - // UCB Content Type. #define PACKAGE_FOLDER_CONTENT_TYPE \ "application/" PACKAGE_URL_SCHEME "-folder" @@ -42,7 +41,6 @@ namespace package_ucp { "application/" PACKAGE_ZIP_URL_SCHEME "-stream" - class Packages; class ContentProvider : public ::ucbhelper::ContentProviderImplHelper diff --git a/ucb/source/ucp/package/pkgresultset.cxx b/ucb/source/ucp/package/pkgresultset.cxx index 33a300e9d26d..d4732094c136 100644 --- a/ucb/source/ucp/package/pkgresultset.cxx +++ b/ucb/source/ucp/package/pkgresultset.cxx @@ -35,13 +35,9 @@ using namespace com::sun::star; using namespace package_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, @@ -54,11 +50,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/package/pkgservices.cxx b/ucb/source/ucp/package/pkgservices.cxx index 256ce82fcfbe..cf750b61d8b4 100644 --- a/ucb/source/ucp/package/pkgservices.cxx +++ b/ucb/source/ucp/package/pkgservices.cxx @@ -45,7 +45,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucppkg1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/ucp/package/pkguri.cxx b/ucb/source/ucp/package/pkguri.cxx index a013056413b3..5b84e78f2c96 100644 --- a/ucb/source/ucp/package/pkguri.cxx +++ b/ucb/source/ucp/package/pkguri.cxx @@ -35,14 +35,9 @@ using namespace package_ucp; - - - // PackageUri Implementation. - - static void normalize( OUString& rURL ) { sal_Int32 nPos = 0; diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx index b9e674a5094e..b66bae008b5a 100644 --- a/ucb/source/ucp/package/pkguri.hxx +++ b/ucb/source/ucp/package/pkguri.hxx @@ -25,13 +25,11 @@ namespace package_ucp { - #define PACKAGE_URL_SCHEME "vnd.sun.star.pkg" #define PACKAGE_ZIP_URL_SCHEME "vnd.sun.star.zip" #define PACKAGE_URL_SCHEME_LENGTH 16 - class PackageUri { mutable OUString m_aUri; diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index d35cdda98faa..07a97adfd27e 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -89,13 +89,9 @@ static ContentType lcl_getContentType( const OUString & rType ) } - - // Content Implementation. - - // static ( "virtual" ctor ) Content* Content::create( const uno::Reference< uno::XComponentContext >& rxContext, @@ -166,11 +162,9 @@ Content::~Content() } - // XInterface methods. - // virtual void SAL_CALL Content::acquire() throw( ) @@ -208,11 +202,9 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( Content ); @@ -292,11 +284,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception ) @@ -326,11 +316,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) @@ -359,11 +347,9 @@ Content::getIdentifier() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, @@ -668,11 +654,9 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() @@ -2925,13 +2909,9 @@ uno::Reference< io::XStream > Content::getStream( } - - // ContentProperties Implementation. - - uno::Sequence< ucb::ContentInfo > ContentProperties::getCreatableContentsInfo() const { diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx index 8d04503cdca3..dec794b75ce3 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.hxx +++ b/ucb/source/ucp/tdoc/tdoc_content.hxx @@ -85,7 +85,6 @@ private: }; - class Content : public ::ucbhelper::ContentImplHelper, public css::ucb::XContentCreator { diff --git a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx index 7cc288203be6..ed469afbc858 100644 --- a/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx +++ b/ucb/source/ucp/tdoc/tdoc_contentcaps.cxx @@ -73,11 +73,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - // Content implementation. - #define MAKEPROPSEQUENCE( a ) \ uno::Sequence< beans::Property >( a, (sizeof (a) / sizeof (a[0])) ) @@ -85,12 +83,10 @@ using namespace tdoc_ucp; uno::Sequence< ucb::CommandInfo >( a, (sizeof (a) / sizeof (a[0])) ) - // IMPORTANT: If any property data ( name / type / ... ) are changed, then // Content::getPropertyValues(...) must be adapted too! - // virtual uno::Sequence< beans::Property > Content::getProperties( const uno::Reference< ucb::XCommandEnvironment > & /*xEnv*/ ) @@ -104,7 +100,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Stream: Supported properties - static const beans::Property aStreamPropertyInfoTable[] = { @@ -161,7 +156,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Folder: Supported properties - static const beans::Property aFolderPropertyInfoTable[] = { @@ -225,7 +219,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Document: Supported properties - static const beans::Property aDocPropertyInfoTable[] = { @@ -290,7 +283,6 @@ uno::Sequence< beans::Property > Content::getProperties( // Root: Supported properties - OSL_ENSURE( m_aProps.getType() == ROOT, "Wrong content type!" ); static const beans::Property aRootPropertyInfoTable[] = @@ -365,7 +357,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Stream, that is a child of a document: Supported commands - static const ucb::CommandInfo aStreamCommandInfoTable1[] = { @@ -416,7 +407,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Stream: Supported commands - static const ucb::CommandInfo aStreamCommandInfoTable[] = { @@ -473,7 +463,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Folder: Supported commands - static const ucb::CommandInfo aFolderCommandInfoTable[] = { @@ -540,7 +529,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Document: Supported commands - static const ucb::CommandInfo aDocCommandInfoTable[] = { @@ -597,7 +585,6 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( // Root: Supported commands - OSL_ENSURE( m_aProps.getType() == ROOT, "Wrong content type!" ); static const ucb::CommandInfo aRootCommandInfoTable[] = diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index 3db64924bf8e..c8213ae8e7f5 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -39,11 +39,9 @@ namespace tdoc_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aURL; @@ -55,19 +53,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector< ResultListEntry* > ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx index 17f727b803ec..1514f270f3f8 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.cxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.cxx @@ -50,14 +50,9 @@ using namespace tdoc_ucp; // OfficeDocumentsCloseListener Implementation. - - - - // util::XCloseListener - // virtual void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::queryClosing( const lang::EventObject& /*Source*/, sal_Bool /*GetsOwnership*/ ) @@ -80,11 +75,9 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::notifyClosin } - // lang::XDocumentEventListener (base of util::XCloseListener) - // virtual void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing( const lang::EventObject& /*Source*/ ) @@ -93,13 +86,9 @@ void SAL_CALL OfficeDocumentsManager::OfficeDocumentsCloseListener::disposing( } - - // OfficeDocumentsManager Implementation. - - OfficeDocumentsManager::OfficeDocumentsManager( const uno::Reference< uno::XComponentContext > & rxContext, OfficeDocumentsEventListener * pDocEventListener ) @@ -174,11 +163,9 @@ getDocumentId( const uno::Reference< uno::XInterface > & xDoc ) } - // document::XDocumentEventListener - // virtual void SAL_CALL OfficeDocumentsManager::documentEventOccured( const document::DocumentEvent & Event ) @@ -425,11 +412,9 @@ void SAL_CALL OfficeDocumentsManager::documentEventOccured( } - // lang::XDocumentEventListener (base of document::XDocumentEventListener) - // virtual void SAL_CALL OfficeDocumentsManager::disposing( const lang::EventObject& /*Source*/ ) @@ -438,11 +423,9 @@ void SAL_CALL OfficeDocumentsManager::disposing( } - // Non-interface. - void OfficeDocumentsManager::buildDocumentsList() { uno::Reference< container::XEnumeration > xEnum diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx index 047e3eaa3ea8..72717e22817b 100644 --- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx +++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx @@ -47,7 +47,6 @@ namespace tdoc_ucp { }; - struct StorageInfo { OUString aTitle; @@ -64,7 +63,6 @@ namespace tdoc_ucp { }; - struct ltref { bool operator()( @@ -77,7 +75,6 @@ namespace tdoc_ucp { typedef std::map< OUString, StorageInfo, ltref > DocumentList; - class OfficeDocumentsManager : public cppu::WeakImplHelper< css::document::XDocumentEventListener > { diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx index 7cf07b8c7c33..cefb72560990 100644 --- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx +++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.cxx @@ -33,13 +33,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - // DocumentContentFactory Implementation. - - DocumentContentFactory::DocumentContentFactory( const uno::Reference< lang::XMultiServiceFactory >& xSMgr ) : m_xSMgr( xSMgr ) @@ -53,11 +49,9 @@ DocumentContentFactory::~DocumentContentFactory() } - // XServiceInfo methods. - // virtual OUString SAL_CALL DocumentContentFactory::getImplementationName() throw ( uno::RuntimeException, std::exception ) @@ -99,11 +93,9 @@ DocumentContentFactory::getSupportedServiceNames_Static() } - // XTransientDocumentsDocumentContentFactory methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL DocumentContentFactory::createDocumentContent( @@ -131,11 +123,9 @@ DocumentContentFactory::createDocumentContent( } - // Service factory implementation. - static uno::Reference< uno::XInterface > SAL_CALL DocumentContentFactory_CreateInstance( const uno::Reference< lang::XMultiServiceFactory> & rSMgr ) diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx index 9398d5d23157..3e497f9a243b 100644 --- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx +++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx @@ -74,19 +74,12 @@ namespace tdoc_ucp } // namespace tdoc_ucp - - // InteractionSupplyPassword Implementation. - - - - // XInterface methods. - // virtual void SAL_CALL InteractionSupplyPassword::acquire() throw() @@ -118,11 +111,9 @@ InteractionSupplyPassword::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - // virtual uno::Sequence< sal_Int8 > SAL_CALL InteractionSupplyPassword::getImplementationId() @@ -152,11 +143,9 @@ uno::Sequence< uno::Type > SAL_CALL InteractionSupplyPassword::getTypes() } - // XInteractionContinuation methods. - // virtual void SAL_CALL InteractionSupplyPassword::select() throw( uno::RuntimeException, std::exception ) @@ -165,11 +154,9 @@ void SAL_CALL InteractionSupplyPassword::select() } - // XInteractionPassword methods. - // virtual void SAL_CALL InteractionSupplyPassword::setPassword( const OUString& aPasswd ) @@ -188,13 +175,9 @@ OUString SAL_CALL InteractionSupplyPassword::getPassword() } - - // DocumentPasswordRequest Implementation. - - DocumentPasswordRequest::DocumentPasswordRequest( task::PasswordRequestMode eMode, const OUString & rDocumentName ) diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index f6983ab6b7c6..844dea93af43 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -43,13 +43,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - // ContentProvider Implementation. - - ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rxContext ) : ::ucbhelper::ContentProviderImplHelper( rxContext ), @@ -67,7 +63,6 @@ ContentProvider::~ContentProvider() } - // XInterface methods. void SAL_CALL ContentProvider::acquire() throw() @@ -96,7 +91,6 @@ css::uno::Any SAL_CALL ContentProvider::queryInterface( const css::uno::Type & r // XTypeProvider methods. - XTYPEPROVIDER_IMPL_4( ContentProvider, lang::XTypeProvider, lang::XServiceInfo, @@ -104,30 +98,24 @@ XTYPEPROVIDER_IMPL_4( ContentProvider, frame::XTransientDocumentsDocumentContentFactory ); - // XServiceInfo methods. - XSERVICEINFO_IMPL_1_CTX( ContentProvider, OUString( "com.sun.star.comp.ucb.TransientDocumentsContentProvider" ), TDOC_CONTENT_PROVIDER_SERVICE_NAME ); - // Service factory implementation. - ONE_INSTANCE_SERVICE_FACTORY_IMPL( ContentProvider ); - // XContentProvider methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::queryContent( @@ -161,11 +149,9 @@ ContentProvider::queryContent( } - // XTransientDocumentsDocumentContentFactory methods. - // virtual uno::Reference< ucb::XContent > SAL_CALL ContentProvider::createDocumentContent( @@ -227,11 +213,9 @@ ContentProvider::createDocumentContent( } - // interface OfficeDocumentsEventListener - // virtual void ContentProvider::notifyDocumentClosed( const OUString & rDocId ) { @@ -329,11 +313,9 @@ void ContentProvider::notifyDocumentOpened( const OUString & rDocId ) } - // Non-UNO - uno::Reference< embed::XStorage > ContentProvider::queryStorage( const OUString & rUri, StorageAccessMode eMode ) const diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index 3fa3f91d6ee5..68b3950f2760 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -39,7 +39,6 @@ namespace com { namespace sun { namespace star { namespace frame { namespace tdoc_ucp { - #define TDOC_CONTENT_PROVIDER_SERVICE_NAME \ "com.sun.star.ucb.TransientDocumentsContentProvider" @@ -53,7 +52,6 @@ namespace tdoc_ucp { "application/" TDOC_URL_SCHEME "-stream" - class StorageElementFactory; class ContentProvider : diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.cxx b/ucb/source/ucp/tdoc/tdoc_resultset.cxx index e7c4bdb2beed..5a9a2f119f9b 100644 --- a/ucb/source/ucp/tdoc/tdoc_resultset.cxx +++ b/ucb/source/ucp/tdoc/tdoc_resultset.cxx @@ -38,13 +38,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, @@ -55,11 +51,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/tdoc/tdoc_services.cxx b/ucb/source/ucp/tdoc/tdoc_services.cxx index f8a558ebc761..3199e9e99a8d 100644 --- a/ucb/source/ucp/tdoc/tdoc_services.cxx +++ b/ucb/source/ucp/tdoc/tdoc_services.cxx @@ -60,7 +60,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucptdoc1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx index 91dd5714e44a..5007c9ac8e59 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.cxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.cxx @@ -39,13 +39,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - // ParentStorageHolder Implementation. - - ParentStorageHolder::ParentStorageHolder( const uno::Reference< embed::XStorage > & xParentStorage, const OUString & rUri ) @@ -58,13 +54,9 @@ ParentStorageHolder::ParentStorageHolder( } - - // Storage Implementation. - - Storage::Storage( const uno::Reference< uno::XComponentContext > & rxContext, const rtl::Reference< StorageElementFactory > & xFactory, const OUString & rUri, @@ -149,11 +141,9 @@ Storage::~Storage() } - // uno::XInterface - // virtual uno::Any SAL_CALL Storage::queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException, std::exception ) @@ -192,11 +182,9 @@ void SAL_CALL Storage::release() } - // lang::XTypeProvider - // virtual uno::Sequence< uno::Type > SAL_CALL Storage::getTypes() throw ( uno::RuntimeException, std::exception ) @@ -213,7 +201,6 @@ uno::Sequence< sal_Int8 > SAL_CALL Storage::getImplementationId() } - // lang::XComponent (base of embed::XStorage) @@ -242,11 +229,9 @@ void SAL_CALL Storage::removeEventListener( } - // container::XElementAccess (base of container::XNameAccess) - // virtual uno::Type SAL_CALL Storage::getElementType() throw ( uno::RuntimeException, std::exception ) @@ -263,11 +248,9 @@ sal_Bool SAL_CALL Storage::hasElements() } - // container::XNameAccess (base of embed::XStorage) - // virtual uno::Any SAL_CALL Storage::getByName( const OUString& aName ) throw ( container::NoSuchElementException, @@ -294,11 +277,9 @@ sal_Bool SAL_CALL Storage::hasByName( const OUString& aName ) } - // embed::XStorage - // virtual void SAL_CALL Storage::copyToStorage( const uno::Reference< embed::XStorage >& xDest ) @@ -501,11 +482,9 @@ void SAL_CALL Storage::moveElementTo( } - // embed::XTransactedObject - // virtual void SAL_CALL Storage::commit() throw ( io::IOException, @@ -567,13 +546,9 @@ void SAL_CALL Storage::revert() } - - // OutputStream Implementation. - - OutputStream::OutputStream( const uno::Reference< uno::XComponentContext > & rxContext, const OUString & rUri, @@ -634,11 +609,9 @@ OutputStream::~OutputStream() } - // uno::XInterface - // virtual uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException, std::exception ) @@ -655,11 +628,9 @@ uno::Any SAL_CALL OutputStream::queryInterface( const uno::Type& aType ) } - // lang::XTypeProvider - // virtual uno::Sequence< uno::Type > SAL_CALL OutputStream::getTypes() throw ( uno::RuntimeException, std::exception ) @@ -676,11 +647,9 @@ uno::Sequence< sal_Int8 > SAL_CALL OutputStream::getImplementationId() } - // io::XOutputStream - // virtual void SAL_CALL OutputStream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) @@ -721,11 +690,9 @@ OutputStream::closeOutput( ) } - // lang::XComponent - // virtual void SAL_CALL OutputStream::dispose() @@ -759,13 +726,9 @@ OutputStream::removeEventListener( } - - // Stream Implementation. - - Stream::Stream( const uno::Reference< uno::XComponentContext > & rxContext, const OUString & rUri, @@ -829,11 +792,9 @@ Stream::~Stream() } - // uno::XInterface - // virtual uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType ) throw ( uno::RuntimeException, std::exception ) @@ -850,11 +811,9 @@ uno::Any SAL_CALL Stream::queryInterface( const uno::Type& aType ) } - // lang::XTypeProvider - // virtual uno::Sequence< uno::Type > SAL_CALL Stream::getTypes() throw ( uno::RuntimeException, std::exception ) @@ -871,11 +830,9 @@ uno::Sequence< sal_Int8 > SAL_CALL Stream::getImplementationId() } - // io::XStream. - // virtual uno::Reference< io::XInputStream > SAL_CALL Stream::getInputStream() throw( uno::RuntimeException, std::exception ) @@ -892,11 +849,9 @@ uno::Reference< io::XOutputStream > SAL_CALL Stream::getOutputStream() } - // io::XOutputStream. - // virtual void SAL_CALL Stream::writeBytes( const uno::Sequence< sal_Int8 >& aData ) throw( io::NotConnectedException, @@ -945,11 +900,9 @@ void SAL_CALL Stream::closeOutput() } - // io::XTruncate. - // virtual void SAL_CALL Stream::truncate() throw( io::IOException, @@ -963,11 +916,9 @@ void SAL_CALL Stream::truncate() } - // io::XInputStream. - // virtual sal_Int32 SAL_CALL Stream::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) @@ -1023,11 +974,9 @@ void SAL_CALL Stream::closeInput() } - // lang::XComponent - // virtual void SAL_CALL Stream::dispose() throw ( uno::RuntimeException, std::exception ) @@ -1058,11 +1007,9 @@ void SAL_CALL Stream::removeEventListener( } - // Non-UNO - void Stream::commitChanges() throw( io::IOException ) { diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx index f92b86fa037c..2e685032dcd6 100644 --- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx +++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx @@ -44,7 +44,6 @@ struct MutexHolder }; - class ParentStorageHolder : public MutexHolder { public: @@ -66,7 +65,6 @@ private: }; - typedef cppu::WeakImplHelper< css::embed::XStorage, @@ -288,7 +286,6 @@ private: }; - typedef cppu::WeakImplHelper< css::io::XOutputStream, @@ -363,7 +360,6 @@ private: }; - typedef cppu::WeakImplHelper< css::io::XStream, css::io::XOutputStream, css::io::XTruncate, diff --git a/ucb/source/ucp/tdoc/tdoc_storage.cxx b/ucb/source/ucp/tdoc/tdoc_storage.cxx index f43bee85815f..1356d93e6997 100644 --- a/ucb/source/ucp/tdoc/tdoc_storage.cxx +++ b/ucb/source/ucp/tdoc/tdoc_storage.cxx @@ -35,14 +35,9 @@ using namespace com::sun::star; using namespace tdoc_ucp; - - - // StorageElementFactory Implementation. - - StorageElementFactory::StorageElementFactory( const uno::Reference< uno::XComponentContext > & rxContext, const rtl::Reference< OfficeDocumentsManager > & xDocsMgr ) @@ -358,11 +353,9 @@ void StorageElementFactory::releaseElement( Storage * pElement ) } - // Non-UNO interface - uno::Reference< embed::XStorage > StorageElementFactory::queryParentStorage( const OUString & rUri, StorageAccessMode eMode ) throw ( embed::InvalidStorageException, diff --git a/ucb/source/ucp/tdoc/tdoc_uri.cxx b/ucb/source/ucp/tdoc/tdoc_uri.cxx index a5eecc14156b..5ae5a5cec9f9 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.cxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.cxx @@ -32,13 +32,9 @@ using namespace tdoc_ucp; - - // Uri Implementation. - - void Uri::init() const { // Already inited? diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx index 39da47e9deb5..4d1c671e1a4b 100644 --- a/ucb/source/ucp/tdoc/tdoc_uri.hxx +++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx @@ -25,12 +25,10 @@ namespace tdoc_ucp { - #define TDOC_URL_SCHEME "vnd.sun.star.tdoc" #define TDOC_URL_SCHEME_LENGTH 17 - class Uri { enum State { UNKNOWN, INVALID, VALID }; diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index f7f97309dae7..1b1bb43ad4d4 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -80,13 +80,9 @@ Important: HTTP headers will not be mapped to DAV properties; only to UCB */ - - // ContentProperties Implementation. - - // static member! uno::Any ContentProperties::m_aEmptyAny; @@ -520,13 +516,9 @@ void ContentProperties::addProperty( const OUString & rName, } - - // CachableContentProperties Implementation. - - namespace { bool isCachable( OUString const & rName, diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx index 36a902cd1fea..d40b8ae8dfc1 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx @@ -37,16 +37,9 @@ namespace webdav_ucp { - - - - // class DAVAuthListenerImpl. - - - class DAVAuthListener_Impl : public DAVAuthListener { public: diff --git a/ucb/source/ucp/webdav-neon/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx index b2f878eb9fef..6abf981e0047 100644 --- a/ucb/source/ucp/webdav-neon/DAVException.hxx +++ b/ucb/source/ucp/webdav-neon/DAVException.hxx @@ -102,7 +102,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-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index 2079fbd9f893..7395bd2bb76a 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -43,14 +43,9 @@ using namespace webdav_ucp; using namespace com::sun::star; - - // DAVAuthListener_Impl Implementation. - - - // virtual int DAVAuthListener_Impl::authenticate( const OUString & inRealm, @@ -130,14 +125,9 @@ int DAVAuthListener_Impl::authenticate( } - - // DAVResourceAccess Implementation. - - - DAVResourceAccess::DAVResourceAccess( const uno::Reference< uno::XComponentContext > & rxContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.cxx b/ucb/source/ucp/webdav-neon/LinkSequence.cxx index b75fee4b5f9b..2551fa53cfd7 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.cxx @@ -36,7 +36,6 @@ using namespace webdav_ucp; using namespace com::sun::star; - struct LinkSequenceParseContext { ucb::Link * pLink; diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx index 2f7ac4182804..d27f6b212924 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx @@ -35,7 +35,6 @@ using namespace webdav_ucp; using namespace com::sun::star; - struct LockEntrySequenceParseContext { ucb::LockEntry * pEntry; diff --git a/ucb/source/ucp/webdav-neon/PropertyMap.hxx b/ucb/source/ucp/webdav-neon/PropertyMap.hxx index 27def70db167..c0c31bb410d4 100644 --- a/ucb/source/ucp/webdav-neon/PropertyMap.hxx +++ b/ucb/source/ucp/webdav-neon/PropertyMap.hxx @@ -36,7 +36,6 @@ namespace webdav_ucp { - struct equalPropertyName { bool operator()( const css::beans::Property & p1, diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx index 22acd274610b..f312d50df046 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx @@ -37,7 +37,6 @@ using namespace webdav_ucp; using namespace com::sun::star; - struct UCBDeadPropertyValueParseContext { OUString * pType; diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index b68dc64f3119..e0eeeeaac6eb 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -96,9 +96,6 @@ using namespace webdav_ucp; // Content Implementation. - - - // ctr for content on an existing webdav resource Content::Content( const uno::Reference< uno::XComponentContext >& rxContext, @@ -168,11 +165,9 @@ Content::~Content() } - // XInterface methods. - // virtual void SAL_CALL Content::acquire() throw( ) @@ -230,11 +225,9 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) } - // XTypeProvider methods. - XTYPEPROVIDER_COMMON_IMPL( Content ); @@ -328,11 +321,9 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() } - // XServiceInfo methods. - // virtual OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException, std::exception ) @@ -350,11 +341,9 @@ uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() } - // XContent methods. - // virtual OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException, std::exception ) @@ -380,11 +369,9 @@ OUString SAL_CALL Content::getContentType() } - // XCommandProcessor methods. - // virtual uno::Any SAL_CALL Content::execute( const ucb::Command& aCommand, @@ -754,11 +741,9 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) } - // XPropertyContainer methods. - void Content::addProperty( const ucb::PropertyCommandArgument& aCmdArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( beans::PropertyExistException, @@ -1014,11 +999,9 @@ void SAL_CALL Content::removeProperty( const OUString& Name ) } - // XContentCreator methods. - // virtual uno::Sequence< ucb::ContentInfo > SAL_CALL Content::queryCreatableContentsInfo() @@ -1135,11 +1118,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-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index 90a57e5611db..0dc43b5dee03 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -63,12 +63,10 @@ namespace webdav_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-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index 03f309a00d3c..10b4cec3555e 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -57,11 +57,9 @@ using namespace com::sun::star; using namespace webdav_ucp; - // ContentProvider implementation. - bool ContentProvider::getProperty( const OUString & rPropName, beans::Property & rProp, bool bStrict ) { @@ -286,11 +284,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-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index c3b4e04826a1..ab883d519720 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -53,11 +53,9 @@ namespace webdav_ucp { - // struct ResultListEntry. - struct ResultListEntry { OUString aId; @@ -72,19 +70,15 @@ struct ResultListEntry }; - // ResultList. - typedef std::vector<std::unique_ptr<ResultListEntry>> ResultList; - // struct DataSupplier_Impl. - struct DataSupplier_Impl { osl::Mutex m_aMutex; @@ -106,13 +100,9 @@ struct DataSupplier_Impl } - - // DataSupplier Implementation. - - DataSupplier::DataSupplier( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index caeeac3d5b76..be6b50406832 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -43,13 +43,9 @@ using namespace com::sun::star; using namespace webdav_ucp; - - // ContentProvider Implementation. - - ContentProvider::ContentProvider( const uno::Reference< uno::XComponentContext >& rxContext ) : ::ucbhelper::ContentProviderImplHelper( rxContext ), @@ -66,7 +62,6 @@ ContentProvider::~ContentProvider() } - // XInterface methods. void SAL_CALL ContentProvider::acquire() @@ -95,36 +90,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-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index bdf929a18cdf..2cb16a4fc899 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -39,7 +39,6 @@ namespace webdav_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" @@ -71,7 +70,6 @@ namespace webdav_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-neon/webdavresultset.cxx b/ucb/source/ucp/webdav-neon/webdavresultset.cxx index 53a7bbd7af55..a4135564fb1b 100644 --- a/ucb/source/ucp/webdav-neon/webdavresultset.cxx +++ b/ucb/source/ucp/webdav-neon/webdavresultset.cxx @@ -43,13 +43,9 @@ using namespace com::sun::star; using namespace webdav_ucp; - - // DynamicResultSet Implementation. - - DynamicResultSet::DynamicResultSet( const uno::Reference< uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, @@ -62,11 +58,9 @@ DynamicResultSet::DynamicResultSet( } - // Non-interface methods. - void DynamicResultSet::initStatic() { m_xResultSet1 diff --git a/ucb/source/ucp/webdav-neon/webdavservices.cxx b/ucb/source/ucp/webdav-neon/webdavservices.cxx index cd3468788fe5..3645824e4c68 100644 --- a/ucb/source/ucp/webdav-neon/webdavservices.cxx +++ b/ucb/source/ucp/webdav-neon/webdavservices.cxx @@ -55,7 +55,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpdav1_component_getFactory( } - if ( xFactory.is() ) { xFactory->acquire(); 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(); |