remove last WeakImplHelper8 uses

Change-Id: I7ecadedb77832fb3073870880dbfba121fdae826

sc/inc/chart2uno.hxx

@@ -42,9 +42,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/implbase5.hxx>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <rtl/ustring.hxx>
 #include <svl/itemprop.hxx>
 
@@ -59,7 +57,7 @@ class ScDocument;
 
 // DataProvider
 class ScChart2DataProvider : public
-                ::cppu::WeakImplHelper5<
+                ::cppu::WeakImplHelper<
                     ::com::sun::star::chart2::data::XDataProvider,
                     ::com::sun::star::chart2::data::XSheetDataProvider,
                     ::com::sun::star::chart2::data::XRangeXMLConversion,
@@ -193,7 +191,7 @@ private:
 
 // DataSource
 class ScChart2DataSource : public
-                ::cppu::WeakImplHelper2<
+                ::cppu::WeakImplHelper<
                     ::com::sun::star::chart2::data::XDataSource,
                     ::com::sun::star::lang::XServiceInfo>,
                 SfxListener
@@ -234,7 +232,7 @@ private:
 
 // DataSequence
 class ScChart2DataSequence : public
-                ::cppu::WeakImplHelper8<
+                ::cppu::WeakImplHelper<
                     ::com::sun::star::chart2::data::XDataSequence,
                     ::com::sun::star::chart2::data::XTextualDataSequence,
                     ::com::sun::star::chart2::data::XNumericalDataSequence,

ucb/source/sorter/sortresult.hxx

@@ -34,7 +34,7 @@
 #include <com/sun/star/ucb/NumberedSortingInfo.hpp>
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/ucb/ListAction.hpp>
-#include <cppuhelper/implbase8.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <deque>
 
 namespace cppu {
@@ -113,7 +113,7 @@ public:
 
 
 
-class SortedResultSet: public cppu::WeakImplHelper8 <
+class SortedResultSet: public cppu::WeakImplHelper <
     css::lang::XServiceInfo,
     css::lang::XComponent,
     css::ucb::XContentAccess,

ucb/source/ucp/file/filrset.hxx

@@ -35,16 +35,14 @@
 #include <com/sun/star/beans/Property.hpp>
 #include "filrow.hxx"
 #include "filnot.hxx"
-#include <cppuhelper/implbase8.hxx>
-
-
+#include <cppuhelper/implbase.hxx>
 
 namespace fileaccess {
 
-    class Notifier;
+class Notifier;
 
 class XResultSet_impl : public Notifier,
-        public cppu::WeakImplHelper8< css::lang::XEventListener,
+        public cppu::WeakImplHelper<  css::lang::XEventListener,
                                       css::sdbc::XRow,
                                       css::sdbc::XResultSet,
                                       css::ucb::XDynamicResultSet,