sw: use variadic cppu::WeakImplHelper

Change-Id: I2c03ffad8d935bad126c19a8647c924af5a9bce5
Reviewed-on: https://gerrit.libreoffice.org/15174
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

14 files changed, 49 insertions, 61 deletions

diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 74e5db326522..3eabac864276 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/frame/XDesktop2.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace linguistic2 {
@@ -44,7 +44,7 @@ namespace com { namespace sun { namespace star {
     properties) were made.
 */
 class SwLinguServiceEventListener :
-    public cppu::WeakImplHelper2
+    public cppu::WeakImplHelper
     <
         com::sun::star::linguistic2::XLinguServiceEventListener,
         com::sun::star::frame::XTerminateListener
diff --git a/sw/inc/finalthreadmanager.hxx b/sw/inc/finalthreadmanager.hxx
index babeba54da30..770434e6155a 100644
--- a/sw/inc/finalthreadmanager.hxx
+++ b/sw/inc/finalthreadmanager.hxx
@@ -23,7 +23,7 @@
 #include <sal/config.h>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/implementationentry.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/util/XJobManager.hpp>
 #include <com/sun/star/frame/XTerminateListener2.hpp>
@@ -34,7 +34,7 @@ class CancelJobsThread;
 class TerminateOfficeThread;
 class SwPauseThreadStarting;
 
-class FinalThreadManager : public ::cppu::WeakImplHelper3< com::sun::star::lang::XServiceInfo,
+class FinalThreadManager : public ::cppu::WeakImplHelper< com::sun::star::lang::XServiceInfo,
                                                            com::sun::star::util::XJobManager,
                                                            com::sun::star::frame::XTerminateListener2 >
 {
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index cfd503ef1d91..8db9f332fb50 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -23,13 +23,13 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class SfxPoolItem;
 class SwClient;
 class SwDoc;
 
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::container::XEnumeration
 >
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 7b95c3734fe1..7c85f9b24b5a 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -42,10 +42,7 @@
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase6.hxx>
-#include <cppuhelper/implbase10.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 #include <tools/link.hxx>
@@ -94,7 +91,7 @@ public:
     void Disconnect();
 };
 
-typedef cppu::WeakImplHelper4
+typedef cppu::WeakImplHelper
 <
     ::com::sun::star::chart2::data::XDataProvider,
     ::com::sun::star::chart2::data::XRangeXMLConversion,
@@ -207,7 +204,7 @@ public:
     void        AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, sal_uInt16 nLines, bool bBehind );
 };
 
-typedef cppu::WeakImplHelper2
+typedef cppu::WeakImplHelper
 <
     ::com::sun::star::chart2::data::XDataSource,
     ::com::sun::star::lang::XServiceInfo
@@ -237,7 +234,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(  ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-typedef cppu::WeakImplHelper10
+typedef cppu::WeakImplHelper
 <
     ::com::sun::star::chart2::data::XDataSequence,
     ::com::sun::star::chart2::data::XTextualDataSequence,
@@ -355,7 +352,7 @@ public:
     bool        ExtendTo( bool bExtendCol, sal_Int32 nFirstNew, sal_Int32 nCount );
 };
 
-typedef cppu::WeakImplHelper4
+typedef cppu::WeakImplHelper
 <
     ::com::sun::star::chart2::data::XLabeledDataSequence2,
     ::com::sun::star::lang::XServiceInfo,
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index ee43c986588d..bb3cd7ca0ffc 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -25,10 +25,7 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <IMark.hxx>
 #include <unobaseclass.hxx>
 #include "swdllapi.h"
@@ -260,7 +257,7 @@ public:
 };
 
 typedef
-cppu::WeakImplHelper3
+cppu::WeakImplHelper
 <
     ::com::sun::star::container::XNameAccess,
     ::com::sun::star::container::XIndexAccess,
@@ -297,7 +294,7 @@ public:
 };
 
 typedef
-cppu::WeakImplHelper4
+cppu::WeakImplHelper
 <
     ::com::sun::star::container::XEnumerationAccess,
     ::com::sun::star::container::XNameAccess,
@@ -438,7 +435,7 @@ class SwXBookmarks : public SwCollectionBaseClass,
 
 };
 
-class SwXNumberingRulesCollection : public cppu::WeakImplHelper1
+class SwXNumberingRulesCollection : public cppu::WeakImplHelper
 <
     ::com::sun::star::container::XIndexAccess
 >,
@@ -460,7 +457,7 @@ public:
 };
 
 typedef
