29 files changed, 99 insertions, 120 deletions
diff --git a/sc/inc/AccessibleFilterTopWindow.hxx b/sc/inc/AccessibleFilterTopWindow.hxx
index b389ef1031d9..2f7cfd1152b2 100644
--- a/sc/inc/AccessibleFilterTopWindow.hxx
+++ b/sc/inc/AccessibleFilterTopWindow.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SC_INC_ACCESSIBLEFILTERTOPWINDOW_HXX
 
 #include "AccessibleFilterMenu.hxx"
-#include <cppuhelper/implbase1.hxx>
 
 class ScCheckListMenuWindow;
 
diff --git a/sc/inc/addruno.hxx b/sc/inc/addruno.hxx
index c9af7bc92626..2661b4ea22f7 100644
--- a/sc/inc/addruno.hxx
+++ b/sc/inc/addruno.hxx
@@ -22,12 +22,12 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 #include "global.hxx"
 #include "address.hxx"
 
-class ScAddressConversionObj : public ::cppu::WeakImplHelper2<
+class ScAddressConversionObj : public ::cppu::WeakImplHelper<
                                     ::com::sun::star::beans::XPropertySet,
                                     ::com::sun::star::lang::XServiceInfo >,
                                public SfxListener
diff --git a/sc/inc/afmtuno.hxx b/sc/inc/afmtuno.hxx
index 7c38d97f57f9..0ea6db177085 100644
--- a/sc/inc/afmtuno.hxx
+++ b/sc/inc/afmtuno.hxx
@@ -35,16 +35,14 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class ScAutoFormatFieldObj;
 class ScAutoFormatObj;
 
 #define SC_AFMTOBJ_INVALID  USHRT_MAX
 
-class ScAutoFormatsObj : public ::cppu::WeakImplHelper4<
+class ScAutoFormatsObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::container::XNameContainer,
                             ::com::sun::star::container::XEnumerationAccess,
                             ::com::sun::star::container::XIndexAccess,
@@ -114,7 +112,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScAutoFormatObj : public ::cppu::WeakImplHelper6<
+class ScAutoFormatObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::container::XIndexAccess,
                             ::com::sun::star::container::XEnumerationAccess,
                             ::com::sun::star::container::XNamed,
@@ -219,7 +217,7 @@ public:
     static ScAutoFormatObj* getImplementation(const css::uno::Reference<css::uno::XInterface>& rObj);
 };
 
-class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper2<
+class ScAutoFormatFieldObj : public ::cppu::WeakImplHelper<
                                 ::com::sun::star::beans::XPropertySet,
                                 ::com::sun::star::lang::XServiceInfo >,
                             public SfxListener
diff --git a/sc/inc/appluno.hxx b/sc/inc/appluno.hxx
index 6e4621604d18..56aa88bf84cd 100644
--- a/sc/inc/appluno.hxx
+++ b/sc/inc/appluno.hxx
@@ -29,9 +29,7 @@
 #include <com/sun/star/sheet/XGlobalSheetSettings.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <sfx2/sfxmodelfactory.hxx>
 
@@ -76,7 +74,7 @@ OUString SAL_CALL ScXMLImport_Settings_getImplementationName() throw();
 css::uno::Reference< css::uno::XInterface > SAL_CALL ScXMLImport_Settings_createInstance(
             const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) throw( css::uno::Exception );
 
-class ScSpreadsheetSettings : public cppu::WeakImplHelper3<
+class ScSpreadsheetSettings : public cppu::WeakImplHelper<
                                         com::sun::star::sheet::XGlobalSheetSettings,
                                         com::sun::star::beans::XPropertySet,
                                         com::sun::star::lang::XServiceInfo>
