diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-25 22:11:08 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-24 10:08:43 +0100 |
| commit | a659ac906aa2d0dfd6d10e40d8a5a6d2d70cc8fc (patch) | |
| tree | 1859492c7602948eca7eb474a64087aa6dec5a3c /framework/source/register | |
| parent | 44b2fb6164aeffcc0c5bfbf53dac12f7b53fb0d4 (diff) | |
framework::PopupMenuController clean-up
Changed the name, it is not a PopupMenuController, but a ToolbarController that
shows a PopupMenu filled at runtime by a PopupMenuController
Make it a base class for other ToolbarController components, there is no sense
to make it a component by itself
Use this base class for three new pure UNO ToolbarController's
(cherry picked from commit 9d1015051c92900def3d465d2eb8bf179f19a398)
Conflicts:
framework/Library_fwk.mk
framework/inc/uielement/popupmenucontroller.hxx
framework/source/uielement/popupmenucontroller.cxx
officecfg/registry/data/org/openoffice/Office/UI/Controller.xcu
Change-Id: I2f5ec06df098d65ffaa17a8f7f6f3ea8774b43c3
Diffstat (limited to 'framework/source/register')
| -rw-r--r-- | framework/source/register/registerservices.cxx | 6 | ||||
| -rw-r--r-- | framework/source/register/registertemp.cxx | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 984ad9d51d10..8ec134ccb726 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -71,6 +71,7 @@ #include <services/substitutepathvars.hxx> #include <services/pathsettings.hxx> #include <services/ContextChangeEventMultiplexer.hxx> +#include <uielement/popuptoolbarcontroller.hxx> COMPONENTGETFACTORY ( fwk, IFFACTORY( ::framework::URLTransformer ) else @@ -112,7 +113,10 @@ COMPONENTGETFACTORY ( fwk, IFFACTORY( ::framework::TabWindowService ) else IFFACTORY( ::framework::SubstitutePathVariables ) else IFFACTORY( ::framework::PathSettings ) else - IFFACTORY( ::framework::ContextChangeEventMultiplexer ) + IFFACTORY( ::framework::ContextChangeEventMultiplexer ) else + IFFACTORY( ::framework::OpenToolbarController ) else + IFFACTORY( ::framework::NewToolbarController ) else + IFFACTORY( ::framework::WizardsToolbarController ) ) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 1f0967d3f0fe..703e79ef8f98 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -50,7 +50,6 @@ #include <uielement/macrosmenucontroller.hxx> #include <uielement/newmenucontroller.hxx> #include <uielement/toolbarsmenucontroller.hxx> -#include <uielement/popupmenucontroller.hxx> COMPONENTGETFACTORY ( fwl, IFFACTORY( ::framework::MediaTypeDetectionHelper ) @@ -70,8 +69,7 @@ COMPONENTGETFACTORY ( fwl, IFFACTORY( ::framework::FooterMenuController ) else IFFACTORY( ::framework::HeaderMenuController ) else IFFACTORY( ::framework::LanguageSelectionMenuController ) else - IFFACTORY( ::framework::Oxt_Handler ) else - IFFACTORY( ::framework::PopupMenuController ) + IFFACTORY( ::framework::Oxt_Handler ) ) /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |