mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use cppu::WeakImplHelper in FTPContentIdentifier

Browse Source 
Change-Id: Id4ea2006fab9607fdbd744ba73deb3dbd30b374b
Reviewed-on: https://gerrit.libreoffice.org/80453
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2019-10-07 15:17:17 +02:00
parent d8ad8cc3c8
commit 0adf816ccd
2 changed files with 3 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
ucb/source/ucp/ftp/ftpcontentidentifier.cxx
View File

@@ -48,48 +48,6 @@ FTPContentIdentifier::~FTPContentIdentifier()
} }
Any SAL_CALL
FTPContentIdentifier::queryInterface(
const Type& rType
)
{
Any aRet =
::cppu::queryInterface(rType,
static_cast< XTypeProvider* >(this),
static_cast< XContentIdentifier* >(this));
return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
}
void SAL_CALL FTPContentIdentifier::acquire() throw() {
OWeakObject::acquire();
}
void SAL_CALL FTPContentIdentifier::release() throw() {
OWeakObject::release();
}
Sequence<sal_Int8> SAL_CALL
FTPContentIdentifier::getImplementationId()
{
return css::uno::Sequence<sal_Int8>();
}
Sequence<Type> SAL_CALL
FTPContentIdentifier::getTypes()
{
static cppu::OTypeCollection s_aCollection(
cppu::UnoType<XTypeProvider>::get(),
cppu::UnoType<XContentIdentifier>::get());
return s_aCollection.getTypes();
}
OUString SAL_CALL OUString SAL_CALL
FTPContentIdentifier::getContentIdentifier( FTPContentIdentifier::getContentIdentifier(
) )

27
ucb/source/ucp/ftp/ftpcontentidentifier.hxx
View File

@@ -25,17 +25,15 @@
#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTIDENTIFIER_HXX #ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTIDENTIFIER_HXX
#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTIDENTIFIER_HXX #define INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTIDENTIFIER_HXX
#include <cppuhelper/weak.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/ucb/XContentIdentifier.hpp> #include <com/sun/star/ucb/XContentIdentifier.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XTypeProvider.hpp>
namespace ftp { namespace ftp {
class FTPContentIdentifier class FTPContentIdentifier :
: public cppu::OWeakObject, public cppu::WeakImplHelper<css::ucb::XContentIdentifier>
public css::lang::XTypeProvider,
public css::ucb::XContentIdentifier
{ {
public: public:
@@ -43,25 +41,6 @@ namespace ftp {
virtual ~FTPContentIdentifier() override; virtual ~FTPContentIdentifier() override;
// XInterface
virtual css::uno::Any SAL_CALL
queryInterface( const css::uno::Type& rType ) override;
virtual void SAL_CALL acquire() throw() override;
virtual void SAL_CALL release() throw() override;
// XTypeProvider
virtual
css::uno::Sequence<css::uno::Type> SAL_CALL
getTypes() override;
virtual css::uno::Sequence<sal_Int8> SAL_CALL
getImplementationId() override;
// XContentIdentifier // XContentIdentifier
virtual OUString SAL_CALL virtual OUString SAL_CALL