diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 09:08:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 09:08:44 +0000 |
| commit | 412b0b6221c97617072d420a07f452a33d0bbca0 (patch) | |
| tree | a17b05fdcfb33924d40e13f2562ca720b75ecd6b /framework | |
| parent | 3d2ac9c4e8ae628e84fdee813133ba61fa8e9591 (diff) | |
INTEGRATION: CWS keyconfig01 (1.19.36); FILE MERGED
2004/07/10 18:16:52 as 1.19.36.4: RESYNC: (1.19-1.22); FILE MERGED
resolve merge conflict
2004/07/08 06:45:42 as 1.19.36.3: #i29863# support localized UI config, support new UI directory structure, adopt converter tool to support accelerators
2004/06/22 07:57:39 as 1.19.36.2: #i29863# second revision of shortcut configuration
2004/06/04 09:34:57 as 1.19.36.1: #i29863# new services for accelerator config
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/register/registerservices.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 63ba2746ec69..3fd204287abd 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registerservices.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: obo $ $Date: 2004-09-09 17:09:56 $ + * last change: $Author: rt $ $Date: 2004-09-20 10:08:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -211,6 +211,18 @@ #include <uifactory/menubarfactory.hxx> #endif +#ifndef __FRAMEWORK_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX_ +#include <accelerators/globalacceleratorconfiguration.hxx> +#endif + +#ifndef __FRAMEWORK_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX_ +#include <accelerators/moduleacceleratorconfiguration.hxx> +#endif + +#ifndef __FRAMEWORK_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX_ +#include <accelerators/documentacceleratorconfiguration.hxx> +#endif + #ifndef __FRAMEWORK_UIFACTORY_TOOLBOXFACTORY_HXX_ #include <uifactory/toolboxfactory.hxx> #endif @@ -275,6 +287,9 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer COMPONENTINFO( ::framework::ModuleUIConfigurationManagerSupplier ) COMPONENTINFO( ::framework::ModuleUIConfigurationManager ) COMPONENTINFO( ::framework::MenuBarFactory ) + COMPONENTINFO( ::framework::GlobalAcceleratorConfiguration ) + COMPONENTINFO( ::framework::ModuleAcceleratorConfiguration ) + COMPONENTINFO( ::framework::DocumentAcceleratorConfiguration ) COMPONENTINFO( ::framework::ToolBoxFactory ) COMPONENTINFO( ::framework::AddonsToolBoxFactory ) COMPONENTINFO( ::framework::WindowStateConfiguration ) @@ -315,6 +330,9 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer IFFACTORY( ::framework::ModuleUIConfigurationManagerSupplier ) else IFFACTORY( ::framework::ModuleUIConfigurationManager ) else IFFACTORY( ::framework::MenuBarFactory ) else + IFFACTORY( ::framework::GlobalAcceleratorConfiguration ) else + IFFACTORY( ::framework::ModuleAcceleratorConfiguration ) else + IFFACTORY( ::framework::DocumentAcceleratorConfiguration ) else IFFACTORY( ::framework::ToolBoxFactory ) else IFFACTORY( ::framework::AddonsToolBoxFactory ) else IFFACTORY( ::framework::WindowStateConfiguration ) else |