diff options
author | Alexandre Vicenzi <vicenzi.alexandre@gmail.com> | 2014-01-31 02:42:47 -0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-01-31 11:41:05 +0100 |
commit | 4f63a5fa269678cdc021f5c280f697e53771545a (patch) | |
tree | fdf0bfc0d65835e565d37b4227825575ba038559 /odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | |
parent | 3a05aabe4190fc948ebdc94a14a15872f977ba0c (diff) |
fdo#54938 Convert odk to cppu::supportsService
Change-Id: Ia5095367be90dd5383e7701ea2587f79a7505a67
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx')
-rw-r--r-- | odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx index 61ab750d3a50..41fc283b202d 100644 --- a/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx +++ b/odk/examples/cpp/complextoolbarcontrols/MyProtocolHandler.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/system/XSystemShellExecute.hpp> +#include <cppuhelper/supportsservice.hxx> using namespace com::sun::star::awt; using namespace com::sun::star::frame; @@ -167,13 +168,6 @@ Sequence < Reference< XDispatch > > SAL_CALL MyProtocolHandler::queryDispatches( return ::rtl::OUString( MYPROTOCOLHANDLER_IMPLEMENTATIONNAME ); } -sal_Bool SAL_CALL MyProtocolHandler_supportsService( const ::rtl::OUString& ServiceName ) - throw (RuntimeException) -{ - return ServiceName == MYPROTOCOLHANDLER_SERVICENAME || - ServiceName == "com.sun.star.frame.ProtocolHandler"; -} - Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler_getSupportedServiceNames( ) throw (RuntimeException) { @@ -200,7 +194,7 @@ Reference< XInterface > SAL_CALL MyProtocolHandler_createInstance( const Referen sal_Bool SAL_CALL MyProtocolHandler::supportsService( const ::rtl::OUString& rServiceName ) throw (RuntimeException) { - return MyProtocolHandler_supportsService( rServiceName ); + return cppu::supportsService(this, rServiceName); } Sequence< ::rtl::OUString > SAL_CALL MyProtocolHandler::getSupportedServiceNames( ) @@ -500,7 +494,6 @@ BaseDispatch::BaseDispatch( const Reference< XComponentContext > &rxContext, { } - BaseDispatch::~BaseDispatch() { mxFrame.clear(); |