@@ -228,7 +226,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScRecentFunctionsObj : public cppu::WeakImplHelper2<
+class ScRecentFunctionsObj : public cppu::WeakImplHelper<
                                         com::sun::star::sheet::XRecentFunctions,
                                         com::sun::star::lang::XServiceInfo>
 {
@@ -254,7 +252,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScFunctionListObj : public cppu::WeakImplHelper4<
+class ScFunctionListObj : public cppu::WeakImplHelper<
                                         com::sun::star::sheet::XFunctionDescriptions,
                                         com::sun::star::container::XEnumerationAccess,
                                         com::sun::star::container::XNameAccess,
diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx
index ac2726d1f00c..7496a47f4366 100644
--- a/sc/inc/cellsuno.hxx
+++ b/sc/inc/cellsuno.hxx
@@ -88,8 +88,7 @@
 #include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
 #include <com/sun/star/sheet/XExternalSheetName.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <boost/scoped_ptr.hpp>
 
@@ -1355,7 +1354,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScCellsObj : public cppu::WeakImplHelper2<
+class ScCellsObj : public cppu::WeakImplHelper<
                             com::sun::star::container::XEnumerationAccess,
                             com::sun::star::lang::XServiceInfo >,
                         public SfxListener
@@ -1388,7 +1387,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScCellsEnumeration : public cppu::WeakImplHelper2<
+class ScCellsEnumeration : public cppu::WeakImplHelper<
                                 com::sun::star::container::XEnumeration,
                                 com::sun::star::lang::XServiceInfo >,
                             public SfxListener
@@ -1426,7 +1425,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScCellFormatsObj : public cppu::WeakImplHelper3<
+class ScCellFormatsObj : public cppu::WeakImplHelper<
                             com::sun::star::container::XIndexAccess,
                             com::sun::star::container::XEnumerationAccess,
                             com::sun::star::lang::XServiceInfo >,
@@ -1470,7 +1469,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScCellFormatsEnumeration : public cppu::WeakImplHelper2<
+class ScCellFormatsEnumeration : public cppu::WeakImplHelper<
                                     com::sun::star::container::XEnumeration,
                                     com::sun::star::lang::XServiceInfo >,
                                  public SfxListener
@@ -1511,7 +1510,7 @@ public:
 
 typedef std::vector< ScRangeList > ScMyRangeLists;
 
-class ScUniqueCellFormatsObj : public cppu::WeakImplHelper3<
+class ScUniqueCellFormatsObj : public cppu::WeakImplHelper<
                             com::sun::star::container::XIndexAccess,
                             com::sun::star::container::XEnumerationAccess,
                             com::sun::star::lang::XServiceInfo >,
@@ -1556,7 +1555,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper2<
+class ScUniqueCellFormatsEnumeration : public cppu::WeakImplHelper<
                                     com::sun::star::container::XEnumeration,
                                     com::sun::star::lang::XServiceInfo >,
                                  public SfxListener
diff --git a/sc/inc/chartuno.hxx b/sc/inc/chartuno.hxx
index da79b1bd26ae..57475815326a 100644
--- a/sc/inc/chartuno.hxx
+++ b/sc/inc/chartuno.hxx
@@ -33,13 +33,13 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <cppuhelper/compbase4.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/compbase.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class ScDocShell;
 class ScChartObj;
 
-class ScChartsObj : public cppu::WeakImplHelper4<
+class ScChartsObj : public cppu::WeakImplHelper<
                             com::sun::star::table::XTableCharts,
                             com::sun::star::container::XEnumerationAccess,
                             com::sun::star::container::XIndexAccess,
@@ -105,7 +105,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-typedef ::cppu::WeakComponentImplHelper4<
+typedef ::cppu::WeakComponentImplHelper<
     ::com::sun::star::table::XTableChart,
     ::com::sun::star::document::XEmbeddedObjectSupplier,
     ::com::sun::star::container::XNamed,
diff --git a/sc/inc/confuno.hxx b/sc/inc/confuno.hxx
index f0551e0abdc4..1252f59acf7c 100644
--- a/sc/inc/confuno.hxx
+++ b/sc/inc/confuno.hxx
@@ -24,11 +24,11 @@
 #include <svl/lstner.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class ScDocShell;
 
-class ScDocumentConfiguration : public cppu::WeakImplHelper2<
+class ScDocumentConfiguration : public cppu::WeakImplHelper<
                                         com::sun::star::beans::XPropertySet,
                                         com::sun::star::lang::XServiceInfo>,
                                 public SfxListener
diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx
index 09ee64ca1438..20105b09259c 100644
--- a/sc/inc/dapiuno.hxx
+++ b/sc/inc/dapiuno.hxx
@@ -50,10 +50,7 @@
 #include <com/sun/star/sheet/XDataPilotTable2.hpp>
 #include <com/sun/star/sheet/XDataPilotTables.hpp>
 
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <vector>
 
@@ -82,7 +79,7 @@ public:
 };
 
 /** DataPilotTables collection per sheet. */
-class ScDataPilotTablesObj : public cppu::WeakImplHelper4<
+class ScDataPilotTablesObj : public cppu::WeakImplHelper<
                                         com::sun::star::sheet::XDataPilotTables,
                                         com::sun::star::container::XEnumerationAccess,
                                         com::sun::star::container::XIndexAccess,
