summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-05-13 15:09:45 +0200
committerNoel Grandin <noel@peralex.com>2013-05-14 08:08:26 +0200
commit0394cb37a2d378511f265004b285fd93df37e5ca (patch)
treef3a7269690e6fbd34b7ef09ff9e874b6f15345ba /framework
parent4481f5d4bcf0ba5b5d02c1dbff6d24d1e5301ff6 (diff)
fdo#46808, Convert ui::ImageManager to new style
The service already existed, it just needed an IDL file. Change-Id: I5bdc3064b0a3caa5a0d2abf4ef5ba3159889c7af
Diffstat (limited to 'framework')
-rw-r--r--framework/inc/services.h2
-rw-r--r--framework/source/uiconfiguration/imagemanager.cxx3
2 files changed, 3 insertions, 2 deletions
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 810bc99341b3..cda8d13be9b2 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -52,7 +52,6 @@ namespace framework{
#define SERVICENAME_TABWINFACTORY DECLARE_ASCII("com.sun.star.frame.TabWindowFactory" )
#define SERVICENAME_TABWINDOW DECLARE_ASCII("com.sun.star.frame.TabWindow" )
#define SERVICENAME_STRINGABBREVIATION DECLARE_ASCII("com.sun.star.util.UriAbbreviation" )
-#define SERVICENAME_IMAGEMANAGER DECLARE_ASCII("com.sun.star.ui.ImageManager" )
#define SERVICENAME_TABWINDOWSERVICE DECLARE_ASCII("com.sun.star.ui.dialogs.TabContainerWindow" )
//_________________________________________________________________________________________________________________
@@ -120,7 +119,6 @@ namespace framework{
#define IMPLEMENTATIONNAME_POPUPMENUDISPATCHER DECLARE_ASCII("com.sun.star.comp.framework.PopupMenuControllerDispatcher" )
#define IMPLEMENTATIONNAME_LANGSELECTIONSTATUSBARCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LangSelectionStatusbarController" )
#define IMPLEMENTATIONNAME_LANGUAGESELECTIONMENUCONTROLLER DECLARE_ASCII("com.sun.star.comp.framework.LanguageSelectionMenuController" )
-#define IMPLEMENTATIONNAME_IMAGEMANAGER DECLARE_ASCII("com.sun.star.comp.framework.ImageManager" )
#define IMPLEMENTATIONNAME_TABWINDOWSERVICE DECLARE_ASCII("com.sun.star.comp.framework.TabWindowService" )
#define IMPLEMENTATIONNAME_WINDOWCONTENTFACTORYMANAGER DECLARE_ASCII("com.sun.star.comp.framework.WindowContentFactoryManager" )
diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx
index 2a382526c408..6e5aae68f230 100644
--- a/framework/source/uiconfiguration/imagemanager.cxx
+++ b/framework/source/uiconfiguration/imagemanager.cxx
@@ -74,6 +74,9 @@ const sal_Int16 MAX_IMAGETYPE_VALUE = ::com::sun::star::ui::ImageType::COL
namespace framework
{
+#define SERVICENAME_IMAGEMANAGER DECLARE_ASCII("com.sun.star.ui.ImageManager" )
+#define IMPLEMENTATIONNAME_IMAGEMANAGER DECLARE_ASCII("com.sun.star.comp.framework.ImageManager" )
+
//*****************************************************************************************************************
// XInterface, XTypeProvider, XServiceInfo
//*****************************************************************************************************************