diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-09-11 11:02:33 +0900 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-09-11 17:16:17 +0000 |
| commit | 8358eadcbae4b1e20f85f31d0faf6b3fccf353eb (patch) | |
| tree | 6d97a23ad4e1791c6d9cc2f633764486c0ad1f6d /xmloff/inc | |
| parent | f1f179ba0ff3d293e81c7b95554f8e6b140340d7 (diff) | |
xmloff: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: I47002abab1e025d0683f4cf8ef7b6c99e668d425
Reviewed-on: https://gerrit.libreoffice.org/18479
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'xmloff/inc')
| -rw-r--r-- | xmloff/inc/StyleMap.hxx | 4 | ||||
| -rw-r--r-- | xmloff/inc/XMLBasicExportFilter.hxx | 4 | ||||
| -rw-r--r-- | xmloff/inc/pch/precompiled_xo.hxx | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index 1f3142a6aaac..04faf515f67f 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -21,7 +21,7 @@ #define INCLUDED_XMLOFF_INC_STYLEMAP_HXX #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <unordered_map> struct StyleNameKey_Impl @@ -63,7 +63,7 @@ inline bool StyleNameHash_Impl::operator()( } class StyleMap : - public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XUnoTunnel>, + public ::cppu::WeakImplHelper< ::com::sun::star::lang::XUnoTunnel>, public std::unordered_map< StyleNameKey_Impl, OUString, StyleNameHash_Impl, StyleNameHash_Impl > { diff --git a/xmloff/inc/XMLBasicExportFilter.hxx b/xmloff/inc/XMLBasicExportFilter.hxx index e88751dde04f..a0b2644c81c0 100644 --- a/xmloff/inc/XMLBasicExportFilter.hxx +++ b/xmloff/inc/XMLBasicExportFilter.hxx @@ -21,11 +21,11 @@ #define INCLUDED_XMLOFF_INC_XMLBASICEXPORTFILTER_HXX #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> // class XMLBasicExportFilter -typedef ::cppu::WeakImplHelper1< +typedef ::cppu::WeakImplHelper< ::com::sun::star::xml::sax::XDocumentHandler > XMLBasicExportFilter_BASE; class XMLBasicExportFilter : public XMLBasicExportFilter_BASE diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx index 49a133d628ed..78573fcf08b3 100644 --- a/xmloff/inc/pch/precompiled_xo.hxx +++ b/xmloff/inc/pch/precompiled_xo.hxx @@ -500,6 +500,7 @@ #include <config_features.h> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/factory.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase3.hxx> #include <cppuhelper/supportsservice.hxx> |