@@ -421,7 +418,7 @@ private:
     ScDataPilotChildObjBase& operator=( const ScDataPilotChildObjBase& ) SAL_DELETED_FUNCTION;
 };
 
-typedef ::cppu::WeakImplHelper4
+typedef ::cppu::WeakImplHelper
 <
     ::com::sun::star::container::XEnumerationAccess,
     ::com::sun::star::container::XIndexAccess,
@@ -485,7 +482,7 @@ private:
     ::com::sun::star::uno::Any maOrient;    /// Field orientation, no value = all fields.
 };
 
-typedef ::cppu::WeakImplHelper5
+typedef ::cppu::WeakImplHelper
 <
     ::com::sun::star::container::XNamed,
     ::com::sun::star::beans::XPropertySet,
@@ -630,7 +627,7 @@ struct ScFieldGroup
 
 typedef ::std::vector< ScFieldGroup > ScFieldGroups;
 
-typedef ::cppu::WeakImplHelper4
+typedef ::cppu::WeakImplHelper
 <
     ::com::sun::star::container::XNameContainer,
     ::com::sun::star::container::XEnumerationAccess,
@@ -716,7 +713,7 @@ private:
     ScFieldGroups       maGroups;
 };
 
-typedef ::cppu::WeakImplHelper5
+typedef ::cppu::WeakImplHelper
 <
     ::com::sun::star::container::XNameContainer,
     ::com::sun::star::container::XEnumerationAccess,
@@ -796,7 +793,7 @@ private:
     OUString     maGroupName;
 };
 
-typedef ::cppu::WeakImplHelper2
+typedef ::cppu::WeakImplHelper
 <
     ::com::sun::star::container::XNamed,
     ::com::sun::star::lang::XServiceInfo
@@ -827,7 +824,7 @@ private:
     OUString     maName;
 };
 
-typedef ::cppu::WeakImplHelper4
+typedef ::cppu::WeakImplHelper
 <
     ::com::sun::star::container::XEnumerationAccess,
     ::com::sun::star::container::XIndexAccess,
@@ -880,7 +877,7 @@ private:
     ScDataPilotItemObj* GetObjectByIndex_Impl( sal_Int32 nIndex ) const;
 };
 
-typedef ::cppu::WeakImplHelper3
+typedef ::cppu::WeakImplHelper
 <
     ::com::sun::star::container::XNamed,
     ::com::sun::star::beans::XPropertySet,
diff --git a/sc/inc/defltuno.hxx b/sc/inc/defltuno.hxx
index 2f4bfd734c44..a0e04f0ebe85 100644
--- a/sc/inc/defltuno.hxx
+++ b/sc/inc/defltuno.hxx
@@ -24,12 +24,12 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/itemprop.hxx>
 
 class ScDocShell;
 
-class ScDocDefaultsObj : public ::cppu::WeakImplHelper3<
+class ScDocDefaultsObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::beans::XPropertySet,
                             ::com::sun::star::beans::XPropertyState,
                             ::com::sun::star::lang::XServiceInfo >,
diff --git a/sc/inc/dispuno.hxx b/sc/inc/dispuno.hxx
index cf01087744a7..9638ed5f72dc 100644
--- a/sc/inc/dispuno.hxx
+++ b/sc/inc/dispuno.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 #include "global.hxx"
 #include <boost/ptr_container/ptr_vector.hpp>
@@ -37,7 +37,7 @@ typedef ::com::sun::star::uno::Reference<
             ::com::sun::star::frame::XStatusListener > XStatusListenerRef;
 typedef boost::ptr_vector<XStatusListenerRef> XStatusListenerArr_Impl;
 
-class ScDispatchProviderInterceptor : public cppu::WeakImplHelper2<
+class ScDispatchProviderInterceptor : public cppu::WeakImplHelper<
                                         com::sun::star::frame::XDispatchProviderInterceptor,
                                         com::sun::star::lang::XEventListener>,
                                     public SfxListener
