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

with the variadic variants.

Change-Id: I2f55a6231e903b0ca198cee3a88023ad1db6c50c
Reviewed-on: https://gerrit.libreoffice.org/18072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

64 files changed, 96 insertions, 109 deletions

diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx
index 31e205e56ca4..5de9a78fd3d3 100644
--- a/sc/source/ui/docshell/macromgr.cxx
+++ b/sc/source/ui/docshell/macromgr.cxx
@@ -21,7 +21,7 @@
 #include "document.hxx"
 
 #include <basic/basmgr.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/diagnose.h>
 #include <sfx2/objsh.hxx>
 #include "formulacell.hxx"
@@ -99,7 +99,7 @@ ScMacroManager::~ScMacroManager()
 {
 }
 
-typedef ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > ContainerListenerHelper;
+typedef ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener > ContainerListenerHelper;
 
 class VBAProjectListener : public ContainerListenerHelper
 {
diff --git a/sc/source/ui/inc/ChartRangeSelectionListener.hxx b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
index 15a67597c176..7760af0aee9b 100644
--- a/sc/source/ui/inc/ChartRangeSelectionListener.hxx
+++ b/sc/source/ui/inc/ChartRangeSelectionListener.hxx
@@ -19,14 +19,14 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_CHARTRANGESELECTIONLISTENER_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_CHARTRANGESELECTIONLISTENER_HXX
 
-#include <cppuhelper/compbase2.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/broadcasthelper.hxx>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 class ScTabViewShell;
 
-typedef ::cppu::WeakComponentImplHelper2<
+typedef ::cppu::WeakComponentImplHelper<
         ::com::sun::star::view::XSelectionChangeListener,
         ::com::sun::star::lang::XServiceInfo >
     ScChartRangeSelectionListener_Base;
diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx
index 847dff59fa4a..c16e0b5bf717 100644
--- a/sc/source/ui/inc/DrawModelBroadcaster.hxx
+++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx
@@ -22,13 +22,13 @@
 
 #include <svl/lstner.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/document/XEventBroadcaster.hpp>
 
 class SdrModel;
 
 class ScDrawModelBroadcaster : public SfxListener,
-    public ::cppu::WeakImplHelper1< com::sun::star::document::XEventBroadcaster >
+    public ::cppu::WeakImplHelper< com::sun::star::document::XEventBroadcaster >
 {
     mutable ::osl::Mutex maListenerMutex;
     ::cppu::OInterfaceContainerHelper maEventListeners;
diff --git a/sc/source/ui/inc/condformatuno.hxx b/sc/source/ui/inc/condformatuno.hxx
index 40f4c78b0370..848eff35fa3f 100644
--- a/sc/source/ui/inc/condformatuno.hxx
+++ b/sc/source/ui/inc/condformatuno.hxx
@@ -20,8 +20,7 @@
 #include <com/sun/star/sheet/XDataBarEntry.hpp>
 #include <com/sun/star/sheet/XIconSetEntry.hpp>
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/itemprop.hxx>
 #include <svl/lstner.hxx>
 #include <rtl/ref.hxx>
@@ -49,7 +48,7 @@ class XSheetCellRanges;
 
 } } }
 
-class ScCondFormatsObj : public cppu::WeakImplHelper1<com::sun::star::sheet::XConditionalFormats>,
+class ScCondFormatsObj : public cppu::WeakImplHelper<com::sun::star::sheet::XConditionalFormats>,
                             public SfxListener
 {
 public:
@@ -82,7 +81,7 @@ private:
     ScDocShell* mpDocShell;
 };
 
-class ScCondFormatObj : public cppu::WeakImplHelper2<com::sun::star::sheet::XConditionalFormat,
+class ScCondFormatObj : public cppu::WeakImplHelper<com::sun::star::sheet::XConditionalFormat,
                             com::sun::star::beans::XPropertySet>
 {
 public:
@@ -168,7 +167,7 @@ private:
     sal_Int32 mnKey;
 };
 
-class ScConditionEntryObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet,
+class ScConditionEntryObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet,
                                 com::sun::star::sheet::XConditionEntry>
 {
 public:
@@ -231,7 +230,7 @@ private:
     const ScCondFormatEntry* mpFormat;
 };
 
-class ScColorScaleFormatObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet,
+class ScColorScaleFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet,
                                 com::sun::star::sheet::XConditionEntry>
 {
 public:
@@ -293,7 +292,7 @@ private:
     const ScColorScaleFormat* mpFormat;
 };
 
-class ScColorScaleEntryObj : public cppu::WeakImplHelper1<com::sun::star::sheet::XColorScaleEntry>
+class ScColorScaleEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XColorScaleEntry>
 {
 public:
     ScColorScaleEntryObj(rtl::Reference<ScColorScaleFormatObj> xParent, size_t nPos);
@@ -325,7 +324,7 @@ private:
     size_t mnPos;
 };
 
-class ScDataBarFormatObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet,
+class ScDataBarFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet,
                                 com::sun::star::sheet::XConditionEntry>
 {
 public:
@@ -386,7 +385,7 @@ private:
     const ScDataBarFormat* mpFormat;
 };
 
-class ScDataBarEntryObj : public cppu::WeakImplHelper1<com::sun::star::sheet::XDataBarEntry>
+class ScDataBarEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XDataBarEntry>
 {
 public:
     ScDataBarEntryObj(rtl::Reference<ScDataBarFormatObj> xParent, size_t nPos);
@@ -412,7 +411,7 @@ private:
     size_t mnPos;
 };
 
-class ScIconSetFormatObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet,
+class ScIconSetFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet,
                                 com::sun::star::sheet::XConditionEntry>
 {
 public:
@@ -473,7 +472,7 @@ private:
     const ScIconSetFormat* mpFormat;
 };
 