-cppu::WeakImplHelper2
+cppu::WeakImplHelper
 <
     ::com::sun::star::container::XIndexAccess,
     ::com::sun::star::lang::XServiceInfo
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index 65345c29e9a5..1d1fbb1701a2 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -28,7 +28,7 @@
 
 class SwFieldType;
 
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::container::XNameAccess
 ,   ::com::sun::star::lang::XServiceInfo
 > SwXTextFieldMasters_Base;
@@ -74,7 +74,7 @@ public:
 
 };
 
-typedef ::cppu::WeakImplHelper3
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::container::XEnumerationAccess
 ,   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::util::XRefreshable
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index edea72c932d7..6434a34035fe 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -29,9 +29,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <sfx2/objsh.hxx>
 
@@ -45,7 +43,7 @@ class SwFmt;
 class SwFlyFrmFmt;
 
 class BaseFrameProperties_Impl;
-class SwXFrame : public cppu::WeakImplHelper6
+class SwXFrame : public cppu::WeakImplHelper
 <
     ::com::sun::star::lang::XServiceInfo,
     ::com::sun::star::beans::XPropertySet,
@@ -158,7 +156,7 @@ public:
     static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrmFmt &rFmt);
 };
 
-typedef cppu::WeakImplHelper3
+typedef cppu::WeakImplHelper
 <
     ::com::sun::star::text::XTextFrame,
     ::com::sun::star::container::XEnumerationAccess,
@@ -241,7 +239,7 @@ public:
     void SAL_CALL operator delete( void * ) throw();
 };
 
-typedef cppu::WeakImplHelper2
+typedef cppu::WeakImplHelper
 <
     ::com::sun::star::text::XTextContent,
     ::com::sun::star::document::XEventsSupplier
@@ -292,7 +290,7 @@ public:
 };
 
 class SwOLENode;
-typedef cppu::WeakImplHelper3
+typedef cppu::WeakImplHelper
 <
     ::com::sun::star::text::XTextContent,
     ::com::sun::star::document::XEmbeddedObjectSupplier2,
@@ -351,7 +349,7 @@ public:
     void SAL_CALL operator delete( void * ) throw();
 };
 
-class SwXOLEListener : public cppu::WeakImplHelper1
+class SwXOLEListener : public cppu::WeakImplHelper
 <
     ::com::sun::star::util::XModifyListener
 >,
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 355f17058d43..23e2dfe83a5b 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -59,7 +59,7 @@ public:
 };
 
 typedef
-cppu::WeakImplHelper1
+cppu::WeakImplHelper
 <
     ::com::sun::star::container::XEnumerationAccess
 >
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 8d096d5946cd..59775173202f 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -30,7 +30,7 @@ namespace com{ namespace sun{ namespace star{
         }
 }}}
 typedef
-cppu::WeakImplHelper3
+cppu::WeakImplHelper
 <
     ::com::sun::star::container::XIndexAccess,
     ::com::sun::star::container::XEnumerationAccess,
diff --git a/sw/inc/unosrch.hxx b/sw/inc/unosrch.hxx
index 71f6943f1ba9..b614822224f5 100644
--- a/sw/inc/unosrch.hxx
+++ b/sw/inc/unosrch.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/util/XPropertyReplace.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 
 class SfxItemPropertySet;
@@ -34,7 +34,7 @@ namespace com{namespace sun{namespace star{namespace util{
     struct SearchOptions;
 }}}}
 
-class SwXTextSearch : public cppu::WeakImplHelper3
+class SwXTextSearch : public cppu::WeakImplHelper
 <
     ::com::sun::star::util::XPropertyReplace,
     ::com::sun::star::lang::XServiceInfo,
diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx
index be8c04b8f2d1..3a81d05e2769 100644
--- a/sw/inc/unostyle.hxx
+++ b/sw/inc/unostyle.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <calbck.hxx>
 
@@ -51,7 +51,7 @@ class IStyleAccess;
 class SfxItemSet;
 typedef std::shared_ptr<SfxItemSet> SfxItemSet_Pointer_t;
 
-class SwXStyleFamilies :  public cppu::WeakImplHelper4
+class SwXStyleFamilies :  public cppu::WeakImplHelper
 <
     ::com::sun::star::container::XIndexAccess,
     ::com::sun::star::container::XNameAccess,
@@ -98,7 +98,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
-class SwXStyleFamily : public cppu::WeakImplHelper4
+class SwXStyleFamily : public cppu::WeakImplHelper
 <
     ::com::sun::star::container::XNameContainer,
     ::com::sun::star::lang::XServiceInfo,
@@ -152,7 +152,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
-class SwXStyle : public cppu::WeakImplHelper7
+class SwXStyle : public cppu::WeakImplHelper
 <
     ::com::sun::star::style::XStyle,
     ::com::sun::star::beans::XPropertySet,
