diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-05-20 17:18:56 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-21 16:29:33 +0100 |
commit | f4bccae9eb48d36de9edd1fa5551e5e8de85b17e (patch) | |
tree | de5ef8238a2bf77986e3fc9625772f8fa77b044e /framework/inc/services.h | |
parent | Revert "fdo#46808, Create new-style frame::ToolBarControllerFactory service" (diff) | |
download | core-f4bccae9eb48d36de9edd1fa5551e5e8de85b17e.tar.gz core-f4bccae9eb48d36de9edd1fa5551e5e8de85b17e.zip |
Revert "fdo#46808, Adapt frame::PopupMenuControllerFactory UNO service"
This reverts commit e93a0018871ebea4da1959c72c06f3c7f4dc7b27.
Conflicts:
desktop/source/app/app.cxx
framework/source/uielement/menubarmanager.cxx
framework/source/uielement/popupmenucontroller.cxx
offapi/UnoApi_offapi.mk
Change-Id: I3d4d49f98603e75357fb315a603a10851b3a7090
Diffstat (limited to 'framework/inc/services.h')
-rw-r--r-- | framework/inc/services.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/framework/inc/services.h b/framework/inc/services.h index a4bd093c6ee5..d57af352065f 100644 --- a/framework/inc/services.h +++ b/framework/inc/services.h @@ -38,6 +38,7 @@ namespace framework{ #define SERVICENAME_JOB DECLARE_ASCII("com.sun.star.task.Job" ) #define SERVICENAME_PROTOCOLHANDLER DECLARE_ASCII("com.sun.star.frame.ProtocolHandler" ) #define SERVICENAME_LAYOUTMANAGER DECLARE_ASCII("com.sun.star.frame.LayoutManager" ) +#define SERVICENAME_POPUPMENUCONTROLLERFACTORY DECLARE_ASCII("com.sun.star.frame.PopupMenuControllerFactory" ) #define SERVICENAME_POPUPMENUCONTROLLER DECLARE_ASCII("com.sun.star.frame.PopupMenuController" ) #define SERVICENAME_MODULEUICONFIGURATIONMANAGER DECLARE_ASCII("com.sun.star.ui.ModuleUIConfigurationManager" ) #define SERVICENAME_MENUBARFACTORY DECLARE_ASCII("com.sun.star.ui.UIElementFactory" ) |