mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hwpfilter: tdf#88206 replace cppu::WeakImplHelper*

Browse Source 
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>
This commit is contained in:
Takeshi Abe
2015-08-15 15:09:19 +09:00
committed by Noel Grandin
parent d74271bec8
commit 370a26f780
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hwpfilter/source/attributes.cxx
View File

@@ -53,7 +53,7 @@ sal_Int16 SAL_CALL AttributeListImpl::getLength() throw (RuntimeException, std::
AttributeListImpl::AttributeListImpl( const AttributeListImpl &r ) : 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 = new AttributeListImpl_impl;
*m_pImpl = *(r.m_pImpl); *m_pImpl = *(r.m_pImpl);

4
hwpfilter/source/attributes.hxx
View File

@@ -22,7 +22,7 @@
#define INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX #define INCLUDED_HWPFILTER_SOURCE_ATTRIBUTES_HXX
#include <com/sun/star/xml/sax/XAttributeList.hpp> #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; using namespace ::com::sun::star::uno;
struct AttributeListImpl_impl; struct AttributeListImpl_impl;
class AttributeListImpl : public WeakImplHelper1< XAttributeList > class AttributeListImpl : public WeakImplHelper< XAttributeList >
{ {
protected: protected:
virtual ~AttributeListImpl(); virtual ~AttributeListImpl();

8
hwpfilter/source/hwpreader.hxx
View File

@@ -37,9 +37,7 @@
#include <com/sun/star/document/XExtendedFilterDetection.hpp> #include <com/sun/star/document/XExtendedFilterDetection.hpp>
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/implbase4.hxx>
#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
@@ -73,7 +71,7 @@ struct HwpReaderPrivate;
/** /**
* This class implements the external Parser interface * This class implements the external Parser interface
*/ */
class HwpReader : public WeakImplHelper1<XFilter> class HwpReader : public WeakImplHelper<XFilter>
{ {
public: public:
@@ -151,7 +149,7 @@ private:
static char* getPStyleName(int, char *); static char* getPStyleName(int, char *);
}; };
class HwpImportFilter : public WeakImplHelper4< XFilter, XImporter, XServiceInfo, XExtendedFilterDetection > class HwpImportFilter : public WeakImplHelper< XFilter, XImporter, XServiceInfo, XExtendedFilterDetection >
{ {
public: public:
HwpImportFilter(const Reference< XMultiServiceFactory >& rFact); HwpImportFilter(const Reference< XMultiServiceFactory >& rFact);