diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-28 09:42:29 +0900 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-09-03 16:14:41 +0000 |
commit | 1873563bb2d9743fe548ceaf2d1429280a27b956 (patch) | |
tree | cc1f851977966aeda4978a618b80bba01ca8dce2 /sc/inc/targuno.hxx | |
parent | tdf#93246: pass on cancel state in mail merge dialog (diff) | |
download | core-1873563bb2d9743fe548ceaf2d1429280a27b956.tar.gz core-1873563bb2d9743fe548ceaf2d1429280a27b956.zip |
sc: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I2f55a6231e903b0ca198cee3a88023ad1db6c50c
Reviewed-on: https://gerrit.libreoffice.org/18072
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sc/inc/targuno.hxx')
-rw-r--r-- | sc/inc/targuno.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sc/inc/targuno.hxx b/sc/inc/targuno.hxx index 433ef8416153..d99930cfa748 100644 --- a/sc/inc/targuno.hxx +++ b/sc/inc/targuno.hxx @@ -48,8 +48,7 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XElementAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> class ScDocShell; @@ -63,7 +62,7 @@ class ScDocShell; //! Graphic / OleObject (need separate collections!) -class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper2< +class ScLinkTargetTypesObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess, ::com::sun::star::lang::XServiceInfo >, public SfxListener @@ -96,7 +95,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; -class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper3< +class ScLinkTargetTypeObj : public ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertySet, ::com::sun::star::document::XLinkTargetSupplier, ::com::sun::star::lang::XServiceInfo >, @@ -158,7 +157,7 @@ public: virtual ::com::sun::star::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; }; -class ScLinkTargetsObj : public ::cppu::WeakImplHelper2< +class ScLinkTargetsObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameAccess, ::com::sun::star::lang::XServiceInfo > { |