@@ -94,7 +94,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScDispatch : public cppu::WeakImplHelper2<
+class ScDispatch : public cppu::WeakImplHelper<
                                     com::sun::star::frame::XDispatch,
                                     com::sun::star::view::XSelectionChangeListener >,
                                 public SfxListener
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
index cd6888598f69..34235a2a0b75 100644
--- a/sc/inc/docuno.hxx
+++ b/sc/inc/docuno.hxx
@@ -48,10 +48,7 @@
 #include <com/sun/star/sheet/opencl/XOpenCLSelection.hpp>
 #include <com/sun/star/sheet/opencl/OpenCLPlatform.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <svl/itemprop.hxx>
 #include <vcl/ITiledRenderable.hxx>
@@ -416,7 +413,7 @@ public:
     virtual void resetSelection() SAL_OVERRIDE;
 };
 
-class ScDrawPagesObj : public cppu::WeakImplHelper2<
+class ScDrawPagesObj : public cppu::WeakImplHelper<
                                 com::sun::star::drawing::XDrawPages,
                                 com::sun::star::lang::XServiceInfo>,
                         public SfxListener
@@ -462,7 +459,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScTableSheetsObj : public cppu::WeakImplHelper5<
+class ScTableSheetsObj : public cppu::WeakImplHelper<
                                 com::sun::star::sheet::XSpreadsheets2,
                                 com::sun::star::sheet::XCellRangesAccess,
                                 com::sun::star::container::XEnumerationAccess,
@@ -572,7 +569,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScTableColumnsObj : public cppu::WeakImplHelper5<
+class ScTableColumnsObj : public cppu::WeakImplHelper<
                                 com::sun::star::table::XTableColumns,
                                 com::sun::star::container::XEnumerationAccess,
                                 com::sun::star::container::XNameAccess,
@@ -679,7 +676,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScTableRowsObj : public cppu::WeakImplHelper4<
+class ScTableRowsObj : public cppu::WeakImplHelper<
                                 com::sun::star::table::XTableRows,
                                 com::sun::star::container::XEnumerationAccess,
                                 com::sun::star::beans::XPropertySet,
@@ -774,7 +771,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper2<
+class ScSpreadsheetSettingsObj : public cppu::WeakImplHelper<
                                     com::sun::star::beans::XPropertySet,
                                     com::sun::star::lang::XServiceInfo>,
                                  public SfxListener
@@ -837,7 +834,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScAnnotationsObj : public cppu::WeakImplHelper3<
+class ScAnnotationsObj : public cppu::WeakImplHelper<
                                 com::sun::star::sheet::XSheetAnnotations,
                                 com::sun::star::container::XEnumerationAccess,
                                 com::sun::star::lang::XServiceInfo>,
@@ -890,7 +887,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScScenariosObj : public cppu::WeakImplHelper4<
+class ScScenariosObj : public cppu::WeakImplHelper<
                                 com::sun::star::sheet::XScenarios,
                                 com::sun::star::container::XEnumerationAccess,
                                 com::sun::star::container::XIndexAccess,
diff --git a/sc/inc/dptabsrc.hxx b/sc/inc/dptabsrc.hxx
index e2fb1b5f6b54..cdae3af4f413 100644
--- a/sc/inc/dptabsrc.hxx
+++ b/sc/inc/dptabsrc.hxx
@@ -40,10 +40,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
 #include "dptabdat.hxx"
@@ -82,7 +79,7 @@ class ScDPLevel;
 class ScDPMembers;
 class ScDPMember;
 
-class ScDPSource : public cppu::WeakImplHelper6<
+class ScDPSource : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XDimensionsSupplier,
                             com::sun::star::sheet::XDataPilotResults,
                             com::sun::star::util::XRefreshable,
@@ -267,7 +264,7 @@ public:
 #endif
 };
 
-class ScDPDimensions : public cppu::WeakImplHelper2<
+class ScDPDimensions : public cppu::WeakImplHelper<
                             com::sun::star::container::XNameAccess,
                             com::sun::star::lang::XServiceInfo >
 {
@@ -309,7 +306,7 @@ public:
     ScDPDimension*  getByIndex(long nIndex) const;
 };
 
-class ScDPDimension : boost::noncopyable, public cppu::WeakImplHelper5<
+class ScDPDimension : boost::noncopyable, public cppu::WeakImplHelper<
                             com::sun::star::sheet::XHierarchiesSupplier,
                             com::sun::star::container::XNamed,
                             com::sun::star::util::XCloneable,
@@ -421,7 +418,7 @@ public:
     const ::com::sun::star::sheet::DataPilotFieldReference& GetReferenceValue() const { return aReferenceValue;}
 };
 
