impress186: merge with DEV300m86

3 files changed, 246 insertions, 33 deletions

diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index 051b4fa9f077..004b61fbf198 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -187,12 +187,13 @@ bool writeOasis2OOoLibraryElement(
 
 void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement
 (
-    Any aElement,
-    const OUString& /*aElementName*/,
-    Reference< XOutputStream > xOutput
+    const Reference < XNameContainer >& xLib,
+    const OUString& aElementName,
+    const Reference< XOutputStream >& xOutput
 )
     throw(Exception)
 {
+    Any aElement = xLib->getByName( aElementName );
     Reference< XInputStreamProvider > xISP;
     aElement >>= xISP;
     if( !xISP.is() )
@@ -256,7 +257,9 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
 
 
 Any SAL_CALL SfxDialogLibraryContainer::importLibraryElement
-    ( const OUString& aFile, const uno::Reference< io::XInputStream >& xElementStream )
+    ( const Reference < XNameContainer >& /*xLib*/,
+      const OUString& /*aElementName */, const OUString& aFile,
+      const uno::Reference< io::XInputStream >& xElementStream )
 {
     Any aRetAny;
 
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 90e7cb4cb4d5..e1ad8b6b4308 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -65,7 +65,7 @@
 #include <com/sun/star/uno/DeploymentException.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/script/LibraryNotLoadedException.hpp>
-#include "com/sun/star/deployment/thePackageManagerFactory.hpp"
+#include "com/sun/star/deployment/ExtensionManager.hpp"
 #include <comphelper/storagehelper.hxx>
 #ifndef _RTL_USTRING_HXX_
 #include <comphelper/anytostring.hxx>
@@ -1080,6 +1080,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
 
                 OUString aUserSearchStr   = OUString::createFromAscii( "vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE" );
                 OUString aSharedSearchStr = OUString::createFromAscii( "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE" );
+                OUString aBundledSearchStr = OUString::createFromAscii( "vnd.sun.star.expand:$BUNDLED_EXTENSIONS" );
                 OUString aInstSearchStr   = OUString::createFromAscii( "$(INST)" );
 
                 Sequence< OUString > aNames = pPrevCont->getElementNames();
@@ -1111,6 +1112,7 @@ sal_Bool SfxLibraryContainer::init_Impl(
                         bool bCreateLink = true;
                         if( aStorageURL.indexOf( aUserSearchStr   ) != -1 ||
                             aStorageURL.indexOf( aSharedSearchStr ) != -1 ||
+                            aStorageURL.indexOf( aBundledSearchStr ) != -1 ||
                             aStorageURL.indexOf( aInstSearchStr   ) != -1 )
                         {
                             bCreateLink = false;
@@ -1369,8 +1371,8 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
             OUString aStreamName = aElementName;
             aStreamName += String( RTL_CONSTASCII_USTRINGPARAM(".xml") );
 
-            Any aElement = pLib->getByName( aElementName );
-            if( !isLibraryElementValid( aElement ) )
+            /*Any aElement = pLib->getByName( aElementName );*/
+            if( !isLibraryElementValid( pLib->getByName( aElementName ) ) )
             {
             #if OSL_DEBUG_LEVEL > 0
                 ::rtl::OStringBuffer aMessage;
@@ -1406,7 +1408,8 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
                     xProps->setPropertyValue( aPropName, uno::makeAny( sal_True ) );
 
                     Reference< XOutputStream > xOutput = xElementStream->getOutputStream();
-                    writeLibraryElement( aElement, aElementName, xOutput );
+                    Reference< XNameContainer > xLib( pLib );
+                    writeLibraryElement( xLib, aElementName, xOutput );
                     // writeLibraryElement closes the stream
                     // xOutput->closeOutput();
                 }
@@ -1458,8 +1461,8 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
                 aElementInetObj.setExtension( maLibElementFileExtension );
                 String aElementPath( aElementInetObj.GetMainURL( INetURLObject::NO_DECODE ) );
 
-                Any aElement = pLib->getByName( aElementName );
-                if( !isLibraryElementValid( aElement ) )
+                /*Any aElement = pLib->getByName( aElementName );*/
+                if( !isLibraryElementValid( pLib->getByName( aElementName ) ) )
                 {
                 #if OSL_DEBUG_LEVEL > 0
                     ::rtl::OStringBuffer aMessage;
@@ -1477,7 +1480,8 @@ void SfxLibraryContainer::implStoreLibrary( SfxLibrary* pLib,
                     if( xSFI->exists( aElementPath ) )
                         xSFI->kill( aElementPath );
                     Reference< XOutputStream > xOutput = xSFI->openFileWrite( aElementPath );
-                    writeLibraryElement( aElement, aElementName, xOutput );
+                    Reference< XNameContainer > xLib( pLib );
+                    writeLibraryElement( xLib, aElementName, xOutput );
                     xOutput->closeOutput();
                 }
                 catch( Exception& )
@@ -2167,6 +2171,7 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink
     SfxLibrary* pNewLib = implCreateLibraryLink( Name, aLibInfoFileURL, aLibDirURL, ReadOnly );
     pNewLib->maLibElementFileExtension = maLibElementFileExtension;
     pNewLib->maUnexpandedStorageURL = aUnexpandedStorageURL;
+    pNewLib->maOrignialStorageURL = StorageURL;
 
     OUString aInitFileName;
     uno::Reference< embed::XStorage > xDummyStor;
@@ -2182,11 +2187,12 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink
 
     OUString aUserSearchStr   = OUString::createFromAscii( "vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE" );
     OUString aSharedSearchStr = OUString::createFromAscii( "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE" );
+    OUString aBundledSearchStr = OUString::createFromAscii( "vnd.sun.star.expand:$BUNDLED_EXTENSIONS" );
     if( StorageURL.indexOf( aUserSearchStr ) != -1 )
     {
         pNewLib->mbExtension = sal_True;
     }
-    else if( StorageURL.indexOf( aSharedSearchStr ) != -1 )
+    else if( StorageURL.indexOf( aSharedSearchStr ) != -1 || StorageURL.indexOf( aBundledSearchStr ) != -1 )
     {
         pNewLib->mbExtension = sal_True;
         pNewLib->mbReadOnly = sal_True;
@@ -2380,7 +2386,9 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name )
                 aFile = aElementInetObj.GetMainURL( INetURLObject::NO_DECODE );
             }
 
-            Any aAny = importLibraryElement( aFile, xInStream );
+            Reference< XNameContainer > xLib( pImplLib );
+            Any aAny = importLibraryElement( xLib, aElementName,
+                                                aFile, xInStream );
             if( pImplLib->hasByName( aElementName ) )
             {
                 if( aAny.hasValue() )
@@ -2785,6 +2793,21 @@ OUString SfxLibraryContainer::expand_url( const OUString& url )
     }
 }
 
+
+//XLibraryContainer3
+OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString& Name )
+    throw (IllegalArgumentException, NoSuchElementException, RuntimeException)
+{
+    LibraryContainerMethodGuard aGuard( *this );
+    SfxLibrary* pImplLib = getImplLib( Name );
+    sal_Bool bLink = pImplLib->mbLink;
+    if( !bLink )
+        throw IllegalArgumentException();
+    OUString aRetStr = pImplLib->maOrignialStorageURL;
+    return aRetStr;
+}
+
+
 ::sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatModeOn() throw (RuntimeException)
 {
     return mbVBACompat;
@@ -3097,8 +3120,10 @@ ScriptExtensionIterator::ScriptExtensionIterator( void )
     : m_eState( USER_EXTENSIONS )
     , m_bUserPackagesLoaded( false )
     , m_bSharedPackagesLoaded( false )
+    , m_bBundledPackagesLoaded( false )
     , m_iUserPackage( 0 )
     , m_iSharedPackage( 0 )
+       , m_iBundledPackage( 0 )
     , m_pScriptSubPackageIterator( NULL )
 {
     Reference< XMultiServiceFactory > xFactory = comphelper::getProcessServiceFactory();
@@ -3147,6 +3172,16 @@ rtl::OUString ScriptExtensionIterator::nextBasicOrDialogLibrary( bool& rbPureDia
                 aRetLib = xScriptPackage->getURL();
                 break;
             }
+            case BUNDLED_EXTENSIONS:
+            {
+                Reference< deployment::XPackage > xScriptPackage =
+                    implGetNextBundledScriptPackage( rbPureDialogLib );
+                if( !xScriptPackage.is() )
+                    break;
+
+                aRetLib = xScriptPackage->getURL();
+                break;
+            }
             case END_REACHED:
                 VOS_ENSURE( false, "ScriptExtensionIterator::nextBasicOrDialogLibrary(): Invalid case END_REACHED" );
                 break;
@@ -3317,10 +3352,11 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextUserScript
     {
         try
         {
-            Reference< XPackageManager > xUserManager =
-                thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("user") );
-            m_aUserPackagesSeq = xUserManager->getDeployedPackages
-                ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+            Reference< XExtensionManager > xManager =
+                ExtensionManager::get( m_xContext );
+            m_aUserPackagesSeq = xManager->getDeployedExtensions
+                (rtl::OUString::createFromAscii("user"),
+                 Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         }
         catch( com::sun::star::uno::DeploymentException& )
         {
@@ -3370,10 +3406,11 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri
     {
         try
         {
-            Reference< XPackageManager > xSharedManager =
-                thePackageManagerFactory::get( m_xContext )->getPackageManager( rtl::OUString::createFromAscii("shared") );
-            m_aSharedPackagesSeq = xSharedManager->getDeployedPackages
-                ( Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+            Reference< XExtensionManager > xSharedManager =
+                ExtensionManager::get( m_xContext );
+            m_aSharedPackagesSeq = xSharedManager->getDeployedExtensions
+                (rtl::OUString::createFromAscii("shared"),
+                 Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
         }
         catch( com::sun::star::uno::DeploymentException& )
         {
@@ -3386,7 +3423,7 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri
 
     if( m_iSharedPackage == m_aSharedPackagesSeq.getLength() )
     {
-        m_eState = END_REACHED;
+        m_eState = BUNDLED_EXTENSIONS;
     }
     else
     {
@@ -3413,4 +3450,57 @@ Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextSharedScri
     return xScriptPackage;
 }
 
+Reference< deployment::XPackage > ScriptExtensionIterator::implGetNextBundledScriptPackage
+    ( bool& rbPureDialogLib )
+{
+    Reference< deployment::XPackage > xScriptPackage;
+
+    if( !m_bBundledPackagesLoaded )
+    {
+        try
+        {
+            Reference< XExtensionManager > xManager =
+                ExtensionManager::get( m_xContext );
+            m_aBundledPackagesSeq = xManager->getDeployedExtensions
+                (rtl::OUString::createFromAscii("bundled"),
+                 Reference< task::XAbortChannel >(), Reference< ucb::XCommandEnvironment >() );
+        }
+        catch( com::sun::star::uno::DeploymentException& )
+        {
+            // Special Office installations may not contain deployment code
+            return xScriptPackage;
+        }
+
+        m_bBundledPackagesLoaded = true;
+    }
+
+    if( m_iBundledPackage == m_aBundledPackagesSeq.getLength() )
+    {
+        m_eState = END_REACHED;
+    }
+    else
+    {
+        if( m_pScriptSubPackageIterator == NULL )
+        {
+            const Reference< deployment::XPackage >* pBundledPackages = m_aBundledPackagesSeq.getConstArray();
+            Reference< deployment::XPackage > xPackage = pBundledPackages[ m_iBundledPackage ];
+            VOS_ENSURE( xPackage.is(), "ScriptExtensionIterator::implGetNextBundledScriptPackage(): Invalid package" );
+            m_pScriptSubPackageIterator = new ScriptSubPackageIterator( xPackage );
+        }
+
+        if( m_pScriptSubPackageIterator != NULL )
+        {
+            xScriptPackage = m_pScriptSubPackageIterator->getNextScriptSubPackage( rbPureDialogLib );
+            if( !xScriptPackage.is() )
+            {
+                delete m_pScriptSubPackageIterator;
+                m_pScriptSubPackageIterator = NULL;
+                m_iBundledPackage++;
+            }
+        }
+    }
+
+    return xScriptPackage;
+}
+
 }   // namespace basic
diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx
index 4185b6f9579c..5622adc19af1 100644
--- a/basic/source/uno/scriptcont.cxx
+++ b/basic/source/uno/scriptcont.cxx
@@ -41,6 +41,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
 #include <com/sun/star/task/ErrorCodeIOException.hpp>
+#include <com/sun/star/script/ModuleType.hpp>
 #include <comphelper/processfactory.hxx>
 #ifndef _COMPHELPER_STORAGEHELPER_HXX_
 #include <comphelper/storagehelper.hxx>
@@ -60,6 +61,7 @@
 #include <svtools/ehdl.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
+#include <basic/basicmanagerrepository.hxx>
 #include "modsizeexceeded.hxx"
 #include <xmlscript/xmlmod_imexp.hxx>
 #include <cppuhelper/factory.hxx>
@@ -184,9 +186,9 @@ bool SAL_CALL SfxScriptLibraryContainer::isLibraryElementValid( Any aElement ) c
 
 void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement
 (
-    Any aElement,
+    const Reference < XNameContainer >& xLib,
     const OUString& aElementName,
-    Reference< XOutputStream > xOutput
+    const Reference< XOutputStream >& xOutput
 )
     throw(Exception)
 {
@@ -211,13 +213,42 @@ void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement
     xmlscript::ModuleDescriptor aMod;
     aMod.aName = aElementName;
     aMod.aLanguage = maScriptLanguage;
+    Any aElement = xLib->getByName( aElementName );
     aElement >>= aMod.aCode;
+
+    Reference < script::XVBAModuleInfo > xModInfo( xLib, UNO_QUERY );
+
+    if( xModInfo.is() && xModInfo->hasModuleInfo( aElementName ) )
+    {
+        script::ModuleInfo aModInfo = xModInfo->getModuleInfo( aElementName );
+        switch( aModInfo.ModuleType )
+        {
+        case ModuleType::NORMAL:
+            aMod.aModuleType = OUString( RTL_CONSTASCII_USTRINGPARAM("normal") );
+            break;
+        case ModuleType::CLASS:
+            aMod.aModuleType = OUString( RTL_CONSTASCII_USTRINGPARAM("class") );
+            break;
+        case ModuleType::FORM:
+            aMod.aModuleType = OUString( RTL_CONSTASCII_USTRINGPARAM("form") );
+            break;
+        case ModuleType::DOCUMENT:
+            aMod.aModuleType = OUString( RTL_CONSTASCII_USTRINGPARAM("document") );
+            break;
+        case ModuleType::UNKNOWN:
+            // nothing
+            break;
+        }
+    }
+
     xmlscript::exportScriptModule( xHandler, aMod );
 }
 
 
 Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
-    ( const OUString& aFile, const uno::Reference< io::XInputStream >& xInStream )
+    ( const Reference < XNameContainer >& xLib,
+      const OUString& aElementName, const OUString& aFile,
+      const uno::Reference< io::XInputStream >& xInStream )
 {
     Any aRetAny;
 
@@ -279,6 +310,86 @@ Any SAL_CALL SfxScriptLibraryContainer::importLibraryElement
     // TODO: Check language
     // aMod.aLanguage
     // aMod.aName ignored
+    if( aMod.aModuleType.getLength() > 0 )
+    {
+        if( !getVBACompatModeOn() )
+        {
+            setVBACompatModeOn( sal_True );
+
+            Any aGlobs;
+            Sequence< Any > aArgs(1);
+            Reference<frame::XModel > xModel( mxOwnerDocument );
+            aArgs[ 0 ] <<= xModel;
+
+            BasicManager* pBasicMgr = getBasicManager();
+            if( pBasicMgr )
+            {
+                aGlobs <<= ::comphelper::getProcessServiceFactory()->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.Globals" ) ), aArgs );
+                pBasicMgr->SetGlobalUNOConstant( "VBAGlobals", aGlobs );
+            }
+            pBasicMgr = BasicManagerRepository::getApplicationBasicManager( sal_False );
+            if( pBasicMgr )
+                pBasicMgr->SetGlobalUNOConstant( "ThisExcelDoc", aArgs[0] );
+        }
+
+        script::ModuleInfo aModInfo;
+        aModInfo.ModuleType = ModuleType::UNKNOWN;
+        if( aMod.aModuleType.equalsAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("normal") ))
+        {
+            aModInfo.ModuleType = ModuleType::NORMAL;
+        }
+        else if( aMod.aModuleType.equalsAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("class") ))
+        {
+            aModInfo.ModuleType = ModuleType::CLASS;
+        }
+        else if( aMod.aModuleType.equalsAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("form") ))
+        {
+            aModInfo.ModuleType = ModuleType::FORM;
+            aModInfo.ModuleObject = mxOwnerDocument;
+        }
+        else if( aMod.aModuleType.equalsAsciiL(
+                    RTL_CONSTASCII_STRINGPARAM("document") ))
+        {
+            aModInfo.ModuleType = ModuleType::DOCUMENT;
+            Reference<frame::XModel > xModel( mxOwnerDocument );
+            Reference< XMultiServiceFactory> xSF( xModel, UNO_QUERY);
+            Reference< container::XNameAccess > xVBACodeNameAccess;
+            if( xSF.is() )
+            {
+                try
+                {
+                    xVBACodeNameAccess.set( xSF->createInstance(
+                        rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+                            "ooo.vba.VBAObjectModuleObjectProvider"))),
+                        UNO_QUERY );
+                }
+                catch(uno::Exception&) {}
+            }
+            if( xVBACodeNameAccess.is() )
+            {
+                try
+                {
+                    aModInfo.ModuleObject.set( xVBACodeNameAccess->getByName( aElementName), uno::UNO_QUERY );
+                }
+                catch(uno::Exception&)
+                {
+                    OSL_TRACE("Failed to get documument object for %s", rtl::OUStringToOString( aElementName, RTL_TEXTENCODING_UTF8 ).getStr() );
+                }
+            }
+        }
+
+        Reference< script::XVBAModuleInfo > xVBAModuleInfo( xLib,
+                                                            UNO_QUERY );
+        if( xVBAModuleInfo.is() )
+        {
+            if( xVBAModuleInfo->hasModuleInfo( aElementName ) )
+                xVBAModuleInfo->removeModuleInfo( aElementName );
+            xVBAModuleInfo->insertModuleInfo( aElementName, aModInfo );
+        }
+    }
 
     return aRetAny;
 }
@@ -574,8 +685,8 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
 
             if( pLib->mbPasswordVerified || pLib->mbDoc50Password )
             {
-                Any aElement = pLib->getByName( aElementName );
-                if( !isLibraryElementValid( aElement ) )
+                /*Any aElement = pLib->getByName( aElementName );*/
+                if( !isLibraryElementValid( pLib->getByName( aElementName ) ) )
                 {
                 #if OSL_DEBUG_LEVEL > 0
                     ::rtl::OStringBuffer aMessage;
@@ -606,7 +717,8 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                     setStreamKey( xSourceStream, pLib->maPassword );
 
                     Reference< XOutputStream > xOutput = xSourceStream->getOutputStream();
-                    writeLibraryElement( aElement, aElementName, xOutput );
+                    Reference< XNameContainer > xLib( pLib );
+                    writeLibraryElement( xLib, aElementName, xOutput );
                     // writeLibraryElement should have the stream already closed
                     // xOutput->closeOutput();
                 }
@@ -659,8 +771,8 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                 aElementInetObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM("pba") ) );
                 String aElementPath = aElementInetObj.GetMainURL( INetURLObject::NO_DECODE );
 
-                Any aElement = pLib->getByName( aElementName );
-                if( !isLibraryElementValid( aElement ) )
+                /*Any aElement = pLib->getByName( aElementName );*/
+                if( !isLibraryElementValid( pLib->getByName( aElementName ) ) )
                 {
                 #if OSL_DEBUG_LEVEL > 0
                     ::rtl::OStringBuffer aMessage;
@@ -741,7 +853,8 @@ sal_Bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib,
                     xProps->setPropertyValue( aPropName, uno::makeAny( aMime ) );
 
                     Reference< XOutputStream > xOut = xSourceStream->getOutputStream();
-                    writeLibraryElement( aElement, aElementName, xOut );
+                    Reference< XNameContainer > xLib( pLib );
+                    writeLibraryElement( xLib, aElementName, xOut );
                     // i50568: sax writer already closes stream
                     // xOut->closeOutput();
 
@@ -903,7 +1016,10 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                         if ( !xInStream.is() )
                             throw io::IOException(); // read access denied, seems to be impossible
 
-                        Any aAny = importLibraryElement( aSourceStreamName, xInStream );
+                        Reference< XNameContainer > xLib( pLib );
+                        Any aAny = importLibraryElement( xLib,
+                                        aElementName, aSourceStreamName,
+                                           xInStream );
                         if( pLib->hasByName( aElementName ) )
                         {
                             if( aAny.hasValue() )
@@ -1006,7 +1122,11 @@ sal_Bool SfxScriptLibraryContainer::implLoadPasswordLibrary
                                 if ( !xInStream.is() )
                                     throw io::IOException(); // read access denied, seems to be impossible
 
-                                Any aAny = importLibraryElement( aSourceStreamName, xInStream );
+                                Reference< XNameContainer > xLib( pLib );
+                                Any aAny = importLibraryElement( xLib,
+                                                aElementName,
+                                                aSourceStreamName,
+                                                xInStream );
                                 if( pLib->hasByName( aElementName ) )
                                 {
                                     if( aAny.hasValue() )