@@ -323,7 +323,7 @@ public:
 
 // access to all automatic style families
 class SwXAutoStyles :
-    public cppu::WeakImplHelper1< ::com::sun::star::style::XAutoStyles >,
+    public cppu::WeakImplHelper< ::com::sun::star::style::XAutoStyles >,
     public SwUnoCollection
 {
     SwDocShell *pDocShell;
@@ -352,7 +352,7 @@ public:
 };
 
 // access to a family of automatic styles (character or paragraph or ...)
-class SwXAutoStyleFamily : public cppu::WeakImplHelper1< com::sun::star::style::XAutoStyleFamily >,
+class SwXAutoStyleFamily : public cppu::WeakImplHelper< com::sun::star::style::XAutoStyleFamily >,
     public SwClient
 {
     SwDocShell *pDocShell;
@@ -377,7 +377,7 @@ public:
 
 };
 
-class SwXAutoStylesEnumerator : public cppu::WeakImplHelper1< ::com::sun::star::container::XEnumeration >,
+class SwXAutoStylesEnumerator : public cppu::WeakImplHelper< ::com::sun::star::container::XEnumeration >,
     public SwClient
 {
     SwAutoStylesEnumImpl *pImpl;
@@ -393,7 +393,7 @@ protected:
 };
 
 // an automatic style
-class SwXAutoStyle : public cppu::WeakImplHelper3
+class SwXAutoStyle : public cppu::WeakImplHelper
 <
     ::com::sun::star::beans::XPropertySet,
     ::com::sun::star::beans::XPropertyState,
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index ce6048e28285..3313b47a2509 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -32,11 +32,7 @@
 #include <com/sun/star/sheet/XCellRangeData.hpp>
 #include <com/sun/star/table/XAutoFormattable.hpp>
 
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase7.hxx>
-#include <cppuhelper/implbase10.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 
 #include <comphelper/uno3.hxx>
@@ -57,7 +53,7 @@ class SwChartDataProvider;
 class SwFrmFmt;
 
 typedef
-cppu::WeakImplHelper4
+cppu::WeakImplHelper
 <
     ::com::sun::star::table::XCell,
     ::com::sun::star::lang::XServiceInfo,
@@ -158,7 +154,7 @@ public:
     SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
 };
 
-class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper2
+class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
 <
     ::com::sun::star::beans::XPropertySet,
     ::com::sun::star::lang::XServiceInfo
@@ -205,7 +201,7 @@ public:
     static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
 };
 
-typedef cppu::WeakImplHelper3<
+typedef cppu::WeakImplHelper<
                                 ::com::sun::star::text::XTextTableCursor,
                                 ::com::sun::star::lang::XServiceInfo,
                                 ::com::sun::star::beans::XPropertySet
@@ -293,7 +289,7 @@ struct SwRangeDescriptor
 };
 
 class SwTableProperties_Impl;
-class SwXTextTable : public cppu::WeakImplHelper10
+class SwXTextTable : public cppu::WeakImplHelper
 <
     ::com::sun::star::text::XTextTable,
     ::com::sun::star::lang::XServiceInfo,
@@ -442,7 +438,7 @@ public:
     SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
 };
 
-class SwXCellRange : public cppu::WeakImplHelper7
+class SwXCellRange : public cppu::WeakImplHelper
 <
     ::com::sun::star::table::XCellRange,
     ::com::sun::star::lang::XServiceInfo,
@@ -557,7 +553,7 @@ public:
 
 };
 
-class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper2
+class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper
 <
     ::com::sun::star::table::XTableRows,
     ::com::sun::star::lang::XServiceInfo
@@ -599,7 +595,7 @@ public:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
 };
 
-class SwXTableColumns : public cppu::WeakImplHelper2
+class SwXTableColumns : public cppu::WeakImplHelper
 <
     ::com::sun::star::table::XTableColumns,
     ::com::sun::star::lang::XServiceInfo
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index 9907fd7a510b..71662286ff6d 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase2.hxx>
 
 #include <unotext.hxx>
@@ -108,7 +109,7 @@ public:
 
 };
 
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::container::XEnumerationAccess
 > SwXHeadFootText_Base;
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 5ca871a566ff..312b68eec8a8 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -30,8 +30,7 @@
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/text/XRedline.hpp>
 
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <pam.hxx>
 #include <unobaseclass.hxx>
@@ -70,7 +69,7 @@ namespace sw {
 
 } // namespace sw
 
-typedef ::cppu::WeakImplHelper8
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::beans::XPropertySet
@@ -258,7 +257,7 @@ public:
 
 };
 
-typedef ::cppu::WeakImplHelper3
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::container::XIndexAccess