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/dlgprov | |
| 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/dlgprov')
| -rw-r--r-- | scripting/source/dlgprov/DialogModelProvider.hxx | 4 | ||||
| -rw-r--r-- | scripting/source/dlgprov/dlgevtatt.hxx | 8 | ||||
| -rw-r--r-- | scripting/source/dlgprov/dlgprov.hxx | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/scripting/source/dlgprov/DialogModelProvider.hxx b/scripting/source/dlgprov/DialogModelProvider.hxx index ef1f468be98c..c225cd86cff6 100644 --- a/scripting/source/dlgprov/DialogModelProvider.hxx +++ b/scripting/source/dlgprov/DialogModelProvider.hxx @@ -22,7 +22,7 @@ #include "sal/config.h" #include "cppuhelper/factory.hxx" -#include "cppuhelper/implbase4.hxx" +#include <cppuhelper/implbase.hxx> #include "com/sun/star/lang/XInitialization.hpp" #include "com/sun/star/container/XNameContainer.hpp" #include "com/sun/star/lang/XServiceInfo.hpp" @@ -32,7 +32,7 @@ namespace dlgprov{ class DialogModelProvider: - public ::cppu::WeakImplHelper4< + public ::cppu::WeakImplHelper< css::lang::XInitialization, css::container::XNameContainer, css::beans::XPropertySet, diff --git a/scripting/source/dlgprov/dlgevtatt.hxx b/scripting/source/dlgprov/dlgevtatt.hxx index 3f12f257c3d7..b0441c77413b 100644 --- a/scripting/source/dlgprov/dlgevtatt.hxx +++ b/scripting/source/dlgprov/dlgevtatt.hxx @@ -28,7 +28,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/beans/XIntrospectionAccess.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/script/XScriptEventsSupplier.hpp> @@ -42,7 +42,7 @@ namespace dlgprov OUStringHash, std::equal_to< OUString > > ListenerHash; - typedef ::cppu::WeakImplHelper1< + typedef ::cppu::WeakImplHelper< ::com::sun::star::script::XScriptEventsAttacher > DialogEventsAttacherImpl_BASE; @@ -84,7 +84,7 @@ namespace dlgprov // class DialogAllListenerImpl - typedef ::cppu::WeakImplHelper1< + typedef ::cppu::WeakImplHelper< ::com::sun::star::script::XAllListener > DialogAllListenerImpl_BASE; @@ -118,7 +118,7 @@ namespace dlgprov // class DialogScriptListenerImpl - typedef ::cppu::WeakImplHelper1< + typedef ::cppu::WeakImplHelper< ::com::sun::star::script::XScriptListener > DialogScriptListenerImpl_BASE; diff --git a/scripting/source/dlgprov/dlgprov.hxx b/scripting/source/dlgprov/dlgprov.hxx index 1a183b379b8e..55444436a74a 100644 --- a/scripting/source/dlgprov/dlgprov.hxx +++ b/scripting/source/dlgprov/dlgprov.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/script/XScriptEventsAttacher.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> #include <memory> @@ -63,7 +63,7 @@ namespace dlgprov const ::com::sun::star::uno::Reference< ::com::sun::star::resource::XStringResourceManager >& xStringResourceManager, const ::com::sun::star::uno::Any &aDialogSourceURL) throw ( ::com::sun::star::uno::Exception ); - typedef ::cppu::WeakImplHelper4< + typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, ::com::sun::star::awt::XDialogProvider2, |