-class ScIconSetEntryObj : public cppu::WeakImplHelper1<com::sun::star::sheet::XIconSetEntry>
+class ScIconSetEntryObj : public cppu::WeakImplHelper<com::sun::star::sheet::XIconSetEntry>
 {
 public:
     ScIconSetEntryObj(rtl::Reference<ScIconSetFormatObj> xParent, size_t nPos);
@@ -499,7 +498,7 @@ private:
     size_t mnPos;
 };
 
-class ScCondDateFormatObj : public cppu::WeakImplHelper2<com::sun::star::beans::XPropertySet,
+class ScCondDateFormatObj : public cppu::WeakImplHelper<com::sun::star::beans::XPropertySet,
                                 com::sun::star::sheet::XConditionEntry>
 {
 public:
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index ce1d3125e144..5d6b5b87d1bb 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -36,7 +36,6 @@
 #include "docuno.hxx"
 
 #include <boost/scoped_ptr.hpp>
-#include <cppuhelper/implbase1.hxx>
 #include <config_telepathy.h>
 #include <unordered_map>
 
diff --git a/sc/source/ui/unoobj/exceldetect.hxx b/sc/source/ui/unoobj/exceldetect.hxx
index 9b70ea31e846..68095b6b48d2 100644
--- a/sc/source/ui/unoobj/exceldetect.hxx
+++ b/sc/source/ui/unoobj/exceldetect.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_UNOOBJ_EXCELDETECT_HXX
 #define INCLUDED_SC_SOURCE_UI_UNOOBJ_EXCELDETECT_HXX
 
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/document/XExtendedFilterDetection.hpp>
@@ -19,7 +19,7 @@ namespace com { namespace sun { namespace star { namespace uno {
     class XComponentContext;
 }}}}
 
-class ScExcelBiffDetect : public cppu::WeakImplHelper2<com::sun::star::document::XExtendedFilterDetection, com::sun::star::lang::XServiceInfo>
+class ScExcelBiffDetect : public cppu::WeakImplHelper<com::sun::star::document::XExtendedFilterDetection, com::sun::star::lang::XServiceInfo>
 {
 public:
     ScExcelBiffDetect( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext );
diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx
index 2aae88cfe6e1..ce80be7ccf31 100644
--- a/sc/source/ui/unoobj/scdetect.hxx
+++ b/sc/source/ui/unoobj/scdetect.hxx
@@ -23,7 +23,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>
@@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star {
     namespace beans { struct PropertyValue; }
 }}}
 
-class ScFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
+class ScFilterDetect : public ::cppu::WeakImplHelper< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
 {
 public:
     ScFilterDetect( const com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext>& xContext );
diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx
index 68913f657749..9098457281ae 100644
--- a/sc/source/ui/unoobj/servuno.cxx
+++ b/sc/source/ui/unoobj/servuno.cxx
@@ -63,6 +63,7 @@
 #include <sfx2/app.hxx>
 
 #include <cppuhelper/component_context.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
 using namespace ::com::sun::star;
@@ -76,7 +77,7 @@ bool isInVBAMode( ScDocShell& rDocSh )
     return false;
 }
 
-class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper1< container::XNameAccess >
+class ScVbaObjectForCodeNameProvider : public ::cppu::WeakImplHelper< container::XNameAccess >
 {
     uno::Any maWorkbook;
     uno::Any maCachedObject;
@@ -165,7 +166,7 @@ public:
 
 };
 
