diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-29 07:48:41 +0900 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-03 17:53:31 +0000 |
| commit | f3c7e6953675f4ed85a5212a6af3ee189400f34e (patch) | |
| tree | 5e0cecee96c3d90b095c3dda64033f5376cc226e /scripting/source/stringresource/stringresource.hxx | |
| parent | 6e88d63829ad46c1cbb5c0c5b40c578430713817 (diff) | |
scripting: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I2a59d42efbb1aeef5078d0b0744b5a3c0559affa
Reviewed-on: https://gerrit.libreoffice.org/18123
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'scripting/source/stringresource/stringresource.hxx')
| -rw-r--r-- | scripting/source/stringresource/stringresource.hxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/scripting/source/stringresource/stringresource.hxx b/scripting/source/stringresource/stringresource.hxx index 5992ea808efe..50edd33f8bd3 100644 --- a/scripting/source/stringresource/stringresource.hxx +++ b/scripting/source/stringresource/stringresource.hxx @@ -28,8 +28,7 @@ #include <com/sun/star/ucb/XSimpleFileAccess3.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <osl/mutex.hxx> @@ -91,7 +90,7 @@ typedef std::vector< LocaleItem* > LocaleItemVector; typedef std::vector< LocaleItem* >::iterator LocaleItemVectorIt; typedef std::vector< LocaleItem* >::const_iterator LocaleItemVectorConstIt; -typedef ::cppu::WeakImplHelper2< +typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::resource::XStringResourceManager > StringResourceImpl_BASE; @@ -233,7 +232,7 @@ public: ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -typedef ::cppu::ImplInheritanceHelper1< +typedef ::cppu::ImplInheritanceHelper< StringResourceImpl, ::com::sun::star::resource::XStringResourcePersistence > StringResourcePersistenceImpl_BASE; @@ -408,7 +407,7 @@ public: }; -typedef ::cppu::ImplInheritanceHelper2< +typedef ::cppu::ImplInheritanceHelper< StringResourcePersistenceImpl, ::com::sun::star::lang::XInitialization, ::com::sun::star::resource::XStringResourceWithStorage > StringResourceWithStorageImpl_BASE; @@ -530,7 +529,7 @@ public: }; -typedef ::cppu::ImplInheritanceHelper2< +typedef ::cppu::ImplInheritanceHelper< StringResourcePersistenceImpl, ::com::sun::star::lang::XInitialization, ::com::sun::star::resource::XStringResourceWithLocation > StringResourceWithLocationImpl_BASE; |