-class ScDPHierarchies : public cppu::WeakImplHelper2<
+class ScDPHierarchies : public cppu::WeakImplHelper<
                             com::sun::star::container::XNameAccess,
                             com::sun::star::lang::XServiceInfo >
 {
@@ -462,7 +459,7 @@ public:
     ScDPHierarchy*  getByIndex(long nIndex) const;
 };
 
-class ScDPHierarchy : public cppu::WeakImplHelper3<
+class ScDPHierarchy : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XLevelsSupplier,
                             com::sun::star::container::XNamed,
                             com::sun::star::lang::XServiceInfo >
@@ -497,7 +494,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScDPLevels : public cppu::WeakImplHelper2<
+class ScDPLevels : public cppu::WeakImplHelper<
                             com::sun::star::container::XNameAccess,
                             com::sun::star::lang::XServiceInfo >
 {
@@ -539,7 +536,7 @@ public:
     ScDPLevel*      getByIndex(long nIndex) const;
 };
 
-class ScDPLevel : public cppu::WeakImplHelper5<
+class ScDPLevel : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XMembersSupplier,
                             com::sun::star::container::XNamed,
                             com::sun::star::sheet::XDataPilotMemberResults,
@@ -672,7 +669,7 @@ public:
 // hash map from name to index in the member array, for fast name access
 typedef std::unordered_map< OUString, sal_Int32, OUStringHash > ScDPMembersHashMap;
 
-class ScDPMembers : public cppu::WeakImplHelper2<
+class ScDPMembers : public cppu::WeakImplHelper<
                             com::sun::star::container::XNameAccess,
                             com::sun::star::lang::XServiceInfo >
 {
@@ -723,7 +720,7 @@ public:
     SCROW                   GetSrcItemsCount();
 };
 
-class ScDPMember : boost::noncopyable, public cppu::WeakImplHelper3<
+class ScDPMember : boost::noncopyable, public cppu::WeakImplHelper<
                             com::sun::star::container::XNamed,
                             com::sun::star::beans::XPropertySet,
                             com::sun::star::lang::XServiceInfo >
diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx
index db7e160ecec0..7b6eda52b253 100644
--- a/sc/inc/eventuno.hxx
+++ b/sc/inc/eventuno.hxx
@@ -22,14 +22,14 @@
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameReplace.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 
 #include "global.hxx"
 
 class ScDocShell;
 
-class ScSheetEventsObj : public cppu::WeakImplHelper2<
+class ScSheetEventsObj : public cppu::WeakImplHelper<
                                         com::sun::star::container::XNameReplace,
                                         com::sun::star::lang::XServiceInfo>,
                                     public SfxListener
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx
index bb117090748a..905e907953f5 100644
--- a/sc/inc/fielduno.hxx
+++ b/sc/inc/fielduno.hxx
@@ -36,8 +36,7 @@
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <cppuhelper/component.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <osl/mutex.hxx>
 
 #include <boost/noncopyable.hpp>
@@ -50,7 +49,7 @@ class ScEditFieldObj;
 class ScDocShell;
 class ScHeaderFooterTextData;
 
-class ScCellFieldsObj : public cppu::WeakImplHelper5<
+class ScCellFieldsObj : public cppu::WeakImplHelper<
                             com::sun::star::container::XEnumerationAccess,
                             com::sun::star::container::XIndexAccess,
                             com::sun::star::container::XContainer,
@@ -123,7 +122,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScHeaderFieldsObj : public cppu::WeakImplHelper5<
+class ScHeaderFieldsObj : public cppu::WeakImplHelper<
                             com::sun::star::container::XEnumerationAccess,
                             com::sun::star::container::XIndexAccess,
                             com::sun::star::container::XContainer,
@@ -194,7 +193,7 @@ public:
  * Generic UNO wrapper for edit engine's field item in cells, headers, and
  * footers.
  */
-class ScEditFieldObj : public cppu::WeakImplHelper4<
+class ScEditFieldObj : public cppu::WeakImplHelper<
                             com::sun::star::text::XTextField,
                             com::sun::star::beans::XPropertySet,
                             com::sun::star::lang::XUnoTunnel,
diff --git a/sc/inc/filtuno.hxx b/sc/inc/filtuno.hxx
index a3126db578ee..14039479037b 100644
--- a/sc/inc/filtuno.hxx
+++ b/sc/inc/filtuno.hxx
@@ -26,14 +26,14 @@
 #include <com/sun/star/document/XExporter.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include "scdllapi.h"
 
 namespace com { namespace sun { namespace star { namespace io {
     class XInputStream;
 } } } }
 
