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>

54 files changed, 127 insertions, 124 deletions

diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index 4763f18a486a..81dd2d0739b1 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
 namespace vcl { class Window; }
@@ -44,7 +44,7 @@ namespace accessibility {
 const sal_Char sAccessibleServiceName[] = "com.sun.star.accessibility.Accessible";
 
 class SwAccessibleContext :
-    public ::cppu::WeakImplHelper5<
+    public ::cppu::WeakImplHelper<
                 ::com::sun::star::accessibility::XAccessible,
                 ::com::sun::star::accessibility::XAccessibleContext,
                 ::com::sun::star::accessibility::XAccessibleComponent,
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index 2c68c77080e2..ba71c62d2f57 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -22,14 +22,14 @@
 
 #include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
 #include <rtl/ref.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <fmtinfmt.hxx>
 
 class SwAccessibleParagraph;
 class SwTxtAttr;
 
 class SwAccessibleHyperlink :
-        public ::cppu::WeakImplHelper1<
+        public ::cppu::WeakImplHelper<
         ::com::sun::star::accessibility::XAccessibleHyperlink >
 {
     friend class SwAccessibleParagraph;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index e68f741df96c..af55befdd439 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -59,7 +59,7 @@
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <pagepreviewlayout.hxx>
 #include <dcontact.hxx>
 #include <svx/unoapi.hxx>
@@ -118,7 +118,7 @@ public:
 };
 
 class SwDrawModellListener_Impl : public SfxListener,
-    public ::cppu::WeakImplHelper1< document::XEventBroadcaster >
+    public ::cppu::WeakImplHelper< document::XEventBroadcaster >
 {
     mutable ::osl::Mutex maListenerMutex;
     ::cppu::OInterfaceContainerHelper maEventListeners;
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index 4ebeebfce888..0dae5fef8256 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/accessibility/XAccessibleHyperlink.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <fmtinfmt.hxx>
 #include <frame.hxx>
 #include <layfrm.hxx>
@@ -29,7 +29,7 @@
 #include "accnotextframe.hxx"
 
 class SwAccessibleNoTextHyperlink :
-        public ::cppu::WeakImplHelper1<
+        public ::cppu::WeakImplHelper<
         ::com::sun::star::accessibility::XAccessibleHyperlink >
 {
     friend class SwAccessibleNoTextFrame;
diff --git a/sw/source/core/docnode/cancellablejob.hxx b/sw/source/core/docnode/cancellablejob.hxx
index 8796fd4d8941..4d11272217e6 100644
--- a/sw/source/core/docnode/cancellablejob.hxx
+++ b/sw/source/core/docnode/cancellablejob.hxx
@@ -21,14 +21,14 @@
 #define INCLUDED_SW_SOURCE_CORE_DOCNODE_CANCELLABLEJOB_HXX
 
 #include <sal/config.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/util/XCancellable.hpp>
 
 #include <rtl/ref.hxx>
 
 class ObservableThread;
 
-class CancellableJob : public ::cppu::WeakImplHelper1<com::sun::star::util::XCancellable>
+class CancellableJob : public ::cppu::WeakImplHelper<com::sun::star::util::XCancellable>
 {
 public:
     explicit CancellableJob( const ::rtl::Reference< ObservableThread >& rThread );
diff --git a/sw/source/core/inc/SwXMLBlockImport.hxx b/sw/source/core/inc/SwXMLBlockImport.hxx
index aa6ea1a9110f..faa8c9828857 100644
--- a/sw/source/core/inc/SwXMLBlockImport.hxx
+++ b/sw/source/core/inc/SwXMLBlockImport.hxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
 #include <com/sun/star/xml/sax/FastToken.hpp>
 #include <sax/fastattribs.hxx>
+#include <cppuhelper/implbase.hxx>
 
 using namespace css::xml::sax;
 using namespace xmloff::token;
@@ -93,7 +94,7 @@ enum SwXMLTextBlockToken : sal_Int32
 };
 
 class SwXMLTextBlockTokenHandler : public
-        cppu::WeakImplHelper1< css::xml::sax::XFastTokenHandler >,
+        cppu::WeakImplHelper< css::xml::sax::XFastTokenHandler >,
         public sax_fastparser::FastTokenHandlerBase
 {
 public:
@@ -122,7 +123,7 @@ enum SwXMLBlockListToken : sal_Int32
 };
 
 class SwXMLBlockListTokenHandler : public
-        cppu::WeakImplHelper1< css::xml::sax::XFastTokenHandler >,
+        cppu::WeakImplHelper< css::xml::sax::XFastTokenHandler >,
         public sax_fastparser::FastTokenHandlerBase
 {
 public:
diff --git a/sw/source/core/inc/SwXTextDefaults.hxx b/sw/source/core/inc/SwXTextDefaults.hxx
index 296e211f07f6..632f606a92d3 100644
--- a/sw/source/core/inc/SwXTextDefaults.hxx
+++ b/sw/source/core/inc/SwXTextDefaults.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_SWXTEXTDEFAULTS_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_SWXTEXTDEFAULTS_HXX
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -27,7 +27,7 @@
 
 class SwDoc;
 
-class SwXTextDefaults :  public cppu::WeakImplHelper3
+class SwXTextDefaults :  public cppu::WeakImplHelper
                         <
                             com::sun::star::beans::XPropertyState,
                             com::sun::star::beans::XPropertySet,
diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx
index e15967b51f63..f13dc85534bc 100644
--- a/sw/source/core/inc/dumpfilter.hxx
+++ b/sw/source/core/inc/dumpfilter.hxx
@@ -14,7 +14,7 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace sw {
 
@@ -22,7 +22,7 @@ namespace sw {
         document as XML. This filter should be mostly be used for testing
         purpose.
       */
-    class LayoutDumpFilter : public cppu::WeakImplHelper4
+    class LayoutDumpFilter : public cppu::WeakImplHelper
                              <
                                com::sun::star::document::XFilter,
                                com::sun::star::document::XExporter,
diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx
index c3ca1d6fe0af..4ad84465b132 100644
--- a/sw/source/core/inc/unobookmark.hxx
+++ b/sw/source/core/inc/unobookmark.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XFormField.hpp>
 
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <sfx2/Metadatable.hxx>
 
@@ -36,7 +36,7 @@
 
 class SwDoc;
 
-typedef ::cppu::ImplInheritanceHelper5
+typedef ::cppu::ImplInheritanceHelper
 <   ::sfx2::MetadatableMixin
 ,   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
@@ -191,7 +191,7 @@ public:
 };
 
 class SwXFieldmarkParameters
-    : public ::cppu::WeakImplHelper1< ::com::sun::star::container::XNameContainer>
+    : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer>
     , private SwClient
 {
     public:
diff --git a/sw/source/core/inc/unofield.hxx b/sw/source/core/inc/unofield.hxx
index 78415a49f53a..3b30ee143793 100644
--- a/sw/source/core/inc/unofield.hxx
+++ b/sw/source/core/inc/unofield.hxx
@@ -26,9 +26,7 @@
 #include <com/sun/star/util/XUpdatable.hpp>
 #include <com/sun/star/text/XDependentTextField.hpp>
 
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <unobaseclass.hxx>
 
@@ -39,7 +37,7 @@ class SwField;
 class SwSetExpField;
 class SwTextAPIObject;
 
-typedef ::cppu::WeakImplHelper4
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::beans::XPropertySet
 ,   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::lang::XUnoTunnel
@@ -151,7 +149,7 @@ public:
 
 };
 
-typedef ::cppu::WeakImplHelper5
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::text::XDependentTextField
 ,   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::beans::XPropertySet
@@ -288,7 +286,7 @@ public:
 
 };
 
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::container::XEnumeration
 ,   ::com::sun::star::lang::XServiceInfo
 > SwXFieldEnumeration_Base;
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 98c8578f947c..247243939425 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -44,7 +43,7 @@ namespace com { namespace sun { namespace star { namespace text {
 class SwTxtNode;
 class SwDoc;
 
-typedef ::cppu::ImplInheritanceHelper3
+typedef ::cppu::ImplInheritanceHelper
 <   SwXTextMarkup
 ,   css::beans::XPropertySet
 ,   css::text::XFlatParagraph
@@ -141,7 +140,7 @@ private:
 };
 
 class SwXFlatParagraphIterator:
-    public ::cppu::WeakImplHelper1
+    public ::cppu::WeakImplHelper
     <
         css::text::XFlatParagraphIterator
     >,
diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx
index c9740960a540..fdf9cf9f90cf 100644
--- a/sw/source/core/inc/unofootnote.hxx
+++ b/sw/source/core/inc/unofootnote.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/text/XTextContent.hpp>
 #include <com/sun/star/text/XFootnote.hpp>
 
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <unotext.hxx>
 
@@ -35,7 +35,7 @@ class SwDoc;
 class SwModify;
 class SwFmtFtn;
 
-typedef ::cppu::WeakImplHelper5
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::beans::XPropertySet
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index ed3b5248f2a6..fb0f948d974a 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -27,8 +27,7 @@
 #include <com/sun/star/text/XDocumentIndexMark.hpp>
 #include <com/sun/star/text/XDocumentIndex.hpp>
 
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <sfx2/Metadatable.hxx>
 
@@ -40,7 +39,7 @@ class SwTOXBaseSection;
 class SwTOXMark;
 class SwTOXType;
 
-typedef ::cppu::ImplInheritanceHelper6
+typedef ::cppu::ImplInheritanceHelper
 <   ::sfx2::MetadatableMixin
 ,   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
@@ -193,7 +192,7 @@ public:
 
 };
 
-typedef ::cppu::WeakImplHelper4
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::beans::XPropertySet
diff --git a/sw/source/core/inc/unoparaframeenum.hxx b/sw/source/core/inc/unoparaframeenum.hxx
index a8d223393f3d..bdbf12507e14 100644
--- a/sw/source/core/inc/unoparaframeenum.hxx
+++ b/sw/source/core/inc/unoparaframeenum.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <unobaseclass.hxx>
 
@@ -66,7 +66,7 @@ enum ParaFrameMode
     PARAFRAME_PORTION_TEXTRANGE,
 };
 
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::container::XEnumeration
 > SwXParaFrameEnumeration_Base;
diff --git a/sw/source/core/inc/unoport.hxx b/sw/source/core/inc/unoport.hxx
index 24030021fb15..9a82ca09c6bd 100644
--- a/sw/source/core/inc/unoport.hxx
+++ b/sw/source/core/inc/unoport.hxx
@@ -35,8 +35,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 
-#include <cppuhelper/implbase8.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <svl/itemprop.hxx>
 
@@ -78,7 +77,7 @@ enum SwTextPortionType
     PORTION_ANNOTATION_END
 };
 
-class SwXTextPortion : public cppu::WeakImplHelper8
+class SwXTextPortion : public cppu::WeakImplHelper
 <
     ::com::sun::star::beans::XTolerantMultiPropertySet,
     ::com::sun::star::beans::XMultiPropertySet,
@@ -244,7 +243,7 @@ public:
 };
 
 class SwXTextPortionEnumeration
-    : public ::cppu::WeakImplHelper3
+    : public ::cppu::WeakImplHelper
         < ::com::sun::star::container::XEnumeration
         , ::com::sun::star::lang::XServiceInfo
         , ::com::sun::star::lang::XUnoTunnel
diff --git a/sw/source/core/inc/unorefmark.hxx b/sw/source/core/inc/unorefmark.hxx
index 73d8d410d97d..6874d939de0d 100644
--- a/sw/source/core/inc/unorefmark.hxx
+++ b/sw/source/core/inc/unorefmark.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
 
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <unobaseclass.hxx>
 
@@ -34,7 +34,7 @@ class SwDoc;
 class SwModify;
 class SwFmtRefMark;
 
-typedef ::cppu::WeakImplHelper5
+typedef ::cppu::WeakImplHelper
 <   ::com::sun::star::lang::XUnoTunnel
 ,   ::com::sun::star::lang::XServiceInfo
 ,   ::com::sun::star::beans::XPropertySet
diff --git a/sw/source/core/inc/unotextmarkup.hxx b/sw/source/core/inc/unotextmarkup.hxx
index c57fd3365842..e7d8a0ea19e3 100644
--- a/sw/source/core/inc/unotextmarkup.hxx
+++ b/sw/source/core/inc/unotextmarkup.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
 #define INCLUDED_SW_SOURCE_CORE_INC_UNOTEXTMARKUP_HXX
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/text/XTextMarkup.hpp>
 #include <com/sun/star/text/XMultiTextMarkup.hpp>
@@ -45,7 +44,7 @@ class SfxPoolItem;
 /** Implementation of the css::text::XTextMarkup interface
  */
 class SwXTextMarkup
-    : public ::cppu::WeakImplHelper2
+    : public ::cppu::WeakImplHelper
         <   ::com::sun::star::text::XTextMarkup
         ,   ::com::sun::star::text::XMultiTextMarkup
         >
@@ -83,7 +82,7 @@ protected:
 /** Implementation of the ::com::sun::star::container::XStringKeyMap interface
  */
 class SwXStringKeyMap:
-    public ::cppu::WeakImplHelper1<
+    public ::cppu::WeakImplHelper<
         ::com::sun::star::container::XStringKeyMap>
 {
 public:
diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index f87ec851b212..d6bbe2e822ea 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -28,9 +28,8 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 #include <com/sun/star/chart2/XChartDocument.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
-#include <cppuhelper/implbase2.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <hintids.hxx>
 #include <sfx2/docfile.hxx>
@@ -87,7 +86,7 @@ public:
 
 SwOLELRUCache* pOLELRU_Cache = 0;
 
-class SwOLEListener_Impl : public ::cppu::WeakImplHelper1< embed::XStateChangeListener >
+class SwOLEListener_Impl : public ::cppu::WeakImplHelper< embed::XStateChangeListener >
 {
     SwOLEObj* mpObj;
 public:
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 396b32aa5481..1d1554d4268a 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -83,6 +83,7 @@
 #include <basic/basmgr.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::document;
@@ -93,7 +94,7 @@ using namespace ::com::sun::star::lang;
 
 #if HAVE_FEATURE_SCRIPTING
 
-class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
+class SwVbaCodeNameProvider : public ::cppu::WeakImplHelper< document::XCodeNameQuery >
 {
     SwDocShell* mpDocShell;
     OUString msThisDocumentCodeName;
@@ -176,7 +177,7 @@ public:
 
 typedef std::unordered_map< OUString, OUString, OUStringHash > StringHashMap;
 
-class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper1< container::XNameContainer >
+class SwVbaProjectNameProvider : public ::cppu::WeakImplHelper< container::XNameContainer >
 {
     StringHashMap mTemplateToProject;
 public:
@@ -238,7 +239,7 @@ public:
 
 };
 
-class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
+class SwVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper< container::XNameAccess >
 {
     SwDocShell* mpDocShell;
 public:
diff --git a/sw/source/core/unocore/unoevent.cxx b/sw/source/core/unocore/unoevent.cxx
index 97b62ecf1ed4..eb84c073fafb 100644
--- a/sw/source/core/unocore/unoevent.cxx
+++ b/sw/source/core/unocore/unoevent.cxx
@@ -39,7 +39,6 @@ using ::com::sun::star::lang::IllegalArgumentException;
 using ::com::sun::star::lang::WrappedTargetException;
 using ::com::sun::star::lang::XServiceInfo;
 using ::com::sun::star::beans::PropertyValue;
-using ::cppu::WeakImplHelper2;
 
 // tables of allowed events for specific objects
 
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index f2d4e2315e27..bd498a3606c2 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -60,6 +60,7 @@
 #include <SwStyleNameMapper.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/string.hxx>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::com::sun::star;
 
@@ -178,7 +179,7 @@ lcl_ConvertTOUNameToUserName(OUString& rTmp)
     }
 }
 
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
 <   lang::XServiceInfo
 ,   container::XIndexReplace
 > SwXDocumentIndexStyleAccess_Base;
@@ -223,7 +224,7 @@ public:
 
 };
 
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
 <   lang::XServiceInfo
 ,   container::XIndexReplace
 > SwXDocumentIndexTokenAccess_Base;
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 0aa17642c18c..b256f8aa4f7d 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -41,6 +41,7 @@
 #include <editeng/crossedoutitem.hxx>
 #include <svx/svdouno.hxx>
 #include <svx/fmglob.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/form/ListSourceType.hpp>
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/form/FormSubmitEncoding.hpp>
@@ -359,7 +360,7 @@ const uno::Reference< script::XEventAttacherManager >&
 }
 
 class SwHTMLImageWatcher :
-    public cppu::WeakImplHelper2< awt::XImageConsumer, XEventListener >
+    public cppu::WeakImplHelper< awt::XImageConsumer, XEventListener >
 {
     uno::Reference< drawing::XShape >       xShape;     // das control
     uno::Reference< XImageProducerSupplier >    xSrc;
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index f2ed24dbff59..00da8162d562 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -56,7 +56,7 @@
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <unomid.h>
 
@@ -83,7 +83,7 @@ struct SwMailMergeDlg_Impl
     uno::Reference<XSelectionSupplier> xSelSupp;
 };
 
-class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper1
+class SwXSelChgLstnr_Impl : public cppu::WeakImplHelper
 <
     view::XSelectionChangeListener
 >
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index d2138626fabe..0d1f2bb2d4e8 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -51,7 +51,7 @@ namespace com
 class SfxMedium;
 class SfxFilter;
 
-class SwFilterDetect : public ::cppu::WeakImplHelper2< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
+class SwFilterDetect : public ::cppu::WeakImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo >
 {
 public:
                             SwFilterDetect();
diff --git a/sw/source/ui/vba/vbabookmarks.cxx b/sw/source/ui/vba/vbabookmarks.cxx
index 8e8e65f4f56a..305c12ff56c5 100644
--- a/sw/source/ui/vba/vbabookmarks.cxx
+++ b/sw/source/ui/vba/vbabookmarks.cxx
@@ -25,7 +25,7 @@
 #include <ooo/vba/word/WdBookmarkSortBy.hpp>
 #include "vbarange.hxx"
 #include "wordvbahelper.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
@@ -46,7 +46,7 @@ public:
 };
 
 // Bookmarks use case-insensitive name lookup in MS Word.
-typedef ::cppu::WeakImplHelper2< container::XNameAccess, container::XIndexAccess > BookmarkCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess > BookmarkCollectionHelper_BASE;
 class BookmarkCollectionHelper : public BookmarkCollectionHelper_BASE
 {
 private:
diff --git a/sw/source/ui/vba/vbaborders.cxx b/sw/source/ui/vba/vbaborders.cxx
index 6d5eaf814d44..4571ee746a78 100644
--- a/sw/source/ui/vba/vbaborders.cxx
+++ b/sw/source/ui/vba/vbaborders.cxx
@@ -21,7 +21,7 @@
 #include <ooo/vba/word/WdBorderType.hpp>
 #include <ooo/vba/word/WdLineStyle.hpp>
 #include <sal/macros.h>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/table/TableBorder.hpp>
 #include <com/sun/star/table/ShadowFormat.hpp>
@@ -31,7 +31,7 @@
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
-typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base;
+typedef ::cppu::WeakImplHelper<container::XIndexAccess > RangeBorders_Base;
 typedef InheritedHelperInterfaceImpl1<word::XBorder > SwVbaBorder_Base;
 
 // #TODO sort these indexes to match the order in which Word iterates over the
diff --git a/sw/source/ui/vba/vbacells.cxx b/sw/source/ui/vba/vbacells.cxx
index 0f8ba16fbebb..710f30d6a4c6 100644
--- a/sw/source/ui/vba/vbacells.cxx
+++ b/sw/source/ui/vba/vbacells.cxx
@@ -21,11 +21,12 @@
 #include "wordvbahelper.hxx"
 #include "vbatablehelper.hxx"
 #include "vbarow.hxx"
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > CellCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > CellCollectionHelper_Base;
 
 class CellsEnumWrapper : public EnumerationHelper_BASE
 {
diff --git a/sw/source/ui/vba/vbadocumentproperties.cxx b/sw/source/ui/vba/vbadocumentproperties.cxx
index 860d8393d4d0..3b2394bdd47e 100644
--- a/sw/source/ui/vba/vbadocumentproperties.cxx
+++ b/sw/source/ui/vba/vbadocumentproperties.cxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "vbadocumentproperties.hxx"
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -632,14 +631,14 @@ SwVbaBuiltInDocumentProperty::getServiceNames()
     }
     return aServiceNames;
 }
-typedef ::cppu::WeakImplHelper3< com::sun::star::container::XIndexAccess
+typedef ::cppu::WeakImplHelper< com::sun::star::container::XIndexAccess
         ,com::sun::star::container::XNameAccess
         ,com::sun::star::container::XEnumerationAccess
         > PropertiesImpl_BASE;
 
 typedef std::unordered_map< sal_Int32, uno::Reference< XDocumentProperty > > DocProps;
 
-typedef ::cppu::WeakImplHelper1< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< com::sun::star::container::XEnumeration > DocPropEnumeration_BASE;
 class DocPropEnumeration : public DocPropEnumeration_BASE
 {
     DocProps mDocProps;
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 0011ea76a51d..ef016607e32d 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -28,6 +28,7 @@
 #include <comphelper/string.hxx>
 #include <ooo/vba/word/WdFieldType.hpp>
 #include <swtypes.hxx>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
@@ -226,8 +227,8 @@ static uno::Any lcl_createField( const uno::Reference< XHelperInterface >& xPare
     return uno::makeAny( xField );
 }
 
-typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > FieldEnumeration_BASE;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > FieldCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< css::container::XEnumeration > FieldEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > FieldCollectionHelper_BASE;
 
 class FieldEnumeration : public FieldEnumeration_BASE
 {
diff --git a/sw/source/ui/vba/vbaframes.cxx b/sw/source/ui/vba/vbaframes.cxx
index 7e76abdb5ceb..6a63ac359310 100644
--- a/sw/source/ui/vba/vbaframes.cxx
+++ b/sw/source/ui/vba/vbaframes.cxx
@@ -22,11 +22,12 @@
 #include <com/sun/star/text/XTextViewCursor.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 #include "wordvbahelper.hxx"
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > FramesEnumeration_Base;
+typedef ::cppu::WeakImplHelper< container::XEnumeration > FramesEnumeration_Base;
 class FramesEnumeration : public FramesEnumeration_Base
 {
 private:
diff --git a/sw/source/ui/vba/vbaheadersfooters.cxx b/sw/source/ui/vba/vbaheadersfooters.cxx
index 082420988ad9..54eaca1c6a44 100644
--- a/sw/source/ui/vba/vbaheadersfooters.cxx
+++ b/sw/source/ui/vba/vbaheadersfooters.cxx
@@ -19,12 +19,13 @@
 #include "vbaheadersfooters.hxx"
 #include "vbaheaderfooter.hxx"
 #include <ooo/vba/word/WdHeaderFooterIndex.hpp>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 // I assume there is only one headersfooters in Writer
-typedef ::cppu::WeakImplHelper1<container::XIndexAccess > HeadersFootersIndexAccess_Base;
+typedef ::cppu::WeakImplHelper<container::XIndexAccess > HeadersFootersIndexAccess_Base;
 class HeadersFootersIndexAccess : public HeadersFootersIndexAccess_Base
 {
 private:
diff --git a/sw/source/ui/vba/vbapalette.cxx b/sw/source/ui/vba/vbapalette.cxx
index 0cdbb5157ed2..da3a62de9081 100644
--- a/sw/source/ui/vba/vbapalette.cxx
+++ b/sw/source/ui/vba/vbapalette.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "vbapalette.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <ooo/vba/word/WdColor.hpp>
 #include <ooo/vba/word/WdColorIndex.hpp>
@@ -49,7 +49,7 @@ WdColor::wdColorGray50,           // 15
 WdColor::wdColorGray25,           // 16
 };
 
-typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess > XIndexAccess_BASE;
 
 class DefaultPalette : public XIndexAccess_BASE
 {
diff --git a/sw/source/ui/vba/vbapanes.cxx b/sw/source/ui/vba/vbapanes.cxx
index 6fdf39d2d64f..19389c3f42fd 100644
--- a/sw/source/ui/vba/vbapanes.cxx
+++ b/sw/source/ui/vba/vbapanes.cxx
@@ -18,12 +18,13 @@
  */
 #include "vbapanes.hxx"
 #include "vbapane.hxx"
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
 // I assume there is only one pane in Writer
-typedef ::cppu::WeakImplHelper1<container::XIndexAccess > PanesIndexAccess_Base;
+typedef ::cppu::WeakImplHelper<container::XIndexAccess > PanesIndexAccess_Base;
 class PanesIndexAccess : public PanesIndexAccess_Base
 {
 private:
diff --git a/sw/source/ui/vba/vbaparagraph.cxx b/sw/source/ui/vba/vbaparagraph.cxx
index 8ae1ef4b5b51..d32c53682d2d 100644
--- a/sw/source/ui/vba/vbaparagraph.cxx
+++ b/sw/source/ui/vba/vbaparagraph.cxx
@@ -21,6 +21,7 @@
 #include <tools/diagnose_ex.h>
 #include "vbarange.hxx"
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
@@ -72,7 +73,7 @@ SwVbaParagraph::getServiceNames()
     return aServiceNames;
 }
 
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > ParagraphCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > ParagraphCollectionHelper_BASE;
 
 class ParagraphCollectionHelper : public ParagraphCollectionHelper_BASE
 {
diff --git a/sw/source/ui/vba/vbarevisions.cxx b/sw/source/ui/vba/vbarevisions.cxx
index 62f9d90dfc68..4b49b7740733 100644
--- a/sw/source/ui/vba/vbarevisions.cxx
+++ b/sw/source/ui/vba/vbarevisions.cxx
@@ -18,15 +18,15 @@
  */
 #include "vbarevisions.hxx"
 #include "vbarevision.hxx"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/document/XRedlinesSupplier.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > RevisionEnumeration_BASE;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > RevisionCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< container::XEnumeration > RevisionEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > RevisionCollectionHelper_BASE;
 typedef std::vector< uno::Reference< beans::XPropertySet > > RevisionMap;
 
 class RedlinesEnumeration : public RevisionEnumeration_BASE
diff --git a/sw/source/ui/vba/vbasections.cxx b/sw/source/ui/vba/vbasections.cxx
index d929357d60a9..06cd0f469315 100644
--- a/sw/source/ui/vba/vbasections.cxx
+++ b/sw/source/ui/vba/vbasections.cxx
@@ -23,12 +23,13 @@
 #include <docsh.hxx>
 #include <doc.hxx>
 #include "wordvbahelper.hxx"
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > SectionEnumeration_BASE;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > SectionCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< container::XEnumeration > SectionEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > SectionCollectionHelper_Base;
 typedef std::vector< uno::Reference< beans::XPropertySet > > XSectionVec;
 
 class SectionEnumeration : public SectionEnumeration_BASE
diff --git a/sw/source/ui/vba/vbastyles.cxx b/sw/source/ui/vba/vbastyles.cxx
index b413b1c4ec3d..e46d74c53aa4 100644
--- a/sw/source/ui/vba/vbastyles.cxx
+++ b/sw/source/ui/vba/vbastyles.cxx
@@ -18,7 +18,7 @@
  */
 #include "vbastyles.hxx"
 #include "vbastyle.hxx"
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -157,7 +157,7 @@ static const MSOStyleNameTable aMSOStyleNameTable[] =
     { 0, 0, 0 }
 };
 
-typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE;
+typedef ::cppu::WeakImplHelper< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > StyleCollectionHelper_BASE;
 
 class StyleCollectionHelper : public StyleCollectionHelper_BASE
 {
diff --git a/sw/source/ui/vba/vbatables.cxx b/sw/source/ui/vba/vbatables.cxx
index 26b60c273cfe..a81375dcc779 100644
--- a/sw/source/ui/vba/vbatables.cxx
+++ b/sw/source/ui/vba/vbatables.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace css;
@@ -58,8 +59,8 @@ static bool lcl_isInHeaderFooter( const uno::Reference< text::XTextTable >& xTab
     return false;
 }
 
-typedef ::cppu::WeakImplHelper1< css::container::XEnumeration > EnumBase;
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XNameAccess > TableCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< css::container::XEnumeration > EnumBase;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XNameAccess > TableCollectionHelper_Base;
 typedef std::vector< uno::Reference< text::XTextTable > > XTextTableVec;
 
 class TableCollectionHelper : public TableCollectionHelper_Base
diff --git a/sw/source/ui/vba/vbatablesofcontents.cxx b/sw/source/ui/vba/vbatablesofcontents.cxx
index 9827666d7566..d0cbc0811c6a 100644
--- a/sw/source/ui/vba/vbatablesofcontents.cxx
+++ b/sw/source/ui/vba/vbatablesofcontents.cxx
@@ -20,11 +20,12 @@
 #include "vbatableofcontents.hxx"
 #include "vbarange.hxx"
 #include <com/sun/star/text/XDocumentIndexesSupplier.hpp>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > TableOfContentsCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > TableOfContentsCollectionHelper_Base;
 typedef std::vector< uno::Reference< text::XDocumentIndex > > XTocVec;
 
 class TablesOfContentsEnumWrapper : public EnumerationHelper_BASE
diff --git a/sw/source/ui/vba/vbatabstops.cxx b/sw/source/ui/vba/vbatabstops.cxx
index 128b6644a38a..7ae01e32d383 100644
--- a/sw/source/ui/vba/vbatabstops.cxx
+++ b/sw/source/ui/vba/vbatabstops.cxx
@@ -21,6 +21,7 @@
 #include <com/sun/star/style/TabAlign.hpp>
 #include <ooo/vba/word/WdTabLeader.hpp>
 #include <ooo/vba/word/WdTabAlignment.hpp>
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
@@ -37,7 +38,7 @@ static void lcl_setTabStops( const uno::Reference< beans::XPropertySet >& xParaP
     xParaProps->setPropertyValue("ParaTabStops", uno::makeAny( aSeq ) );
 }
 
-typedef ::cppu::WeakImplHelper2< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess, container::XEnumerationAccess > TabStopCollectionHelper_Base;
 
 class TabStopsEnumWrapper : public EnumerationHelper_BASE
 {
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;