diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:12:30 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-02 14:12:30 +0000 |
| commit | 668fc293ef84b8b8e533eefeec0d1a8f1ede8484 (patch) | |
| tree | b10fbce4d0f3fffda6b24c088c787cb180ab8dfc /framework/source/uiconfiguration/uiconfigurationmanager.cxx | |
| parent | 94a7a25bd387c29fd5f7416e57287b742766fdfb (diff) | |
INTEGRATION: CWS docking2 (1.6.10); FILE MERGED
2004/07/16 06:36:45 cd 1.6.10.1: #i31417# Fixed wrong automatic merge
Diffstat (limited to 'framework/source/uiconfiguration/uiconfigurationmanager.cxx')
| -rw-r--r-- | framework/source/uiconfiguration/uiconfigurationmanager.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index e5b3e21b12..ea326dd039 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -2,9 +2,9 @@ * * $RCSfile: uiconfigurationmanager.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2004-07-07 11:28:00 $ + * last change: $Author: hr $ $Date: 2004-08-02 15:12:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -333,10 +333,13 @@ void UIConfigurationManager::impl_requestUIElementData( sal_Int16 nElementType, { try { - Reference< XIndexContainer > xIndexContainer( static_cast< OWeakObject * >( new RootItemContainer() ), UNO_QUERY ); MenuConfiguration aMenuCfg( m_xServiceManager ); - RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xIndexContainer ); - aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); + Reference< XIndexAccess > xContainer( aMenuCfg.CreateMenuBarConfigurationFromXML( xInputStream )); + RootItemContainer* pRootItemContainer = RootItemContainer::GetImplementation( xContainer ); + if ( pRootItemContainer ) + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( pRootItemContainer, sal_True ) ), UNO_QUERY ); + else + aUIElementData.xSettings = Reference< XIndexAccess >( static_cast< OWeakObject * >( new ConstItemContainer( xContainer, sal_True ) ), UNO_QUERY ); return; } catch ( ::com::sun::star::lang::WrappedTargetException& ) |