-class ScFilterOptionsObj : public ::cppu::WeakImplHelper5<
+class ScFilterOptionsObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::beans::XPropertyAccess,
                             ::com::sun::star::ui::dialogs::XExecutableDialog,
                             ::com::sun::star::document::XImporter,
diff --git a/sc/inc/fmtuno.hxx b/sc/inc/fmtuno.hxx
index 3ee15f1dd216..d59caf8c2212 100644
--- a/sc/inc/fmtuno.hxx
+++ b/sc/inc/fmtuno.hxx
@@ -36,9 +36,7 @@
 
 #include <com/sun/star/sheet/XMultiFormulaTokens.hpp>
 #include <com/sun/star/sheet/FormulaToken.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/sheet/ConditionOperator2.hpp>
 
 #include "address.hxx"
@@ -68,7 +66,7 @@ struct ScCondFormatEntryItem
     ScCondFormatEntryItem();
 };
 
-class ScTableConditionalFormat : public cppu::WeakImplHelper5<
+class ScTableConditionalFormat : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XSheetConditionalEntries,
                             com::sun::star::container::XNameAccess,
                             com::sun::star::container::XEnumerationAccess,
@@ -141,7 +139,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScTableConditionalEntry : public cppu::WeakImplHelper3<
+class ScTableConditionalEntry : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XSheetCondition2,
                             com::sun::star::sheet::XSheetConditionalEntry,
                             com::sun::star::lang::XServiceInfo >
@@ -190,7 +188,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScTableValidationObj : public cppu::WeakImplHelper5<
+class ScTableValidationObj : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XSheetCondition2,
                             com::sun::star::sheet::XMultiFormulaTokens,
                             com::sun::star::beans::XPropertySet,
diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx
index abbd31f549d8..d267c2a12bf2 100644
--- a/sc/inc/funcuno.hxx
+++ b/sc/inc/funcuno.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sheet/XFunctionAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 
 class ScDocument;
@@ -52,7 +52,7 @@ public:
     void        Clear();
 };
 
-class ScFunctionAccess : public cppu::WeakImplHelper3<
+class ScFunctionAccess : public cppu::WeakImplHelper<
                                         com::sun::star::sheet::XFunctionAccess,
                                         com::sun::star::beans::XPropertySet,
                                         com::sun::star::lang::XServiceInfo>,
diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index 8ff623364787..4d87b79721eb 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include "scdllapi.h"
 
@@ -84,7 +84,7 @@ sal_Bool SAL_CALL ClassName::supportsService( const OUString& ServiceName ) \
     if (rType == cppu::UnoType<x>::get())  \
     { uno::Any aR; aR <<= uno::Reference<x>(static_cast<y*>(this)); return aR; }
 
-class ScIndexEnumeration : public cppu::WeakImplHelper2<
+class ScIndexEnumeration : public cppu::WeakImplHelper<
                                 com::sun::star::container::XEnumeration,
                                 com::sun::star::lang::XServiceInfo >
 {
@@ -115,7 +115,7 @@ public:
 };
 
 //  new (uno 3) variant
-class ScNameToIndexAccess : public cppu::WeakImplHelper2<
+class ScNameToIndexAccess : public cppu::WeakImplHelper<
                                 com::sun::star::container::XIndexAccess,
                                 com::sun::star::lang::XServiceInfo >
 {
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx
index fa46ca59cd30..63f8b1057736 100644
--- a/sc/inc/nameuno.hxx
+++ b/sc/inc/nameuno.hxx
@@ -36,10 +36,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/document/XActionLockable.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase6.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ref.hxx>
 
 class ScDocShell;
@@ -48,7 +45,7 @@ class ScRangeData;
 class ScTokenArray;
 class ScNamedRangesObj;
 
-class SC_DLLPUBLIC ScNamedRangeObj : public ::cppu::WeakImplHelper6<
+class SC_DLLPUBLIC ScNamedRangeObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::sheet::XNamedRange,
                             ::com::sun::star::sheet::XFormulaTokens,
                             ::com::sun::star::sheet::XCellRangeReferrer,
@@ -171,7 +168,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScNamedRangesObj : public ::cppu::WeakImplHelper6<
+class ScNamedRangesObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::sheet::XNamedRanges,
                             ::com::sun::star::container::XEnumerationAccess,
                             ::com::sun::star::container::XIndexAccess,
@@ -337,7 +334,7 @@ public:
     virtual                 ~ScLocalNamedRangesObj();
 };
 
