diff options
author | Raj Natarajan <rajkumar.natarajan@gmail.com> | 2015-07-23 07:42:18 +0530 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-28 07:28:09 +0000 |
commit | adbfe33377813b209bb4a7d7e4e9f737be033969 (patch) | |
tree | de46a6e5c0b41fba2c5073c09ee88aa501c258e3 /sc/inc/datauno.hxx | |
parent | c1780b4c9217b3b5374907b7e537f481ed2c680e (diff) |
tdf#88206 Change uses of cppu::WeakImplHelper* to the variadic variant
Change-Id: I16ca3893798cbb20a93eceea259fafd7a31eff44
Reviewed-on: https://gerrit.libreoffice.org/17346
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sc/inc/datauno.hxx')
-rw-r--r-- | sc/inc/datauno.hxx | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx index da1e88495be3..8fa2c09695b7 100644 --- a/sc/inc/datauno.hxx +++ b/sc/inc/datauno.hxx @@ -43,11 +43,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/util/XRefreshable.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase5.hxx> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/itemprop.hxx> #include <svl/lstner.hxx> #include <boost/ptr_container/ptr_vector.hpp> @@ -108,7 +104,7 @@ public: // to uno, both look the same -class ScSubTotalDescriptorBase : public cppu::WeakImplHelper6< +class ScSubTotalDescriptorBase : public cppu::WeakImplHelper< com::sun::star::sheet::XSubTotalDescriptor, com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, @@ -246,7 +242,7 @@ public: virtual void PutData( const ScSubTotalParam& rParam ) SAL_OVERRIDE; }; -class ScSubTotalFieldObj : public cppu::WeakImplHelper2< +class ScSubTotalFieldObj : public cppu::WeakImplHelper< com::sun::star::sheet::XSubTotalField, com::sun::star::lang::XServiceInfo > { @@ -278,7 +274,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScConsolidationDescriptor : public cppu::WeakImplHelper2< +class ScConsolidationDescriptor : public cppu::WeakImplHelper< com::sun::star::sheet::XConsolidationDescriptor, com::sun::star::lang::XServiceInfo > { @@ -331,7 +327,7 @@ public: // to uno, all three look the same -class ScFilterDescriptorBase : public cppu::WeakImplHelper5< +class ScFilterDescriptorBase : public cppu::WeakImplHelper< com::sun::star::sheet::XSheetFilterDescriptor, com::sun::star::sheet::XSheetFilterDescriptor2, com::sun::star::sheet::XSheetFilterDescriptor3, @@ -477,7 +473,7 @@ public: virtual void PutData( const ScQueryParam& rParam ) SAL_OVERRIDE; }; -class ScDatabaseRangeObj : public cppu::WeakImplHelper6< +class ScDatabaseRangeObj : public cppu::WeakImplHelper< com::sun::star::sheet::XDatabaseRange, com::sun::star::util::XRefreshable, com::sun::star::container::XNamed, @@ -593,7 +589,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScDatabaseRangesObj : public cppu::WeakImplHelper4< +class ScDatabaseRangesObj : public cppu::WeakImplHelper< com::sun::star::sheet::XDatabaseRanges, com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, @@ -654,7 +650,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScUnnamedDatabaseRangesObj : public cppu::WeakImplHelper1< +class ScUnnamedDatabaseRangesObj : public cppu::WeakImplHelper< com::sun::star::sheet::XUnnamedDatabaseRanges>, public SfxListener { |