diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-01 18:13:22 +0900 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-03 08:14:03 +0000 |
commit | d465e8273f1ee54450f0bf59c41bda93c54b3db4 (patch) | |
tree | 88d951bdce2d78df440e959a630f84a6940a2e70 /sfx2/source/doc/SfxDocumentMetaData.cxx | |
parent | 32b6f11132dec25212f6ed6df4c2aa2419ebb065 (diff) |
sfx2: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: Id9b4ad4d1fa700c5ea3dd7417292cf2ddb7ade50
Reviewed-on: https://gerrit.libreoffice.org/18229
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2/source/doc/SfxDocumentMetaData.cxx')
-rw-r--r-- | sfx2/source/doc/SfxDocumentMetaData.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 27e31f02e0fd..8556b0ebaaf3 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> #include <boost/noncopyable.hpp> -#include <cppuhelper/compbase6.hxx> +#include <cppuhelper/compbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -79,7 +79,7 @@ #include <limits> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/document/XCompatWriterDocProperties.hpp> #include <com/sun/star/beans/PropertyBag.hpp> @@ -115,7 +115,7 @@ namespace { typedef std::vector<std::vector<std::pair<const char*, OUString> > > AttrVector; -typedef ::cppu::WeakComponentImplHelper6< +typedef ::cppu::WeakComponentImplHelper< css::lang::XServiceInfo, css::document::XDocumentProperties, css::lang::XInitialization, @@ -353,7 +353,7 @@ protected: void createUserDefined(); }; -typedef ::cppu::ImplInheritanceHelper1< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE; +typedef ::cppu::ImplInheritanceHelper< SfxDocumentMetaData, css::document::XCompatWriterDocProperties > CompatWriterDocPropsImpl_BASE; class CompatWriterDocPropsImpl : public CompatWriterDocPropsImpl_BASE { |