diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-21 12:10:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-21 13:05:11 +0100 |
| commit | 773d5c69261f0b2511c7a0124804449bf664bfb5 (patch) | |
| tree | 81ed8a62f67fadc44d7671e08f2a0a971193bd39 | |
| parent | 75899a2b57ae54ac7d9d2ae27183c915ee238455 (diff) | |
remove last WeakImplHelper8 uses
Change-Id: I7ecadedb77832fb3073870880dbfba121fdae826
| -rw-r--r-- | sc/inc/chart2uno.hxx | 10 | ||||
| -rw-r--r-- | ucb/source/sorter/sortresult.hxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/file/filrset.hxx | 8 |
3 files changed, 9 insertions, 13 deletions
diff --git a/sc/inc/chart2uno.hxx b/sc/inc/chart2uno.hxx index 4dfdbebcbeb2..03e988c0400b 100644 --- a/sc/inc/chart2uno.hxx +++ b/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, diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx index a225fb969862..f5f74690cce6 100644 --- a/ucb/source/sorter/sortresult.hxx +++ b/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, diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx index a50645be44ff..c8e104a2cba1 100644 --- a/ucb/source/ucp/file/filrset.hxx +++ b/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, |