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 /offapi/UnoApi_offapi.mk | |
| parent | e9679a4a769e1edcc9c41c96de5739286323be79 (diff) | |
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 'offapi/UnoApi_offapi.mk')
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 91c31c42d9ca..395d5412073a 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -198,7 +198,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\ GlobalEventBroadcaster \ MediaTypeDetectionHelper \ ModuleManager \ - PopupMenuControllerFactory \ SessionListener \ StartModule \ TaskCreator \ @@ -942,6 +941,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/frame,\ FramesContainer \ LayoutManager \ PopupMenuController \ + PopupMenuControllerFactory \ ProtocolHandler \ SessionManager \ Settings \ @@ -2630,7 +2630,6 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,offapi/com/sun/star/frame,\ XTitleChangeBroadcaster \ XTitleChangeListener \ XToolbarController \ - XToolbarControllerFactory \ XToolbarControllerListener \ XTransientDocumentsDocumentContentFactory \ XUIControllerRegistration \ |