diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-07-30 16:41:22 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-07-30 13:15:51 +0000 |
| commit | e646e614e26d647c6b7ce6918b8dddad71568f96 (patch) | |
| tree | 5451c01d4a6210bb8c4696acb07526a6465f391e /include/editeng | |
| parent | 517e5d1e3339133c3a91d801fdb85f1d70057883 (diff) | |
tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants for editeng.
Change-Id: I28373dd31b8b922f59b99bf1c12faa31c72b9906
Reviewed-on: https://gerrit.libreoffice.org/17416
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/AccessibleContextBase.hxx | 4 | ||||
| -rw-r--r-- | include/editeng/AccessibleEditableTextPara.hxx | 4 | ||||
| -rw-r--r-- | include/editeng/AccessibleImageBullet.hxx | 4 | ||||
| -rw-r--r-- | include/editeng/UnoForbiddenCharsTable.hxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/include/editeng/AccessibleContextBase.hxx b/include/editeng/AccessibleContextBase.hxx index 391857d3104d..581f4fb877c1 100644 --- a/include/editeng/AccessibleContextBase.hxx +++ b/include/editeng/AccessibleContextBase.hxx @@ -36,7 +36,7 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <osl/mutex.hxx> -#include <cppuhelper/compbase4.hxx> +#include <cppuhelper/compbase.hxx> #include <editeng/editengdllapi.h> @@ -52,7 +52,7 @@ struct MutexOwner {mutable ::osl::Mutex maMutex;}; */ class EDITENG_DLLPUBLIC AccessibleContextBase : public MutexOwner, - public cppu::WeakComponentImplHelper4< + public cppu::WeakComponentImplHelper< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx index 37a6a25da8ea..6d48c27e6d73 100644 --- a/include/editeng/AccessibleEditableTextPara.hxx +++ b/include/editeng/AccessibleEditableTextPara.hxx @@ -23,7 +23,7 @@ #include <rtl/ustring.hxx> #include <tools/gen.hxx> #include <cppuhelper/weakref.hxx> -#include <cppuhelper/compbase9.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/interfacecontainer.hxx> @@ -46,7 +46,7 @@ namespace accessibility { - typedef ::cppu::WeakComponentImplHelper9< ::com::sun::star::accessibility::XAccessible, + typedef ::cppu::WeakComponentImplHelper< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleComponent, ::com::sun::star::accessibility::XAccessibleEditableText, diff --git a/include/editeng/AccessibleImageBullet.hxx b/include/editeng/AccessibleImageBullet.hxx index 79f2dbf56dd4..d4caae753dce 100644 --- a/include/editeng/AccessibleImageBullet.hxx +++ b/include/editeng/AccessibleImageBullet.hxx @@ -22,7 +22,7 @@ #include <tools/gen.hxx> #include <cppuhelper/weakref.hxx> -#include <cppuhelper/implbase5.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <com/sun/star/uno/Reference.hxx> @@ -36,7 +36,7 @@ namespace accessibility { - typedef ::cppu::WeakImplHelper5< ::com::sun::star::accessibility::XAccessible, + typedef ::cppu::WeakImplHelper< ::com::sun::star::accessibility::XAccessible, ::com::sun::star::accessibility::XAccessibleContext, ::com::sun::star::accessibility::XAccessibleComponent, ::com::sun::star::accessibility::XAccessibleEventBroadcaster, diff --git a/include/editeng/UnoForbiddenCharsTable.hxx b/include/editeng/UnoForbiddenCharsTable.hxx index 45ef28ed1eb8..7e729ebfcbd2 100644 --- a/include/editeng/UnoForbiddenCharsTable.hxx +++ b/include/editeng/UnoForbiddenCharsTable.hxx @@ -24,12 +24,12 @@ #include <com/sun/star/linguistic2/XSupportedLocales.hpp> #include <rtl/ref.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <editeng/editengdllapi.h> class SvxForbiddenCharactersTable; -class EDITENG_DLLPUBLIC SvxUnoForbiddenCharsTable : public cppu::WeakImplHelper2< +class EDITENG_DLLPUBLIC SvxUnoForbiddenCharsTable : public cppu::WeakImplHelper< com::sun::star::i18n::XForbiddenCharacters, com::sun::star::linguistic2::XSupportedLocales> { |