writerfilter/source/dmapper/GraphicImport.cxx | 4 ++--
writerfilter/source/dmapper/ModelEventListener.hxx | 4 ++--
writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 5 ++---
writerfilter/source/ooxml/OOXMLFastContextHandler.hxx | 4 ++--
writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx | 6 ++----
5 files changed, 10 insertions(+), 13 deletions(-)
New commits:
commit 71cda4559fee5dada9877d90c03136566a0f81c1
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Apr 6 10:59:17 2015 +0200
writerfilter: use variadic cppu::WeakImplHelper
Change-Id: I38c7776d141bb1e582be7043993986cd6346c331
Reviewed-on: https://gerrit.libreoffice.org/15168
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx
b/writerfilter/source/dmapper/GraphicImport.cxx
index 8b9dc63..9cfae29 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -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;
diff --git a/writerfilter/source/dmapper/ModelEventListener.hxx
b/writerfilter/source/dmapper/ModelEventListener.hxx
index aecfb6a..d0933b3 100644
--- a/writerfilter/source/dmapper/ModelEventListener.hxx
+++ b/writerfilter/source/dmapper/ModelEventListener.hxx
@@ -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;
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 9a9c841..8a8e1b8 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -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),
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
index 3021526..f4e0ba7 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.hxx
@@ -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;
diff --git a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
index bc5bc08..d3ac6bc 100644
--- a/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
+++ b/writerfilter/source/ooxml/OOXMLFastDocumentHandler.hxx
@@ -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(
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
