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/styleuno.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/styleuno.hxx')
| -rw-r--r-- | sc/inc/styleuno.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sc/inc/styleuno.hxx b/sc/inc/styleuno.hxx index b8abfed38bff..a41d9e3e8a8d 100644 --- a/sc/inc/styleuno.hxx +++ b/sc/inc/styleuno.hxx @@ -34,8 +34,7 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase7.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XComponent.hpp> @@ -46,7 +45,7 @@ class SfxObjectShell; class ScStyleFamilyObj; class ScStyleObj; -class ScStyleFamiliesObj : public ::cppu::WeakImplHelper4< +class ScStyleFamiliesObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XIndexAccess, ::com::sun::star::container::XNameAccess, ::com::sun::star::style::XStyleLoader2, @@ -118,7 +117,7 @@ private: ::com::sun::star::uno::RuntimeException, std::exception); }; -class ScStyleFamilyObj : public ::cppu::WeakImplHelper4< +class ScStyleFamilyObj : public ::cppu::WeakImplHelper< ::com::sun::star::container::XNameContainer, ::com::sun::star::container::XIndexAccess, ::com::sun::star::beans::XPropertySet, @@ -210,7 +209,7 @@ public: throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; -class ScStyleObj : public ::cppu::WeakImplHelper7< +class ScStyleObj : public ::cppu::WeakImplHelper< ::com::sun::star::style::XStyle, ::com::sun::star::beans::XPropertySet, ::com::sun::star::beans::XMultiPropertySet, |