[Libreoffice-commits] core.git: sax/qa sax/source sax/test
Takeshi Abe
tabe at fixedpoint.jp
Thu Aug 27 00:39:57 PDT 2015
sax/qa/cppunit/parser.cxx | 4 ++--
sax/source/expatwrap/attrlistimpl.cxx | 2 +-
sax/source/expatwrap/attrlistimpl.hxx | 4 ++--
sax/source/expatwrap/sax_expat.cxx | 6 +++---
sax/source/expatwrap/saxwriter.cxx | 4 ++--
sax/source/fastparser/fastparser.cxx | 3 ++-
sax/test/sax/testsax.cxx | 7 +++----
sax/test/sax/testwriter.cxx | 9 ++++-----
sax/test/saxdemo.cxx | 11 +++++------
9 files changed, 24 insertions(+), 26 deletions(-)
New commits:
commit 61cac9542a2a16455aa6868b2495d940cb488726
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Wed Aug 26 18:13:46 2015 +0900
sax: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: Id8d0c61b0454652abbbd09be0c72696a057dc2d2
Reviewed-on: https://gerrit.libreoffice.org/18008
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/sax/qa/cppunit/parser.cxx b/sax/qa/cppunit/parser.cxx
index b781d9e..e3f0ef9 100644
--- a/sax/qa/cppunit/parser.cxx
+++ b/sax/qa/cppunit/parser.cxx
@@ -14,7 +14,7 @@
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
#include <sax/fastparser.hxx>
#include <test/bootstrapfixture.hxx>
@@ -23,7 +23,7 @@ using namespace css::xml::sax;
namespace {
-class DummyTokenHandler : public cppu::WeakImplHelper1< xml::sax::XFastTokenHandler >
+class DummyTokenHandler : public cppu::WeakImplHelper< xml::sax::XFastTokenHandler >
{
public:
DummyTokenHandler() {}
diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx
index 481e46f..525659d 100644
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ b/sax/source/expatwrap/attrlistimpl.cxx
@@ -64,7 +64,7 @@ sal_Int16 AttributeList::getLength() throw (RuntimeException, std::exception)
AttributeList::AttributeList( const AttributeList &r ) :
- cppu::WeakImplHelper2<XAttributeList, XCloneable>()
+ cppu::WeakImplHelper<XAttributeList, XCloneable>()
{
m_pImpl = new AttributeList_impl;
*m_pImpl = *(r.m_pImpl);
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index a03985e..e3afa15 100644
--- a/sax/source/expatwrap/attrlistimpl.hxx
+++ b/sax/source/expatwrap/attrlistimpl.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SAX_SOURCE_EXPATWRAP_ATTRLISTIMPL_HXX
#include "sal/config.h"
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
@@ -33,7 +33,7 @@ struct AttributeList_impl;
//FIXME
class AttributeList :
- public ::cppu::WeakImplHelper2<
+ public ::cppu::WeakImplHelper<
::com::sun::star::xml::sax::XAttributeList,
::com::sun::star::util::XCloneable >
{
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 8bbfd24..c02ee87 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -34,7 +34,7 @@
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <rtl/ref.hxx>
#include <sal/log.hxx>
@@ -138,7 +138,7 @@ class SaxExpatParser_Impl;
// This class implements the external Parser interface
class SaxExpatParser
- : public WeakImplHelper3< XInitialization
+ : public WeakImplHelper< XInitialization
, XServiceInfo
, XParser >
{
@@ -357,7 +357,7 @@ extern "C"
// LocatorImpl
class LocatorImpl :
- public WeakImplHelper2< XLocator, com::sun::star::io::XSeekable >
+ public WeakImplHelper< XLocator, com::sun::star::io::XSeekable >
// should use a different interface for stream positions!
{
public:
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index f1d418a..4215119 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -35,7 +35,7 @@
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <cppuhelper/weak.hxx>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <osl/diagnose.h>
@@ -869,7 +869,7 @@ static inline sal_Int32 getFirstLineBreak( const OUString & str ) throw ()
}
class SAXWriter :
- public WeakImplHelper2<
+ public WeakImplHelper<
XWriter,
XServiceInfo >
{
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index c866618..04ec931 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -28,6 +28,7 @@
#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
+#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <osl/conditn.hxx>
@@ -329,7 +330,7 @@ static int call_callbackExternalEntityRef( XML_Parser parser,
#endif
}
-class FastLocatorImpl : public WeakImplHelper1< XLocator >
+class FastLocatorImpl : public WeakImplHelper< XLocator >
{
public:
FastLocatorImpl( FastSaxParserImpl *p ) : mpParser(p) {}
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx
index b520059..104ac8c 100644
--- a/sax/test/sax/testsax.cxx
+++ b/sax/test/sax/testsax.cxx
@@ -30,8 +30,7 @@
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::cppu;
using namespace ::com::sun::star::uno;
@@ -45,7 +44,7 @@ using namespace ::com::sun::star::xml::sax;
namespace sax_test {
-class OSaxParserTest : public WeakImplHelper1< XSimpleTest >
+class OSaxParserTest : public WeakImplHelper< XSimpleTest >
{
public:
OSaxParserTest( const Reference < XMultiServiceFactory > & rFactory ) : m_rFactory( rFactory )
@@ -236,7 +235,7 @@ Reference< XInputStream > createStreamFromFile(
}
class TestDocumentHandler :
- public WeakImplHelper3< XExtendedDocumentHandler , XEntityResolver , XErrorHandler >
+ public WeakImplHelper< XExtendedDocumentHandler , XEntityResolver , XErrorHandler >
{
public:
TestDocumentHandler( const Reference < XMultiServiceFactory > &r , sal_Bool bPrint )
diff --git a/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx
index 752cedc..a1bddcf 100644
--- a/sax/test/sax/testwriter.cxx
+++ b/sax/test/sax/testwriter.cxx
@@ -31,8 +31,7 @@
#include <osl/time.h>
#include <cppuhelper/factory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
using namespace ::std;
@@ -47,7 +46,7 @@ using namespace ::com::sun::star::xml::sax;
namespace sax_test {
class OFileWriter :
- public WeakImplHelper1< XOutputStream >
+ public WeakImplHelper< XOutputStream >
{
public:
OFileWriter( char *pcFile ) { strncpy( m_pcFile, pcFile, 256 - 1 ); m_f = 0; }
@@ -92,7 +91,7 @@ void OFileWriter::closeOutput()
class OSaxWriterTest :
- public WeakImplHelper1< XSimpleTest >
+ public WeakImplHelper< XSimpleTest >
{
public:
OSaxWriterTest( const Reference < XMultiServiceFactory > & rFactory ) : m_rFactory( rFactory )
@@ -144,7 +143,7 @@ private:
*
*----------------------------------------*/
struct AttributeListImpl_impl;
-class AttributeListImpl : public WeakImplHelper1< XAttributeList >
+class AttributeListImpl : public WeakImplHelper< XAttributeList >
{
public:
AttributeListImpl();
diff --git a/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 5af47eb..95d83f0 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.cxx
@@ -40,8 +40,7 @@
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <cppuhelper/servicefactory.hxx>
-#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase.hxx>
#include <osl/diagnose.h>
@@ -57,7 +56,7 @@ using namespace ::com::sun::star::io;
/************
* Sequence of bytes -> InputStream
************/
-class OInputStream : public WeakImplHelper1 < XInputStream >
+class OInputStream : public WeakImplHelper < XInputStream >
{
public:
OInputStream( const Sequence< sal_Int8 >&seq ) :
@@ -130,7 +129,7 @@ Reference< XInputStream > createStreamFromFile(
// The Documenthandler for reading sax
class TestDocumentHandler :
- public WeakImplHelper3< XExtendedDocumentHandler , XEntityResolver , XErrorHandler >
+ public WeakImplHelper< XExtendedDocumentHandler , XEntityResolver , XErrorHandler >
{
public:
TestDocumentHandler( )
@@ -251,7 +250,7 @@ public:
// implements an XAttributeList
struct AttributeListImpl_impl;
-class AttributeListImpl : public WeakImplHelper1< XAttributeList >
+class AttributeListImpl : public WeakImplHelper< XAttributeList >
{
public:
AttributeListImpl();
@@ -431,7 +430,7 @@ void writeParagraphHelper(
// writes data to a file
class OFileWriter :
- public WeakImplHelper1< XOutputStream >
+ public WeakImplHelper< XOutputStream >
{
public:
OFileWriter( char *pcFile ) { strncpy( m_pcFile , pcFile, 256 - 1 ); m_f = 0; }
More information about the Libreoffice-commits
mailing list