diff options
| author | Takeshi Abe <tabe@fixedpoint.jp> | 2015-08-26 18:13:46 +0900 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-27 07:39:35 +0000 |
| commit | 61cac9542a2a16455aa6868b2495d940cb488726 (patch) | |
| tree | 6ddad76200186d7af39e18f2939d88e549536be3 /sax/test | |
| parent | 1950127b1cf056bc5b7d594e6a2d54375f8504ab (diff) | |
sax: tdf#88206 replace cppu::WeakImplHelper*
with the variadic variants.
Change-Id: Id8d0c61b0454652abbbd09be0c72696a057dc2d2
Reviewed-on: https://gerrit.libreoffice.org/18008
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sax/test')
| -rw-r--r-- | sax/test/sax/testsax.cxx | 7 | ||||
| -rw-r--r-- | sax/test/sax/testwriter.cxx | 9 | ||||
| -rw-r--r-- | sax/test/saxdemo.cxx | 11 |
3 files changed, 12 insertions, 15 deletions
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx index b520059975a3..104ac8c7de77 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 752cedc2d121..a1bddcf26c6b 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 5af47eb763ff..95d83f0c0354 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; } |