-class ScLabelRangeObj : public ::cppu::WeakImplHelper2<
+class ScLabelRangeObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::sheet::XLabelRange,
                             ::com::sun::star::lang::XServiceInfo >,
                         public SfxListener
@@ -376,7 +373,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScLabelRangesObj : public ::cppu::WeakImplHelper3<
+class ScLabelRangesObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::sheet::XLabelRanges,
                             ::com::sun::star::container::XEnumerationAccess,
                             ::com::sun::star::lang::XServiceInfo >,
diff --git a/sc/inc/notesuno.hxx b/sc/inc/notesuno.hxx
index e11f3ad8f4fd..e8ec0e63c00d 100644
--- a/sc/inc/notesuno.hxx
+++ b/sc/inc/notesuno.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/text/XSimpleText.hpp>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 #include "address.hxx"
 
@@ -33,7 +33,7 @@ class ScDocShell;
 class SvxUnoText;
 class ScPostIt;
 
-class ScAnnotationObj : public cppu::WeakImplHelper5<
+class ScAnnotationObj : public cppu::WeakImplHelper<
                             com::sun::star::container::XChild,
                             com::sun::star::text::XSimpleText,
                             com::sun::star::sheet::XSheetAnnotation,
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 0557c2ebef13..9f6258bca087 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -426,6 +426,7 @@
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/factory.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sc/inc/pch/precompiled_scfilt.hxx b/sc/inc/pch/precompiled_scfilt.hxx
index 0e7455ab2c51..32480a7c3ef2 100644
--- a/sc/inc/pch/precompiled_scfilt.hxx
+++ b/sc/inc/pch/precompiled_scfilt.hxx
@@ -296,6 +296,7 @@
 #include <config_orcus.h>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/factory.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/sc/inc/pch/precompiled_vbaobj.hxx b/sc/inc/pch/precompiled_vbaobj.hxx
index bb9a44467230..130a34cf90fc 100644
--- a/sc/inc/pch/precompiled_vbaobj.hxx
+++ b/sc/inc/pch/precompiled_vbaobj.hxx
@@ -206,6 +206,7 @@
 #include <cppuhelper/bootstrap.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/exc_hlp.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
diff --git a/sc/inc/shapeuno.hxx b/sc/inc/shapeuno.hxx
index 4182893ddf63..7dccd90df81e 100644
--- a/sc/inc/shapeuno.hxx
+++ b/sc/inc/shapeuno.hxx
@@ -29,7 +29,7 @@
 #include <com/sun/star/document/XEventsSupplier.hpp>
 #include <com/sun/star/container/XChild.hpp>
 
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <cppuhelper/implbase1.hxx>
 
 namespace com { namespace sun { namespace star {
@@ -49,7 +49,7 @@ class  ScMacroInfo;
 //  object which aggregates all svx shape objects,
 //  to add own properties
 
-typedef ::cppu::WeakImplHelper5 <   ::com::sun::star::beans::XPropertySet
+typedef ::cppu::WeakImplHelper <   ::com::sun::star::beans::XPropertySet
                                 ,   ::com::sun::star::beans::XPropertyState
                                 ,   ::com::sun::star::text::XTextContent
                                 ,   ::com::sun::star::document::XEventsSupplier
diff --git a/sc/inc/srchuno.hxx b/sc/inc/srchuno.hxx
index 2a19c1b5dfc4..8719a6ff45b6 100644
--- a/sc/inc/srchuno.hxx
+++ b/sc/inc/srchuno.hxx
@@ -24,11 +24,11 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <svl/itemprop.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class SvxSearchItem;
 
-class ScCellSearchObj : public cppu::WeakImplHelper3<
+class ScCellSearchObj : public cppu::WeakImplHelper<
                                 com::sun::star::util::XReplaceDescriptor,
                                 com::sun::star::lang::XUnoTunnel,
                                 com::sun::star::lang::XServiceInfo >
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx
index b8abfed38bff..a41d9e3e8a8d 100644
--- a/sc/inc/styleuno.hxx
+++ b/sc/inc/styleuno.hxx
@@ -34,8 +34,7 @@
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase4.hxx>
-#include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
 
 
@@ -46,7 +45,7 @@ class SfxObjectShell;
 class ScStyleFamilyObj;
 class ScStyleObj;
 
-class ScStyleFamiliesObj : public ::cppu::WeakImplHelper4<
+class ScStyleFamiliesObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::container::XIndexAccess,
                             ::com::sun::star::container::XNameAccess,
                             ::com::sun::star::style::XStyleLoader2,
@@ -118,7 +117,7 @@ private:
                                             ::com::sun::star::uno::RuntimeException, std::exception);
 };
 
-class ScStyleFamilyObj : public ::cppu::WeakImplHelper4<
+class ScStyleFamilyObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::container::XNameContainer,
                             ::com::sun::star::container::XIndexAccess,
                             ::com::sun::star::beans::XPropertySet,
@@ -210,7 +209,7 @@ public:
                                 throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
 };
 
