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

tdf#88206 replace cppu::WeakImplHelper* in sax and xml*

Browse Source 
Change-Id: I75f4000a17155fbdff96fe0733dc0225b20cd4d2
Reviewed-on: https://gerrit.libreoffice.org/31678
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Jochen Nitschke
2016-12-06 14:24:17 +01:00
committed by Noel Grandin
parent e67857cb18
commit bd3402ba43
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sax/fastattribs.hxx
View File

@@ -25,7 +25,7 @@
#include <com/sun/star/xml/Attribute.hpp> #include <com/sun/star/xml/Attribute.hpp>
#include <com/sun/star/xml/FastAttribute.hpp> #include <com/sun/star/xml/FastAttribute.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <sax/saxdllapi.h> #include <sax/saxdllapi.h>
#include <map> #include <map>
@@ -70,7 +70,7 @@ class SAX_DLLPUBLIC FastTokenHandlerBase
const char *pStr, size_t nLength ); const char *pStr, size_t nLength );
}; };
class SAX_DLLPUBLIC FastAttributeList : public ::cppu::WeakImplHelper1< css::xml::sax::XFastAttributeList > class SAX_DLLPUBLIC FastAttributeList : public cppu::WeakImplHelper< css::xml::sax::XFastAttributeList >
{ {
public: public:
FastAttributeList( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& xTokenHandler, FastAttributeList( const css::uno::Reference< css::xml::sax::XFastTokenHandler >& xTokenHandler,

4
include/xmloff/XMLEmbeddedObjectExportFilter.hxx
View File

@@ -23,9 +23,9 @@
#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp>
#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/implbase3.hxx> #include <cppuhelper/implbase.hxx>
class XMLEmbeddedObjectExportFilter : public ::cppu::WeakImplHelper3< class XMLEmbeddedObjectExportFilter : public cppu::WeakImplHelper<
css::xml::sax::XExtendedDocumentHandler, css::xml::sax::XExtendedDocumentHandler,
css::lang::XServiceInfo, css::lang::XServiceInfo,
css::lang::XInitialization> css::lang::XInitialization>

4
include/xmloff/fasttokenhandler.hxx
View File

@@ -11,7 +11,7 @@
#define INCLUDED_XMLOFF_FASTTOKENHANDLER_HXX #define INCLUDED_XMLOFF_FASTTOKENHANDLER_HXX
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp> #include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <sax/fastattribs.hxx> #include <sax/fastattribs.hxx>
#include <xmloff/token/tokens.hxx> #include <xmloff/token/tokens.hxx>
#include <rtl/instance.hxx> #include <rtl/instance.hxx>
@@ -59,7 +59,7 @@ private:
struct StaticTokenMap : public rtl::Static< TokenMap, StaticTokenMap > {}; struct StaticTokenMap : public rtl::Static< TokenMap, StaticTokenMap > {};
class XMLOFF_DLLPUBLIC FastTokenHandler : public cppu::WeakImplHelper1< class XMLOFF_DLLPUBLIC FastTokenHandler : public cppu::WeakImplHelper<
css::xml::sax::XFastTokenHandler >, css::xml::sax::XFastTokenHandler >,
public sax_fastparser::FastTokenHandlerBase public sax_fastparser::FastTokenHandlerBase
{ {

4
include/xmloff/xmlexp.hxx
View File

@@ -57,7 +57,7 @@
#include <xmloff/XMLPageExport.hxx> #include <xmloff/XMLPageExport.hxx>
#include <xmloff/ProgressBarHelper.hxx> #include <xmloff/ProgressBarHelper.hxx>
#include <cppuhelper/implbase6.hxx> #include <cppuhelper/implbase.hxx>
#include <tools/fldunit.hxx> #include <tools/fldunit.hxx>
#include <list> #include <list>
@@ -108,7 +108,7 @@ namespace o3tl
template<> struct typed_flags<SvXMLExportFlags> : is_typed_flags<SvXMLExportFlags, 0x8fff> {}; template<> struct typed_flags<SvXMLExportFlags> : is_typed_flags<SvXMLExportFlags, 0x8fff> {};
} }
class XMLOFF_DLLPUBLIC SvXMLExport : public ::cppu::WeakImplHelper6< class XMLOFF_DLLPUBLIC SvXMLExport : public cppu::WeakImplHelper<
css::document::XFilter, css::document::XFilter,
css::lang::XServiceInfo, css::lang::XServiceInfo,
css::document::XExporter, css::document::XExporter,

4
include/xmloff/xmlictxt.hxx
View File

@@ -27,14 +27,14 @@
#include <com/sun/star/xml/sax/XFastContextHandler.hpp> #include <com/sun/star/xml/sax/XFastContextHandler.hpp>
#include <tools/ref.hxx> #include <tools/ref.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <xmloff/nmspmap.hxx> #include <xmloff/nmspmap.hxx>
#include <memory> #include <memory>
class SvXMLNamespaceMap; class SvXMLNamespaceMap;
class SvXMLImport; class SvXMLImport;
class XMLOFF_DLLPUBLIC SvXMLImportContext : public ::cppu::WeakImplHelper1< ::css::xml::sax::XFastContextHandler > class XMLOFF_DLLPUBLIC SvXMLImportContext : public cppu::WeakImplHelper< css::xml::sax::XFastContextHandler >
{ {
friend class SvXMLImport; friend class SvXMLImport;

4
include/xmloff/xmlimp.hxx
View File

@@ -50,7 +50,7 @@
#include <xmloff/shapeimport.hxx> #include <xmloff/shapeimport.hxx>
#include <xmloff/SchXMLImportHelper.hxx> #include <xmloff/SchXMLImportHelper.hxx>
#include <xmloff/ProgressBarHelper.hxx> #include <xmloff/ProgressBarHelper.hxx>
#include <cppuhelper/implbase8.hxx> #include <cppuhelper/implbase.hxx>
#include <xmloff/formlayerimport.hxx> #include <xmloff/formlayerimport.hxx>
#include <comphelper/attributelist.hxx> #include <comphelper/attributelist.hxx>
@@ -136,7 +136,7 @@ public:
}; };
class XMLOFF_DLLPUBLIC SvXMLImport : public ::cppu::WeakImplHelper8< class XMLOFF_DLLPUBLIC SvXMLImport : public cppu::WeakImplHelper<
css::xml::sax::XExtendedDocumentHandler, css::xml::sax::XExtendedDocumentHandler,
css::xml::sax::XFastDocumentHandler, css::xml::sax::XFastDocumentHandler,
css::lang::XServiceInfo, css::lang::XServiceInfo,

4
include/xmloff/xmlmetae.hxx
View File

@@ -24,7 +24,7 @@
#include <xmloff/dllapi.h> #include <xmloff/dllapi.h>
#include <sal/types.h> #include <sal/types.h>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <xmloff/xmltoken.hxx> #include <xmloff/xmltoken.hxx>
#include <vector> #include <vector>
@@ -46,7 +46,7 @@ class SvXMLExport;
office:meta must <em>not</em> be written. office:meta must <em>not</em> be written.
</p> </p>
*/ */
class XMLOFF_DLLPUBLIC SvXMLMetaExport : public ::cppu::WeakImplHelper1< class XMLOFF_DLLPUBLIC SvXMLMetaExport : public cppu::WeakImplHelper<
css::xml::sax::XDocumentHandler > css::xml::sax::XDocumentHandler >
{ {
private: private:

4
include/xmlscript/xml_helper.hxx
View File

@@ -21,7 +21,7 @@
#include <vector> #include <vector>
#include <rtl/byteseq.hxx> #include <rtl/byteseq.hxx>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase.hxx>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp>
@@ -39,7 +39,7 @@ namespace xmlscript
class XMLSCRIPT_DLLPUBLIC XMLElement class XMLSCRIPT_DLLPUBLIC XMLElement
: public ::cppu::WeakImplHelper1< css::xml::sax::XAttributeList > : public cppu::WeakImplHelper< css::xml::sax::XAttributeList >
{ {
public: public:
inline XMLElement( OUString const & name ) inline XMLElement( OUString const & name )