diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-09-08 04:57:32 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-09-08 04:57:32 +0000 |
| commit | ca00697e3dae9a03573d11281fc8d9a4ee391d3d (patch) | |
| tree | c390c65f02f6f32b6d6d9faa600f4688a8c81857 /framework/source/register | |
| parent | 047473d4f1a12e867ab7154113f7f1c5422d5368 (diff) | |
CWS-TOOLING: integrate CWS oj18
2009-08-21 15:08:49 +0200 oj r275263 : wrong check
2009-08-21 08:56:01 +0200 oj r275215 : missing not
2009-08-20 07:27:13 +0200 oj r275164 : use new method from global
2009-08-19 10:22:35 +0200 oj r275138 : call GetLocale instead of pLocale
2009-08-18 10:39:32 +0200 oj r275082 : missing header include
2009-08-18 10:09:44 +0200 oj r275081 : new methods at global
2009-08-18 10:09:00 +0200 oj r275080 : unused var
2009-08-18 08:59:04 +0200 oj r275078 : move files from classes to xml
2009-08-17 14:58:16 +0200 oj r275056 : CWS-TOOLING: rebase CWS oj18 to trunk@275001 (milestone: DEV300:m55)
2009-08-17 13:29:44 +0200 oj r275047 : compile error
2009-08-17 13:27:47 +0200 oj r275045 : compile error
2009-08-17 11:44:54 +0200 oj r275040 : add dep
2009-07-22 14:26:05 +0200 oj r274240 : move unused services into fwl
2009-07-22 14:25:35 +0200 oj r274239 : move unused services into fwl
2009-07-22 13:47:45 +0200 oj r274233 : remove some unused code
2009-07-22 09:06:20 +0200 oj r274219 : export dbtoolsclient dbcharsethelper for sc
2009-07-22 08:48:58 +0200 oj r274218 : create NumberFormatter on demand
2009-07-22 08:39:23 +0200 oj r274217 : change char to sal_Char
2009-07-22 07:33:34 +0200 oj r274214 : export dbtoolsclient dbcharsethelper for sc
2009-07-22 07:30:04 +0200 oj r274213 : late init of numberformatter and breakiterator
2009-07-22 07:28:55 +0200 oj r274212 : export dbtoolsclient dbcharsethelper for sc
2009-07-21 13:43:28 +0200 oj r274196 : check if quick start is enbaled
2009-07-21 13:40:09 +0200 oj r274195 : check config entry for UiEventsLogger
2009-07-21 13:37:40 +0200 oj r274194 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
2009-07-21 13:35:38 +0200 oj r274193 : code refactoring, remove of duplicate code and some late inits and removale of not needed files
2009-07-21 13:33:41 +0200 oj r274192 : doc meta data will now be created on demand
2009-07-21 13:13:40 +0200 oj r274187 : load ldap functions on demand
2009-07-21 13:03:17 +0200 oj r274183 : late init of TransliterationImpl
2009-07-21 12:36:10 +0200 oj r274180 : late init of charClass
Diffstat (limited to 'framework/source/register')
| -rw-r--r-- | framework/source/register/registerservices.cxx | 134 | ||||
| -rw-r--r-- | framework/source/register/registertemp.cxx | 71 |
2 files changed, 133 insertions, 72 deletions
diff --git a/framework/source/register/registerservices.cxx b/framework/source/register/registerservices.cxx index d54b206d393f..c9a8764c7509 100644 --- a/framework/source/register/registerservices.cxx +++ b/framework/source/register/registerservices.cxx @@ -61,29 +61,29 @@ =================================================================================================================*/ #include <services/urltransformer.hxx> #include <services/desktop.hxx> -#include <services/tabwindowservice.hxx> +//#include <services/tabwindowservice.hxx> #include <services/frame.hxx> #include <services/modulemanager.hxx> -#include <dispatch/oxt_handler.hxx> +//#include <dispatch/oxt_handler.hxx> #include <jobs/jobexecutor.hxx> -#include <recording/dispatchrecordersupplier.hxx> -#include <recording/dispatchrecorder.hxx> -#include <dispatch/mailtodispatcher.hxx> -#include <dispatch/servicehandler.hxx> +//#include <recording/dispatchrecordersupplier.hxx> +//#include <recording/dispatchrecorder.hxx> +//#include <dispatch/mailtodispatcher.hxx> +//#include <dispatch/servicehandler.hxx> #include <jobs/jobdispatch.hxx> #include <services/backingcomp.hxx> -#include <services/dispatchhelper.hxx> +//#include <services/dispatchhelper.hxx> #include <services/layoutmanager.hxx> -#include <services/license.hxx> +//#include <services/license.hxx> #include <uifactory/uielementfactorymanager.hxx> #include <uifactory/popupmenucontrollerfactory.hxx> -#include <uielement/fontmenucontroller.hxx> -#include <uielement/fontsizemenucontroller.hxx> +//#include <uielement/fontmenucontroller.hxx> +//#include <uielement/fontsizemenucontroller.hxx> #include <uielement/objectmenucontroller.hxx> -#include <uielement/headermenucontroller.hxx> -#include <uielement/footermenucontroller.hxx> +//#include <uielement/headermenucontroller.hxx> +//#include <uielement/footermenucontroller.hxx> #include <uielement/controlmenucontroller.hxx> -#include <uielement/macrosmenucontroller.hxx> +//#include <uielement/macrosmenucontroller.hxx> #include <uielement/uicommanddescription.hxx> #include <uiconfiguration/uiconfigurationmanager.hxx> #include <uiconfiguration/moduleuicfgsupplier.hxx> @@ -95,53 +95,54 @@ #include <uifactory/toolboxfactory.hxx> #include <uifactory/addonstoolboxfactory.hxx> #include "uiconfiguration/windowstateconfiguration.hxx" -#include <uielement/toolbarsmenucontroller.hxx> +//#include <uielement/toolbarsmenucontroller.hxx> #include "uifactory/toolbarcontrollerfactory.hxx" #include "uifactory/statusbarcontrollerfactory.hxx" -#include <uielement/toolbarsmenucontroller.hxx> #include <services/autorecovery.hxx> #include <helper/statusindicatorfactory.hxx> #include <uielement/recentfilesmenucontroller.hxx> #include <uifactory/statusbarfactory.hxx> #include <uiconfiguration/uicategorydescription.hxx> #include <services/sessionlistener.hxx> -#include <uielement/logoimagestatusbarcontroller.hxx> -#include <uielement/logotextstatusbarcontroller.hxx> -#include <uielement/newmenucontroller.hxx> +//#include <uielement/logoimagestatusbarcontroller.hxx> +//#include <uielement/logotextstatusbarcontroller.hxx> +//#include <uielement/newmenucontroller.hxx> #include <services/taskcreatorsrv.hxx> -#include <uielement/simpletextstatusbarcontroller.hxx> -#include <services/uriabbreviation.hxx> -#include <dispatch/popupmenudispatcher.hxx> +//#include <uielement/simpletextstatusbarcontroller.hxx> +//#include <services/uriabbreviation.hxx> + #include <uielement/langselectionstatusbarcontroller.hxx> -#include <uielement/langselectionmenucontroller.hxx> +//#include <uielement/langselectionmenucontroller.hxx> #include <uiconfiguration/imagemanager.hxx> #include <uifactory/windowcontentfactorymanager.hxx> +#include <services/substitutepathvars.hxx> +#include <services/pathsettings.hxx> COMPONENTGETIMPLEMENTATIONENVIRONMENT COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer ) COMPONENTINFO( ::framework::Desktop ) COMPONENTINFO( ::framework::Frame ) - COMPONENTINFO( ::framework::Oxt_Handler ) + //COMPONENTINFO( ::framework::Oxt_Handler ) COMPONENTINFO( ::framework::JobExecutor ) - COMPONENTINFO( ::framework::DispatchRecorderSupplier ) - COMPONENTINFO( ::framework::DispatchRecorder ) - COMPONENTINFO( ::framework::MailToDispatcher ) - COMPONENTINFO( ::framework::ServiceHandler ) + //COMPONENTINFO( ::framework::DispatchRecorderSupplier ) + //COMPONENTINFO( ::framework::DispatchRecorder ) + //COMPONENTINFO( ::framework::MailToDispatcher ) + //COMPONENTINFO( ::framework::ServiceHandler ) COMPONENTINFO( ::framework::JobDispatch ) COMPONENTINFO( ::framework::BackingComp ) - COMPONENTINFO( ::framework::DispatchHelper ) + //COMPONENTINFO( ::framework::DispatchHelper ) COMPONENTINFO( ::framework::LayoutManager ) - COMPONENTINFO( ::framework::License ) + //COMPONENTINFO( ::framework::License ) COMPONENTINFO( ::framework::UIElementFactoryManager ) COMPONENTINFO( ::framework::PopupMenuControllerFactory ) - COMPONENTINFO( ::framework::FontMenuController ) - COMPONENTINFO( ::framework::FontSizeMenuController ) + //COMPONENTINFO( ::framework::FontMenuController ) + //COMPONENTINFO( ::framework::FontSizeMenuController ) COMPONENTINFO( ::framework::ObjectMenuController ) - COMPONENTINFO( ::framework::HeaderMenuController ) - COMPONENTINFO( ::framework::FooterMenuController ) + //COMPONENTINFO( ::framework::HeaderMenuController ) + //COMPONENTINFO( ::framework::FooterMenuController ) COMPONENTINFO( ::framework::ControlMenuController ) - COMPONENTINFO( ::framework::MacrosMenuController ) + //COMPONENTINFO( ::framework::MacrosMenuController ) COMPONENTINFO( ::framework::UICommandDescription ) COMPONENTINFO( ::framework::ModuleManager ) COMPONENTINFO( ::framework::UIConfigurationManager ) @@ -155,7 +156,7 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer COMPONENTINFO( ::framework::AddonsToolBoxFactory ) COMPONENTINFO( ::framework::WindowStateConfiguration ) COMPONENTINFO( ::framework::ToolbarControllerFactory ) - COMPONENTINFO( ::framework::ToolbarsMenuController ) + //COMPONENTINFO( ::framework::ToolbarsMenuController ) COMPONENTINFO( ::framework::AutoRecovery ) COMPONENTINFO( ::framework::StatusIndicatorFactory ) COMPONENTINFO( ::framework::RecentFilesMenuController ) @@ -163,43 +164,45 @@ COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::URLTransformer COMPONENTINFO( ::framework::UICategoryDescription ) COMPONENTINFO( ::framework::StatusbarControllerFactory ) COMPONENTINFO( ::framework::SessionListener ) - COMPONENTINFO( ::framework::LogoImageStatusbarController ) - COMPONENTINFO( ::framework::LogoTextStatusbarController ) - COMPONENTINFO( ::framework::NewMenuController ) + //COMPONENTINFO( ::framework::LogoImageStatusbarController ) + //COMPONENTINFO( ::framework::LogoTextStatusbarController ) + //COMPONENTINFO( ::framework::NewMenuController ) COMPONENTINFO( ::framework::TaskCreatorService ) - COMPONENTINFO( ::framework::SimpleTextStatusbarController ) - COMPONENTINFO( ::framework::UriAbbreviation ) - COMPONENTINFO( ::framework::PopupMenuDispatcher ) + //COMPONENTINFO( ::framework::SimpleTextStatusbarController ) + //COMPONENTINFO( ::framework::UriAbbreviation ) + //COMPONENTINFO( ::framework::PopupMenuDispatcher ) COMPONENTINFO( ::framework::ImageManager ) COMPONENTINFO( ::framework::LangSelectionStatusbarController ) - COMPONENTINFO( ::framework::LanguageSelectionMenuController ) - COMPONENTINFO( ::framework::TabWindowService ) + //COMPONENTINFO( ::framework::LanguageSelectionMenuController ) + //COMPONENTINFO( ::framework::TabWindowService ) COMPONENTINFO( ::framework::WindowContentFactoryManager ) + COMPONENTINFO( ::framework::SubstitutePathVariables ) + COMPONENTINFO( ::framework::PathSettings ) ) COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer ) else IFFACTORY( ::framework::Desktop ) else IFFACTORY( ::framework::Frame ) else - IFFACTORY( ::framework::Oxt_Handler ) else + //IFFACTORY( ::framework::Oxt_Handler ) else IFFACTORY( ::framework::JobExecutor ) else - IFFACTORY( ::framework::DispatchRecorderSupplier ) else - IFFACTORY( ::framework::DispatchRecorder ) else - IFFACTORY( ::framework::MailToDispatcher ) else - IFFACTORY( ::framework::ServiceHandler ) else + //IFFACTORY( ::framework::DispatchRecorderSupplier ) else + //IFFACTORY( ::framework::DispatchRecorder ) else + //IFFACTORY( ::framework::MailToDispatcher ) else + //IFFACTORY( ::framework::ServiceHandler ) else IFFACTORY( ::framework::JobDispatch ) else IFFACTORY( ::framework::BackingComp ) else - IFFACTORY( ::framework::DispatchHelper ) else + //IFFACTORY( ::framework::DispatchHelper ) else IFFACTORY( ::framework::LayoutManager ) else - IFFACTORY( ::framework::License ) else + //IFFACTORY( ::framework::License ) else IFFACTORY( ::framework::UIElementFactoryManager ) else IFFACTORY( ::framework::PopupMenuControllerFactory ) else - IFFACTORY( ::framework::FontMenuController ) else - IFFACTORY( ::framework::FontSizeMenuController ) else + //IFFACTORY( ::framework::FontMenuController ) else + //IFFACTORY( ::framework::FontSizeMenuController ) else IFFACTORY( ::framework::ObjectMenuController ) else - IFFACTORY( ::framework::HeaderMenuController ) else - IFFACTORY( ::framework::FooterMenuController ) else + //IFFACTORY( ::framework::HeaderMenuController ) else + //IFFACTORY( ::framework::FooterMenuController ) else IFFACTORY( ::framework::ControlMenuController ) else - IFFACTORY( ::framework::MacrosMenuController ) else + //IFFACTORY( ::framework::MacrosMenuController ) else IFFACTORY( ::framework::UICommandDescription ) else IFFACTORY( ::framework::ModuleManager ) else IFFACTORY( ::framework::UIConfigurationManager ) else @@ -213,7 +216,7 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer IFFACTORY( ::framework::AddonsToolBoxFactory ) else IFFACTORY( ::framework::WindowStateConfiguration ) else IFFACTORY( ::framework::ToolbarControllerFactory ) else - IFFACTORY( ::framework::ToolbarsMenuController ) else + //IFFACTORY( ::framework::ToolbarsMenuController ) else IFFACTORY( ::framework::AutoRecovery ) else IFFACTORY( ::framework::StatusIndicatorFactory ) else IFFACTORY( ::framework::RecentFilesMenuController ) else @@ -222,18 +225,19 @@ COMPONENTGETFACTORY ( IFFACTORY( ::framework::URLTransformer IFFACTORY( ::framework::SessionListener ) else IFFACTORY( ::framework::StatusbarControllerFactory ) else IFFACTORY( ::framework::SessionListener ) else - IFFACTORY( ::framework::LogoImageStatusbarController ) else - IFFACTORY( ::framework::LogoTextStatusbarController ) else + //IFFACTORY( ::framework::LogoImageStatusbarController ) else + //IFFACTORY( ::framework::LogoTextStatusbarController ) else IFFACTORY( ::framework::TaskCreatorService ) else - IFFACTORY( ::framework::NewMenuController ) else - IFFACTORY( ::framework::SimpleTextStatusbarController ) else - IFFACTORY( ::framework::UriAbbreviation ) else - IFFACTORY( ::framework::PopupMenuDispatcher ) else + //IFFACTORY( ::framework::NewMenuController ) else + //IFFACTORY( ::framework::SimpleTextStatusbarController ) else + //IFFACTORY( ::framework::UriAbbreviation ) else + //IFFACTORY( ::framework::PopupMenuDispatcher ) else IFFACTORY( ::framework::ImageManager ) else - IFFACTORY( ::framework::PopupMenuDispatcher ) else IFFACTORY( ::framework::LangSelectionStatusbarController ) else - IFFACTORY( ::framework::LanguageSelectionMenuController ) else + //IFFACTORY( ::framework::LanguageSelectionMenuController ) else IFFACTORY( ::framework::WindowContentFactoryManager ) else - IFFACTORY( ::framework::TabWindowService ) + //IFFACTORY( ::framework::TabWindowService ) else + IFFACTORY( ::framework::SubstitutePathVariables ) else + IFFACTORY( ::framework::PathSettings ) ) diff --git a/framework/source/register/registertemp.cxx b/framework/source/register/registertemp.cxx index 6aad0e0e114f..704854558256 100644 --- a/framework/source/register/registertemp.cxx +++ b/framework/source/register/registertemp.cxx @@ -60,17 +60,74 @@ ) =================================================================================================================*/ #include <services/mediatypedetectionhelper.hxx> -#include <services/substitutepathvars.hxx> -#include <services/pathsettings.hxx> +#include <dispatch/mailtodispatcher.hxx> +#include <dispatch/oxt_handler.hxx> +#include <dispatch/popupmenudispatcher.hxx> +#include <dispatch/servicehandler.hxx> +#include <services/dispatchhelper.hxx> +#include <recording/dispatchrecorder.hxx> +#include <recording/dispatchrecordersupplier.hxx> +#include <services/license.hxx> +#include <services/uriabbreviation.hxx> +#include <uielement/simpletextstatusbarcontroller.hxx> +#include <uielement/logoimagestatusbarcontroller.hxx> +#include <uielement/logotextstatusbarcontroller.hxx> +#include <services/tabwindowservice.hxx> +#include <uielement/fontmenucontroller.hxx> +#include <uielement/fontsizemenucontroller.hxx> +#include <uielement/footermenucontroller.hxx> +#include <uielement/headermenucontroller.hxx> +#include <uielement/langselectionmenucontroller.hxx> +#include <uielement/macrosmenucontroller.hxx> +#include <uielement/newmenucontroller.hxx> +#include <uielement/toolbarsmenucontroller.hxx> COMPONENTGETIMPLEMENTATIONENVIRONMENT COMPONENTWRITEINFO ( COMPONENTINFO( ::framework::MediaTypeDetectionHelper ) - COMPONENTINFO( ::framework::SubstitutePathVariables ) - COMPONENTINFO( ::framework::PathSettings ) + COMPONENTINFO( ::framework::MailToDispatcher ) + COMPONENTINFO( ::framework::NewMenuController ) + COMPONENTINFO( ::framework::ToolbarsMenuController ) + COMPONENTINFO( ::framework::MacrosMenuController ) + COMPONENTINFO( ::framework::FontSizeMenuController ) + COMPONENTINFO( ::framework::HeaderMenuController ) + COMPONENTINFO( ::framework::FooterMenuController ) + COMPONENTINFO( ::framework::FontMenuController ) + COMPONENTINFO( ::framework::ServiceHandler ) + COMPONENTINFO( ::framework::LogoImageStatusbarController ) + COMPONENTINFO( ::framework::LogoTextStatusbarController ) + COMPONENTINFO( ::framework::SimpleTextStatusbarController ) + COMPONENTINFO( ::framework::UriAbbreviation ) + COMPONENTINFO( ::framework::LanguageSelectionMenuController ) + COMPONENTINFO( ::framework::PopupMenuDispatcher ) + COMPONENTINFO( ::framework::DispatchHelper ) + COMPONENTINFO( ::framework::TabWindowService ) + COMPONENTINFO( ::framework::DispatchRecorder ) + COMPONENTINFO( ::framework::DispatchRecorderSupplier ) + COMPONENTINFO( ::framework::Oxt_Handler ) + COMPONENTINFO( ::framework::License ) ) -COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) else - IFFACTORY( ::framework::SubstitutePathVariables ) else - IFFACTORY( ::framework::PathSettings ) +COMPONENTGETFACTORY ( IFFACTORY( ::framework::MediaTypeDetectionHelper ) + IFFACTORY( ::framework::MailToDispatcher ) else + IFFACTORY( ::framework::ServiceHandler ) else + IFFACTORY( ::framework::LogoTextStatusbarController ) else + IFFACTORY( ::framework::LogoImageStatusbarController ) else + IFFACTORY( ::framework::License ) else + IFFACTORY( ::framework::PopupMenuDispatcher ) else + IFFACTORY( ::framework::DispatchHelper ) else + IFFACTORY( ::framework::TabWindowService ) else + IFFACTORY( ::framework::DispatchRecorder ) else + IFFACTORY( ::framework::DispatchRecorderSupplier ) else + IFFACTORY( ::framework::SimpleTextStatusbarController ) else + IFFACTORY( ::framework::ToolbarsMenuController ) else + IFFACTORY( ::framework::FontMenuController ) else + IFFACTORY( ::framework::MacrosMenuController ) else + IFFACTORY( ::framework::NewMenuController ) else + IFFACTORY( ::framework::FontSizeMenuController ) else + IFFACTORY( ::framework::UriAbbreviation ) else + IFFACTORY( ::framework::FooterMenuController ) else + IFFACTORY( ::framework::HeaderMenuController ) else + IFFACTORY( ::framework::LanguageSelectionMenuController ) else + IFFACTORY( ::framework::Oxt_Handler ) ) |