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 /offapi/com/sun/star/frame/StatusbarControllerFactory.idl | |
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 'offapi/com/sun/star/frame/StatusbarControllerFactory.idl')
-rw-r--r-- | offapi/com/sun/star/frame/StatusbarControllerFactory.idl | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl index 173ef5d28912..7572c6cbe419 100644 --- a/offapi/com/sun/star/frame/StatusbarControllerFactory.idl +++ b/offapi/com/sun/star/frame/StatusbarControllerFactory.idl @@ -20,13 +20,10 @@ #ifndef __com_sun_star_frame_StatusbarControllerFactory_idl__ #define __com_sun_star_frame_StatusbarControllerFactory_idl__ -#include <com/sun/star/lang/XMultiComponentFactory.idl> -#include <com/sun/star/frame/XUIControllerRegistration.idl> - +#include <com/sun/star/frame/XUIControllerFactory.idl> module com { module sun { module star { module frame { - /** specifies a factory that creates instances of registered status bar controller. @@ -38,40 +35,15 @@ module com { module sun { module star { module frame { @since OOo 2.0 */ - -service StatusbarControllerFactory +service StatusbarControllerFactory : XUIControllerFactory { - /** this interface provides functions to create new instances of a registered - status bar controller. - - <p> - Use <member scope="com.sun.star.lang">XMultiComponentFactory::createInstanceWithArguments()</member> - to create a new status bar controller instance. Use the CommandURL as the - service specifier. - - This call supports the following arguments provided as - <type scope="com::sun::star::beans">PropertyValue</type>: - <ul> - <li><b>Frame</b><br>specifies the <type scope="com::sun::star::frame">XFrame</type> - instance to which the status bar controller belongs to. This - property must be provided to the status bar controller, otherwise it - cannot dispatch its internal commands.</li> - <li><b>ModuleIdentifier</b><br>optional string that specifies in which module - context the status bar controller should be created.</li> - </ul> - </p> - */ - interface com::sun::star::lang::XMultiComponentFactory; - - /** provides functions to query for, register and deregister a status bar - controller. + /** service constructor */ - interface com::sun::star::frame::XUIControllerRegistration; + create(); }; }; }; }; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |