diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-22 17:06:40 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-23 06:06:04 +0000 |
| commit | 7f4e0d6aa29da640408cf4cc84b2fc1a0c11f8ba (patch) | |
| tree | 7d078f47d4d7b72c627bae7e7192cf7316b5ebeb /oox/source/docprop | |
| parent | 9beb2bedc0f65b90cd35f7fa6c9b53ee6729a0c4 (diff) | |
oox: tdf#88206 replace cppu::WeakImplHelper* etc.
with the variadic variants.
Change-Id: I8a82df7ea24874d8e246dc983418d872f1943c8e
Reviewed-on: https://gerrit.libreoffice.org/17919
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'oox/source/docprop')
| -rw-r--r-- | oox/source/docprop/docprophandler.hxx | 4 | ||||
| -rw-r--r-- | oox/source/docprop/ooxmldocpropimport.hxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx index daabc03234b5..26d3593b00e9 100644 --- a/oox/source/docprop/docprophandler.hxx +++ b/oox/source/docprop/docprophandler.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/xml/sax/XFastDocumentHandler.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "oox/token/namespaces.hxx" #include "oox/token/tokens.hxx" @@ -39,7 +39,7 @@ namespace docprop { #define DC_TOKEN( token ) (::oox::NMSP_dc | XML_##token) #define DCT_TOKEN( token ) (::oox::NMSP_dcTerms | XML_##token) -class OOXMLDocPropHandler : public ::cppu::WeakImplHelper1< ::com::sun::star::xml::sax::XFastDocumentHandler > +class OOXMLDocPropHandler : public ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XFastDocumentHandler > { ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext; ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties > m_xDocProp; diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx index 861825a5dd5d..c186eb0083b5 100644 --- a/oox/source/docprop/ooxmldocpropimport.hxx +++ b/oox/source/docprop/ooxmldocpropimport.hxx @@ -24,13 +24,13 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> namespace oox { namespace docprop { class DocumentPropertiesImport : - public ::cppu::WeakImplHelper2< + public ::cppu::WeakImplHelper< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::document::XOOXMLDocumentPropertiesImporter > { |