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, 33 insertions, 35 deletions

diff --git a/sw/source/uibase/config/StoredChapterNumbering.cxx b/sw/source/uibase/config/StoredChapterNumbering.cxx
index 6f3a8e8ef3a9..162184169c57 100644
--- a/sw/source/uibase/config/StoredChapterNumbering.cxx
+++ b/sw/source/uibase/config/StoredChapterNumbering.cxx
@@ -9,7 +9,7 @@
 
 #include <uinums.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/container/XNamed.hpp>
@@ -42,7 +42,7 @@ using namespace ::xmloff::token;
 namespace sw {
 
 class StoredChapterNumberingRules
-    : public ::cppu::WeakImplHelper2<container::XNamed,container::XIndexReplace>
+    : public ::cppu::WeakImplHelper<container::XNamed,container::XIndexReplace>
 {
 private:
     // TODO in case this ever becomes accessible via api need a invalidate
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index f24657595a34..d34efb368cb1 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -117,6 +117,7 @@
 #include <svx/dataaccessdescriptor.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/textenc.h>
+#include <cppuhelper/implbase.hxx>
 #include <ndindex.hxx>
 #include <pam.hxx>
 #include <swcrsr.hxx>
@@ -201,7 +202,7 @@ bool lcl_getCountFromResultSet( sal_Int32& rCount, const uno::Reference<XResultS
 }
 }
 
-class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper1
+class SwConnectionDisposedListener_Impl : public cppu::WeakImplHelper
 < lang::XEventListener >
 {
 private:
diff --git a/sw/source/uibase/dbui/dbtree.cxx b/sw/source/uibase/dbui/dbtree.cxx
index 552cc9c85a52..2ad207ce04f3 100644
--- a/sw/source/uibase/dbui/dbtree.cxx
+++ b/sw/source/uibase/dbui/dbtree.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/sdb/XCompletedConnection.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svx/dbaexchange.hxx>
 
 #include <dbmgr.hxx>
@@ -70,7 +70,7 @@ struct SwConnectionData
 
 typedef boost::ptr_vector<SwConnectionData> SwConnectionArr;
 
-class SwDBTreeList_Impl : public cppu::WeakImplHelper1 < XContainerListener >
+class SwDBTreeList_Impl : public cppu::WeakImplHelper < XContainerListener >
 {
     Reference< XDatabaseContext > xDBContext;
     SwConnectionArr aConnections;
diff --git a/sw/source/uibase/docvw/srcedtw.cxx b/sw/source/uibase/docvw/srcedtw.cxx
index f4a7b170df72..c4042d812873 100644
--- a/sw/source/uibase/docvw/srcedtw.cxx
+++ b/sw/source/uibase/docvw/srcedtw.cxx
@@ -24,7 +24,7 @@
 
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertiesChangeListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
@@ -206,7 +206,7 @@ static void lcl_Highlight(const OUString& rSource, SwTextPortions& aPortionList)
 }
 
 class SwSrcEditWindow::ChangesListener:
-    public cppu::WeakImplHelper1< css::beans::XPropertiesChangeListener >
+    public cppu::WeakImplHelper< css::beans::XPropertiesChangeListener >
 {
 public:
     ChangesListener(SwSrcEditWindow & editor): editor_(editor) {}
diff --git a/sw/source/uibase/inc/SwXFilterOptions.hxx b/sw/source/uibase/inc/SwXFilterOptions.hxx
index 12cb723f5007..5a51d05dd340 100644
--- a/sw/source/uibase/inc/SwXFilterOptions.hxx
+++ b/sw/source/uibase/inc/SwXFilterOptions.hxx
@@ -25,13 +25,13 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace com { namespace sun { namespace star { namespace io {
     class XInputStream;
 } } } }
 
-class SwXFilterOptions : public ::cppu::WeakImplHelper5<
+class SwXFilterOptions : public ::cppu::WeakImplHelper<
                             ::com::sun::star::beans::XPropertyAccess,
                             ::com::sun::star::ui::dialogs::XExecutableDialog,
                             ::com::sun::star::document::XImporter,
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index b542f9694620..c6691af3dcc1 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/mail/XMailMessage.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/compbase2.hxx>
 #include <vcl/scrbar.hxx>
@@ -136,7 +136,7 @@ public:
 };
 
 class SW_DLLPUBLIC SwAuthenticator :
-    public cppu::WeakImplHelper1< ::com::sun::star::mail::XAuthenticator>
+    public cppu::WeakImplHelper< ::com::sun::star::mail::XAuthenticator>
 {
     OUString m_aUserName;
     OUString m_aPassword;
@@ -156,7 +156,7 @@ public:
 };
 
 class SW_DLLPUBLIC SwConnectionContext :
-    public cppu::WeakImplHelper1< ::com::sun::star::uno::XCurrentContext >
+    public cppu::WeakImplHelper< ::com::sun::star::uno::XCurrentContext >
 {
     OUString     m_sMailServer;
     sal_Int16           m_nPort;
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index b89ee26e0c14..655c7d35fab0 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -27,7 +27,7 @@
 #include <sfx2/objsh.hxx>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <com/sun/star/datatransfer/clipboard/XClipboardListener.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/weakref.hxx>
 
 class SwXTextView;
@@ -45,7 +45,7 @@ namespace com{ namespace sun{ namespace star {
     }
 }}}
 
-class SwScannerEventListener : public ::cppu::WeakImplHelper1<
+class SwScannerEventListener : public ::cppu::WeakImplHelper<
     ::com::sun::star::lang::XEventListener >
 {
     SwView* pView;
@@ -63,7 +63,7 @@ public:
 };
 
 // Clipboard EventListener
-class SwClipboardChangeListener : public ::cppu::WeakImplHelper1<
+class SwClipboardChangeListener : public ::cppu::WeakImplHelper<
     ::com::sun::star::datatransfer::clipboard::XClipboardListener >
 {
     SwView* pView;
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index e2981975fdcd..f95c333eee3f 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -31,9 +31,7 @@
 #include <com/sun/star/text/XText.hpp>
 #include <svl/itemprop.hxx>
 #include <svl/lstner.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svtools/unoevent.hxx>
 class SwTextBlocks;
 class SwGlossaries;
@@ -51,7 +49,7 @@ typedef tools::SvRef<SwDocShell> SwDocShellRef;
     SAL_CALL SwXAutoTextContainer_createInstance(
         const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ) throw ( ::com::sun::star::uno::Exception );
 
-class SwXAutoTextContainer : public cppu::WeakImplHelper2
+class SwXAutoTextContainer : public cppu::WeakImplHelper
 <
     ::com::sun::star::text::XAutoTextContainer2,
     ::com::sun::star::lang::XServiceInfo
@@ -89,7 +87,7 @@ public:
 
 };
 
-class SwXAutoTextGroup : public cppu::WeakImplHelper6
+class SwXAutoTextGroup : public cppu::WeakImplHelper
 <
     ::com::sun::star::text::XAutoTextGroup,
     ::com::sun::star::beans::XPropertySet,
@@ -157,7 +155,7 @@ public:
 
 class SwXAutoTextEntry
         :public SfxListener
-        ,public cppu::WeakImplHelper5
+        ,public cppu::WeakImplHelper
         <
             ::com::sun::star::text::XAutoTextEntry,
             ::com::sun::star::lang::XServiceInfo,
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index 7e65f7f81977..3871d3c18257 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -24,15 +24,14 @@
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <list>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 
 class SwView;
 
-class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper3
+class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper
 <
     ::com::sun::star::frame::XDispatchProviderInterceptor,
     ::com::sun::star::lang::XEventListener,
@@ -94,7 +93,7 @@ struct StatusStruct_Impl
     ::com::sun::star::util::URL                                                 aURL;
 };
 typedef std::list< StatusStruct_Impl > StatusListenerList;
-class SwXDispatch : public cppu::WeakImplHelper2
+class SwXDispatch : public cppu::WeakImplHelper
 <
     ::com::sun::star::frame::XDispatch,
     ::com::sun::star::view::XSelectionChangeListener
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index 6ede6aa3bd80..14c1ad5f2f79 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNOMAILMERGE_HXX
 #define INCLUDED_SW_SOURCE_UIBASE_INC_UNOMAILMERGE_HXX
 
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <unotools/configitem.hxx>
 
@@ -63,7 +63,7 @@ class SwDBManager;
 class MailMergeExecuteFinalizer;
 
 class SwXMailMerge :
-    public cppu::WeakImplHelper6
+    public cppu::WeakImplHelper
     <
         com::sun::star::task::XJob,
         com::sun::star::util::XCancellable,
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index a0f24eb0e4d9..38df3f4deb44 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -24,8 +24,7 @@
 #include <com/sun/star/view/XViewSettingsSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/ChainablePropertySet.hxx>
 #include <comphelper/SettingsHelper.hxx>
 #include <usrpref.hxx>
@@ -37,7 +36,7 @@ class SwDoc;
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL SwXModule_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & );
 
