diff options
| author | Alexandre Vicenzi <vicenzi.alexandre@gmail.com> | 2014-02-05 23:57:38 -0200 |
|---|---|---|
| committer | Marcos Souza <marcos.souza.org@gmail.com> | 2014-02-06 15:47:54 +0000 |
| commit | f139c10fd357c1c07f857a1d277f39d9cbc39d1f (patch) | |
| tree | 242d722ae6b27e273e61a17baf79b22ef010eaae /oox | |
| parent | 61e28e86ed30fb37df96c7fd0807b5aaeacf5eea (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 'oox')
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.cxx | 17 | ||||
| -rw-r--r-- | oox/source/shape/ShapeContextHandler.hxx | 7 |
2 files changed, 9 insertions, 15 deletions
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index fb24aa359f9d..34ddd3db76f8 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -28,6 +28,7 @@ #include "oox/vml/vmlshape.hxx" #include "oox/drawingml/themefragmenthandler.hxx" #include <boost/scoped_ptr.hpp> +#include <cppuhelper/supportsservice.hxx> namespace oox { namespace shape { @@ -547,8 +548,7 @@ OUString SAL_CALL ShapeContextHandler::getRelationFragmentPath() return msRelationFragmentPath; } -void SAL_CALL ShapeContextHandler::setRelationFragmentPath -(const OUString & the_value) +void SAL_CALL ShapeContextHandler::setRelationFragmentPath(const OUString & the_value) throw (uno::RuntimeException) { msRelationFragmentPath = the_value; @@ -562,8 +562,6 @@ void SAL_CALL ShapeContextHandler::setRelationFragmentPath void SAL_CALL ShapeContextHandler::setStartToken( ::sal_Int32 _starttoken ) throw (::com::sun::star::uno::RuntimeException) { mnStartToken = _starttoken; - - } awt::Point SAL_CALL ShapeContextHandler::getPosition() throw (uno::RuntimeException) @@ -588,15 +586,10 @@ uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames() return ShapeContextHandler_getSupportedServiceNames(); } -::sal_Bool SAL_CALL ShapeContextHandler::supportsService -(const OUString & ServiceName) throw (css::uno::RuntimeException) +::sal_Bool SAL_CALL ShapeContextHandler::supportsService(const OUString & ServiceName) + throw (css::uno::RuntimeException) { - uno::Sequence< OUString > aSeq = getSupportedServiceNames(); - - if (aSeq[0].equals(ServiceName)) - return sal_True; - - return sal_False; + return cppu::supportsService(this, ServiceName); } }} diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx index bf27e167a8ea..d6083dcacad7 100644 --- a/oox/source/shape/ShapeContextHandler.hxx +++ b/oox/source/shape/ShapeContextHandler.hxx @@ -21,7 +21,7 @@ #include <boost/shared_ptr.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase2.hxx> #include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp> #include "oox/drawingml/graphicshapecontext.hxx" #include "oox/drawingml/shape.hxx" @@ -29,6 +29,7 @@ #include "oox/core/fragmenthandler2.hxx" #include "oox/core/xmlfilterbase.hxx" #include "ShapeFilterBase.hxx" +#include <com/sun/star/lang/XServiceInfo.hpp> namespace oox { namespace shape { @@ -45,8 +46,8 @@ public: }; class ShapeContextHandler: - public ::cppu::WeakImplHelper1< - css::xml::sax::XFastShapeContextHandler> + public ::cppu::WeakImplHelper2< css::xml::sax::XFastShapeContextHandler, + css::lang::XServiceInfo > { public: explicit ShapeContextHandler |