diff options
| author | Ariel Constenla-Haile <arielch@apache.org> | 2013-04-26 21:55:57 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-05-21 16:29:33 +0100 |
| commit | 8b050d1e91a6623fb2770421e564a74d6259d816 (patch) | |
| tree | cd2ee3f0c91955bb45cc53c92767b1e5aabc20e1 /framework/Library_fwk.mk | |
| parent | f4bccae9eb48d36de9edd1fa5551e5e8de85b17e (diff) | |
UI Controller Factory fixes
- "ModuleName" --> "ModuleIdentifier": the IDL definition for
css::frame::PopupMenuControllerFactory and
css::frame::StatusbarControllerFactory tells to use a property named
"ModuleIdentifier", but in the code it is named "ModuleName"
- Undocumented css::frame::ToolbarControllerFactory
- Fix service name of ToolbarControllerFactory (ToolbarControllerFactory
instead of ToolBarControllerFactory)
- Convert the three service factories to new style, and use these
new-style services in the source code
- Implement multiple inheritance: added new css::frame::XUIControllerFactory
- Added a (true) base class and implemented the three factories in a
single file
(cherry picked from commit acc7fed28f54f836b0923180431a0c180f91e98c)
Conflicts:
framework/inc/pch/precompiled_framework.hxx
framework/inc/uielement/toolbarmanager.hxx
framework/inc/uifactory/popupmenucontrollerfactory.hxx
framework/inc/uifactory/statusbarcontrollerfactory.hxx
framework/inc/uifactory/uicontrollerfactory.hxx
framework/source/uielement/addonstoolbarmanager.cxx
framework/source/uielement/menubarmanager.cxx
framework/source/uielement/popupmenucontroller.cxx
framework/source/uielement/statusbarmanager.cxx
framework/source/uielement/toolbarmanager.cxx
framework/source/uifactory/popupmenucontrollerfactory.cxx
framework/source/uifactory/statusbarcontrollerfactory.cxx
framework/source/uifactory/uicontrollerfactory.cxx
framework/source/unotypes/fwk.xml
offapi/com/sun/star/frame/PopupMenuControllerFactory.idl
offapi/com/sun/star/frame/StatusbarControllerFactory.idl
offapi/com/sun/star/frame/makefile.mk
svtools/source/uno/toolboxcontroller.cxx
Change-Id: Ia8580539badf650a84bc6e57a6b832071e011f0a
Diffstat (limited to 'framework/Library_fwk.mk')
| -rw-r--r-- | framework/Library_fwk.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk index 2a53057dd86a..bc9b711f2f4d 100644 --- a/framework/Library_fwk.mk +++ b/framework/Library_fwk.mk @@ -160,10 +160,8 @@ $(eval $(call gb_Library_add_exception_objects,fwk,\ framework/source/uifactory/addonstoolboxfactory \ framework/source/uifactory/factoryconfiguration \ framework/source/uifactory/menubarfactory \ - framework/source/uifactory/popupmenucontrollerfactory \ - framework/source/uifactory/statusbarcontrollerfactory \ framework/source/uifactory/statusbarfactory \ - framework/source/uifactory/toolbarcontrollerfactory \ + framework/source/uifactory/uicontrollerfactory \ framework/source/uifactory/toolboxfactory \ framework/source/uifactory/uielementfactorymanager \ framework/source/uifactory/windowcontentfactorymanager \ |