svx: tdf#88206 replace cppu::WeakImplHelper* etc.

with the variadic variants.

Change-Id: Id881385b2653da2ee89498afbd6453d40acaea83
Reviewed-on: https://gerrit.libreoffice.org/18358
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

56 files changed, 113 insertions, 117 deletions

diff --git a/svx/inc/AccessibleTableShape.hxx b/svx/inc/AccessibleTableShape.hxx
index 934fd33d50e0..1c704ecd09de 100644
--- a/svx/inc/AccessibleTableShape.hxx
+++ b/svx/inc/AccessibleTableShape.hxx
@@ -27,12 +27,12 @@
 
 #include <rtl/ref.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <svx/AccessibleShape.hxx>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
-#include <cppuhelper/compbase5.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <boost/noncopyable.hpp>
 
@@ -45,7 +45,7 @@ namespace accessibility
     class AccessibleTableShapeImpl;
     class AccessibleCell;
 
-    typedef ::cppu::ImplInheritanceHelper2< AccessibleShape,
+    typedef ::cppu::ImplInheritanceHelper< AccessibleShape,
                                             ::com::sun::star::accessibility::XAccessibleTable,
                                             ::com::sun::star::view::XSelectionChangeListener
                                           > AccessibleTableShape_Base;
@@ -151,7 +151,7 @@ private:
     sal_Int32 GetIndexOfSelectedChild( sal_Int32 nSelectedChildIndex ) const;
 };
 
-typedef ::cppu::WeakImplHelper5<
+typedef ::cppu::WeakImplHelper<
             ::com::sun::star::accessibility::XAccessible,
             ::com::sun::star::accessibility::XAccessibleComponent,
             ::com::sun::star::accessibility::XAccessibleContext,
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index fb6c52896c3d..886c28596b3d 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -260,13 +260,13 @@
 #include <config_features.h>
 #include <config_folders.h>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/compbase6.hxx>
 #include <cppuhelper/component_context.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase7.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx
index febf7c081689..99fa0de8ce1b 100644
--- a/svx/inc/pch/precompiled_svxcore.hxx
+++ b/svx/inc/pch/precompiled_svxcore.hxx
@@ -452,13 +452,12 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/factory.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index 8aa95e1e99f0..64c4718057b0 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -29,7 +29,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
-#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weak.hxx>
 #include <svtools/toolboxcontroller.hxx>
 #include <vcl/button.hxx>
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index 4cea26f20bf6..151cb5af61a7 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -58,7 +58,7 @@ ChildrenManagerImpl::ChildrenManagerImpl (
     const uno::Reference<drawing::XShapes>& rxShapeList,
     const AccessibleShapeTreeInfo& rShapeTreeInfo,
     AccessibleContextBase& rContext)
-    : ::cppu::WeakComponentImplHelper2<
+    : ::cppu::WeakComponentImplHelper<
           ::com::sun::star::document::XEventListener,
           ::com::sun::star::view::XSelectionChangeListener>(maMutex),
       mxShapeList (rxShapeList),
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index d7935966e37f..ccacc2d582ad 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -24,7 +24,7 @@
 #include <svx/IAccessibleParent.hxx>
 #include <svx/AccessibleShapeTreeInfo.hxx>
 #include <editeng/AccessibleContextBase.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <osl/mutex.hxx>
 #include <vector>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -73,7 +73,7 @@ typedef ::std::vector<ChildDescriptor> ChildDescriptorListType;
 */
 class ChildrenManagerImpl
     :   public MutexOwner,
-        public cppu::WeakComponentImplHelper2<
+        public cppu::WeakComponentImplHelper<
             ::com::sun::star::document::XEventListener,
             ::com::sun::star::view::XSelectionChangeListener>,
         public IAccessibleViewForwarderListener,
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index c78641fcb78e..8d766c725956 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -51,7 +51,7 @@
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/tools/unotools.hxx>
 #include <com/sun/star/document/XActionLockable.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 using namespace css;
@@ -62,7 +62,7 @@ class SdrObjCustomShape;
 
 namespace {
 
-class EnhancedCustomShapeEngine : public cppu::WeakImplHelper3
+class EnhancedCustomShapeEngine : public cppu::WeakImplHelper
 <
     css::lang::XInitialization,
     css::lang::XServiceInfo,
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
index 3a2390600144..37ad46dbf298 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEHANDLE_HXX
 
 #include <com/sun/star/uno/RuntimeException.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -29,7 +29,7 @@
 #include <com/sun/star/awt/Point.hpp>
 #include <cppuhelper/weakref.hxx>
 
-class EnhancedCustomShapeHandle : public cppu::WeakImplHelper2
+class EnhancedCustomShapeHandle : public cppu::WeakImplHelper
 <
     com::sun::star::drawing::XCustomShapeHandle,
     com::sun::star::lang::XInitialization
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index 6c416d83c614..f640161af669 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/text/RubyAdjust.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svtools/colorcfg.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
@@ -83,7 +83,7 @@ SfxChildWinInfo SvxRubyChildWindow::GetInfo() const
     return SfxChildWindow::GetInfo();
 }
 
