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>

3 files changed, 20 insertions, 27 deletions

diff --git a/sc/inc/AccessibleGlobal.hxx b/sc/inc/AccessibleGlobal.hxx
index 58be88f9856f..9b6e9ff2280e 100644
--- a/sc/inc/AccessibleGlobal.hxx
+++ b/sc/inc/AccessibleGlobal.hxx
@@ -21,12 +21,12 @@
 #define INCLUDED_SC_INC_ACCESSIBLEGLOBAL_HXX
 
 #include <com/sun/star/accessibility/XAccessibleStateSet.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <set>
 
 /// Generic XAccessibleStateSet implementation.
-class ScAccessibleStateSet : public ::cppu::WeakImplHelper1< ::com::sun::star::accessibility::XAccessibleStateSet >
+class ScAccessibleStateSet : public ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessibleStateSet >
 {
 public:
     ScAccessibleStateSet();
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
 {
diff --git a/sc/inc/linkuno.hxx b/sc/inc/linkuno.hxx
index c4b804f9a0f2..9789dc5e8dbb 100644
--- a/sc/inc/linkuno.hxx
+++ b/sc/inc/linkuno.hxx
@@ -37,10 +37,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "externalrefmgr.hxx"
 
@@ -53,7 +50,7 @@ typedef ::com::sun::star::uno::Reference<
             ::com::sun::star::util::XRefreshListener > XRefreshListenerRef;
 typedef boost::ptr_vector<XRefreshListenerRef> XRefreshListenerArr_Impl;
 
-class ScSheetLinkObj : public cppu::WeakImplHelper4<
+class ScSheetLinkObj : public cppu::WeakImplHelper<
                             com::sun::star::container::XNamed,
                             com::sun::star::util::XRefreshable,
                             com::sun::star::beans::XPropertySet,
@@ -153,7 +150,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScSheetLinksObj : public cppu::WeakImplHelper4<
+class ScSheetLinksObj : public cppu::WeakImplHelper<
                             com::sun::star::container::XNameAccess,
                             com::sun::star::container::XEnumerationAccess,
                             com::sun::star::container::XIndexAccess,
@@ -207,7 +204,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScAreaLinkObj : public cppu::WeakImplHelper4<
+class ScAreaLinkObj : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XAreaLink,
                             com::sun::star::util::XRefreshable,
                             com::sun::star::beans::XPropertySet,
@@ -313,7 +310,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScAreaLinksObj : public cppu::WeakImplHelper3<
+class ScAreaLinksObj : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XAreaLinks,
                             com::sun::star::container::XEnumerationAccess,
                             com::sun::star::lang::XServiceInfo >,
@@ -367,7 +364,7 @@ public:
 
 //! order of XNamed and DDELink changed to avoid "duplicate comdat" symbols
 
-class ScDDELinkObj : public cppu::WeakImplHelper5<
+class ScDDELinkObj : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XDDELink,
                             com::sun::star::container::XNamed,
                             com::sun::star::util::XRefreshable,
@@ -430,7 +427,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScDDELinksObj : public cppu::WeakImplHelper4<
+class ScDDELinksObj : public cppu::WeakImplHelper<
                             com::sun::star::container::XEnumerationAccess,
                             com::sun::star::container::XIndexAccess,
                             com::sun::star::sheet::XDDELinks,
@@ -491,7 +488,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScExternalSheetCacheObj : public cppu::WeakImplHelper1< ::com::sun::star::sheet::XExternalSheetCache >
+class ScExternalSheetCacheObj : public cppu::WeakImplHelper< ::com::sun::star::sheet::XExternalSheetCache >
 {
 public:
     explicit ScExternalSheetCacheObj(ScDocShell* pDocShell, ScExternalRefCache::TableTypeRef pTable, size_t nIndex);
@@ -524,7 +521,7 @@ private:
     size_t mnIndex;
 };
 
-class ScExternalDocLinkObj : public cppu::WeakImplHelper1< ::com::sun::star::sheet::XExternalDocLink >
+class ScExternalDocLinkObj : public cppu::WeakImplHelper< ::com::sun::star::sheet::XExternalDocLink >
 {
 public:
     ScExternalDocLinkObj(ScDocShell* pDocShell, ScExternalRefManager* pRefMgr, sal_uInt16 nFileId);
@@ -572,7 +569,7 @@ private:
 };
 
 /** This is the UNO API equivalent of ScExternalRefManager. */
-class ScExternalDocLinksObj : public cppu::WeakImplHelper1< ::com::sun::star::sheet::XExternalDocLinks >
+class ScExternalDocLinksObj : public cppu::WeakImplHelper< ::com::sun::star::sheet::XExternalDocLinks >
 {
 public:
     ScExternalDocLinksObj(ScDocShell* pDocShell);