diff options
| author | Oliver Bolte <obo@openoffice.org> | 2004-11-16 13:53:57 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2004-11-16 13:53:57 +0000 |
| commit | b46e222025dd0fd42a3417562a8407d521127955 (patch) | |
| tree | 474d9dcaf763c180059917f83548562e871b6934 /framework/source/register | |
| parent | bda7c3ef99c5d4ace3842ef00a2fe91fc8dabbd7 (diff) | |
INTEGRATION: CWS docking4 (1.23.4); FILE MERGED
2004/10/11 10:49:31 cd 1.23.4.4: RESYNC: (1.24-1.25); FILE MERGED
2004/09/27 16:29:53 cd 1.23.4.3: #i33338# Added new categories service
2004/09/20 13:01:28 cd 1.23.4.2: RESYNC: (1.23-1.24); FILE MERGED
2004/09/17 06:37:41 cd 1.23.4.1: #i33023# Removed format menu controller service from XML files - registerservices.cxx
Diffstat (limited to 'framework/source/register')
| -rw-r--r-- | framework/source/register/registerservices.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 3fd204287abd..ef1595f147f1 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registerservices.cxx,v $ * - * $Revision: 1.25 $ + * $Revision: 1.26 $ * - * last change: $Author: rt $ $Date: 2004-09-20 10:08:44 $ + * last change: $Author: obo $ $Date: 2004-11-16 14:53:57 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -255,6 +255,10 @@ #include <uifactory/statusbarfactory.hxx> #endif +#ifndef __FRAMEWORK_UIELEMENT_UICATEGORYDESCRPTION_HXX_ +#include <uiconfiguration/uicategorydescription.hxx> +#endif + COMPONENTGETIMPLEMENTATIONENVIRONMENT COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer ) @@ -293,11 +297,11 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer COMPONENTINFO( ::framework::ToolBoxFactory ) COMPONENTINFO( ::framework::AddonsToolBoxFactory ) COMPONENTINFO( ::framework::WindowStateConfiguration ) - COMPONENTINFO( ::framework::ToolbarsMenuController ) COMPONENTINFO( ::framework::ToolbarControllerFactory ) COMPONENTINFO( ::framework::ToolbarsMenuController ) COMPONENTINFO( ::framework::RecentFilesMenuController ) COMPONENTINFO( ::framework::StatusBarFactory ) + COMPONENTINFO( ::framework::UICategoryDescription ) ) COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else @@ -336,10 +340,10 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer IFFACTORY( ::framework::ToolBoxFactory ) else IFFACTORY( ::framework::AddonsToolBoxFactory ) else IFFACTORY( ::framework::WindowStateConfiguration ) else - IFFACTORY( ::framework::ToolbarsMenuController ) else IFFACTORY( ::framework::ToolbarControllerFactory ) else IFFACTORY( ::framework::ToolbarsMenuController ) else IFFACTORY( ::framework::RecentFilesMenuController ) else - IFFACTORY( ::framework::StatusBarFactory ) + IFFACTORY( ::framework::StatusBarFactory ) else + IFFACTORY( ::framework::UICategoryDescription ) ) |