-class SvxRubyData_Impl : public cppu::WeakImplHelper1<css::view::XSelectionChangeListener>
+class SvxRubyData_Impl : public cppu::WeakImplHelper<css::view::XSelectionChangeListener>
 {
     Reference<XModel> xModel;
     Reference<XRubySelection> xSelection;
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 70ea9e9601cf..c00f25939451 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -55,6 +55,7 @@
 #include "sdbdatacolumn.hxx"
 
 #include <comphelper/property.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <boost/scoped_ptr.hpp>
 
@@ -87,7 +88,7 @@ using namespace com::sun::star::accessibility;
             | BrowserMode::VLINES        \
             | BrowserMode::HEADERBAR_NEW     \
 
-class RowSetEventListener : public ::cppu::WeakImplHelper1<XRowsChangeListener>
+class RowSetEventListener : public ::cppu::WeakImplHelper<XRowsChangeListener>
 {
     VclPtr<DbGridControl> m_pControl;
 public:
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index b9fcbb29e834..ea1d6a0d7965 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -39,7 +39,7 @@
 #include <comphelper/uno3.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/sqlnode.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <fmservs.hxx>
 #include <fmshimp.hxx>
 #include <sfx2/dispatch.hxx>
@@ -281,7 +281,7 @@ public:
 
 // class FmFilterAdapter, Listener an den FilterControls
 
-class FmFilterAdapter : public ::cppu::WeakImplHelper1< XFilterControllerListener >
+class FmFilterAdapter : public ::cppu::WeakImplHelper< XFilterControllerListener >
 {
     FmFilterModel*              m_pModel;
     Reference< XIndexAccess >   m_xControllers;
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 3c7690cb47d9..fbc8b845b4b4 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/awt/XControl.hpp>
 
 #include <tools/diagnose_ex.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/processfactory.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
@@ -75,7 +75,7 @@ namespace svxform
 
     //= FormScriptListener
 
-    typedef ::cppu::WeakImplHelper1 <   XScriptListener
+    typedef ::cppu::WeakImplHelper <   XScriptListener
                                     >   FormScriptListener_Base;
 
     /** implements the XScriptListener interface, is used by FormScriptingEnvironment
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index e90f74b61937..affd7bfc8708 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -42,7 +42,7 @@
 #include <com/sun/star/util/URLTransformer.hpp>
 
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
@@ -160,7 +160,7 @@ namespace svx
         0
     };
 
-    typedef ::cppu::WeakImplHelper1 <   XFocusListener
+    typedef ::cppu::WeakImplHelper <   XFocusListener
                                     >   FmFocusListenerAdapter_Base;
     class FmFocusListenerAdapter : public FmFocusListenerAdapter_Base
     {
@@ -246,7 +246,7 @@ namespace svx
         m_xWindow.clear();
     }
 
-    typedef ::cppu::WeakImplHelper1 <   XMouseListener
+    typedef ::cppu::WeakImplHelper <   XMouseListener
                                     >   FmMouseListenerAdapter_Base;
     class FmMouseListenerAdapter : public FmMouseListenerAdapter_Base
     {
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 35d4538fb380..ae9d25137fc1 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -73,9 +73,9 @@ using namespace ::dbtools;
 
 #include <com/sun/star/script/XScriptListener.hpp>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
-class ScriptEventListenerWrapper : public cppu::WeakImplHelper1< XScriptListener >
+class ScriptEventListenerWrapper : public cppu::WeakImplHelper< XScriptListener >
 {
 public:
     explicit ScriptEventListenerWrapper( FmFormModel& _rModel) throw ( RuntimeException )
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 2edb9002fc39..385da67c6138 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/processfactory.hxx>
 
@@ -58,7 +58,7 @@ namespace svxform
 
     //= LegacyFormController
 
-    typedef ::cppu::WeakImplHelper2 <   form::XFormController
+    typedef ::cppu::WeakImplHelper <   form::XFormController
                                     ,   XServiceInfo
                                     >   LegacyFormController_Base;
     /** is an implementation of the legacy form controller service, namely css.form.FormController, supporting the
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index 2f4fcf57431f..857e0b1e9520 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -58,6 +58,7 @@
 #include <com/sun/star/style/GraphicLocation.hpp>
 #include <map>
 #include <boost/scoped_ptr.hpp>
+#include <cppuhelper/implbase.hxx>
 
 #undef GALLERY_USE_CLIPBOARD
 
@@ -105,7 +106,7 @@ struct CommandInfo
     }
 };
 
-class GalleryThemePopup : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
+class GalleryThemePopup : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
 {
 private:
     const GalleryTheme* mpTheme;
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 09bc230734e0..3c20eec95e5d 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -30,7 +30,7 @@
 #include <tools/link.hxx>
 #include <tools/resary.hxx>
 #include <tools/rc.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/accessibleeventnotifier.hxx>
 #include <svx/framebordertype.hxx>
@@ -48,7 +48,7 @@ namespace a11y {
 
 
 class AccFrameSelector :
-    public ::cppu::WeakImplHelper5<
+    public ::cppu::WeakImplHelper<
                 ::com::sun::star::accessibility::XAccessible,
                 ::com::sun::star::accessibility::XAccessibleContext,
                 ::com::sun::star::accessibility::XAccessibleComponent,
diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx
index e6ceeb22e198..9804a18dfb45 100644
--- a/svx/source/inc/datalistener.hxx
+++ b/svx/source/inc/datalistener.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_DATALISTENER_HXX
 #define INCLUDED_SVX_SOURCE_INC_DATALISTENER_HXX
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/xml/dom/events/XEventListener.hpp>
@@ -32,7 +32,7 @@ namespace svxform
 
     class DataNavigatorWindow;
 
-    typedef cppu::WeakImplHelper3<
+    typedef cppu::WeakImplHelper<
         com::sun::star::container::XContainerListener,
         com::sun::star::frame::XFrameActionListener,
         com::sun::star::xml::dom::events::XEventListener > DataListener_t;
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 1cd3ba4dacfc..71f5b6869de0 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -31,8 +31,7 @@
 #include <svtools/svmedit2.hxx>
 #include <svtools/treelistbox.hxx>
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/task/StatusIndicatorFactory.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -184,7 +183,7 @@ class IRecoveryUpdateListener
 };
 
 
-class RecoveryCore : public ::cppu::WeakImplHelper1< css::frame::XStatusListener >
+class RecoveryCore : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
 {
 
     // types, const
@@ -309,7 +308,7 @@ class PluginProgressWindow : public vcl::Window
         virtual void dispose() SAL_OVERRIDE;
 };
 
-class PluginProgress : public ::cppu::WeakImplHelper2< css::task::XStatusIndicator ,
+class PluginProgress : public ::cppu::WeakImplHelper< css::task::XStatusIndicator ,
                                                        css::lang::XComponent       >
 {
     // member
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index 12db53d0c2b1..ec65af0b0d4f 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.hxx
@@ -51,6 +51,7 @@
 #include "fmexch.hxx"
 #include <vector>
 #include <set>
+#include <cppuhelper/implbase.hxx>
 
 class SdrObjListIter;
 class FmFormShell;
@@ -296,7 +297,7 @@ namespace svxform
     class NavigatorTreeModel;
 
     class OFormComponentObserver
-        :public ::cppu::WeakImplHelper2 <   ::com::sun::star::beans::XPropertyChangeListener
+        :public ::cppu::WeakImplHelper <   ::com::sun::star::beans::XPropertyChangeListener
                                         ,   ::com::sun::star::container::XContainerListener
                                         >
     {
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 082633eef1a0..d2045a592e3d 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.hxx
@@ -52,8 +52,7 @@
 #include <osl/mutex.hxx>
 #include <cppuhelper/component.hxx>
 #include <comphelper/container.hxx>
-#include <cppuhelper/compbase4.hxx>
-#include <cppuhelper/compbase6.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <unotools/configitem.hxx>
 #include "formcontrolling.hxx"
 #include "fmdocumentclassification.hxx"
@@ -122,7 +121,7 @@ struct FmLoadAction
 
 
 class SfxViewFrame;
-typedef ::cppu::WeakComponentImplHelper4<   ::com::sun::star::beans::XPropertyChangeListener
+typedef ::cppu::WeakComponentImplHelper<   ::com::sun::star::beans::XPropertyChangeListener
                                         ,   ::com::sun::star::container::XContainerListener
                                         ,   ::com::sun::star::view::XSelectionChangeListener
                                         ,   ::com::sun::star::form::XFormControllerListener
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index 33e16412a8e3..fa2a18ec8bb8 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -24,14 +24,14 @@
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
 #include <com/sun/star/util/URL.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "fmslotinvalidator.hxx"
 
 
 namespace svx
 {
 
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::frame::XStatusListener
+    typedef ::cppu::WeakImplHelper <   ::com::sun::star::frame::XStatusListener
                                     >   FmTextControlFeature_Base;
 
     class FmTextControlFeature : public FmTextControlFeature_Base
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index 7c6e1af05e5c..c5a91159cbc1 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/ContainerEvent.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 #include <svl/lstner.hxx>
@@ -121,7 +121,7 @@ public:
 
 
 class SVX_DLLPRIVATE FmXUndoEnvironment
-    : public ::cppu::WeakImplHelper3<   ::com::sun::star::beans::XPropertyChangeListener
+    : public ::cppu::WeakImplHelper<   ::com::sun::star::beans::XPropertyChangeListener
                                     ,   ::com::sun::star::container::XContainerListener
                                     ,   ::com::sun::star::util::XModifyListener
                                     >
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index a713c6e734d8..984a763868cb 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.hxx
@@ -41,8 +41,7 @@
 
 #include <comphelper/stl_types.hxx>
 #include <tools/link.hxx>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <comphelper/uno3.hxx>
 #include <rtl/ref.hxx>
 #include <vcl/vclptr.hxx>
@@ -82,7 +81,7 @@ namespace svx {
 
 // FormViewPageWindowAdapter
 
-typedef ::cppu::WeakImplHelper2 <   ::com::sun::star::container::XIndexAccess
+typedef ::cppu::WeakImplHelper <   ::com::sun::star::container::XIndexAccess
                                 ,   ::com::sun::star::form::runtime::XFormControllerContext
                                 >   FormViewPageWindowAdapter_Base;
 
@@ -139,7 +138,7 @@ typedef ::std::map  <   ::com::sun::star::uno::Reference< ::com::sun::star::awt:
                     >   MapControlContainerToSetOfForms;
 class SdrModel;
 
-class FmXFormView : public ::cppu::WeakImplHelper3<
+class FmXFormView : public ::cppu::WeakImplHelper<
                             ::com::sun::star::form::XFormControllerListener,
                             ::com::sun::star::awt::XFocusListener,
                             ::com::sun::star::container::XContainerListener>
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index dc90e721dbe4..f3b1f7d1730f 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/form/runtime/XFormOperations.hpp>
 #include <com/sun/star/sdb/XSQLErrorListener.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <vector>
 
@@ -125,7 +125,7 @@ namespace svx
 
     //= FormControllerHelper
 
-    typedef ::cppu::WeakImplHelper2 <   ::com::sun::star::form::runtime::XFeatureInvalidation
+    typedef ::cppu::WeakImplHelper <   ::com::sun::star::form::runtime::XFeatureInvalidation
                                     ,   ::com::sun::star::sdb::XSQLErrorListener
                                     >   FormControllerHelper_Base;
     /** is a helper class which manages form controller functionality (such as moveNext etc.).
diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
index c6b3c0874918..65be5212fd25 100644
--- a/svx/source/inc/formdispatchinterceptor.hxx
+++ b/svx/source/inc/formdispatchinterceptor.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/uno3.hxx>
 
 
@@ -47,7 +47,7 @@ namespace svxform
 
     //=
 
-    typedef ::cppu::WeakComponentImplHelper2<   ::com::sun::star::frame::XDispatchProviderInterceptor
+    typedef ::cppu::WeakComponentImplHelper<   ::com::sun::star::frame::XDispatchProviderInterceptor
                                             ,   ::com::sun::star::lang::XEventListener
                                             >   DispatchInterceptionMultiplexer_BASE;
 
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index 8c860e4a0a38..a040bb758edb 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -24,14 +24,14 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/form/runtime/XFormOperations.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 
 
 namespace svx
 {
 
-    typedef ::cppu::WeakImplHelper1 <   ::com::sun::star::frame::XDispatch
+    typedef ::cppu::WeakImplHelper <   ::com::sun::star::frame::XDispatch
                                     >   OSingleFeatureDispatcher_Base;
 
     class OSingleFeatureDispatcher : public OSingleFeatureDispatcher_Base
diff --git a/svx/source/inc/svxpixelctlaccessiblecontext.hxx b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
index c67ad532714d..616078284473 100644
--- a/svx/source/inc/svxpixelctlaccessiblecontext.hxx
+++ b/svx/source/inc/svxpixelctlaccessiblecontext.hxx
@@ -37,10 +37,8 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/compbase6.hxx>
-#include <cppuhelper/compbase7.hxx>
 #include <cppuhelper/compbase5.hxx>
 #include <comphelper/broadcasthelper.hxx>
-#include <cppuhelper/implbase6.hxx>
 #include <comphelper/servicehelper.hxx>
 
 #include <svx/rectenum.hxx>
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 6f9407d88835..f22fe12e3649 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -42,8 +42,6 @@
 #include <cppuhelper/compbase6.hxx>
 #include <cppuhelper/compbase7.hxx>
 #include <comphelper/broadcasthelper.hxx>
-#include <cppuhelper/implbase6.hxx>
-#include <cppuhelper/implbase7.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <svx/rectenum.hxx>
 #include <vcl/vclptr.hxx>
diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx
index 3ef6205f23bd..254572ff5b5d 100644
--- a/svx/source/inc/unogalthemeprovider.hxx
+++ b/svx/source/inc/unogalthemeprovider.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SVX_SOURCE_INC_UNOGALTHEMEPROVIDER_HXX
 #define INCLUDED_SVX_SOURCE_INC_UNOGALTHEMEPROVIDER_HXX
 
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/gallery/XGalleryThemeProvider.hpp>
@@ -29,7 +29,7 @@ class Gallery;
 
 namespace {
 
-class GalleryThemeProvider : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XInitialization,
+class GalleryThemeProvider : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XInitialization,
                                                              ::com::sun::star::gallery::XGalleryThemeProvider,
                                                              ::com::sun::star::lang::XServiceInfo >
 {
diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
index 8479eeb23bae..9f00a32a829a 100644
--- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
+++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx
@@ -49,7 +49,7 @@
 #include <osl/mutex.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/scopeguard.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -494,7 +494,7 @@ namespace sdr { namespace contact {
 
     //= ViewObjectContactOfUnoControl_Impl
 
-    typedef     ::cppu::WeakImplHelper4 <   XWindowListener
+    typedef     ::cppu::WeakImplHelper <   XWindowListener
                                         ,   XPropertyChangeListener
                                         ,   XContainerListener
                                         ,   XModeChangeListener
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
index 590759bd7568..df89146cf949 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx
@@ -32,7 +32,6 @@
 #include <framework/sfxhelperfunctions.hxx>
 #include <framework/imageproducer.hxx>
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
 
 #include <com/sun/star/frame/XStatusListener.hpp>
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 83f24b352a29..f9d2811c3ac2 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -60,7 +60,7 @@
 #include <sot/formats.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <svtools/transfer.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <svl/solar.hrc>
 #include <svl/urihelper.hxx>
@@ -102,7 +102,7 @@ static uno::Reference < beans::XPropertySet > lcl_getFrame_throw(const SdrOle2Ob
     return xFrame;
 }
 
-class SdrLightEmbeddedClient_Impl : public ::cppu::WeakImplHelper5
+class SdrLightEmbeddedClient_Impl : public ::cppu::WeakImplHelper
                                                             < embed::XStateChangeListener
                                                             , document::XEventListener
                                                             , embed::XInplaceClient
diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx
index e7ce02ae2997..b3d227bd8d38 100644
--- a/svx/source/svdraw/svdouno.cxx
+++ b/svx/source/svdraw/svdouno.cxx
@@ -62,10 +62,10 @@ using namespace sdr::contact;
 
 #include <com/sun/star/lang/XEventListener.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
-class SdrControlEventListenerImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener >
+class SdrControlEventListenerImpl : public ::cppu::WeakImplHelper< ::com::sun::star::lang::XEventListener >
 {
 protected:
     SdrUnoObj*                  pObj;
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index dca0e54d79cc..b7497fcf71c0 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -34,7 +34,7 @@
 #include <svx/AccessibleShapeTreeInfo.hxx>
 #include <AccessibleTableShape.hxx>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "cell.hxx"
 
@@ -46,7 +46,7 @@ namespace accessibility
 
 class AccessibleShapeTreeInfo;
 
-typedef ::cppu::ImplInheritanceHelper1< AccessibleContextBase, ::com::sun::star::accessibility::XAccessibleExtendedComponent > AccessibleCellBase;
+typedef ::cppu::ImplInheritanceHelper< AccessibleContextBase, ::com::sun::star::accessibility::XAccessibleExtendedComponent > AccessibleCellBase;
 
 class AccessibleCell : boost::noncopyable, public AccessibleCellBase, public AccessibleComponentBase, public IAccessibleViewForwarderListener
 {
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 8524cf631294..f6838780233d 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -32,7 +32,7 @@
 
 #include <algorithm>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svx/svdotable.hxx>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 
@@ -61,7 +61,7 @@ struct hash
 
 typedef std::unordered_map< Reference< XCell >, rtl::Reference< AccessibleCell >, hash > AccessibleCellMap;
 
-class AccessibleTableShapeImpl : public cppu::WeakImplHelper1< XModifyListener >
+class AccessibleTableShapeImpl : public cppu::WeakImplHelper< XModifyListener >
 {
 public:
     explicit AccessibleTableShapeImpl( AccessibleShapeTreeInfo& rShapeTreeInfo );
diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx
index dc0b5e482a70..8760a170b335 100644
--- a/svx/source/table/cellcursor.hxx
+++ b/svx/source/table/cellcursor.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/table/XMergeableCellRange.hpp>
 #include <com/sun/star/table/XCellCursor.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "cellrange.hxx"
 
 
@@ -31,7 +31,7 @@ namespace sdr { namespace table {
 
 struct CellPos;
 
-typedef ::cppu::ImplInheritanceHelper2< CellRange, ::com::sun::star::table::XCellCursor, ::com::sun::star::table::XMergeableCellRange > CellCursorBase;
+typedef ::cppu::ImplInheritanceHelper< CellRange, ::com::sun::star::table::XCellCursor, ::com::sun::star::table::XMergeableCellRange > CellCursorBase;
 
 class CellCursor : public CellCursorBase
 {
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index edf53c8ea555..2cbdc10a7e99 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -56,7 +56,7 @@
 #include "svx/xflhtit.hxx"
 #include "svx/xflftrit.hxx"
 #include "svx/xfltrit.hxx"
-
+#include <cppuhelper/implbase.hxx>
 
 
 using ::com::sun::star::uno::Any;
@@ -195,7 +195,7 @@ bool TableStyleSettings::operator==( const TableStyleSettings& rStyle ) const
 
 
 
-class SdrTableObjImpl : public TableDesignUser, public ::cppu::WeakImplHelper1< ::com::sun::star::util::XModifyListener >
+class SdrTableObjImpl : public TableDesignUser, public ::cppu::WeakImplHelper< ::com::sun::star::util::XModifyListener >
 {
 public:
     CellRef mxActiveCell;
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index 580f19165923..8b7599c40121 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "propertyset.hxx"
 #include "tablemodel.hxx"
@@ -31,7 +31,7 @@
 
 namespace sdr { namespace table {
 
-typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableColumnBase;
+typedef ::cppu::ImplInheritanceHelper< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableColumnBase;
 
 class TableColumn : public TableColumnBase
 {
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 1c4cfcd751d0..149d0dbc21e4 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -70,6 +70,7 @@
 #include <memory>
 #include <o3tl/enumarray.hxx>
 #include <o3tl/enumrange.hxx>
+#include <cppuhelper/implbase.hxx>
 
 using ::editeng::SvxBorderLine;
 using namespace sdr::table;
@@ -83,7 +84,7 @@ using namespace ::com::sun::star::style;
 
 namespace sdr { namespace table {
 
-class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XModifyListener >
+class SvxTableControllerModifyListener : public ::cppu::WeakImplHelper< ::com::sun::star::util::XModifyListener >
 {
 public:
     explicit SvxTableControllerModifyListener( SvxTableController* pController )
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index 6480c729229f..8e1849570b6d 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -32,8 +32,8 @@
 #include <vcl/svapp.hxx>
 
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase6.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/supportsservice.hxx>
 
@@ -66,7 +66,7 @@ namespace sdr { namespace table {
 
 typedef std::map< OUString, sal_Int32 > CellStyleNameMap;
 
-typedef ::cppu::WeakComponentImplHelper6< XStyle, XNameReplace, XServiceInfo, XIndexAccess, XModifyBroadcaster, XModifyListener > TableDesignStyleBase;
+typedef ::cppu::WeakComponentImplHelper< XStyle, XNameReplace, XServiceInfo, XIndexAccess, XModifyBroadcaster, XModifyListener > TableDesignStyleBase;
 
 class TableDesignStyle : private ::cppu::BaseMutex, public TableDesignStyleBase
 {
@@ -125,7 +125,7 @@ public:
 
 typedef std::vector< Reference< XStyle > > TableDesignStyleVector;
 
-class TableDesignFamily : public ::cppu::WeakImplHelper7< XNameContainer, XNamed, XIndexAccess, XSingleServiceFactory,  XServiceInfo, XComponent, XPropertySet >
+class TableDesignFamily : public ::cppu::WeakImplHelper< XNameContainer, XNamed, XIndexAccess, XSingleServiceFactory,  XServiceInfo, XComponent, XPropertySet >
 {
 public:
     // XServiceInfo
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index 80fc4ce8a7b4..a39856445fad 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/table/XTable.hpp>
 #include <basegfx/range/b2irectangle.hxx>
 #include <basegfx/tuple/b2ituple.hxx>
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/listenernotification.hxx>
 #include "celltypes.hxx"
@@ -50,7 +50,7 @@ protected:
     ~ICellRange() {}
 };
 
-typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::table::XTable, ::com::sun::star::util::XBroadcaster > TableModelBase;
+typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::table::XTable, ::com::sun::star::util::XBroadcaster > TableModelBase;
 
 class TableModel : public ::comphelper::OBaseMutex,
                    public TableModelBase,
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index 46198861818e..f0b742b0f280 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "propertyset.hxx"
 #include "tablemodel.hxx"
@@ -31,7 +31,7 @@
 
 namespace sdr { namespace table {
 
-typedef ::cppu::ImplInheritanceHelper2< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableRowBase;
+typedef ::cppu::ImplInheritanceHelper< FastPropertySet, ::com::sun::star::table::XCellRange, ::com::sun::star::container::XNamed > TableRowBase;
 
 class TableRow : public TableRowBase
 {
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index 5f0cbdcac71c..2dc0e30a4657 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <vcl/vclptr.hxx>
 
 
@@ -59,7 +59,7 @@ The dialog gets this information from the registry on execute and writes it back
 
 class ChineseTranslationDialog;
 
-class ChineseTranslation_UnoDialog : public ::cppu::WeakImplHelper5 <
+class ChineseTranslation_UnoDialog : public ::cppu::WeakImplHelper <
                               ::com::sun::star::ui::dialogs::XExecutableDialog
                             , ::com::sun::star::lang::XInitialization
                             , ::com::sun::star::beans::XPropertySet
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 52ccf4995eef..f77c801f626e 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -38,7 +38,7 @@
 #include <framework/interaction.hxx>
 #include <com/sun/star/drawing/GraphicFilterRequest.hpp>
 #include <com/sun/star/util/URL.hpp>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 #include <vcl/metaact.hxx>
@@ -138,7 +138,7 @@ namespace {
 
         @implements com.sun.star.drawing.GraphicExportFilter
     */
-    class GraphicExporter : public WeakImplHelper2< XGraphicExportFilter, XServiceInfo >
+    class GraphicExporter : public WeakImplHelper< XGraphicExportFilter, XServiceInfo >
     {
     public:
         GraphicExporter();
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index ff97a04957b5..11ec9917a472 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <vector>
 #include <svl/lstner.hxx>
@@ -36,7 +36,7 @@ class SfxItemPool;
 class SfxItemSet;
 
 typedef std::vector< SfxItemSet* > ItemPoolVector;
-class SvxUnoNameItemTable : public cppu::WeakImplHelper2< com::sun::star::container::XNameContainer, com::sun::star::lang::XServiceInfo >,
+class SvxUnoNameItemTable : public cppu::WeakImplHelper< com::sun::star::container::XNameContainer, com::sun::star::lang::XServiceInfo >,
                             public SfxListener
 {
 private:
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index f8f0d41396de..2da6f8661418 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/diagnose.h>
 #include <osl/mutex.hxx>
@@ -46,7 +46,7 @@ namespace svx
     /** implements a component to export namespaces of all SvXMLAttrContainerItem inside
         one or two pools with a variable count of which ids.
     */
-    class NamespaceMap : public WeakImplHelper2< XNameAccess, XServiceInfo >
+    class NamespaceMap : public WeakImplHelper< XNameAccess, XServiceInfo >
     {
     private:
         sal_uInt16* mpWhichIds;
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index cda985d819ce..2cf5597a02c6 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -28,7 +28,7 @@
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <svx/xdef.hxx>
 
@@ -40,7 +40,7 @@
 using namespace com::sun::star;
 using namespace ::cppu;
 
-class SvxUnoXPropertyTable : public WeakImplHelper2< container::XNameContainer, lang::XServiceInfo >
+class SvxUnoXPropertyTable : public WeakImplHelper< container::XNameContainer, lang::XServiceInfo >
 {
 private:
     XPropertyList*  mpList;
diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx
index f2c156bbd608..c10eab8f3a5d 100644
--- a/svx/source/unodraw/gluepts.cxx
+++ b/svx/source/unodraw/gluepts.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/drawing/GluePoint2.hpp>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <svx/svdmodel.hxx>
 #include <svx/svdobj.hxx>
@@ -35,7 +35,7 @@ using namespace ::cppu;
 
 const sal_uInt16 NON_USER_DEFINED_GLUE_POINTS = 4;
 
-class SvxUnoGluePointAccess : public WeakImplHelper2< container::XIndexContainer, container::XIdentifierContainer >
+class SvxUnoGluePointAccess : public WeakImplHelper< container::XIndexContainer, container::XIdentifierContainer >
 {
 private:
     SdrObjectWeakRef    mpObject;
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index b7a702c196c3..7993b9309a5f 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/frame/XSynchronousDispatch.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/file.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/ref.hxx>
@@ -44,7 +44,7 @@ using namespace ::osl;
 
 namespace {
 
-class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo        ,
+class RecoveryUI : public ::cppu::WeakImplHelper< css::lang::XServiceInfo        ,
                                                    css::frame::XSynchronousDispatch > // => XDispatch!
 {
 
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index 5a4136d0dcd5..5acf6ba1b6f0 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <rtl/ref.hxx>
 #include <svx/xtable.hxx>
@@ -30,7 +30,7 @@ using namespace ::com::sun::star;
 
 namespace {
 
-class SvxUnoColorTable : public cppu::WeakImplHelper2< container::XNameContainer, lang::XServiceInfo >
+class SvxUnoColorTable : public cppu::WeakImplHelper< container::XNameContainer, lang::XServiceInfo >
 {
 private:
     XColorListRef pList;
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 38ecbace9dea..6b6ac206d117 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -28,7 +28,7 @@
 #include <comphelper/servicehelper.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svx/unofill.hxx>
 #include <editeng/unonrule.hxx>
 #include <svtools/unoimap.hxx>
@@ -66,7 +66,7 @@ using namespace ::com::sun::star;
 
 //-
 
-class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper2< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo >
+class SvxUnoDrawPagesAccess : public ::cppu::WeakImplHelper< ::com::sun::star::drawing::XDrawPages, ::com::sun::star::lang::XServiceInfo >
 {
 private:
     SvxUnoDrawingModel& mrModel;
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index d12392b7f578..456c36184522 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <svl/style.hxx>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <svl/itempool.hxx>
 #include <svl/itemset.hxx>
@@ -49,7 +49,7 @@ using namespace ::cppu;
 
 typedef std::vector< SfxItemSet* > ItemPoolVector;
 
-class SvxUnoMarkerTable : public WeakImplHelper2< container::XNameContainer, lang::XServiceInfo >,
+class SvxUnoMarkerTable : public WeakImplHelper< container::XNameContainer, lang::XServiceInfo >,
                           public SfxListener
 {
 private:
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index f09222c564d3..de6bb825ad06 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -22,7 +22,7 @@
 
 #include <list>
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/gallery/XGalleryTheme.hpp>
@@ -38,7 +38,7 @@ namespace unogallery {
 // - GalleryTheme -
 
 
-class GalleryTheme : public ::cppu::WeakImplHelper2<
+class GalleryTheme : public ::cppu::WeakImplHelper<
                                                         ::com::sun::star::gallery::XGalleryTheme,
                                                         ::com::sun::star::lang::XServiceInfo >,
                      public SfxListener
diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx
index 3d699240dc9f..b3a726da01b3 100644
--- a/svx/source/xml/xmleohlp.cxx
+++ b/svx/source/xml/xmleohlp.cxx
@@ -43,6 +43,7 @@
 #include <comphelper/embeddedobjectcontainer.hxx>
 
 #include <comphelper/classids.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <map>
 #include "svx/xmleohlp.hxx"
 #include <boost/scoped_ptr.hpp>
@@ -64,7 +65,7 @@ using namespace ::com::sun::star::lang;
 
 
 
-class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper1<XOutputStream>
+class OutputStorageWrapper_Impl : public ::cppu::WeakImplHelper<XOutputStream>
 {
     ::osl::Mutex    maMutex;
     Reference < XOutputStream > xOut;
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 74573fb5eeab..9268b9d61ac5 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -28,7 +28,8 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <rtl/ref.hxx>
@@ -73,7 +74,7 @@ const MetaCommentAction* ImplCheckForEPS( GDIMetaFile& rMtf )
 }
 
 class SvXMLGraphicInputStream:
-    public cppu::WeakImplHelper1<XInputStream>, private boost::noncopyable
+    public cppu::WeakImplHelper<XInputStream>, private boost::noncopyable
 {
 private:
 
@@ -199,7 +200,7 @@ void SAL_CALL SvXMLGraphicInputStream::closeInput() throw( NotConnectedException
 }
 
 class SvXMLGraphicOutputStream:
-    public cppu::WeakImplHelper1<XOutputStream>, private boost::noncopyable
+    public cppu::WeakImplHelper<XOutputStream>, private boost::noncopyable
 {
 private:
 
@@ -895,7 +896,7 @@ namespace {
 
 namespace impl
 {
-typedef ::cppu::WeakComponentImplHelper4<
+typedef ::cppu::WeakComponentImplHelper<
         lang::XInitialization,
         document::XGraphicObjectResolver,
         document::XBinaryStreamResolver,