diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2012-12-06 12:29:24 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-21 14:01:17 +0100 |
| commit | cfaac477e2a23880310070690beb3222b1c8227c (patch) | |
| tree | c5678e2606d73d548392174109df695b35fc053b /framework/Library_fwk.mk | |
| parent | Related: #i121442# Read Statusbar merging configuration (diff) | |
| download | core-cfaac477e2a23880310070690beb3222b1c8227c.tar.gz core-cfaac477e2a23880310070690beb3222b1c8227c.zip | |
Related: #i121442# support status bar merging and StatusbarControllers
framework refactoring and new code to support status bar merging and UNO
StatusbarControllers
(cherry picked from commit 0b3a77478cf2cfd245a87bc528f851e959a2e6c7)
Conflicts:
framework/source/uielement/statusbarmanager.cxx
framework/source/uielement/toolbarmerger.cxx
Change-Id: I334a220ff27bb365e98a0ebd8bc6e55d65e76d64
Diffstat (limited to 'framework/Library_fwk.mk')
| -rw-r--r-- | framework/Library_fwk.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index d1818146dfd9..2a53057dd86a 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -135,6 +135,7 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/uielement/controlmenucontroller \ framework/source/uielement/dropdownboxtoolbarcontroller \ framework/source/uielement/edittoolbarcontroller \ + framework/source/uielement/genericstatusbarcontroller \ framework/source/uielement/generictoolbarcontroller \ framework/source/uielement/imagebuttontoolbarcontroller \ framework/source/uielement/langselectionstatusbarcontroller \ @@ -146,7 +147,9 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/uielement/recentfilesmenucontroller \ framework/source/uielement/spinfieldtoolbarcontroller \ framework/source/uielement/statusbar \ + framework/source/uielement/statusbaritem \ framework/source/uielement/statusbarmanager \ + framework/source/uielement/statusbarmerger \ framework/source/uielement/statusbarwrapper \ framework/source/uielement/statusindicatorinterfacewrapper \ framework/source/uielement/togglebuttontoolbarcontroller \ |