diff options
| author | Noel Grandin <noel@peralex.com> | 2013-05-13 08:20:58 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-05-13 09:38:03 +0200 |
| commit | 49e422e58e3193f1614298eb61c756abb299330f (patch) | |
| tree | b228a5d379cbf6c5c9a3422d484d96c010d3447f /framework | |
| parent | 088e86b865062dd4cc5ba0c85c6068dea62238db (diff) | |
fdo#46808, Convert ui::UICategoryDescripion to new style
Change-Id: I4fbba222b8429b5935c8e15c74d1670edd4fb303
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/services.h | 2 | ||||
| -rw-r--r-- | framework/source/uiconfiguration/uicategorydescription.cxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/framework/inc/services.h b/framework/inc/services.h index b77c0a680be0..810bc99341b3 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -47,7 +47,6 @@ namespace framework{ #define SERVICENAME_TOOLBARFACTORY DECLARE_ASCII("com.sun.star.ui.ToolBarFactory" ) #define SERVICENAME_LICENSE SERVICENAME_JOB #define SERVICENAME_STATUSBARFACTORY DECLARE_ASCII("com.sun.star.ui.StatusBarFactory" ) -#define SERVICENAME_UICATEGORYDESCRIPTION DECLARE_ASCII("com.sun.star.ui.UICategoryDescription" ) #define SERVICENAME_STATUSBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.StatusbarControllerFactory" ) #define SERVICENAME_STATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.frame.StatusbarController" ) #define SERVICENAME_TABWINFACTORY DECLARE_ASCII("com.sun.star.frame.TabWindowFactory" ) @@ -106,7 +105,6 @@ namespace framework{ #define IMPLEMENTATIONNAME_RECENTFILESMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.RecentFilesMenuController" ) #define IMPLEMENTATIONNAME_STATUSBARFACTORY DECLARE_ASCII("com.sun.star.comp.framework.StatusBarFactory" ) #define IMPLEMENTATIONNAME_STATUSBARCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.comp.framework.StatusBarControllerFactory" ) -#define IMPLEMENTATIONNAME_UICATEGORYDESCRIPTION DECLARE_ASCII("com.sun.star.comp.framework.UICategoryDescription" ) #define IMPLEMENTATIONNAME_APPDISPATCHPROVIDER DECLARE_ASCII("com.sun.star.comp.sfx2.AppDispatchProvider" ) #define IMPLEMENTATIONNAME_SESSIONLISTENER DECLARE_ASCII("com.sun.star.comp.frame.SessionListener" ) #define IMPLEMENTATIONNAME_HELPONSTARTUP DECLARE_ASCII("com.sun.star.comp.framework.HelpOnStartup" ) diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index 78f97f4c9a14..84dec3b1ff4b 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -415,6 +415,10 @@ void SAL_CALL ConfigurationAccess_UICategory::disposing( const EventObject& aEve //***************************************************************************************************************** // XInterface, XTypeProvider, XServiceInfo //***************************************************************************************************************** + +#define SERVICENAME_UICATEGORYDESCRIPTION DECLARE_ASCII("com.sun.star.ui.UICategoryDescription" ) +#define IMPLEMENTATIONNAME_UICATEGORYDESCRIPTION DECLARE_ASCII("com.sun.star.comp.framework.UICategoryDescription" ) + DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2 ( UICategoryDescription , ::cppu::OWeakObject , SERVICENAME_UICATEGORYDESCRIPTION , |