#i34819# Module identifier must be used to initialize image manager correctly

2 files changed, 11 insertions, 7 deletions

diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
index 3a71ad08d16c..cb0594c7307d 100644
--- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
+++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: moduleuicfgsupplier.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: rt $ $Date: 2004-09-20 10:08:59 $
+ *  last change: $Author: kz $ $Date: 2004-10-04 11:51:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -460,10 +460,13 @@ throw ( NoSuchElementException, RuntimeException)
         aArgs[3] <<= aArg;
         */
         PropertyValue   aArg;
-        Sequence< Any > aArgs( 1 );
+        Sequence< Any > aArgs( 2 );
         aArg.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleShortName" ));
         aArg.Value <<= sShort;
         aArgs[0] <<= aArg;
+        aArg.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "ModuleIdentifier" ));
+        aArg.Value <<= ModuleIdentifier;
+        aArgs[1] <<= aArg;
 
         pIter->second = Reference< XUIConfigurationManager >( m_xServiceManager->createInstanceWithArguments(
                                                                 SERVICENAME_MODULEUICONFIGURATIONMANAGER, aArgs ),
diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
index 36bf392ee640..1dd17b3e5252 100644
--- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
+++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: moduleuiconfigurationmanager.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2004-09-20 10:09:11 $
+ *  last change: $Author: kz $ $Date: 2004-10-04 11:51:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -872,11 +872,12 @@ void SAL_CALL ModuleUIConfigurationManager::initialize( const Sequence< Any >& a
     if ( !m_bInitialized )
     {
         ::comphelper::SequenceAsHashMap lArgs(aArguments);
-        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
+        m_aModuleIdentifier = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleIdentifier"), ::rtl::OUString());
+        m_aModuleShortName  = lArgs.getUnpackedValueOrDefault(::rtl::OUString::createFromAscii("ModuleShortName"), ::rtl::OUString());
 
         m_aStorageHandler.connectToResource(PresetHandler::E_MODULES,
                                             PresetHandler::RESOURCETYPE_MENUBAR(), // this path wont be used later ... seee next lines!
-                                            m_aModuleIdentifier,
+                                            m_aModuleShortName,
                                             css::uno::Reference< css::embed::XStorage >()); // no document root used here!
 
         m_xUserRootCommit       = css::uno::Reference< css::embed::XTransactedObject >(m_aStorageHandler.getOrCreateRootStorageUser(), css::uno::UNO_QUERY_THROW);