diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 09:04:17 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-09-20 09:04:17 +0000 |
| commit | c5f3b883365e1fba075a8fcc4e35171491826055 (patch) | |
| tree | 0265f398378fa804118f92492cd0f9f3dfb4f0ce /framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx | |
| parent | 890f20eb5750661c2e36e4f4ef25f65e1281cae9 (diff) | |
INTEGRATION: CWS keyconfig01 (1.3.30); FILE MERGED
2004/07/10 18:08:47 as 1.3.30.2: RESYNC: (1.3-1.4); FILE MERGED
resolve merge conflict
2004/07/08 06:45:40 as 1.3.30.1: #i29863# support localized UI config, support new UI directory structure, adopt converter tool to support accelerators
Diffstat (limited to 'framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx')
| -rw-r--r-- | framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx index 8f7cfa4d503f..965d0012be25 100644 --- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx +++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx @@ -2,9 +2,9 @@ * * $RCSfile: moduleuiconfigurationmanager.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: obo $ $Date: 2004-07-06 16:51:15 $ + * last change: $Author: rt $ $Date: 2004-09-20 10:04:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -74,6 +74,10 @@ // my own includes //_________________________________________________________________________________________________________________ +#ifndef __FRAMEWORK_ACCELERATORS_PRESETHANDLER_HXX_ +#include <accelerators/presethandler.hxx> +#endif + #ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_ #include <threadhelp/threadhelpbase.hxx> #endif @@ -312,6 +316,7 @@ namespace framework com::sun::star::uno::Reference< com::sun::star::embed::XTransactedObject > m_xUserRootCommit; com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener + PresetHandler m_aStorageHandler; com::sun::star::uno::Reference< com::sun::star::lang::XComponent > m_xModuleImageManager; }; } |