-class SwXModule : public cppu::WeakImplHelper3
+class SwXModule : public cppu::WeakImplHelper
 <
     ::com::sun::star::view::XViewSettingsSupplier,
     ::com::sun::star::view::XPrintSettingsSupplier,
diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx
index de1dadc31520..17187fd68db1 100644
--- a/sw/source/uibase/inc/unotxvw.hxx
+++ b/sw/source/uibase/inc/unotxvw.hxx
@@ -36,7 +36,7 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/datatransfer/XTransferableSupplier.hpp>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/itemprop.hxx>
 #include "calbck.hxx"
 #include "TextCursorHelper.hxx"
@@ -157,7 +157,7 @@ public:
     SfxObjectShellLock      BuildTmpSelectionDoc();
 };
 
-typedef cppu::WeakImplHelper8<
+typedef cppu::WeakImplHelper<
                             ::com::sun::star::text::XTextViewCursor,
                             ::com::sun::star::lang::XServiceInfo,
                             ::com::sun::star::text::XPageCursor,
diff --git a/sw/source/uibase/uno/unomailmerge.cxx b/sw/source/uibase/uno/unomailmerge.cxx
index 609414bd3262..38390117bc58 100644
--- a/sw/source/uibase/uno/unomailmerge.cxx
+++ b/sw/source/uibase/uno/unomailmerge.cxx
@@ -49,6 +49,7 @@
 #include <com/sun/star/mail/XSmtpService.hpp>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/event.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <swevent.hxx>
 #include <unomailmerge.hxx>
 #include <swdll.hxx>
@@ -184,7 +185,7 @@ static bool LoadFromURL_impl(
 
 namespace
 {
-    class DelayedFileDeletion : public ::cppu::WeakImplHelper1< util::XCloseListener >,
+    class DelayedFileDeletion : public ::cppu::WeakImplHelper< util::XCloseListener >,
                                 private boost::noncopyable
     {
     protected:
diff --git a/sw/source/uibase/uno/unomodule.hxx b/sw/source/uibase/uno/unomodule.hxx
index 424871a2d213..8d7c29654f4b 100644
--- a/sw/source/uibase/uno/unomodule.hxx
+++ b/sw/source/uibase/uno/unomodule.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
@@ -48,7 +48,7 @@ namespace com
     }
 }
 
-class SwUnoModule : public ::cppu::WeakImplHelper3< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
+class SwUnoModule : public ::cppu::WeakImplHelper< css::frame::XDispatchProvider, css::frame::XNotifyingDispatch, css::lang::XServiceInfo >
 {
     css::uno::Reference < css::lang::XMultiServiceFactory > m_xFactory;