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/nameuno.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/nameuno.hxx')
| -rw-r--r-- | sc/inc/nameuno.hxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index fa46ca59cd30..63f8b1057736 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -36,10 +36,7 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/XActionLockable.hpp> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase5.hxx> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> class ScDocShell; @@ -48,7 +45,7 @@ class ScRangeData; class ScTokenArray; class ScNamedRangesObj; -class SC_DLLPUBLIC ScNamedRangeObj : public ::cppu::WeakImplHelper6< +class SC_DLLPUBLIC ScNamedRangeObj : public ::cppu::WeakImplHelper< ::com::sun::star::sheet::XNamedRange, ::com::sun::star::sheet::XFormulaTokens, ::com::sun::star::sheet::XCellRangeReferrer, @@ -171,7 +168,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScNamedRangesObj : public ::cppu::WeakImplHelper6< +class ScNamedRangesObj : public ::cppu::WeakImplHelper< ::com::sun::star::sheet::XNamedRanges, ::com::sun::star::container::XEnumerationAccess, ::com::sun::star::container::XIndexAccess, @@ -337,7 +334,7 @@ public: virtual ~ScLocalNamedRangesObj(); }; -class ScLabelRangeObj : public ::cppu::WeakImplHelper2< +class ScLabelRangeObj : public ::cppu::WeakImplHelper< ::com::sun::star::sheet::XLabelRange, ::com::sun::star::lang::XServiceInfo >, public SfxListener @@ -376,7 +373,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScLabelRangesObj : public ::cppu::WeakImplHelper3< +class ScLabelRangesObj : public ::cppu::WeakImplHelper< ::com::sun::star::sheet::XLabelRanges, ::com::sun::star::container::XEnumerationAccess, ::com::sun::star::lang::XServiceInfo >, |