diff options
author | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-25 22:11:08 +0000 |
---|---|---|
committer | Ariel Constenla-Haile <arielch@apache.org> | 2013-05-25 22:11:08 +0000 |
commit | 9d1015051c92900def3d465d2eb8bf179f19a398 (patch) | |
tree | a8daca8f9813a86472acfe51bfc055d74cb7bfcc /framework/Library_fwk.mk | |
parent | c01a6f4f370b72f0751cf4f5c11310682e2b3248 (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
Notes
Notes:
merged as: a659ac906aa2d0dfd6d10e40d8a5a6d2d70cc8fc
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 db55c575540c..d541867cf565 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -112,11 +112,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/modelwinservice \ framework/source/services/modulemanager \ @@ -154,6 +154,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/panelwindow \ framework/source/uielement/panelwrapper \ framework/source/uielement/progressbarwrapper \ @@ -175,8 +176,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 \ |