wangxin/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity
Files
3d4d89cf5a181aa306dfadc8cfb9a2cf8e59bfcd
loongoffice/framework/util/fwk.component
Ariel Constenla-Haile 8b050d1e91 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
2013-05-21 16:29:33 +01:00

141 lines
6.9 KiB
XML
Raw Blame History

<?xml version="1.0" encoding="UTF-8"?>
<!--
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<component loader="com.sun.star.loader.SharedLibrary" prefix="fwk"
xmlns="http://openoffice.org/2010/uno-components">
<implementation name="com.sun.star.comp.frame.SessionListener">
<service name="com.sun.star.frame.SessionListener"/>
</implementation>
<implementation name="com.sun.star.comp.framework.AddonsToolBarFactory">
<service name="com.sun.star.ui.ToolBarFactory"/>
</implementation>
<implementation name="com.sun.star.comp.framework.AutoRecovery">
<service name="com.sun.star.frame.AutoRecovery"/>
</implementation>
<implementation name="com.sun.star.comp.framework.BackingComp">
<service name="com.sun.star.frame.StartModule"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ControlMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
<implementation name="com.sun.star.comp.framework.Desktop">
<service name="com.sun.star.frame.Desktop"/>
</implementation>
<implementation name="com.sun.star.comp.framework.DocumentAcceleratorConfiguration">
<service name="com.sun.star.ui.DocumentAcceleratorConfiguration"/>
</implementation>
<implementation name="org.apache.openoffice.comp.framework.ContextChangeEventMultiplexer">
<service name="com.sun.star.ui.ContextChangeEventMultiplexer"/>
<singleton name="com.sun.star.ui.ContextChangeEventMultiplexer"/>
</implementation>
<implementation name="com.sun.star.comp.framework.Frame">
<service name="com.sun.star.frame.Frame"/>
</implementation>
<implementation name="com.sun.star.comp.framework.GlobalAcceleratorConfiguration">
<service name="com.sun.star.ui.GlobalAcceleratorConfiguration"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ImageManager">
<service name="com.sun.star.ui.ImageManager"/>
</implementation>
<implementation name="com.sun.star.comp.framework.JobExecutor">
<service name="com.sun.star.task.JobExecutor"/>
</implementation>
<implementation name="com.sun.star.comp.framework.LangSelectionStatusbarController">
<service name="com.sun.star.frame.StatusbarController"/>
</implementation>
<implementation name="com.sun.star.comp.framework.LayoutManager">
<service name="com.sun.star.frame.LayoutManager"/>
</implementation>
<implementation name="com.sun.star.comp.framework.MenuBarFactory">
<service name="com.sun.star.ui.UIElementFactory"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ModuleAcceleratorConfiguration">
<service name="com.sun.star.ui.ModuleAcceleratorConfiguration"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ModuleManager">
<service name="com.sun.star.frame.ModuleManager"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManager">
<service name="com.sun.star.ui.ModuleUIConfigurationManager"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ModuleUIConfigurationManagerSupplier">
<service name="com.sun.star.ui.ModuleUIConfigurationManagerSupplier"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ObjectMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
<implementation name="com.sun.star.comp.framework.PathSettings">
<service name="com.sun.star.util.PathSettings"/>
</implementation>
<implementation name="com.sun.star.comp.framework.PathSubstitution">
<service name="com.sun.star.util.PathSubstitution"/>
</implementation>
<implementation name="com.sun.star.comp.framework.PopupMenuControllerFactory">
<service name="com.sun.star.frame.PopupMenuControllerFactory"/>
</implementation>
<implementation name="com.sun.star.comp.framework.RecentFilesMenuController">
<service name="com.sun.star.frame.PopupMenuController"/>
</implementation>
<implementation name="com.sun.star.comp.framework.StatusBarControllerFactory">
<service name="com.sun.star.frame.StatusbarControllerFactory"/>
</implementation>
<implementation name="com.sun.star.comp.framework.StatusBarFactory">
<service name="com.sun.star.ui.StatusBarFactory"/>
</implementation>
<implementation name="com.sun.star.comp.framework.StatusIndicatorFactory">
<service name="com.sun.star.task.StatusIndicatorFactory"/>
</implementation>
<implementation name="com.sun.star.comp.framework.TaskCreator">
<service name="com.sun.star.frame.TaskCreator"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ToolBarControllerFactory">
<service name="com.sun.star.frame.ToolbarControllerFactory"/>
</implementation>
<implementation name="com.sun.star.comp.framework.ToolBarFactory">
<service name="com.sun.star.ui.ToolBarFactory"/>
</implementation>
<implementation name="com.sun.star.comp.framework.UICategoryDescription">
<service name="com.sun.star.ui.UICategoryDescription"/>
</implementation>
<implementation name="com.sun.star.comp.framework.UICommandDescription">
<service name="com.sun.star.frame.UICommandDescription"/>
</implementation>
<implementation name="com.sun.star.comp.framework.UIConfigurationManager">
<service name="com.sun.star.ui.UIConfigurationManager"/>
</implementation>
<implementation name="com.sun.star.comp.framework.UIElementFactoryManager">
<service name="com.sun.star.ui.UIElementFactoryManager"/>
</implementation>
<implementation name="com.sun.star.comp.framework.URLTransformer">
<service name="com.sun.star.util.URLTransformer"/>
</implementation>
<implementation name="com.sun.star.comp.framework.WindowContentFactoryManager">
<service name="com.sun.star.ui.WindowContentFactoryManager"/>
</implementation>
<implementation name="com.sun.star.comp.framework.WindowStateConfiguration">
<service name="com.sun.star.ui.WindowStateConfiguration"/>
</implementation>
<implementation name="com.sun.star.comp.framework.jobs.JobDispatch">
<service name="com.sun.star.frame.ProtocolHandler"/>
</implementation>
<implementation name="com.sun.star.comp.framework.TabWindowService">
<service name="com.sun.star.ui.dialogs.TabContainerWindow"/>
</implementation>
</component>
View Git Blame Copy Permalink