diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-15 15:09:19 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-18 07:11:34 +0000 |
| commit | 370a26f7804d12da26abe007f1d80a00c4fdaeb4 (patch) | |
| tree | 655fa07736c88f0142a50492f082ec585c860422 /hwpfilter | |
| parent | d74271bec86e13beca09e5c5f2842efd45756d9c (diff) | |
hwpfilter: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: Ibfe59dc7631cf499f42ff998066ed73d1eb257b3
Reviewed-on: https://gerrit.libreoffice.org/17767
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'hwpfilter')
| -rw-r--r-- | hwpfilter/source/attributes.cxx | 2 | ||||
| -rw-r--r-- | hwpfilter/source/attributes.hxx | 4 | ||||
| -rw-r--r-- | hwpfilter/source/hwpreader.hxx | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/hwpfilter/source/attributes.cxx b/hwpfilter/source/attributes.cxx index a5749e8e0dd7..14868ec5a8f3 100644 --- a/hwpfilter/source/attributes.cxx +++ b/hwpfilter/source/attributes.cxx @@ -53,7 +53,7 @@ sal_Int16 SAL_CALL AttributeListImpl::getLength() throw (RuntimeException, std:: AttributeListImpl::AttributeListImpl( const AttributeListImpl &r ) : -cppu::WeakImplHelper1<com::sun::star::xml::sax::XAttributeList>( r ) +cppu::WeakImplHelper<com::sun::star::xml::sax::XAttributeList>( r ) { m_pImpl = new AttributeListImpl_impl; *m_pImpl = *(r.m_pImpl); diff --git a/hwpfilter/source/attributes.hxx b/hwpfilter/source/attributes.hxx index de1bde89548f..e762579c7031 100644 --- a/hwpfilter/source/attributes.hxx +++ b/hwpfilter/source/attributes.hxx @@ -22,7 +22,7 @@ #define INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX #include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> /*---------------------------------------- * @@ -35,7 +35,7 @@ using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; struct AttributeListImpl_impl; -class AttributeListImpl : public WeakImplHelper1< XAttributeList > +class AttributeListImpl : public WeakImplHelper< XAttributeList > { protected: virtual ~AttributeListImpl(); diff --git a/hwpfilter/source/hwpreader.hxx b/hwpfilter/source/hwpreader.hxx index 15baadd89f09..c94c078ef603 100644 --- a/hwpfilter/source/hwpreader.hxx +++ b/hwpfilter/source/hwpreader.hxx @@ -37,9 +37,7 @@ #include <com/sun/star/document/XExtendedFilterDetection.hpp> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase4.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> @@ -73,7 +71,7 @@ struct HwpReaderPrivate; /** * This class implements the external Parser interface */ -class HwpReader : public WeakImplHelper1<XFilter> +class HwpReader : public WeakImplHelper<XFilter> { public: @@ -151,7 +149,7 @@ private: static char* getPStyleName(int, char *); }; -class HwpImportFilter : public WeakImplHelper4< XFilter, XImporter, XServiceInfo, XExtendedFilterDetection > +class HwpImportFilter : public WeakImplHelper< XFilter, XImporter, XServiceInfo, XExtendedFilterDetection > { public: HwpImportFilter(const Reference< XMultiServiceFactory >& rFact); |