summaryrefslogtreecommitdiff
path: root/xmlscript
diff options
context:
space:
mode:
authorAlexandre Vicenzi <vicenzi.alexandre@gmail.com>2014-02-05 23:57:38 -0200
committerMarcos Souza <marcos.souza.org@gmail.com>2014-02-06 15:47:54 +0000
commitf139c10fd357c1c07f857a1d277f39d9cbc39d1f (patch)
tree242d722ae6b27e273e61a17baf79b22ef010eaae /xmlscript
parent61e28e86ed30fb37df96c7fd0807b5aaeacf5eea (diff)
fdo#54938 Convert oox, sc, vcl, svtools... to cppu::supportsService
Change-Id: I6268bc57417d53b9810c81071fbcd604e2a19507 Reviewed-on: https://gerrit.libreoffice.org/7886 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Marcos Souza <marcos.souza.org@gmail.com>
Diffstat (limited to 'xmlscript')
-rw-r--r--xmlscript/source/xml_helper/xml_impctx.cxx22
1 files changed, 8 insertions, 14 deletions
diff --git a/xmlscript/source/xml_helper/xml_impctx.cxx b/xmlscript/source/xml_helper/xml_impctx.cxx
index adee7b22da12..6bcafae6cf39 100644
--- a/xmlscript/source/xml_helper/xml_impctx.cxx
+++ b/xmlscript/source/xml_helper/xml_impctx.cxx
@@ -22,12 +22,12 @@
#include <cppuhelper/factory.hxx>
#include <cppuhelper/implementationentry.hxx>
#include <cppuhelper/implbase1.hxx>
-#include <cppuhelper/implbase3.hxx>
-
+#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/supportsservice.hxx>
#include <com/sun/star/xml/input/XAttributes.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
-
+#include <com/sun/star/lang/XServiceInfo.hpp>
#include <vector>
#include <boost/unordered_map.hpp>
@@ -91,9 +91,10 @@ struct MGuard
};
class DocumentHandlerImpl :
- public ::cppu::WeakImplHelper3< xml::sax::XDocumentHandler,
+ public ::cppu::WeakImplHelper4< xml::sax::XDocumentHandler,
xml::input::XNamespaceMapping,
- lang::XInitialization >
+ lang::XInitialization,
+ com::sun::star::lang::XServiceInfo >
{
friend class ExtendedAttributes;
@@ -413,17 +414,10 @@ OUString DocumentHandlerImpl::getImplementationName()
return getImplementationName_DocumentHandlerImpl();
}
-sal_Bool DocumentHandlerImpl::supportsService(
- OUString const & servicename )
+sal_Bool DocumentHandlerImpl::supportsService( OUString const & servicename )
throw (RuntimeException)
{
- Sequence< OUString > names( getSupportedServiceNames_DocumentHandlerImpl() );
- for ( sal_Int32 nPos = names.getLength(); nPos--; )
- {
- if (names[ nPos ].equals( servicename ))
- return sal_True;
- }
- return sal_False;
+ return cppu::supportsService(this, servicename);
}
Sequence< OUString > DocumentHandlerImpl::getSupportedServiceNames()