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

writerfilter: use variadic cppu::WeakImplHelper

Browse Source 
Change-Id: I38c7776d141bb1e582be7043993986cd6346c331
Reviewed-on: https://gerrit.libreoffice.org/15168
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna
2015-04-06 10:59:17 +02:00
parent aea8f62517
commit 71cda4559f
5 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
writerfilter/source/dmapper/GraphicImport.cxx
View File

@@ -44,7 +44,7 @@
#include <svx/svdobj.hxx>
#include <svx/unoapi.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx>
#include <comphelper/string.hxx>
@@ -72,7 +72,7 @@ namespace dmapper
using namespace std;
using namespace css;
class XInputStreamHelper : public cppu::WeakImplHelper1<io::XInputStream>
class XInputStreamHelper : public cppu::WeakImplHelper<io::XInputStream>
{
const sal_uInt8* m_pBuffer;
const sal_Int32 m_nLength;

4
writerfilter/source/dmapper/ModelEventListener.hxx
View File

@@ -20,14 +20,14 @@
#define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_MODELEVENTLISTENER_HXX
#include <com/sun/star/document/XEventListener.hpp>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase.hxx>
namespace writerfilter {
namespace dmapper{
class ModelEventListener :
public cppu::WeakImplHelper1< ::com::sun::star::document::XEventListener >
public cppu::WeakImplHelper< ::com::sun::star::document::XEventListener >
{
bool m_bIndexes;
bool m_bControls;

5
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
View File

@@ -83,9 +83,8 @@ OOXMLFastContextHandler::OOXMLFastContextHandler
mpParserState->incContextCount();
}
OOXMLFastContextHandler::OOXMLFastContextHandler
(OOXMLFastContextHandler * pContext)
: cppu::WeakImplHelper1<com::sun::star::xml::sax::XFastContextHandler>(),
OOXMLFastContextHandler::OOXMLFastContextHandler(OOXMLFastContextHandler * pContext)
: cppu::WeakImplHelper<xml::sax::XFastContextHandler>(),
mpParent(pContext),
mId(0),
mnDefine(0),

4
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
View File

@@ -26,7 +26,7 @@
#include <set>
#include "sal/config.h"
#include "com/sun/star/uno/XComponentContext.hpp"
#include "cppuhelper/implbase1.hxx"
#include "cppuhelper/implbase.hxx"
#include "com/sun/star/xml/sax/XFastContextHandler.hpp"
#include "OOXMLParserState.hxx"
#include "OOXMLPropertySetImpl.hxx"
@@ -42,7 +42,7 @@ namespace ooxml
{
class OOXMLFastContextHandler: public ::cppu::WeakImplHelper1<css::xml::sax::XFastContextHandler>
class OOXMLFastContextHandler: public ::cppu::WeakImplHelper<css::xml::sax::XFastContextHandler>
{
public:
typedef std::shared_ptr<OOXMLFastContextHandler> Pointer_t;

6
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
View File

@@ -22,7 +22,7 @@
#include <sal/config.h>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
#include <dmapper/resourcemodel.hxx>
#include <ooxml/OOXMLDocument.hxx>
@@ -34,9 +34,7 @@ namespace ooxml
class OOXMLFastContextHandler;
class OOXMLFastDocumentHandler:
public ::cppu::WeakImplHelper1<
css::xml::sax::XFastDocumentHandler>
class OOXMLFastDocumentHandler : public cppu::WeakImplHelper<css::xml::sax::XFastDocumentHandler>
{
public:
OOXMLFastDocumentHandler(