From 0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Sat, 22 Feb 2014 21:20:15 +0100 Subject: Remove unneccessary comments MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- ucb/source/ucp/ext/ucpext_content.cxx | 42 +++++++++++++++--------------- ucb/source/ucp/ext/ucpext_datasupplier.cxx | 30 ++++++++++----------- ucb/source/ucp/ext/ucpext_provider.cxx | 22 ++++++++-------- ucb/source/ucp/ext/ucpext_resultset.cxx | 6 ++--- ucb/source/ucp/ext/ucpext_services.cxx | 2 +- 5 files changed, 51 insertions(+), 51 deletions(-) (limited to 'ucb/source/ucp/ext') diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 2e5b7658a717..2b9a16f96781 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -100,7 +100,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== namespace { - //-------------------------------------------------------------------------------------------------------------- + OUString lcl_compose( const OUString& i_rBaseURL, const OUString& i_rRelativeURL ) { ENSURE_OR_RETURN( !i_rBaseURL.isEmpty(), "illegal base URL", i_rRelativeURL ); @@ -112,7 +112,7 @@ namespace ucb { namespace ucp { namespace ext return aComposer.makeStringAndClear(); } - //-------------------------------------------------------------------------------------------------------------- + struct SelectPropertyName : public ::std::unary_function< Property, OUString > { const OUString& operator()( const Property& i_rProperty ) const @@ -125,7 +125,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== //= Content //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + Content::Content( const Reference< XComponentContext >& rxContext, ::ucbhelper::ContentProviderImplHelper* i_pProvider, const Reference< XContentIdentifier >& i_rIdentifier ) :Content_Base( rxContext, i_pProvider, i_rIdentifier ) @@ -169,18 +169,18 @@ namespace ucb { namespace ucp { namespace ext } } - //------------------------------------------------------------------------------------------------------------------ + Content::~Content() { } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL Content::getImplementationName() throw( RuntimeException ) { return OUString( "org.openoffice.comp.ucp.ext.Content" ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( RuntimeException ) { Sequence< OUString > aServiceNames(2); @@ -189,14 +189,14 @@ namespace ucb { namespace ucp { namespace ext return aServiceNames; } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL Content::getContentType() throw( RuntimeException ) { impl_determineContentType(); return *m_aContentType; } - //------------------------------------------------------------------------------------------------------------------ + Any SAL_CALL Content::execute( const Command& aCommand, sal_Int32 /* CommandId */, const Reference< XCommandEnvironment >& i_rEvironment ) throw( Exception, CommandAbortedException, RuntimeException ) { @@ -288,25 +288,25 @@ namespace ucb { namespace ucp { namespace ext return aRet; } - //------------------------------------------------------------------------------------------------------------------ + void SAL_CALL Content::abort( sal_Int32 ) throw( RuntimeException ) { } - //------------------------------------------------------------------------------------------------------------------ + OUString Content::encodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::encode( i_rIdentifier, rtl_UriCharClassRegName, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); } - //------------------------------------------------------------------------------------------------------------------ + OUString Content::decodeIdentifier( const OUString& i_rIdentifier ) { return ::rtl::Uri::decode( i_rIdentifier, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); } - //------------------------------------------------------------------------------------------------------------------ + bool Content::denotesRootContent( const OUString& i_rContentIdentifier ) { const OUString sRootURL( ContentProvider::getRootURL() ); @@ -323,7 +323,7 @@ namespace ucb { namespace ucp { namespace ext return false; } - //------------------------------------------------------------------------------------------------------------------ + OUString Content::getParentURL() { const OUString sRootURL( ContentProvider::getRootURL() ); @@ -389,7 +389,7 @@ namespace ucb { namespace ucp { namespace ext return OUString(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XRow > Content::getArtificialNodePropertyValues( const Reference< XComponentContext >& rxContext, const Sequence< Property >& i_rProperties, const OUString& i_rTitle ) { @@ -458,7 +458,7 @@ namespace ucb { namespace ucp { namespace ext return Reference< XRow >( xRow.get() ); } - //------------------------------------------------------------------------------------------------------------------ + OUString Content::getPhysicalURL() const { ENSURE_OR_RETURN( m_eExtContentType != E_ROOT, "illegal call", OUString() ); @@ -472,7 +472,7 @@ namespace ucb { namespace ucp { namespace ext return lcl_compose( sPackageLocation, m_sPathIntoExtension ); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XRow > Content::getPropertyValues( const Sequence< Property >& i_rProperties, const Reference< XCommandEnvironment >& i_rEnv ) { ::osl::Guard< ::osl::Mutex > aGuard( m_aMutex ); @@ -518,7 +518,7 @@ namespace ucb { namespace ucp { namespace ext return NULL; } - //------------------------------------------------------------------------------------------------------------------ + Sequence< Any > Content::setPropertyValues( const Sequence< PropertyValue >& i_rValues, const Reference< XCommandEnvironment >& /* xEnv */) { ::osl::ClearableGuard< osl::Mutex > aGuard( m_aMutex ); @@ -542,7 +542,7 @@ namespace ucb { namespace ucp { namespace ext return aRet; } - //------------------------------------------------------------------------------------------------------------------ + Sequence< CommandInfo > Content::getCommands( const Reference< XCommandEnvironment > & /*xEnv*/ ) { sal_uInt32 nCommandCount = 5; @@ -586,7 +586,7 @@ namespace ucb { namespace ucp { namespace ext return Sequence< CommandInfo >( aCommandInfoTable, nCommandCount ); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< Property > Content::getProperties( const Reference< XCommandEnvironment > & /*xEnv*/ ) { static const Property aProperties[] = @@ -619,7 +619,7 @@ namespace ucb { namespace ucp { namespace ext return Sequence< Property >( aProperties, sizeof( aProperties ) / sizeof( aProperties[0] ) ); } - //------------------------------------------------------------------------------------------------------------------ + bool Content::impl_isFolder() { if ( !!m_aIsFolder ) @@ -641,7 +641,7 @@ namespace ucb { namespace ucp { namespace ext return *m_aIsFolder; } - //------------------------------------------------------------------------------------------------------------------ + void Content::impl_determineContentType() { if ( !!m_aContentType ) diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 3c2d80ef34ca..20e9409ef68d 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -98,7 +98,7 @@ namespace ucb { namespace ucp { namespace ext ~DataSupplier_Impl(); }; - //------------------------------------------------------------------------------------------------------------------ + DataSupplier_Impl::~DataSupplier_Impl() { } @@ -124,7 +124,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== //= DataSupplier //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + DataSupplier::DataSupplier( const Reference< XComponentContext >& rxContext, const ::rtl::Reference< Content >& i_rContent, const sal_Int32 i_nOpenMode ) @@ -132,7 +132,7 @@ namespace ucb { namespace ucp { namespace ext { } - //------------------------------------------------------------------------------------------------------------------ + void DataSupplier::fetchData() { try @@ -195,12 +195,12 @@ namespace ucb { namespace ucp { namespace ext } } - //------------------------------------------------------------------------------------------------------------------ + DataSupplier::~DataSupplier() { } - //------------------------------------------------------------------------------------------------------------------ + OUString DataSupplier::queryContentIdentifierString( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -216,7 +216,7 @@ namespace ucb { namespace ucp { namespace ext return OUString(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XContentIdentifier > DataSupplier::queryContentIdentifier( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -239,7 +239,7 @@ namespace ucb { namespace ucp { namespace ext return Reference< XContentIdentifier >(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XContent > DataSupplier::queryContent( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -271,7 +271,7 @@ namespace ucb { namespace ucp { namespace ext return Reference< XContent >(); } - //------------------------------------------------------------------------------------------------------------------ + bool DataSupplier::getResult( sal_uInt32 i_nIndex ) { ::osl::ClearableGuard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -283,26 +283,26 @@ namespace ucb { namespace ucp { namespace ext return false; } - //------------------------------------------------------------------------------------------------------------------ + sal_uInt32 DataSupplier::totalCount() { ::osl::ClearableGuard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); return m_pImpl->m_aResults.size(); } - //------------------------------------------------------------------------------------------------------------------ + sal_uInt32 DataSupplier::currentCount() { return m_pImpl->m_aResults.size(); } - //------------------------------------------------------------------------------------------------------------------ + bool DataSupplier::isCountFinal() { return true; } - //------------------------------------------------------------------------------------------------------------------ + Reference< XRow > DataSupplier::queryPropertyValues( sal_uInt32 i_nIndex ) { ::osl::MutexGuard aGuard( m_pImpl->m_aMutex ); @@ -343,7 +343,7 @@ namespace ucb { namespace ucp { namespace ext return xRow; } - //------------------------------------------------------------------------------------------------------------------ + void DataSupplier::releasePropertyValues( sal_uInt32 i_nIndex ) { ::osl::Guard< ::osl::Mutex > aGuard( m_pImpl->m_aMutex ); @@ -352,12 +352,12 @@ namespace ucb { namespace ucp { namespace ext m_pImpl->m_aResults[ i_nIndex ].xRow.clear(); } - //------------------------------------------------------------------------------------------------------------------ + void DataSupplier::close() { } - //------------------------------------------------------------------------------------------------------------------ + void DataSupplier::validate() throw( ResultSetException ) { } diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 66d3e4b72535..05b83dcaae25 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -50,30 +50,30 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== //= ContentProvider //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + ContentProvider::ContentProvider( const Reference< XComponentContext >& rxContext ) :ContentProvider_Base( rxContext ) { } - //------------------------------------------------------------------------------------------------------------------ + ContentProvider::~ContentProvider() { } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL ContentProvider::getImplementationName_static() throw (RuntimeException) { return OUString( "org.openoffice.comp.ucp.ext.ContentProvider" ); } - //------------------------------------------------------------------------------------------------------------------ + OUString SAL_CALL ContentProvider::getImplementationName() throw (RuntimeException) { return getImplementationName_static(); } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames_static( ) throw (RuntimeException) { Sequence< OUString > aServiceNames(2); @@ -82,31 +82,31 @@ namespace ucb { namespace ucp { namespace ext return aServiceNames; } - //------------------------------------------------------------------------------------------------------------------ + Sequence< OUString > SAL_CALL ContentProvider::getSupportedServiceNames( ) throw (RuntimeException) { return getSupportedServiceNames_static(); } - //------------------------------------------------------------------------------------------------------------------ + Reference< XInterface > ContentProvider::Create( const Reference< XComponentContext >& i_rContext ) { return *( new ContentProvider( i_rContext ) ); } - //------------------------------------------------------------------------------------------------------------------ + OUString ContentProvider::getRootURL() { return OUString( "vnd.sun.star.extension://" ); } - //------------------------------------------------------------------------------------------------------------------ + OUString ContentProvider::getArtificialNodeContentType() { return OUString( "application/vnd.sun.star.extension-content" ); } - //------------------------------------------------------------------------------------------------------------------ + namespace { void lcl_ensureAndTransfer( OUString& io_rIdentifierFragment, OUStringBuffer& o_rNormalization, const sal_Unicode i_nLeadingChar ) @@ -118,7 +118,7 @@ namespace ucb { namespace ucp { namespace ext } } - //------------------------------------------------------------------------------------------------------------------ + Reference< XContent > SAL_CALL ContentProvider::queryContent( const Reference< XContentIdentifier >& i_rIdentifier ) throw( IllegalIdentifierException, RuntimeException ) { diff --git a/ucb/source/ucp/ext/ucpext_resultset.cxx b/ucb/source/ucp/ext/ucpext_resultset.cxx index 432f2a014507..415e0ceab799 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.cxx +++ b/ucb/source/ucp/ext/ucpext_resultset.cxx @@ -49,7 +49,7 @@ namespace ucb { namespace ucp { namespace ext //================================================================================================================== //= ResultSet //================================================================================================================== - //------------------------------------------------------------------------------------------------------------------ + ResultSet::ResultSet( const Reference< XComponentContext >& rxContext, const ::rtl::Reference< Content >& i_rContent, const OpenCommandArgument2& i_rCommand, const Reference< XCommandEnvironment >& i_rEnv ) :ResultSetImplHelper( rxContext, i_rCommand ) @@ -58,7 +58,7 @@ namespace ucb { namespace ucp { namespace ext { } - //------------------------------------------------------------------------------------------------------------------ + void ResultSet::initStatic() { ::rtl::Reference< DataSupplier > pDataSupplier( new DataSupplier( @@ -75,7 +75,7 @@ namespace ucb { namespace ucp { namespace ext pDataSupplier->fetchData(); } - //------------------------------------------------------------------------------------------------------------------ + void ResultSet::initDynamic() { initStatic(); diff --git a/ucb/source/ucp/ext/ucpext_services.cxx b/ucb/source/ucp/ext/ucpext_services.cxx index bbb64b4815b8..8b2388fdb920 100644 --- a/ucb/source/ucp/ext/ucpext_services.cxx +++ b/ucb/source/ucp/ext/ucpext_services.cxx @@ -59,7 +59,7 @@ namespace ucb { namespace ucp { namespace ext extern "C" { - //------------------------------------------------------------------------------------------------------------------ + SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpext_component_getFactory( const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey ) { return ::cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , ::ucb::ucp::ext::s_aServiceEntries ); -- cgit