-class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper1< document::XCodeNameQuery >
+class ScVbaCodeNameProvider : public ::cppu::WeakImplHelper< document::XCodeNameQuery >
 {
     ScDocShell& mrDocShell;
 public:
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 177cfc7d31f1..ed20b5b793a3 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -28,7 +28,7 @@
 #include <editeng/unofield.hxx>
 #include <svx/shapepropertynotifier.hxx>
 #include <toolkit/helper/convert.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
 #include <com/sun/star/drawing/XShape.hpp>
@@ -1361,7 +1361,7 @@ SdrObject* ScShapeObj::GetSdrObject() const throw()
 #define SC_EVENTACC_SCRIPT      "Script"
 #define SC_EVENTACC_EVENTTYPE   "EventType"
 
-class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper1< container::XNameReplace >
+class ShapeUnoEventAccessImpl : public ::cppu::WeakImplHelper< container::XNameReplace >
 {
 private:
     ScShapeObj* mpShape;
diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx
index c70c9eef8640..d5fc99f72fd7 100644
--- a/sc/source/ui/vba/vbaapplication.hxx
+++ b/sc/source/ui/vba/vbaapplication.hxx
@@ -25,9 +25,9 @@
 
 #include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbaapplicationbase.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
-typedef cppu::ImplInheritanceHelper1< VbaApplicationBase, ov::excel::XApplication > ScVbaApplication_BASE;
+typedef cppu::ImplInheritanceHelper< VbaApplicationBase, ov::excel::XApplication > ScVbaApplication_BASE;
 
 struct ScVbaAppSettings;
 
diff --git a/sc/source/ui/vba/vbaassistant.hxx b/sc/source/ui/vba/vbaassistant.hxx
index 3ccbc2d7d202..dc6193763319 100644
--- a/sc/source/ui/vba/vbaassistant.hxx
+++ b/sc/source/ui/vba/vbaassistant.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAASSISTANT_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAASSISTANT_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/XAssistant.hpp>
 
 #include <sfx2/sfxhelp.hxx>
@@ -27,7 +27,7 @@
 #include "excelvbahelper.hxx"
 #include <vbahelper/vbahelperinterface.hxx>
 
-typedef ::cppu::WeakImplHelper1< ov::XAssistant > Assistant;
+typedef ::cppu::WeakImplHelper< ov::XAssistant > Assistant;
 typedef InheritedHelperInterfaceImpl< Assistant > ScVbaAssistantImpl_BASE;
 
 class ScVbaAssistant : public ScVbaAssistantImpl_BASE
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index 47020c181ddf..12ee55ce075f 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -20,6 +20,7 @@
 #include "vbaaxes.hxx"
 #include "vbaaxis.hxx"
 #include "vbachart.hxx"
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XlAxisType.hpp>
 #include <ooo/vba/excel/XlAxisGroup.hpp>
 #include <ooo/vba/excel/XAxis.hpp>
@@ -82,7 +83,7 @@ ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno:
 
 namespace {
 
-class AxisIndexWrapper : public ::cppu::WeakImplHelper1< container::XIndexAccess >
+class AxisIndexWrapper : public ::cppu::WeakImplHelper< container::XIndexAccess >
 {
     // if necessary for better performance we could change this into a map and cache the
     // indices -> Axis, currently we create a new Axis object
diff --git a/sc/source/ui/vba/vbaaxistitle.hxx b/sc/source/ui/vba/vbaaxistitle.hxx
index cfef6b78dea8..a42824d8717f 100644
--- a/sc/source/ui/vba/vbaaxistitle.hxx
+++ b/sc/source/ui/vba/vbaaxistitle.hxx
@@ -20,10 +20,10 @@
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAAXISTITLE_HXX
 
 #include "vbatitle.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XAxisTitle.hpp>
 
-typedef  TitleImpl< cppu::WeakImplHelper1< ov::excel::XAxisTitle > > AxisTitleBase;
+typedef  TitleImpl< cppu::WeakImplHelper< ov::excel::XAxisTitle > > AxisTitleBase;
 
 class ScVbaAxisTitle : public AxisTitleBase
 {
diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx
index 7ef2b922fd07..b540585d82a8 100644
--- a/sc/source/ui/vba/vbaborders.cxx
+++ b/sc/source/ui/vba/vbaborders.cxx
@@ -19,7 +19,7 @@
 #include "vbaborders.hxx"
 
 #include <sal/macros.h>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XlBordersIndex.hpp>
 #include <ooo/vba/excel/XlBorderWeight.hpp>
 #include <ooo/vba/excel/XlLineStyle.hpp>
@@ -34,7 +34,7 @@ using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 using namespace ::ooo::vba::excel;
 
-typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base;
+typedef ::cppu::WeakImplHelper<container::XIndexAccess > RangeBorders_Base;
 typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base;
 
 // #TODO sort these indexes to match the order in which Excel iterates over the
diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx
index fe8f7ed08fb2..2dfc77d59437 100644
--- a/sc/source/ui/vba/vbaborders.hxx
+++ b/sc/source/ui/vba/vbaborders.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBABORDERS_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBABORDERS_HXX
 
-#include <cppuhelper/implbase1.hxx>
 #include <ooo/vba/excel/XBorders.hpp>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx
index 7548a96a0afc..d91bd3f17d3a 100644
--- a/sc/source/ui/vba/vbacharacters.hxx
+++ b/sc/source/ui/vba/vbacharacters.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACHARACTERS_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBACHARACTERS_HXX
 
-#include <cppuhelper/implbase1.hxx>
-
 #include <ooo/vba/excel/XCharacters.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/text/XSimpleText.hpp>
diff --git a/sc/source/ui/vba/vbachart.hxx b/sc/source/ui/vba/vbachart.hxx
index 02b79e909a0d..34cfb47d9b89 100644
--- a/sc/source/ui/vba/vbachart.hxx
+++ b/sc/source/ui/vba/vbachart.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACHART_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBACHART_HXX
 
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/table/XTableChart.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
diff --git a/sc/source/ui/vba/vbachartobject.hxx b/sc/source/ui/vba/vbachartobject.hxx
index 01dd37728d67..cdf5cea902b2 100644
--- a/sc/source/ui/vba/vbachartobject.hxx
+++ b/sc/source/ui/vba/vbachartobject.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACHARTOBJECT_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBACHARTOBJECT_HXX
 
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/table/XTableChart.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
diff --git a/sc/source/ui/vba/vbachartobjects.hxx b/sc/source/ui/vba/vbachartobjects.hxx
index 810d6474a1a3..c3eaabf81d4c 100644
--- a/sc/source/ui/vba/vbachartobjects.hxx
+++ b/sc/source/ui/vba/vbachartobjects.hxx
@@ -22,7 +22,6 @@
 
 #include <ooo/vba/excel/XChartObjects.hpp>
 #include <ooo/vba/excel/XChartObject.hpp>
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/table/XTableCharts.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx
index 95bb635e985e..e1542ff63540 100644
--- a/sc/source/ui/vba/vbacharttitle.hxx
+++ b/sc/source/ui/vba/vbacharttitle.hxx
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACHARTTITLE_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBACHARTTITLE_HXX
 #include "vbatitle.hxx"
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XChartTitle.hpp>
 
-typedef TitleImpl< cppu::WeakImplHelper1< ov::excel::XChartTitle > > ChartTitleBase;
+typedef TitleImpl< cppu::WeakImplHelper< ov::excel::XChartTitle > > ChartTitleBase;
 
 class ScVbaChartTitle : public ChartTitleBase
 {
diff --git a/sc/source/ui/vba/vbacomment.hxx b/sc/source/ui/vba/vbacomment.hxx
index 9f41fb9cba8e..9f7e004b8c21 100644
--- a/sc/source/ui/vba/vbacomment.hxx
+++ b/sc/source/ui/vba/vbacomment.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACOMMENT_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBACOMMENT_HXX
 
-#include <cppuhelper/implbase1.hxx>
-
 #include <ooo/vba/excel/XComment.hpp>
 #include <ooo/vba/excel/XApplication.hpp>
 #include <ooo/vba/msforms/XShape.hpp>
diff --git a/sc/source/ui/vba/vbacomments.hxx b/sc/source/ui/vba/vbacomments.hxx
index 08b5d60fd050..3255dffc6413 100644
--- a/sc/source/ui/vba/vbacomments.hxx
+++ b/sc/source/ui/vba/vbacomments.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBACOMMENTS_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBACOMMENTS_HXX
 
-#include <cppuhelper/implbase1.hxx>
-
 #include <ooo/vba/excel/XComments.hpp>
 
 #include "excelvbahelper.hxx"
diff --git a/sc/source/ui/vba/vbadialog.hxx b/sc/source/ui/vba/vbadialog.hxx
index 9564ef3024e6..a249803c23e1 100644
--- a/sc/source/ui/vba/vbadialog.hxx
+++ b/sc/source/ui/vba/vbadialog.hxx
@@ -19,12 +19,12 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBADIALOG_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBADIALOG_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XDialog.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbadialogbase.hxx>
 
-typedef cppu::ImplInheritanceHelper1< VbaDialogBase, ov::excel::XDialog > ScVbaDialog_BASE;
+typedef cppu::ImplInheritanceHelper< VbaDialogBase, ov::excel::XDialog > ScVbaDialog_BASE;
 
 class ScVbaDialog : public ScVbaDialog_BASE
 {
diff --git a/sc/source/ui/vba/vbadialogs.hxx b/sc/source/ui/vba/vbadialogs.hxx
index 06ae7c468c61..985dd5c7a501 100644
--- a/sc/source/ui/vba/vbadialogs.hxx
+++ b/sc/source/ui/vba/vbadialogs.hxx
@@ -24,9 +24,9 @@
 #include <ooo/vba/XCollection.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbadialogsbase.hxx>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
-typedef cppu::ImplInheritanceHelper1< VbaDialogsBase, ov::excel::XDialogs > ScVbaDialogs_BASE;
+typedef cppu::ImplInheritanceHelper< VbaDialogsBase, ov::excel::XDialogs > ScVbaDialogs_BASE;
 
 class ScVbaDialogs : public ScVbaDialogs_BASE
 {
diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx
index d49cc688eed9..a083c2252dd3 100644
--- a/sc/source/ui/vba/vbaeventshelper.cxx
+++ b/sc/source/ui/vba/vbaeventshelper.cxx
@@ -32,7 +32,7 @@
 #include <com/sun/star/util/XChangesListener.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
 
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <unotools/eventcfg.hxx>
 #include <vcl/svapp.hxx>
@@ -108,7 +108,7 @@ uno::Reference< awt::XWindow > lclGetWindowForController( const uno::Reference<
 } // namespace
 
 // This class is to process Workbook window related event
-class ScVbaEventListener : public ::cppu::WeakImplHelper4< awt::XTopWindowListener,
+class ScVbaEventListener : public ::cppu::WeakImplHelper< awt::XTopWindowListener,
                                                            awt::XWindowListener,
                                                            frame::XBorderResizeListener,
                                                            util::XChangesListener >
diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx
index b87a11571e09..fd6274b60eda 100644
--- a/sc/source/ui/vba/vbafont.hxx
+++ b/sc/source/ui/vba/vbafont.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAFONT_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAFONT_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <ooo/vba/excel/XFont.hpp>
@@ -29,7 +29,7 @@
 
 class ScCellRangeObj;
 
-typedef cppu::ImplInheritanceHelper1< VbaFontBase, ov::excel::XFont > ScVbaFont_BASE;
+typedef cppu::ImplInheritanceHelper< VbaFontBase, ov::excel::XFont > ScVbaFont_BASE;
 
 class ScVbaFont : public ScVbaFont_BASE
 {
diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx
index 12b552a8519e..fc31ffb31150 100644
--- a/sc/source/ui/vba/vbaglobals.hxx
+++ b/sc/source/ui/vba/vbaglobals.hxx
@@ -25,14 +25,14 @@
 #include <ooo/vba/excel/XGlobals.hpp>
 #include <ooo/vba/excel/XApplication.hpp>
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "excelvbahelper.hxx"
 
 #include <vbahelper/vbaglobalbase.hxx>
 
     // class ScVbaGlobals
 
-typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE;
+typedef ::cppu::ImplInheritanceHelper< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE;
 
     class ScVbaGlobals : public ScVbaGlobals_BASE
     {
diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx
index 6cf6ec14a9cb..b3e80e0ca8c5 100644
--- a/sc/source/ui/vba/vbahyperlinks.cxx
+++ b/sc/source/ui/vba/vbahyperlinks.cxx
@@ -20,6 +20,7 @@
 #include "vbahyperlinks.hxx"
 #include <algorithm>
 #include <vector>
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/office/MsoHyperlinkType.hpp>
 #include "rangelst.hxx"
 #include "vbahyperlink.hxx"
@@ -100,7 +101,7 @@ bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >&
 
 namespace detail {
 
-class ScVbaHlinkContainer : public ::cppu::WeakImplHelper1< container::XIndexAccess >
+class ScVbaHlinkContainer : public ::cppu::WeakImplHelper< container::XIndexAccess >
 {
 public:
     explicit ScVbaHlinkContainer() throw (uno::RuntimeException);
diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx
index aa289f22c39c..a30c17317db7 100644
--- a/sc/source/ui/vba/vbamenubars.cxx
+++ b/sc/source/ui/vba/vbamenubars.cxx
@@ -8,12 +8,13 @@
  */
 #include "vbamenubars.hxx"
 #include "vbamenubar.hxx"
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XlSheetType.hpp>
 
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-class MenuBarEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
+class MenuBarEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration >
 {
     uno::Reference< XHelperInterface > m_xParent;
     uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/sc/source/ui/vba/vbamenubars.hxx b/sc/source/ui/vba/vbamenubars.hxx
index 331476438486..b714920b43d9 100644
--- a/sc/source/ui/vba/vbamenubars.hxx
+++ b/sc/source/ui/vba/vbamenubars.hxx
@@ -13,7 +13,6 @@
 #include <ooo/vba/excel/XMenuBar.hpp>
 #include <ooo/vba/XCommandBars.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <cppuhelper/implbase1.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbacollectionimpl.hxx>
 
diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx
index 2d6c20a1e572..4ef5b911a332 100644
--- a/sc/source/ui/vba/vbamenuitems.cxx
+++ b/sc/source/ui/vba/vbamenuitems.cxx
@@ -9,12 +9,13 @@
 #include "vbamenuitems.hxx"
 #include "vbamenuitem.hxx"
 #include "vbamenu.hxx"
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/office/MsoControlType.hpp>
 
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< container::XEnumeration > MenuEnumeration_BASE;
 
 class MenuEnumeration : public MenuEnumeration_BASE
 {
diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx
index 16068af9fcba..0960970e0c9f 100644
--- a/sc/source/ui/vba/vbamenus.cxx
+++ b/sc/source/ui/vba/vbamenus.cxx
@@ -8,12 +8,13 @@
  */
 #include "vbamenus.hxx"
 #include "vbamenu.hxx"
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/office/MsoControlType.hpp>
 
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< container::XEnumeration > MenuEnumeration_BASE;
 
 class MenuEnumeration : public MenuEnumeration_BASE
 {
diff --git a/sc/source/ui/vba/vbaoleobject.hxx b/sc/source/ui/vba/vbaoleobject.hxx
index c97bdcda4126..aa02152bdf69 100644
--- a/sc/source/ui/vba/vbaoleobject.hxx
+++ b/sc/source/ui/vba/vbaoleobject.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECT_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECT_HXX
 
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <ooo/vba/excel/XOLEObject.hpp>
 #include <ooo/vba/msforms/XControl.hpp>
diff --git a/sc/source/ui/vba/vbaoleobjects.cxx b/sc/source/ui/vba/vbaoleobjects.cxx
index 426dc12e5bff..efa8038e142e 100644
--- a/sc/source/ui/vba/vbaoleobjects.cxx
+++ b/sc/source/ui/vba/vbaoleobjects.cxx
@@ -24,11 +24,12 @@
 
 #include "vbaoleobject.hxx"
 #include "vbaoleobjects.hxx"
+#include <cppuhelper/implbase.hxx>
 
 using namespace com::sun::star;
 using namespace ooo::vba;
 
-typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess > XIndexAccess_BASE;
 
 namespace {
 
diff --git a/sc/source/ui/vba/vbaoleobjects.hxx b/sc/source/ui/vba/vbaoleobjects.hxx
index ea8634690a62..a0cfa9a3582d 100644
--- a/sc/source/ui/vba/vbaoleobjects.hxx
+++ b/sc/source/ui/vba/vbaoleobjects.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECTS_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAOLEOBJECTS_HXX
 
-#include <cppuhelper/implbase1.hxx>
 #include <ooo/vba/excel/XOLEObjects.hpp>
 
 #include <vbahelper/vbacollectionimpl.hxx>
diff --git a/sc/source/ui/vba/vbaoutline.hxx b/sc/source/ui/vba/vbaoutline.hxx
index f21008caf304..3e7201d5b36d 100644
--- a/sc/source/ui/vba/vbaoutline.hxx
+++ b/sc/source/ui/vba/vbaoutline.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAOUTLINE_HXX
 
 #include <com/sun/star/sheet/XSheetOutline.hpp>
-#include <cppuhelper/implbase1.hxx>
 #include <ooo/vba/excel/XOutline.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx
index e80c4acb98f9..31d4b45d922c 100644
--- a/sc/source/ui/vba/vbapagebreak.hxx
+++ b/sc/source/ui/vba/vbapagebreak.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPAGEBREAK_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAPAGEBREAK_HXX
 
-#include <cppuhelper/implbase1.hxx>
 #include <ooo/vba/excel/XPageBreak.hpp>
 #include <ooo/vba/excel/XHPageBreak.hpp>
 #include <ooo/vba/excel/XVPageBreak.hpp>
diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx
index dcab022f6c12..4f442d1c54fd 100644
--- a/sc/source/ui/vba/vbapagebreaks.cxx
+++ b/sc/source/ui/vba/vbapagebreaks.cxx
@@ -18,11 +18,12 @@
  */
 #include "vbapagebreaks.hxx"
 #include "vbapagebreak.hxx"
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XWorksheet.hpp>
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
 
-class RangePageBreaks : public ::cppu::WeakImplHelper1<container::XIndexAccess >
+class RangePageBreaks : public ::cppu::WeakImplHelper<container::XIndexAccess >
 {
 private:
     uno::Reference< XHelperInterface > mxParent;
diff --git a/sc/source/ui/vba/vbapagebreaks.hxx b/sc/source/ui/vba/vbapagebreaks.hxx
index 11b1a0cc9fbd..5cdd5ab64da0 100644
--- a/sc/source/ui/vba/vbapagebreaks.hxx
+++ b/sc/source/ui/vba/vbapagebreaks.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPAGEBREAKS_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAPAGEBREAKS_HXX
 
-#include <cppuhelper/implbase1.hxx>
 #include <ooo/vba/excel/XHPageBreaks.hpp>
 #include <ooo/vba/excel/XHPageBreak.hpp>
 #include <ooo/vba/excel/XVPageBreaks.hpp>
diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx
index 5b7ff9b6a815..e7ba2c4569d0 100644
--- a/sc/source/ui/vba/vbapagesetup.hxx
+++ b/sc/source/ui/vba/vbapagesetup.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPAGESETUP_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAPAGESETUP_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XPageSetup.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
@@ -28,7 +28,7 @@
 #include <vbahelper/vbapagesetupbase.hxx>
 #include <ooo/vba/excel/XlPaperSize.hpp>
 
-typedef cppu::ImplInheritanceHelper1< VbaPageSetupBase, ov::excel::XPageSetup > ScVbaPageSetup_BASE;
+typedef cppu::ImplInheritanceHelper< VbaPageSetupBase, ov::excel::XPageSetup > ScVbaPageSetup_BASE;
 
 class ScVbaPageSetup :  public ScVbaPageSetup_BASE
 {
diff --git a/sc/source/ui/vba/vbapalette.cxx b/sc/source/ui/vba/vbapalette.cxx
index 2d52843d511a..8619bf27334b 100644
--- a/sc/source/ui/vba/vbapalette.cxx
+++ b/sc/source/ui/vba/vbapalette.cxx
@@ -20,7 +20,7 @@
 #include "vbapalette.hxx"
 
 #include <sal/macros.h>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include "excelvbahelper.hxx"
@@ -46,7 +46,7 @@ static const ColorData spnDefColorTable8[] =
 /* 56 */    0x003366, 0x339966, 0x003300, 0x333300, 0x993300, 0x993366, 0x333399, 0x333333
 };
 
-typedef ::cppu::WeakImplHelper1< container::XIndexAccess > XIndexAccess_BASE;
+typedef ::cppu::WeakImplHelper< container::XIndexAccess > XIndexAccess_BASE;
 
 class DefaultPalette : public XIndexAccess_BASE
 {
diff --git a/sc/source/ui/vba/vbapane.hxx b/sc/source/ui/vba/vbapane.hxx
index 8553966a646e..654afc872874 100644
--- a/sc/source/ui/vba/vbapane.hxx
+++ b/sc/source/ui/vba/vbapane.hxx
@@ -20,11 +20,12 @@
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAPANE_HXX
 
 #include <com/sun/star/sheet/XViewPane.hpp>
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XPane.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
 #include "excelvbahelper.hxx"
 
-class ScVbaPane : public cppu::WeakImplHelper1< ov::excel::XPane >
+class ScVbaPane : public cppu::WeakImplHelper< ov::excel::XPane >
 {
 public:
     ScVbaPane(
diff --git a/sc/source/ui/vba/vbapivotcache.hxx b/sc/source/ui/vba/vbapivotcache.hxx
index a5bad13f6934..0b7844bbb4ec 100644
--- a/sc/source/ui/vba/vbapivotcache.hxx
+++ b/sc/source/ui/vba/vbapivotcache.hxx
@@ -18,7 +18,6 @@
  */
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTCACHE_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTCACHE_HXX
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/sheet/XDataPilotTable.hpp>
 
diff --git a/sc/source/ui/vba/vbapivottable.hxx b/sc/source/ui/vba/vbapivottable.hxx
index 3681e3beed96..0fc35d16959d 100644
--- a/sc/source/ui/vba/vbapivottable.hxx
+++ b/sc/source/ui/vba/vbapivottable.hxx
@@ -18,7 +18,6 @@
  */
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTTABLE_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTTABLE_HXX
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/sheet/XDataPilotTable.hpp>
 #include <ooo/vba/excel/XPivotTable.hpp>
diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx
index afe2a33c88a6..970abe8ddf23 100644
--- a/sc/source/ui/vba/vbapivottables.hxx
+++ b/sc/source/ui/vba/vbapivottables.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTTABLES_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAPIVOTTABLES_HXX
 
-#include <cppuhelper/implbase1.hxx>
-
 #include <ooo/vba/excel/XPivotTables.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx
index f557bb25960a..cb4e5a11278b 100644
--- a/sc/source/ui/vba/vbapropvalue.hxx
+++ b/sc/source/ui/vba/vbapropvalue.hxx
@@ -19,11 +19,11 @@
 #ifndef SC_VBA_PROPVALULE_HXX
 #define SC_VBA_PROPVALULE_HXX
 #include <ooo/vba/XPropValue.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "excelvbahelper.hxx"
 
-typedef ::cppu::WeakImplHelper1< ov::XPropValue > PropValueImpl_BASE;
+typedef ::cppu::WeakImplHelper< ov::XPropValue > PropValueImpl_BASE;
 
 class PropListener
 {
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index e4eaf2f38bc3..004f0286aaab 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -156,6 +156,7 @@
 #include "queryentry.hxx"
 #include "markdata.hxx"
 #include <comphelper/anytostring.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <global.hxx>
 
@@ -310,7 +311,7 @@ public:
 // very simple class to pass to ScVbaCollectionBaseImpl containing
 // just one item
 
-class SingleRangeIndexAccess : public ::cppu::WeakImplHelper2< container::XIndexAccess,
+class SingleRangeIndexAccess : public ::cppu::WeakImplHelper< container::XIndexAccess,
                                                                container::XEnumerationAccess >
 {
 private:
@@ -604,7 +605,7 @@ sal_Int32 m_nCol;
 sal_Int32 m_nArea;
 };
 
-typedef ::cppu::WeakImplHelper1< container::XEnumeration > CellsEnumeration_BASE;
+typedef ::cppu::WeakImplHelper< container::XEnumeration > CellsEnumeration_BASE;
 typedef ::std::vector< CellPos > vCellPos;
 
 // #FIXME - QUICK
diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx
index fcde9b12213a..401bcd610676 100644
--- a/sc/source/ui/vba/vbarange.hxx
+++ b/sc/source/ui/vba/vbarange.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBARANGE_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBARANGE_HXX
 
-#include <cppuhelper/implbase4.hxx>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 
 #include <ooo/vba/excel/XRange.hpp>
diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx
index 39550fdcc41b..5451aeecf63c 100644
--- a/sc/source/ui/vba/vbasheetobject.hxx
+++ b/sc/source/ui/vba/vbasheetobject.hxx
@@ -23,6 +23,7 @@
 #include <ooo/vba/excel/XButton.hpp>
 #include <ooo/vba/excel/XControlObject.hpp>
 #include <ooo/vba/excel/XSheetObject.hpp>
+#include <cppuhelper/implbase.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 #include "vbapalette.hxx"
 
@@ -117,7 +118,7 @@ protected:
     css::uno::Reference< css::beans::XPropertySet > mxShapeProps;
 };
 
-typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectBase, ov::excel::XControlObject > ScVbaControlObject_BASE;
+typedef ::cppu::ImplInheritanceHelper< ScVbaSheetObjectBase, ov::excel::XControlObject > ScVbaControlObject_BASE;
 
 class ScVbaControlObjectBase : public ScVbaControlObject_BASE
 {
@@ -162,7 +163,7 @@ protected:
     OUString maEventMethod;
 };
 
-typedef ::cppu::ImplInheritanceHelper1< ScVbaControlObjectBase, ov::excel::XButton > ScVbaButton_BASE;
+typedef ::cppu::ImplInheritanceHelper< ScVbaControlObjectBase, ov::excel::XButton > ScVbaButton_BASE;
 
 class ScVbaButton : public ScVbaButton_BASE
 {
diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx
index 9a71a7cb3c69..3916dfea971c 100644
--- a/sc/source/ui/vba/vbasheetobjects.cxx
+++ b/sc/source/ui/vba/vbasheetobjects.cxx
@@ -31,6 +31,7 @@
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/XFormsSupplier.hpp>
 #include "vbasheetobject.hxx"
+#include <cppuhelper/implbase.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::ooo::vba;
@@ -65,7 +66,7 @@ inline double lclPointsToHmm( const uno::Any& rPoints ) throw (uno::RuntimeExcep
     Derived classes provide all required functionality specific to the type of
     shapes covered by the container.
  */
-class ScVbaObjectContainer : public ::cppu::WeakImplHelper1< container::XIndexAccess >
+class ScVbaObjectContainer : public ::cppu::WeakImplHelper< container::XIndexAccess >
 {
 public:
     explicit ScVbaObjectContainer(
diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx
index dd23df21ef87..0b18d2a87beb 100644
--- a/sc/source/ui/vba/vbasheetobjects.hxx
+++ b/sc/source/ui/vba/vbasheetobjects.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBASHEETOBJECTS_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBASHEETOBJECTS_HXX
 
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XGraphicObjects.hpp>
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <rtl/ref.hxx>
@@ -61,7 +62,7 @@ protected:
     ScVbaObjectContainerRef mxContainer;
 };
 
-typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectsBase, ov::excel::XGraphicObjects > ScVbaGraphicObjects_BASE;
+typedef ::cppu::ImplInheritanceHelper< ScVbaSheetObjectsBase, ov::excel::XGraphicObjects > ScVbaGraphicObjects_BASE;
 
 /** Base class for collections containing a specific type of graphic object
     from a sheet.
diff --git a/sc/source/ui/vba/vbatextboxshape.hxx b/sc/source/ui/vba/vbatextboxshape.hxx
index ae11d01f4676..983d593a92a5 100644
--- a/sc/source/ui/vba/vbatextboxshape.hxx
+++ b/sc/source/ui/vba/vbatextboxshape.hxx
@@ -18,14 +18,14 @@
  */
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBATEXTBOXSHAPE_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBATEXTBOXSHAPE_HXX
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <ooo/vba/msforms/XTextBoxShape.hpp>
 #include <vbahelper/vbashape.hxx>
 #include "excelvbahelper.hxx"
 #include "vbacharacters.hxx"
 
-typedef cppu::ImplInheritanceHelper1< ScVbaShape, ov::msforms::XTextBoxShape > TextBoxShapeImpl_BASE;
+typedef cppu::ImplInheritanceHelper< ScVbaShape, ov::msforms::XTextBoxShape > TextBoxShapeImpl_BASE;
 
 class ScVbaTextBoxShape : public TextBoxShapeImpl_BASE
 {
diff --git a/sc/source/ui/vba/vbatextframe.hxx b/sc/source/ui/vba/vbatextframe.hxx
index 559a6c2a4543..9f5c8dd614e8 100644
--- a/sc/source/ui/vba/vbatextframe.hxx
+++ b/sc/source/ui/vba/vbatextframe.hxx
@@ -18,12 +18,13 @@
  */
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBATEXTFRAME_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBATEXTFRAME_HXX
+#include <cppuhelper/implbase.hxx>
 #include <ooo/vba/excel/XTextFrame.hpp>
 #include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbatextframe.hxx>
 
 //typedef InheritedHelperInterfaceImpl1< ov::excel::XTextFrame > ScVbaTextFrame_BASE;
-typedef cppu::ImplInheritanceHelper1< VbaTextFrame, ov::excel::XTextFrame > ScVbaTextFrame_BASE;
+typedef cppu::ImplInheritanceHelper< VbaTextFrame, ov::excel::XTextFrame > ScVbaTextFrame_BASE;
 
 class ScVbaTextFrame : public ScVbaTextFrame_BASE
 {
diff --git a/sc/source/ui/vba/vbavalidation.hxx b/sc/source/ui/vba/vbavalidation.hxx
index 3cd33313fe94..957ecdf62bcf 100644
--- a/sc/source/ui/vba/vbavalidation.hxx
+++ b/sc/source/ui/vba/vbavalidation.hxx
@@ -18,7 +18,6 @@
  */
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAVALIDATION_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAVALIDATION_HXX
-#include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <ooo/vba/excel/XValidation.hpp>
 #include <com/sun/star/table/XCellRange.hpp>
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index 7f2701732eae..500983412dd3 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -33,6 +33,7 @@
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/awt/XWindow2.hpp>
 #include <com/sun/star/awt/PosSize.hpp>
+#include <cppuhelper/implbase.hxx>
 
 #include <docsh.hxx>
 #include <tabvwsh.hxx>
@@ -54,12 +55,12 @@ SCTAB, OUStringHash,
 
 typedef std::vector< uno::Reference< sheet::XSpreadsheet > > Sheets;
 
-typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess
+typedef ::cppu::WeakImplHelper< container::XEnumerationAccess
     , com::sun::star::container::XIndexAccess
     , com::sun::star::container::XNameAccess
     > SelectedSheets_BASE;
 
-class SelectedSheetsEnum : public ::cppu::WeakImplHelper1< container::XEnumeration >
+class SelectedSheetsEnum : public ::cppu::WeakImplHelper< container::XEnumeration >
 {
 public:
     uno::Reference< uno::XComponentContext > m_xContext;
diff --git a/sc/source/ui/vba/vbawindow.hxx b/sc/source/ui/vba/vbawindow.hxx
index 41c9ec12a115..c9931c59bfe1 100644
--- a/sc/source/ui/vba/vbawindow.hxx
+++ b/sc/source/ui/vba/vbawindow.hxx
@@ -27,12 +27,13 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <ooo/vba/excel/XPane.hpp>
 #include <com/sun/star/awt/XDevice.hpp>
+#include <cppuhelper/implbase.hxx>
 
 #include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbawindowbase.hxx>
 #include "vbaworkbook.hxx"
 
-typedef cppu::ImplInheritanceHelper1< VbaWindowBase, ov::excel::XWindow > WindowImpl_BASE;
+typedef cppu::ImplInheritanceHelper< VbaWindowBase, ov::excel::XWindow > WindowImpl_BASE;
 
 class ScVbaWindow : public WindowImpl_BASE
 {
diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx
index 3d4f573ca786..f02c891b5394 100644
--- a/sc/source/ui/vba/vbawindows.cxx
+++ b/sc/source/ui/vba/vbawindows.cxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include "vbawindow.hxx"
 #include "vbaglobals.hxx"
@@ -103,7 +103,7 @@ public:
     }
 };
 
-typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess
+typedef ::cppu::WeakImplHelper< container::XEnumerationAccess
     , com::sun::star::container::XIndexAccess
     , com::sun::star::container::XNameAccess
     > WindowsAccessImpl_BASE;
diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx
index cef6f5699e4b..574c1a75e748 100644
--- a/sc/source/ui/vba/vbawindows.hxx
+++ b/sc/source/ui/vba/vbawindows.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWINDOWS_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAWINDOWS_HXX
 
-#include <cppuhelper/implbase1.hxx>
 #include <ooo/vba/excel/XWindows.hpp>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/sc/source/ui/vba/vbaworkbook.hxx b/sc/source/ui/vba/vbaworkbook.hxx
index 6512f5cd02d6..ca0a2e1ebdb0 100644
--- a/sc/source/ui/vba/vbaworkbook.hxx
+++ b/sc/source/ui/vba/vbaworkbook.hxx
@@ -21,10 +21,11 @@
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <ooo/vba/excel/XWorkbook.hpp>
+#include <cppuhelper/implbase.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
 #include <vbahelper/vbadocumentbase.hxx>
 
-typedef cppu::ImplInheritanceHelper1< VbaDocumentBase, ov::excel::XWorkbook > ScVbaWorkbook_BASE;
+typedef cppu::ImplInheritanceHelper< VbaDocumentBase, ov::excel::XWorkbook > ScVbaWorkbook_BASE;
 
 class ScVbaWorkbook : public ScVbaWorkbook_BASE
 {
diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx
index 424fdcc06ca2..78af85ec3e0f 100644
--- a/sc/source/ui/vba/vbaworkbooks.cxx
+++ b/sc/source/ui/vba/vbaworkbooks.cxx
@@ -18,9 +18,6 @@
  */
 #include <comphelper/processfactory.hxx>
 
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
-
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx
index 080af1f6e187..8c36b4d0e1dd 100644
--- a/sc/source/ui/vba/vbaworkbooks.hxx
+++ b/sc/source/ui/vba/vbaworkbooks.hxx
@@ -19,13 +19,14 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX
 
+#include <cppuhelper/implbase.hxx>
 #include <vbahelper/vbacollectionimpl.hxx>
 #include <ooo/vba/excel/XWorkbooks.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <vbahelper/vbadocumentsbase.hxx>
 #include "excelvbahelper.hxx"
 
-typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > ScVbaWorkbooks_BASE;
+typedef cppu::ImplInheritanceHelper< VbaDocumentsBase, ov::excel::XWorkbooks > ScVbaWorkbooks_BASE;
 
 class ScVbaWorkbooks : public ScVbaWorkbooks_BASE
 {
diff --git a/sc/source/ui/vba/vbaworksheet.hxx b/sc/source/ui/vba/vbaworksheet.hxx
index 30164e1013e2..94ca544fa303 100644
--- a/sc/source/ui/vba/vbaworksheet.hxx
+++ b/sc/source/ui/vba/vbaworksheet.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEET_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEET_HXX
 
-#include <cppuhelper/implbase2.hxx>
 #include <comphelper/unwrapargs.hxx>
 
 #include <com/sun/star/sheet/XSpreadsheet.hpp>
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 18b8515f8bed..5f6b24e73d29 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -28,7 +28,7 @@
 #include <svl/eitem.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -59,7 +59,7 @@ typedef std::vector< uno::Reference< sheet::XSpreadsheet > >  SheetMap;
 // #FIXME #TODO the implementation of the Sheets collections sucks,
 // e.g. there is no support for tracking sheets added/removed from the collection
 
-class WorkSheetsEnumeration : public ::cppu::WeakImplHelper1< container::XEnumeration >
+class WorkSheetsEnumeration : public ::cppu::WeakImplHelper< container::XEnumeration >
 {
     SheetMap mSheetMap;
     SheetMap::iterator mIt;
@@ -78,7 +78,7 @@ public:
     }
 };
 
-class SheetCollectionHelper : public ::cppu::WeakImplHelper3< container::XNameAccess,
+class SheetCollectionHelper : public ::cppu::WeakImplHelper< container::XNameAccess,
                                                               container::XIndexAccess,
                                                               container::XEnumerationAccess >
 {
diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx
index 92ec4b212787..93df52c9c4f9 100644
--- a/sc/source/ui/vba/vbaworksheets.hxx
+++ b/sc/source/ui/vba/vbaworksheets.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEETS_HXX
 #define INCLUDED_SC_SOURCE_UI_VBA_VBAWORKSHEETS_HXX
 
-#include <cppuhelper/implbase1.hxx>
-
 #include <ooo/vba/excel/XWorksheets.hpp>
 #include <com/sun/star/sheet/XSpreadsheets.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>