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/Library_fwk.mk | |
| 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/Library_fwk.mk')
| -rw-r--r-- | framework/Library_fwk.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index bc9b711f2f4d..0e365051a498 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -104,11 +104,11 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/loadenv/loadenv \ framework/source/loadenv/targethelper \ framework/source/register/registerservices \ + framework/source/services/ContextChangeEventMultiplexer \ framework/source/services/autorecovery \ framework/source/services/backingcomp \ framework/source/services/backingwindow \ framework/source/services/desktop \ - framework/source/services/ContextChangeEventMultiplexer \ framework/source/services/frame \ framework/source/services/modulemanager \ framework/source/services/pathsettings \ @@ -143,6 +143,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/uielement/menubarmerger \ framework/source/uielement/menubarwrapper \ framework/source/uielement/objectmenucontroller \ + framework/source/uielement/popuptoolbarcontroller \ framework/source/uielement/progressbarwrapper \ framework/source/uielement/recentfilesmenucontroller \ framework/source/uielement/spinfieldtoolbarcontroller \ @@ -161,8 +162,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/uifactory/factoryconfiguration \ framework/source/uifactory/menubarfactory \ framework/source/uifactory/statusbarfactory \ - framework/source/uifactory/uicontrollerfactory \ framework/source/uifactory/toolboxfactory \ + framework/source/uifactory/uicontrollerfactory \ framework/source/uifactory/uielementfactorymanager \ framework/source/uifactory/windowcontentfactorymanager \ framework/source/xml/acceleratorconfigurationreader \ |