diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-08 10:53:34 +0900 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-11 07:06:51 +0000 |
commit | 678bb5135bf99a295c38060aa003e81a8c3b435a (patch) | |
tree | 678f5221dc2cc1bf29c7e11e917139c6566679c6 /include | |
parent | 0b0fb87fbac36ef9fbf3dfeac0f1372617f4b3e4 (diff) |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants, for filter.
Change-Id: I30dcd7cfb3e484034f6cceceb1ff7cd9d3f4b7a6
Reviewed-on: https://gerrit.libreoffice.org/17585
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/filter/msfilter/mstoolbar.hxx | 1 | ||||
-rw-r--r-- | include/filter/msfilter/msvbahelper.hxx | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/filter/msfilter/mstoolbar.hxx b/include/filter/msfilter/mstoolbar.hxx index 028e9a5c7e07..8d3704e3a5d8 100644 --- a/include/filter/msfilter/mstoolbar.hxx +++ b/include/filter/msfilter/mstoolbar.hxx @@ -20,7 +20,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <tools/stream.hxx> #include <vcl/bitmap.hxx> -#include <cppuhelper/implbase1.hxx> class TBCHeader; diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index 5eef1fc40f8c..2e1da6fc9005 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -20,7 +20,7 @@ #define INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX #include <sfx2/objsh.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/script/vba/XVBAMacroResolver.hpp> @@ -51,7 +51,7 @@ MSFILTER_DLLPUBLIC ::com::sun::star::awt::KeyEvent parseKeyEvent( const OUString MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxDoc, const ::com::sun::star::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (::com::sun::star::uno::RuntimeException, std::exception); -typedef ::cppu::WeakImplHelper3< +typedef ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XInitialization, ::com::sun::star::script::vba::XVBAMacroResolver > VBAMacroResolverBase; |