-class ScStyleObj : public ::cppu::WeakImplHelper7<
+class ScStyleObj : public ::cppu::WeakImplHelper<
                     ::com::sun::star::style::XStyle,
                     ::com::sun::star::beans::XPropertySet,
                     ::com::sun::star::beans::XMultiPropertySet,
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx
index 433ef8416153..d99930cfa748 100644
--- a/sc/inc/targuno.hxx
+++ b/sc/inc/targuno.hxx
@@ -48,8 +48,7 @@
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XElementAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 
 class ScDocShell;
 
@@ -63,7 +62,7 @@ class ScDocShell;
 
 //! Graphic / OleObject (need separate collections!)
 
-class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper2<
+class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper<
                                 ::com::sun::star::container::XNameAccess,
                                 ::com::sun::star::lang::XServiceInfo >,
                             public SfxListener
@@ -96,7 +95,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL      getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
-class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper3<
+class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper<
                                 ::com::sun::star::beans::XPropertySet,
                                 ::com::sun::star::document::XLinkTargetSupplier,
                                 ::com::sun::star::lang::XServiceInfo >,
@@ -158,7 +157,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
-class ScLinkTargetsObj : public ::cppu::WeakImplHelper2<
+class ScLinkTargetsObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::container::XNameAccess,
                             ::com::sun::star::lang::XServiceInfo >
 {
diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx
index 3223c066f081..93c7b6696f06 100644
--- a/sc/inc/textuno.hxx
+++ b/sc/inc/textuno.hxx
@@ -28,8 +28,7 @@
 #include <com/sun/star/sheet/XHeaderFooterContent.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/implbase3.hxx>
-#include <cppuhelper/implbase5.hxx>
+#include <cppuhelper/implbase.hxx>
 
 #include <rtl/ref.hxx>
 #include "scdllapi.h"
@@ -57,7 +56,7 @@ struct ScHeaderFieldData;
 //  ScHeaderFooterContentObj is a dumb container which must be re-written into
 //  the page template using setPropertyValue
 
-class ScHeaderFooterContentObj : public cppu::WeakImplHelper3<
+class ScHeaderFooterContentObj : public cppu::WeakImplHelper<
                             com::sun::star::sheet::XHeaderFooterContent,
                             com::sun::star::lang::XUnoTunnel,
                             com::sun::star::lang::XServiceInfo >
@@ -140,7 +139,7 @@ public:
  *
  * ScHeaderFooterTextObj changes the text in a ScHeaderFooterContentObj.
  */
-class ScHeaderFooterTextObj : public cppu::WeakImplHelper5<
+class ScHeaderFooterTextObj : public cppu::WeakImplHelper<
                             com::sun::star::text::XText,
                             com::sun::star::text::XTextRangeMover,
                             com::sun::star::container::XEnumerationAccess,
diff --git a/sc/inc/tokenuno.hxx b/sc/inc/tokenuno.hxx
index 6c1009ff897d..6dd75aad1ff3 100644
--- a/sc/inc/tokenuno.hxx
+++ b/sc/inc/tokenuno.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp>
 #include <com/sun/star/sheet/FormulaToken.hpp>
 #include <com/sun/star/sheet/XFormulaParser.hpp>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <svl/lstner.hxx>
 #include <formula/FormulaOpCodeMapperObj.hxx>
 #include "address.hxx"
@@ -48,7 +48,7 @@ public:
                         const ScTokenArray& rTokenArray );
 };
 
-class ScFormulaParserObj : public ::cppu::WeakImplHelper3<
+class ScFormulaParserObj : public ::cppu::WeakImplHelper<
                             ::com::sun::star::sheet::XFormulaParser,
                             ::com::sun::star::beans::XPropertySet,
                             ::com::sun::star::lang::XServiceInfo >,