diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-08 10:41:27 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-09-08 08:07:43 +0000 |
| commit | bfa5b13b42770fb709dc2af7cab7aff1942eaa50 (patch) | |
| tree | 83fae76d9ba0d7935f93b6203e66a415168e072b /toolkit/source/awt | |
| parent | 751c771adc45cb150fa42bc70397e2571b28a60b (diff) | |
toolkit: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: If62a0c3da7f9732a60316dfd49323f6ab838fb6d
Reviewed-on: https://gerrit.libreoffice.org/18396
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'toolkit/source/awt')
| -rw-r--r-- | toolkit/source/awt/asynccallback.cxx | 4 | ||||
| -rw-r--r-- | toolkit/source/awt/stylesettings.hxx | 4 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxtoolkit.cxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx index cc988b2b0831..f344eb86e0da 100644 --- a/toolkit/source/awt/asynccallback.cxx +++ b/toolkit/source/awt/asynccallback.cxx @@ -24,7 +24,7 @@ #include "osl/mutex.hxx" #include "cppuhelper/factory.hxx" #include "cppuhelper/implementationentry.hxx" -#include "cppuhelper/implbase2.hxx" +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include "com/sun/star/lang/XServiceInfo.hpp" #include <com/sun/star/uno/XComponentContext.hpp> @@ -34,7 +34,7 @@ namespace { class AsyncCallback: - public ::cppu::WeakImplHelper2< + public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::awt::XRequestCallback>, private boost::noncopyable diff --git a/toolkit/source/awt/stylesettings.hxx b/toolkit/source/awt/stylesettings.hxx index c49f1b7684b3..1274b59bab78 100644 --- a/toolkit/source/awt/stylesettings.hxx +++ b/toolkit/source/awt/stylesettings.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/awt/XStyleSettings.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <boost/scoped_ptr.hpp> @@ -42,7 +42,7 @@ namespace toolkit //= WindowStyleSettings struct WindowStyleSettings_Data; - typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XStyleSettings + typedef ::cppu::WeakImplHelper < ::com::sun::star::awt::XStyleSettings > WindowStyleSettings_Base; class WindowStyleSettings : public WindowStyleSettings_Base { diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 9d5ff0183e51..43174f51e1fb 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -45,7 +45,7 @@ #include <com/sun/star/awt/XMessageBoxFactory.hpp> #include <cppuhelper/bootstrap.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> @@ -147,7 +147,7 @@ protected: }; class VCLXToolkit : public VCLXToolkit_Impl, - public cppu::WeakComponentImplHelper2< + public cppu::WeakComponentImplHelper< css::awt::XToolkitExperimental, css::lang::XServiceInfo > { @@ -648,7 +648,7 @@ static void SAL_CALL ToolkitWorkerFunction( void* pArgs ) // constructor, which might initialize VCL VCLXToolkit::VCLXToolkit(): - cppu::WeakComponentImplHelper2< + cppu::WeakComponentImplHelper< ::com::sun::star::awt::XToolkitExperimental, ::com::sun::star::lang::XServiceInfo>( GetMutex() ), m_aTopWindowListeners(rBHelper.rMutex), |