From 89d4ecc16e7e9501f357a26de50b3318d24446f3 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 22 Feb 2013 14:55:20 +0200 Subject: fdo#46808, Convert frame::DispatchRecorder to new style API CHANGE: dropped the XIndexReplace interface because no-one is using it. Change-Id: Iad77af588a070b22f2fce007a6ec4641758997a8 --- framework/inc/services.h | 2 -- framework/source/recording/dispatchrecorder.cxx | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'framework') diff --git a/framework/inc/services.h b/framework/inc/services.h index 3a5496a565ea..abc275b58ae5 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -38,7 +38,6 @@ namespace framework{ #define SERVICENAME_CONTENTHANDLERFACTORY DECLARE_ASCII("com.sun.star.frame.ContentHandlerFactory" ) #define SERVICENAME_STATUSINDICATORFACTORY DECLARE_ASCII("com.sun.star.task.StatusIndicatorFactory" ) #define SERVICENAME_JOB DECLARE_ASCII("com.sun.star.task.Job" ) -#define SERVICENAME_DISPATCHRECORDER DECLARE_ASCII("com.sun.star.frame.DispatchRecorder" ) #define SERVICENAME_PROTOCOLHANDLER DECLARE_ASCII("com.sun.star.frame.ProtocolHandler" ) #define SERVICENAME_PATHSETTINGS DECLARE_ASCII("com.sun.star.util.PathSettings" ) #define SERVICENAME_LAYOUTMANAGER DECLARE_ASCII("com.sun.star.frame.LayoutManager" ) @@ -77,7 +76,6 @@ namespace framework{ #define IMPLEMENTATIONNAME_SWTHREADMANAGER DECLARE_ASCII("com.sun.star.util.comp.FinalThreadManager" ) #define IMPLEMENTATIONNAME_JOBEXECUTOR DECLARE_ASCII("com.sun.star.comp.framework.JobExecutor" ) #define IMPLEMENTATIONNAME_DISPATCHRECORDERSUPPLIER DECLARE_ASCII("com.sun.star.comp.framework.DispatchRecorderSupplier") -#define IMPLEMENTATIONNAME_DISPATCHRECORDER DECLARE_ASCII("com.sun.star.comp.framework.DispatchRecorder" ) #define IMPLEMENTATIONNAME_MAILTODISPATCHER DECLARE_ASCII("com.sun.star.comp.framework.MailToDispatcher" ) #define IMPLEMENTATIONNAME_SERVICEHANDLER DECLARE_ASCII("com.sun.star.comp.framework.ServiceHandler" ) #define IMPLEMENTATIONNAME_UIINTERACTIONHANDLER DECLARE_ASCII("com.sun.star.comp.uui.UUIInteractionHandler" ) diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index f4a131358c70..73c8d1e5af5d 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -59,8 +59,8 @@ DEFINE_XTYPEPROVIDER_6( DEFINE_XSERVICEINFO_MULTISERVICE( DispatchRecorder, ::cppu::OWeakObject, - SERVICENAME_DISPATCHRECORDER, - IMPLEMENTATIONNAME_DISPATCHRECORDER) + OUString("com.sun.star.frame.DispatchRecorder"), + OUString("com.sun.star.comp.framework.DispatchRecorder")) DEFINE_INIT_SERVICE( DispatchRecorder, -- cgit