diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-30 21:24:35 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-31 07:14:47 +0000 |
| commit | c1c6a8615c420e8b1dd1f94614a36e250dab8f96 (patch) | |
| tree | 46304fa1a82b0f3bde8d7c3341818ff69cec7934 /sd/inc | |
| parent | 5670f4ca8785180f135927477945027518e92ed4 (diff) | |
sd: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I01909ee45c31d17356e13b1ff2430440daff9aa7
Reviewed-on: https://gerrit.libreoffice.org/18146
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 10 | ||||
| -rw-r--r-- | sd/inc/stlfamily.hxx | 4 | ||||
| -rw-r--r-- | sd/inc/stlpool.hxx | 5 | ||||
| -rw-r--r-- | sd/inc/stlsheet.hxx | 4 |
4 files changed, 8 insertions, 15 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index ea9a234dff99..e8ac76af66d5 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -23,7 +23,7 @@ #include "comphelper/anytostring.hxx" #include "comphelper/scopeguard.hxx" #include "cppuhelper/exc_hlp.hxx" -#include "cppuhelper/implbase1.hxx" +#include <cppuhelper/implbase.hxx> #include "osl/diagnose.h" #include "osl/time.h" #include "rtl/ref.hxx" @@ -372,15 +372,9 @@ #include <cppcanvas/vclfactory.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/bootstrap.hxx> -#include <cppuhelper/compbase1.hxx> -#include <cppuhelper/compbase2.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase5.hxx> #include <cppuhelper/propertysetmixin.hxx> #include <cppuhelper/proptypehlp.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/sd/inc/stlfamily.hxx b/sd/inc/stlfamily.hxx index 9f5e743fe2d5..a88772bcb789 100644 --- a/sd/inc/stlfamily.hxx +++ b/sd/inc/stlfamily.hxx @@ -33,7 +33,7 @@ #include <rtl/ref.hxx> -#include <cppuhelper/implbase7.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/style.hxx> @@ -43,7 +43,7 @@ class SdStyleSheet; class SdPage; struct SdStyleFamilyImpl; -class SdStyleFamily : public ::cppu::WeakImplHelper7< css::container::XNameContainer, css::container::XNamed, css::container::XIndexAccess, css::lang::XSingleServiceFactory, css::lang::XServiceInfo, css::lang::XComponent, css::beans::XPropertySet > +class SdStyleFamily : public ::cppu::WeakImplHelper< css::container::XNameContainer, css::container::XNamed, css::container::XIndexAccess, css::lang::XSingleServiceFactory, css::lang::XServiceInfo, css::lang::XComponent, css::beans::XPropertySet > { public: /// creates the style family for the given SfxStyleFamily diff --git a/sd/inc/stlpool.hxx b/sd/inc/stlpool.hxx index 2578b0756a97..b6ebc30b0a0e 100644 --- a/sd/inc/stlpool.hxx +++ b/sd/inc/stlpool.hxx @@ -28,8 +28,7 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase7.hxx> +#include <cppuhelper/implbase.hxx> #include <map> #include <vector> @@ -46,7 +45,7 @@ class SvxNumberFormat; typedef std::map< const SdPage*, SdStyleFamilyRef > SdStyleFamilyMap; -typedef ::cppu::ImplInheritanceHelper4< SfxStyleSheetPool, +typedef ::cppu::ImplInheritanceHelper< SfxStyleSheetPool, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::container::XIndexAccess, ::com::sun::star::container::XNameAccess, diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx index e57ef3900140..9e05c2e043fc 100644 --- a/sd/inc/stlsheet.hxx +++ b/sd/inc/stlsheet.hxx @@ -30,7 +30,7 @@ #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/basemutex.hxx> #include <svl/style.hxx> @@ -43,7 +43,7 @@ class ModifyListenerForewarder; -typedef cppu::ImplInheritanceHelper5< SfxUnoStyleSheet, +typedef cppu::ImplInheritanceHelper< SfxUnoStyleSheet, ::com::sun::star::beans::XPropertySet, ::com::sun::star::lang::XServiceInfo, ::com::sun::star::beans::XPropertyState, |