diff options
author | Oliver Bolte <obo@openoffice.org> | 2005-03-15 11:57:01 +0000 |
---|---|---|
committer | Oliver Bolte <obo@openoffice.org> | 2005-03-15 11:57:01 +0000 |
commit | 42f73ce7aee7fe28f932a30d3bd6d65535908250 (patch) | |
tree | 0dca2686ef8a929aa69dd49eff9f9c08b8e43c4e /framework/source | |
parent | 12fe5beaa8805de09f24277dfb098c45339963a2 (diff) |
INTEGRATION: CWS c01v005 (1.29.26); FILE MERGED
2005/03/05 00:31:27 hjs 1.29.26.2: RESYNC: (1.29-1.30); FILE MERGED
2005/02/22 17:01:19 cd 1.29.26.1: #119876# new statusbar logo controllers
Diffstat (limited to 'framework/source')
-rw-r--r-- | framework/source/register/registerservices.cxx | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index 5c0354011326..db384ad1e3ea 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -2,9 +2,9 @@ * * $RCSfile: registerservices.cxx,v $ * - * $Revision: 1.30 $ + * $Revision: 1.31 $ * - * last change: $Author: vg $ $Date: 2005-02-16 16:42:28 $ + * last change: $Author: obo $ $Date: 2005-03-15 12:57:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -275,6 +275,14 @@ #include <services/sessionlistener.hxx> #endif +#ifndef __FRAMEWORK_UIELEMENT_LOGOIMAGESTATUSBARCONTROLLER_HXX_ +#include <uielement/logoimagestatusbarcontroller.hxx> +#endif + +#ifndef __FRAMEWORK_UIELEMENT_LOGOTEXTSTATUSBARCONTROLLER_HXX_ +#include <uielement/logotextstatusbarcontroller.hxx> +#endif + #ifndef __FRAMEWORK_UIELEMENT_NEWMENUCONTROLLER_HXX_ #include <uielement/newmenucontroller.hxx> #endif @@ -326,6 +334,8 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer COMPONENTINFO( ::framework::UICategoryDescription ) COMPONENTINFO( ::framework::StatusbarControllerFactory ) COMPONENTINFO( ::framework::SessionListener ) + COMPONENTINFO( ::framework::LogoImageStatusbarController ) + COMPONENTINFO( ::framework::LogoTextStatusbarController ) COMPONENTINFO( ::framework::NewMenuController ) ) @@ -372,9 +382,11 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer IFFACTORY( ::framework::RecentFilesMenuController ) else IFFACTORY( ::framework::StatusBarFactory ) else IFFACTORY( ::framework::UICategoryDescription ) else - IFFACTORY( ::framework::SessionListener ) -else + IFFACTORY( ::framework::SessionListener ) else IFFACTORY( ::framework::StatusbarControllerFactory ) else + IFFACTORY( ::framework::SessionListener ) else + IFFACTORY( ::framework::LogoImageStatusbarController ) else + IFFACTORY( ::framework::LogoTextStatusbarController ) else IFFACTORY( ::framework::NewMenuController ) ) |