unoxml/inc/pch/precompiled_unoxml.hxx | 2 +- unoxml/qa/unit/domtest.cxx | 8 ++++---- unoxml/source/dom/attr.hxx | 4 ++-- unoxml/source/dom/attributesmap.hxx | 4 ++-- unoxml/source/dom/cdatasection.hxx | 3 ++- unoxml/source/dom/characterdata.hxx | 4 ++-- unoxml/source/dom/childlist.hxx | 4 ++-- unoxml/source/dom/comment.hxx | 3 ++- unoxml/source/dom/document.hxx | 4 ++-- unoxml/source/dom/documentbuilder.cxx | 4 ++-- unoxml/source/dom/documentbuilder.hxx | 4 ++-- unoxml/source/dom/documentfragment.hxx | 3 ++- unoxml/source/dom/documenttype.hxx | 3 ++- unoxml/source/dom/domimplementation.hxx | 4 ++-- unoxml/source/dom/element.hxx | 3 ++- unoxml/source/dom/elementlist.cxx | 3 ++- unoxml/source/dom/elementlist.hxx | 7 +++---- unoxml/source/dom/entitiesmap.hxx | 4 ++-- unoxml/source/dom/entity.hxx | 3 ++- unoxml/source/dom/entityreference.hxx | 3 ++- unoxml/source/dom/node.hxx | 4 ++-- unoxml/source/dom/notation.hxx | 3 ++- unoxml/source/dom/notationsmap.hxx | 4 ++-- unoxml/source/dom/processinginstruction.hxx | 3 ++- unoxml/source/dom/saxbuilder.hxx | 4 ++-- unoxml/source/dom/text.hxx | 4 ++-- unoxml/source/events/event.hxx | 4 ++-- unoxml/source/events/mouseevent.hxx | 4 ++-- unoxml/source/events/mutationevent.hxx | 4 ++-- unoxml/source/events/uievent.hxx | 4 ++-- unoxml/source/rdf/CBlankNode.cxx | 4 ++-- unoxml/source/rdf/CLiteral.cxx | 4 ++-- unoxml/source/rdf/CURI.cxx | 4 ++-- unoxml/source/rdf/librdf_repository.cxx | 11 +++++------ unoxml/source/xpath/nodelist.hxx | 4 ++-- unoxml/source/xpath/xpathapi.hxx | 4 ++-- unoxml/source/xpath/xpathobject.hxx | 4 ++-- 37 files changed, 79 insertions(+), 71 deletions(-)
New commits: commit 9303e87bb6839afc09d4db543ff17f2fb5142359 Author: Takeshi Abe <[email protected]> Date: Thu Sep 10 12:16:49 2015 +0900 unoxml: tdf#88206 replace cppu::WeakImplHelper* etc. with the variadic variants. Change-Id: Id753717b228061c810a0122e551326ab001949a9 Reviewed-on: https://gerrit.libreoffice.org/18460 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/unoxml/inc/pch/precompiled_unoxml.hxx b/unoxml/inc/pch/precompiled_unoxml.hxx index bb69ccc..a5d60a5 100644 --- a/unoxml/inc/pch/precompiled_unoxml.hxx +++ b/unoxml/inc/pch/precompiled_unoxml.hxx @@ -38,7 +38,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> #include <libxml/tree.h> diff --git a/unoxml/qa/unit/domtest.cxx b/unoxml/qa/unit/domtest.cxx index 9a03f66..d85c8aa 100644 --- a/unoxml/qa/unit/domtest.cxx +++ b/unoxml/qa/unit/domtest.cxx @@ -24,7 +24,7 @@ #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/compbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/basemutex.hxx> #include <cppunit/TestFixture.h> @@ -89,7 +89,7 @@ static const char errorTestFile[] = static const char fatalTestFile[] = ""; struct ErrorHandler - : public ::cppu::WeakImplHelper1< xml::sax::XErrorHandler > + : public ::cppu::WeakImplHelper< xml::sax::XErrorHandler > { sal_uInt32 mnErrCount; sal_uInt32 mnFatalCount; @@ -117,7 +117,7 @@ struct ErrorHandler }; struct DocumentHandler - : public ::cppu::WeakImplHelper1< xml::sax::XFastDocumentHandler > + : public ::cppu::WeakImplHelper< xml::sax::XFastDocumentHandler > { // XFastContextHandler virtual void SAL_CALL startFastElement( ::sal_Int32 Element, const uno::Reference< xml::sax::XFastAttributeList >& ) throw (xml::sax::SAXException, uno::RuntimeException) SAL_OVERRIDE @@ -169,7 +169,7 @@ struct DocumentHandler }; struct TokenHandler - : public ::cppu::WeakImplHelper1< xml::sax::XFastTokenHandler > + : public ::cppu::WeakImplHelper< xml::sax::XFastTokenHandler > { virtual ::sal_Int32 SAL_CALL getTokenFromUTF8( const uno::Sequence< ::sal_Int8 >& Identifier ) throw (uno::RuntimeException) SAL_OVERRIDE { diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx index 5046e9d..2468625 100644 --- a/unoxml/source/dom/attr.hxx +++ b/unoxml/source/dom/attr.hxx @@ -24,7 +24,7 @@ #include <libxml/tree.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XNode.hpp> @@ -36,7 +36,7 @@ namespace DOM { typedef ::std::pair< OString, OString > stringpair_t; - typedef ::cppu::ImplInheritanceHelper1< CNode, css::xml::dom::XAttr > CAttr_Base; + typedef ::cppu::ImplInheritanceHelper< CNode, css::xml::dom::XAttr > CAttr_Base; class CAttr : public CAttr_Base diff --git a/unoxml/source/dom/attributesmap.hxx b/unoxml/source/dom/attributesmap.hxx index d49a39f..7455b64 100644 --- a/unoxml/source/dom/attributesmap.hxx +++ b/unoxml/source/dom/attributesmap.hxx @@ -27,14 +27,14 @@ #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XNamedNodeMap.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace DOM { class CElement; class CAttributesMap - : public cppu::WeakImplHelper1< css::xml::dom::XNamedNodeMap > + : public cppu::WeakImplHelper< css::xml::dom::XNamedNodeMap > { private: ::rtl::Reference<CElement> const m_pElement; diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx index 6073ba6..2ec4ceb 100644 --- a/unoxml/source/dom/cdatasection.hxx +++ b/unoxml/source/dom/cdatasection.hxx @@ -23,11 +23,12 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XCDATASection.hpp> +#include <cppuhelper/implbase.hxx> #include <text.hxx> namespace DOM { - typedef ::cppu::ImplInheritanceHelper1< CText, css::xml::dom::XCDATASection > + typedef ::cppu::ImplInheritanceHelper< CText, css::xml::dom::XCDATASection > CCDATASection_Base; class CCDATASection diff --git a/unoxml/source/dom/characterdata.hxx b/unoxml/source/dom/characterdata.hxx index 39d637a..0eb5222e 100644 --- a/unoxml/source/dom/characterdata.hxx +++ b/unoxml/source/dom/characterdata.hxx @@ -24,7 +24,7 @@ #include <sal/types.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XNode.hpp> @@ -34,7 +34,7 @@ namespace DOM { - typedef ::cppu::ImplInheritanceHelper1< CNode, css::xml::dom::XCharacterData > + typedef ::cppu::ImplInheritanceHelper< CNode, css::xml::dom::XCharacterData > CCharacterData_Base; class CCharacterData diff --git a/unoxml/source/dom/childlist.hxx b/unoxml/source/dom/childlist.hxx index 8ac42e0..fa94ed6 100644 --- a/unoxml/source/dom/childlist.hxx +++ b/unoxml/source/dom/childlist.hxx @@ -27,14 +27,14 @@ #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XNodeList.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace DOM { class CNode; class CChildList - : public cppu::WeakImplHelper1< css::xml::dom::XNodeList > + : public cppu::WeakImplHelper< css::xml::dom::XNodeList > { private: ::rtl::Reference<CNode> const m_pNode; diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx index 6280c18..44057c6 100644 --- a/unoxml/source/dom/comment.hxx +++ b/unoxml/source/dom/comment.hxx @@ -23,11 +23,12 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XComment.hpp> +#include <cppuhelper/implbase.hxx> #include <characterdata.hxx> namespace DOM { - typedef ::cppu::ImplInheritanceHelper1< CCharacterData, css::xml::dom::XComment > + typedef ::cppu::ImplInheritanceHelper< CCharacterData, css::xml::dom::XComment > CComment_Base; class CComment diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx index 4ba221b..04099ef 100644 --- a/unoxml/source/dom/document.hxx +++ b/unoxml/source/dom/document.hxx @@ -27,7 +27,7 @@ #include <sal/types.h> -#include <cppuhelper/implbase6.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/StringPair.hpp> @@ -56,7 +56,7 @@ namespace DOM class CElement; - typedef ::cppu::ImplInheritanceHelper6< + typedef ::cppu::ImplInheritanceHelper< CNode, css::xml::dom::XDocument, css::xml::dom::events::XDocumentEvent, css::io::XActiveDataControl, css::io::XActiveDataSource, css::xml::sax::XSAXSerializable, css::xml::sax::XFastSAXSerializable> diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index a5a1bb5..d2f03be 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -33,7 +33,7 @@ #include <osl/diagnose.h> #include <comphelper/processfactory.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/xml/sax/SAXParseException.hpp> @@ -60,7 +60,7 @@ using css::xml::sax::InputSource; namespace DOM { - class CDefaultEntityResolver : public cppu::WeakImplHelper1< XEntityResolver > + class CDefaultEntityResolver : public cppu::WeakImplHelper< XEntityResolver > { public: virtual InputSource SAL_CALL resolveEntity( const OUString& sPublicId, const OUString& sSystemId ) diff --git a/unoxml/source/dom/documentbuilder.hxx b/unoxml/source/dom/documentbuilder.hxx index 1f7a96d..6312616 100644 --- a/unoxml/source/dom/documentbuilder.hxx +++ b/unoxml/source/dom/documentbuilder.hxx @@ -22,7 +22,7 @@ #include <sal/types.h> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> @@ -41,7 +41,7 @@ namespace DOM { - typedef ::cppu::WeakImplHelper2 + typedef ::cppu::WeakImplHelper < css::xml::dom::XDocumentBuilder , css::lang::XServiceInfo > CDocumentBuilder_Base; diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx index 809c37d..95778fc 100644 --- a/unoxml/source/dom/documentfragment.hxx +++ b/unoxml/source/dom/documentfragment.hxx @@ -23,11 +23,12 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XDocumentFragment.hpp> +#include <cppuhelper/implbase.hxx> #include <node.hxx> namespace DOM { - typedef ::cppu::ImplInheritanceHelper1< CNode, css::xml::dom::XDocumentFragment > + typedef ::cppu::ImplInheritanceHelper< CNode, css::xml::dom::XDocumentFragment > CDocumentFragment_Base; class CDocumentFragment diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx index 5523eb4..bec5d2b 100644 --- a/unoxml/source/dom/documenttype.hxx +++ b/unoxml/source/dom/documenttype.hxx @@ -29,11 +29,12 @@ #include <com/sun/star/xml/dom/XNodeList.hpp> #include <com/sun/star/xml/dom/XNamedNodeMap.hpp> +#include <cppuhelper/implbase.hxx> #include <node.hxx> namespace DOM { - typedef ::cppu::ImplInheritanceHelper1< CNode, css::xml::dom::XDocumentType > + typedef ::cppu::ImplInheritanceHelper< CNode, css::xml::dom::XDocumentType > CDocumentType_Base; class CDocumentType diff --git a/unoxml/source/dom/domimplementation.hxx b/unoxml/source/dom/domimplementation.hxx index 4ffd187..540fa7f 100644 --- a/unoxml/source/dom/domimplementation.hxx +++ b/unoxml/source/dom/domimplementation.hxx @@ -27,12 +27,12 @@ #include <com/sun/star/xml/dom/XDocumentType.hpp> #include <com/sun/star/xml/dom/XDOMImplementation.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace DOM { class CDOMImplementation - : public cppu::WeakImplHelper1< css::xml::dom::XDOMImplementation > + : public cppu::WeakImplHelper< css::xml::dom::XDOMImplementation > { public: diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx index 8afbc42..4e29ae1 100644 --- a/unoxml/source/dom/element.hxx +++ b/unoxml/source/dom/element.hxx @@ -28,11 +28,12 @@ #include <com/sun/star/xml/dom/XNamedNodeMap.hpp> #include <com/sun/star/xml/dom/NodeType.hpp> +#include <cppuhelper/implbase.hxx> #include <node.hxx> namespace DOM { - typedef ::cppu::ImplInheritanceHelper1<CNode, css::xml::dom::XElement > CElement_Base; + typedef ::cppu::ImplInheritanceHelper<CNode, css::xml::dom::XElement > CElement_Base; class CElement : public CElement_Base diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx index 8dd8ac7..ef88c99 100644 --- a/unoxml/source/dom/elementlist.cxx +++ b/unoxml/source/dom/elementlist.cxx @@ -21,6 +21,7 @@ #include <string.h> +#include <cppuhelper/implbase.hxx> #include <osl/diagnose.h> #include <element.hxx> @@ -32,7 +33,7 @@ using namespace css::xml::dom::events; namespace { - class WeakEventListener : public ::cppu::WeakImplHelper1<css::xml::dom::events::XEventListener> + class WeakEventListener : public ::cppu::WeakImplHelper<css::xml::dom::events::XEventListener> { private: css::uno::WeakReference<css::xml::dom::events::XEventListener> mxOwner; diff --git a/unoxml/source/dom/elementlist.hxx b/unoxml/source/dom/elementlist.hxx index c61df46..07928923 100644 --- a/unoxml/source/dom/elementlist.hxx +++ b/unoxml/source/dom/elementlist.hxx @@ -36,8 +36,7 @@ #include <com/sun/star/xml/dom/events/XEvent.hpp> #include <com/sun/star/xml/dom/events/XEventListener.hpp> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> namespace DOM { @@ -46,7 +45,7 @@ namespace DOM typedef std::vector< xmlNodePtr > nodevector_t; class CElementListImpl - : public cppu::WeakImplHelper2< css::xml::dom::XNodeList, + : public cppu::WeakImplHelper< css::xml::dom::XNodeList, css::xml::dom::events::XEventListener > { private: @@ -89,7 +88,7 @@ namespace DOM }; class CElementList - : public cppu::WeakImplHelper2< css::xml::dom::XNodeList, + : public cppu::WeakImplHelper< css::xml::dom::XNodeList, css::xml::dom::events::XEventListener > { private: diff --git a/unoxml/source/dom/entitiesmap.hxx b/unoxml/source/dom/entitiesmap.hxx index fc7164c..efa977e 100644 --- a/unoxml/source/dom/entitiesmap.hxx +++ b/unoxml/source/dom/entitiesmap.hxx @@ -27,14 +27,14 @@ #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XNamedNodeMap.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace DOM { class CDocumentType; class CEntitiesMap - : public cppu::WeakImplHelper1< css::xml::dom::XNamedNodeMap > + : public cppu::WeakImplHelper< css::xml::dom::XNamedNodeMap > { private: ::rtl::Reference<CDocumentType> const m_pDocType; diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx index 501b596..30f5c5b 100644 --- a/unoxml/source/dom/entity.hxx +++ b/unoxml/source/dom/entity.hxx @@ -28,11 +28,12 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XEntity.hpp> +#include <cppuhelper/implbase.hxx> #include <node.hxx> namespace DOM { - typedef ::cppu::ImplInheritanceHelper1< CNode, css::xml::dom::XEntity > CEntity_Base; + typedef ::cppu::ImplInheritanceHelper< CNode, css::xml::dom::XEntity > CEntity_Base; class CEntity : public CEntity_Base diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx index 7f154e1..11076cb 100644 --- a/unoxml/source/dom/entityreference.hxx +++ b/unoxml/source/dom/entityreference.hxx @@ -25,11 +25,12 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XEntityReference.hpp> +#include <cppuhelper/implbase.hxx> #include <node.hxx> namespace DOM { - typedef ::cppu::ImplInheritanceHelper1< CNode, css::xml::dom::XEntityReference > + typedef ::cppu::ImplInheritanceHelper< CNode, css::xml::dom::XEntityReference > CEntityReference_Base; class CEntityReference diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx index 65bd92f..74c81d4 100644 --- a/unoxml/source/dom/node.hxx +++ b/unoxml/source/dom/node.hxx @@ -27,7 +27,7 @@ #include <rtl/string.hxx> #include <rtl/ustring.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <sax/fastattribs.hxx> @@ -94,7 +94,7 @@ namespace DOM class CDocument; - class CNode : public cppu::WeakImplHelper3< css::xml::dom::XNode, css::lang::XUnoTunnel, css::xml::dom::events::XEventTarget > + class CNode : public cppu::WeakImplHelper< css::xml::dom::XNode, css::lang::XUnoTunnel, css::xml::dom::events::XEventTarget > { friend class CDocument; friend class CElement; diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx index 50be07d..f38ad98 100644 --- a/unoxml/source/dom/notation.hxx +++ b/unoxml/source/dom/notation.hxx @@ -25,11 +25,12 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XNotation.hpp> +#include <cppuhelper/implbase.hxx> #include <node.hxx> namespace DOM { - typedef cppu::ImplInheritanceHelper1< CNode, css::xml::dom::XNotation > CNotation_Base; + typedef cppu::ImplInheritanceHelper< CNode, css::xml::dom::XNotation > CNotation_Base; class CNotation : public CNotation_Base diff --git a/unoxml/source/dom/notationsmap.hxx b/unoxml/source/dom/notationsmap.hxx index d740587..6b119a5 100644 --- a/unoxml/source/dom/notationsmap.hxx +++ b/unoxml/source/dom/notationsmap.hxx @@ -27,14 +27,14 @@ #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XNamedNodeMap.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> namespace DOM { class CDocumentType; class CNotationsMap - : public cppu::WeakImplHelper1< css::xml::dom::XNamedNodeMap > + : public cppu::WeakImplHelper< css::xml::dom::XNamedNodeMap > { private: ::rtl::Reference<CDocumentType> const m_pDocType; diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx index a052bcc..4e5505a 100644 --- a/unoxml/source/dom/processinginstruction.hxx +++ b/unoxml/source/dom/processinginstruction.hxx @@ -25,11 +25,12 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XProcessingInstruction.hpp> +#include <cppuhelper/implbase.hxx> #include <node.hxx> namespace DOM { - typedef ::cppu::ImplInheritanceHelper1< CNode, css::xml::dom::XProcessingInstruction > + typedef ::cppu::ImplInheritanceHelper< CNode, css::xml::dom::XProcessingInstruction > CProcessingInstruction_Base; class CProcessingInstruction diff --git a/unoxml/source/dom/saxbuilder.hxx b/unoxml/source/dom/saxbuilder.hxx index 728a262..cfa0869 100644 --- a/unoxml/source/dom/saxbuilder.hxx +++ b/unoxml/source/dom/saxbuilder.hxx @@ -25,7 +25,7 @@ #include <sal/types.h> #include <osl/mutex.hxx> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> @@ -50,7 +50,7 @@ namespace DOM typedef std::stack< NSMap > NSStack; class CSAXDocumentBuilder - : public ::cppu::WeakImplHelper2< css::xml::dom::XSAXDocumentBuilder2, css::lang::XServiceInfo > + : public ::cppu::WeakImplHelper< css::xml::dom::XSAXDocumentBuilder2, css::lang::XServiceInfo > { private: diff --git a/unoxml/source/dom/text.hxx b/unoxml/source/dom/text.hxx index fc90d8c..1ee6e5d 100644 --- a/unoxml/source/dom/text.hxx +++ b/unoxml/source/dom/text.hxx @@ -24,7 +24,7 @@ #include <sal/types.h> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XNode.hpp> @@ -34,7 +34,7 @@ namespace DOM { - typedef ::cppu::ImplInheritanceHelper1< CCharacterData, css::xml::dom::XText > CText_Base; + typedef ::cppu::ImplInheritanceHelper< CCharacterData, css::xml::dom::XText > CText_Base; class CText : public CText_Base diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx index 55f1591..d6df8a7 100644 --- a/unoxml/source/events/event.hxx +++ b/unoxml/source/events/event.hxx @@ -27,13 +27,13 @@ #include <com/sun/star/xml/dom/events/XEventTarget.hpp> #include <com/sun/star/util/Time.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "../dom/node.hxx" namespace DOM {namespace events { -class CEvent : public cppu::WeakImplHelper1< css::xml::dom::events::XEvent > +class CEvent : public cppu::WeakImplHelper< css::xml::dom::events::XEvent > { friend class CEventDispatcher; diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx index 19df1ed..6a53ed3 100644 --- a/unoxml/source/events/mouseevent.hxx +++ b/unoxml/source/events/mouseevent.hxx @@ -23,13 +23,13 @@ #include <com/sun/star/xml/dom/events/PhaseType.hpp> #include <com/sun/star/xml/dom/events/XMouseEvent.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "uievent.hxx" namespace DOM { namespace events { -typedef ::cppu::ImplInheritanceHelper1< CUIEvent, css::xml::dom::events::XMouseEvent > +typedef ::cppu::ImplInheritanceHelper< CUIEvent, css::xml::dom::events::XMouseEvent > CMouseEvent_Base; class CMouseEvent diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx index 7fe031d..d95a05f 100644 --- a/unoxml/source/events/mutationevent.hxx +++ b/unoxml/source/events/mutationevent.hxx @@ -28,13 +28,13 @@ #include <com/sun/star/xml/dom/events/AttrChangeType.hpp> #include <com/sun/star/xml/dom/events/XMutationEvent.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "event.hxx" namespace DOM { namespace events { -typedef ::cppu::ImplInheritanceHelper1< CEvent, css::xml::dom::events::XMutationEvent > +typedef ::cppu::ImplInheritanceHelper< CEvent, css::xml::dom::events::XMutationEvent > CMutationEvent_Base; class CMutationEvent diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx index fbf5744..4d197b2 100644 --- a/unoxml/source/events/uievent.hxx +++ b/unoxml/source/events/uievent.hxx @@ -26,13 +26,13 @@ #include <com/sun/star/xml/dom/events/XUIEvent.hpp> #include <com/sun/star/xml/dom/views/XAbstractView.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include "event.hxx" namespace DOM { namespace events { -typedef ::cppu::ImplInheritanceHelper1< CEvent, css::xml::dom::events::XUIEvent > CUIEvent_Base; +typedef ::cppu::ImplInheritanceHelper< CEvent, css::xml::dom::events::XUIEvent > CUIEvent_Base; class CUIEvent : public CUIEvent_Base diff --git a/unoxml/source/rdf/CBlankNode.cxx b/unoxml/source/rdf/CBlankNode.cxx index def3b8f..5590f6f 100644 --- a/unoxml/source/rdf/CBlankNode.cxx +++ b/unoxml/source/rdf/CBlankNode.cxx @@ -20,7 +20,7 @@ #include "CNodes.hxx" #include <boost/noncopyable.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -33,7 +33,7 @@ namespace { class CBlankNode: - public ::cppu::WeakImplHelper3< + public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XInitialization, css::rdf::XBlankNode>, diff --git a/unoxml/source/rdf/CLiteral.cxx b/unoxml/source/rdf/CLiteral.cxx index 93cd892..5209398 100644 --- a/unoxml/source/rdf/CLiteral.cxx +++ b/unoxml/source/rdf/CLiteral.cxx @@ -20,7 +20,7 @@ #include "CNodes.hxx" #include <boost/noncopyable.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -35,7 +35,7 @@ namespace { class CLiteral: - public ::cppu::WeakImplHelper3< + public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XInitialization, css::rdf::XLiteral>, diff --git a/unoxml/source/rdf/CURI.cxx b/unoxml/source/rdf/CURI.cxx index e73b95e8..ec9430f 100644 --- a/unoxml/source/rdf/CURI.cxx +++ b/unoxml/source/rdf/CURI.cxx @@ -20,7 +20,7 @@ #include "CNodes.hxx" #include <boost/noncopyable.hpp> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -34,7 +34,7 @@ namespace { class CURI: - public ::cppu::WeakImplHelper3< + public ::cppu::WeakImplHelper< css::lang::XServiceInfo, css::lang::XInitialization, css::rdf::XURI>, diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 1dc5eaf..c2603f3 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -54,8 +54,7 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <osl/diagnose.h> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/implbase.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/supportsservice.hxx> @@ -273,7 +272,7 @@ private: class librdf_Repository: private boost::noncopyable, // private ::cppu::BaseMutex, - public ::cppu::WeakImplHelper3< + public ::cppu::WeakImplHelper< lang::XServiceInfo, rdf::XDocumentRepository, lang::XInitialization> @@ -457,7 +456,7 @@ private: */ class librdf_GraphResult: private boost::noncopyable, - public ::cppu::WeakImplHelper1< + public ::cppu::WeakImplHelper< container::XEnumeration> { public: @@ -571,7 +570,7 @@ throw (uno::RuntimeException, container::NoSuchElementException, */ class librdf_QuerySelectResult: private boost::noncopyable, - public ::cppu::WeakImplHelper1< + public ::cppu::WeakImplHelper< rdf::XQuerySelectResult> { public: @@ -697,7 +696,7 @@ librdf_QuerySelectResult::getBindingNames() throw (uno::RuntimeException, std::e */ class librdf_NamedGraph: private boost::noncopyable, - public ::cppu::WeakImplHelper1< + public ::cppu::WeakImplHelper< rdf::XNamedGraph> { public: diff --git a/unoxml/source/xpath/nodelist.hxx b/unoxml/source/xpath/nodelist.hxx index f1aa9f4..2b5da0b 100644 --- a/unoxml/source/xpath/nodelist.hxx +++ b/unoxml/source/xpath/nodelist.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <rtl/ref.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XNode.hpp> @@ -42,7 +42,7 @@ namespace DOM { namespace XPath { - class CNodeList : public cppu::WeakImplHelper1< css::xml::dom::XNodeList > + class CNodeList : public cppu::WeakImplHelper< css::xml::dom::XNodeList > { private: /// #i115995# keep document alive diff --git a/unoxml/source/xpath/xpathapi.hxx b/unoxml/source/xpath/xpathapi.hxx index 5b47f89..cf84886 100644 --- a/unoxml/source/xpath/xpathapi.hxx +++ b/unoxml/source/xpath/xpathapi.hxx @@ -25,7 +25,7 @@ #include <sal/types.h> -#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> @@ -48,7 +48,7 @@ namespace XPath typedef std::map<OUString, OUString> nsmap_t; typedef std::vector< css::uno::Reference<css::xml::xpath::XXPathExtension> > extensions_t; - typedef ::cppu::WeakImplHelper2 + typedef ::cppu::WeakImplHelper < css::xml::xpath::XXPathAPI , css::lang::XServiceInfo > CXPathAPI_Base; diff --git a/unoxml/source/xpath/xpathobject.hxx b/unoxml/source/xpath/xpathobject.hxx index 987621b..7fba073 100644 --- a/unoxml/source/xpath/xpathobject.hxx +++ b/unoxml/source/xpath/xpathobject.hxx @@ -28,7 +28,7 @@ #include <sal/types.h> #include <rtl/ref.hxx> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/xml/dom/XNodeList.hpp> @@ -40,7 +40,7 @@ namespace DOM { namespace XPath { - class CXPathObject : public cppu::WeakImplHelper1< css::xml::xpath::XXPathObject > + class CXPathObject : public cppu::WeakImplHelper< css::xml::xpath::XXPathObject > { private: ::rtl::Reference< DOM::CDocument > const m_pDocument; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
