diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2016-09-28 21:53:59 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-29 06:53:56 +0000 |
| commit | 2bebc1fc2e76f73d953ca1e1f64803fd4c42a62c (patch) | |
| tree | 2dde75809db61a0f03efd141aeb1d41efa1d91c8 /include/svl | |
| parent | d200c344cfd7bf25b6dc6cac5626728c3ef94fff (diff) | |
tdf#88206 replace cppu::WeakImplHelper* in sfx2 and svl
some fallout in include/editeng/unotext.hxx
which uses WeakAggImplHelper1 from implbase1.hxx
Change-Id: I7237c46c1eb17752c63eeddc6a3aee41788fbbd2
Reviewed-on: https://gerrit.libreoffice.org/29374
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/svl')
| -rw-r--r-- | include/svl/itemprop.hxx | 6 | ||||
| -rw-r--r-- | include/svl/style.hxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/svl/itemprop.hxx b/include/svl/itemprop.hxx index 216efdd954fb..026e1b2e5b22 100644 --- a/include/svl/itemprop.hxx +++ b/include/svl/itemprop.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/itemset.hxx> #include <svl/svldllapi.h> #include <vector> @@ -155,7 +155,7 @@ public: }; struct SfxItemPropertySetInfo_Impl; -class SVL_DLLPUBLIC SfxItemPropertySetInfo : public cppu::WeakImplHelper1<css::beans::XPropertySetInfo> +class SVL_DLLPUBLIC SfxItemPropertySetInfo : public cppu::WeakImplHelper<css::beans::XPropertySetInfo> { std::unique_ptr<SfxItemPropertySetInfo_Impl> m_pImpl; @@ -179,7 +179,7 @@ public: }; -class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper1<css::beans::XPropertySetInfo > +class SVL_DLLPUBLIC SfxExtItemPropertySetInfo: public cppu::WeakImplHelper<css::beans::XPropertySetInfo> { SfxItemPropertyMap aExtMap; public: diff --git a/include/svl/style.hxx b/include/svl/style.hxx index 48e4586542f0..59fd6cf08596 100644 --- a/include/svl/style.hxx +++ b/include/svl/style.hxx @@ -25,7 +25,7 @@ #include <rtl/ref.hxx> #include <comphelper/weak.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <svl/svldllapi.h> #include <rsc/rscsfx.hxx> #include <svl/hint.hxx> @@ -273,7 +273,7 @@ public: virtual bool SetParent( const OUString& ) override; protected: - SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper2 + SfxStyleSheet() // do not use! needed by MSVC at compile time to satisfy ImplInheritanceHelper : SfxStyleSheetBase(OUString("dummy"), nullptr, SfxStyleFamily::All, 0) { assert(false); @@ -332,7 +332,7 @@ public: const OUString& GetOldName() const { return aName; } }; -class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, css::style::XStyle, css::lang::XUnoTunnel > +class SVL_DLLPUBLIC SfxUnoStyleSheet : public cppu::ImplInheritanceHelper<SfxStyleSheet, css::style::XStyle, css::lang::XUnoTunnel> { public: SfxUnoStyleSheet( const OUString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, sal_uInt16 _nMaske ); |