sc/inc/dapiuno.hxx | 23 ++++----------
sc/source/ui/unoobj/dapiuno.cxx | 42 ---------------------------
ucb/source/cacher/cachedcontentresultset.cxx | 33 ---------------------
ucb/source/cacher/cachedcontentresultset.hxx | 22 +++-----------
4 files changed, 12 insertions(+), 108 deletions(-)
New commits:
commit 353be96d175d522b21440dbe2b39a67650eebf08
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 7 15:04:36 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 8 08:28:48 2019 +0200
use cppu::WeakImplHelper in CachedContentResultSetFactory
Change-Id: I1575e051fe963a4bf73453a7e6b89c9c891d1ff9
Reviewed-on: https://gerrit.libreoffice.org/80412
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/ucb/source/cacher/cachedcontentresultset.cxx
b/ucb/source/cacher/cachedcontentresultset.cxx
index a84be15215c6..a6a2899aef99 100644
--- a/ucb/source/cacher/cachedcontentresultset.cxx
+++ b/ucb/source/cacher/cachedcontentresultset.cxx
@@ -2066,39 +2066,6 @@
CachedContentResultSetFactory::~CachedContentResultSetFactory()
{
}
-
-// CachedContentResultSetFactory XInterface methods.
-void SAL_CALL CachedContentResultSetFactory::acquire()
- throw()
-{
- OWeakObject::acquire();
-}
-
-void SAL_CALL CachedContentResultSetFactory::release()
- throw()
-{
- OWeakObject::release();
-}
-
-css::uno::Any SAL_CALL CachedContentResultSetFactory::queryInterface( const
css::uno::Type & rType )
-{
- css::uno::Any aRet = cppu::queryInterface( rType,
- static_cast< XTypeProvider*
>(this),
- static_cast< XServiceInfo*
>(this),
- static_cast<
XCachedContentResultSetFactory* >(this)
- );
- return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
-}
-
-// CachedContentResultSetFactory XTypeProvider methods.
-
-
-XTYPEPROVIDER_IMPL_3( CachedContentResultSetFactory,
- XTypeProvider,
- XServiceInfo,
- XCachedContentResultSetFactory );
-
-
// CachedContentResultSetFactory XServiceInfo methods.
XSERVICEINFO_COMMOM_IMPL( CachedContentResultSetFactory,
diff --git a/ucb/source/cacher/cachedcontentresultset.hxx
b/ucb/source/cacher/cachedcontentresultset.hxx
index fc1741b5412f..3e450f4d01ea 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -31,6 +31,7 @@
#include <com/sun/star/ucb/FetchResult.hpp>
#include <com/sun/star/ucb/XContentIdentifierMapping.hpp>
#include <com/sun/star/ucb/XCachedContentResultSetFactory.hpp>
+#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
#include <memory>
@@ -365,11 +366,10 @@ private:
};
-class CachedContentResultSetFactory final
- : public cppu::OWeakObject
- , public css::lang::XTypeProvider
- , public css::lang::XServiceInfo
- , public css::ucb::XCachedContentResultSetFactory
+class CachedContentResultSetFactory final :
+ public cppu::WeakImplHelper<
+ css::lang::XServiceInfo,
+ css::ucb::XCachedContentResultSetFactory>
{
css::uno::Reference< css::uno::XComponentContext > m_xContext;
@@ -379,18 +379,6 @@ public:
virtual ~CachedContentResultSetFactory() 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< sal_Int8 > SAL_CALL getImplementationId()
override;
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override;
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName )
override;
commit 32e48476fe514955aca5f66f6f7a632341623f01
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Oct 7 15:00:51 2019 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 8 08:28:33 2019 +0200
use cppu::WeakImplHelper in ScDataPilotDescriptorBase
Change-Id: I16f7ba16f08c186bbdb32af5206089c497e1c8c1
Reviewed-on: https://gerrit.libreoffice.org/80411
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index cc5067171293..e73e824c309c 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -128,13 +128,13 @@ public:
};
// ScDataPilotDescriptorBase is never instantiated directly
-class SAL_DLLPUBLIC_RTTI ScDataPilotDescriptorBase : public
css::sheet::XDataPilotDescriptor,
- public css::beans::XPropertySet,
- public
css::sheet::XDataPilotDataLayoutFieldSupplier,
- public css::lang::XServiceInfo,
- public css::lang::XUnoTunnel,
- public css::lang::XTypeProvider,
- public cppu::OWeakObject,
+class SAL_DLLPUBLIC_RTTI ScDataPilotDescriptorBase :
+ public cppu::WeakImplHelper<
+ css::sheet::XDataPilotDescriptor,
+ css::beans::XPropertySet,
+
css::sheet::XDataPilotDataLayoutFieldSupplier,
+ css::lang::XServiceInfo,
+ css::lang::XUnoTunnel>,
public SfxListener
{
private:
@@ -145,11 +145,6 @@ public:
ScDataPilotDescriptorBase(ScDocShell* pDocSh);
virtual ~ScDataPilotDescriptorBase() override;
- 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;
-
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint
) override;
ScDocShell* GetDocShell() const { return pDocShell; }
@@ -204,10 +199,6 @@ public:
SC_DLLPUBLIC static const css::uno::Sequence<sal_Int8>& getUnoTunnelId();
- // XTypeProvider (override in ScDataPilotTableObj)
- virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
- virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId()
override;
-
// XServiceInfo is in derived classes
};
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index d71b93ff1ba0..14698deec829 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -596,48 +596,6 @@ ScDataPilotDescriptorBase::~ScDataPilotDescriptorBase()
pDocShell->GetDocument().RemoveUnoObject(*this);
}
-Any SAL_CALL ScDataPilotDescriptorBase::queryInterface( const uno::Type& rType
)
-{
- SC_QUERYINTERFACE( XDataPilotDescriptor )
- SC_QUERYINTERFACE( XPropertySet )
- SC_QUERYINTERFACE( XDataPilotDataLayoutFieldSupplier )
- SC_QUERYINTERFACE( XNamed ) // base of XDataPilotDescriptor
- SC_QUERYINTERFACE( lang::XUnoTunnel )
- SC_QUERYINTERFACE( lang::XTypeProvider )
- SC_QUERYINTERFACE( lang::XServiceInfo )
-
- return OWeakObject::queryInterface( rType );
-}
-
-void SAL_CALL ScDataPilotDescriptorBase::acquire() throw()
-{
- OWeakObject::acquire();
-}
-
-void SAL_CALL ScDataPilotDescriptorBase::release() throw()
-{
- OWeakObject::release();
-}
-
-Sequence< uno::Type > SAL_CALL ScDataPilotDescriptorBase::getTypes()
-{
- static Sequence< uno::Type > const aTypes
- {
- cppu::UnoType<XDataPilotDescriptor>::get(),
- cppu::UnoType<XPropertySet>::get(),
- cppu::UnoType<XDataPilotDataLayoutFieldSupplier>::get(),
- cppu::UnoType<lang::XUnoTunnel>::get(),
- cppu::UnoType<lang::XTypeProvider>::get(),
- cppu::UnoType<lang::XServiceInfo>::get(),
- };
- return aTypes;
-}
-
-Sequence<sal_Int8> SAL_CALL ScDataPilotDescriptorBase::getImplementationId()
-{
- return css::uno::Sequence<sal_Int8>();
-}
-
void ScDataPilotDescriptorBase::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
//! update of references ?
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
