[Libreoffice-commits] .: Branch 'libreoffice-3-4' - 2 commits - basic/source

[Noel Power]

 basic/source/uno/dlgcont.cxx  |    2 +-
 basic/source/uno/namecont.cxx |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 857ebe4b6e40275bbe2afaca41210dda97950b9f
Author: Lionel Elie Mamane <lionel.mamane at gestman.lu>
Date:   Sun Aug 14 17:00:54 2011 +0200

    fdo#40079: load Dialog library before trying to get embedded images

diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx
index c8da150..158d9fe 100644
--- a/basic/source/uno/dlgcont.cxx
+++ b/basic/source/uno/dlgcont.cxx
@@ -292,7 +292,7 @@ void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< e
     Sequence< OUString > sLibraries = getElementNames();
     for ( sal_Int32 i=0; i < sLibraries.getLength(); ++i )
     {
-        // libraries will already be loaded from above
+        loadLibrary( sLibraries[ i ] );
         Reference< XNameContainer > xLib;
         getByName( sLibraries[ i ] ) >>= xLib;
         if ( xLib.is() )
commit 4252f25461096964205c550d483b4c13be2c44f3
Author: Lionel Elie Mamane <lionel.mamane at gestman.lu>
Date:   Mon Aug 15 14:02:25 2011 +0200

    Janitorial: deduplicate code; no behaviour change

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 444a4ed..92225a4 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1806,10 +1806,8 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
         // open the source storage which might be used to copy yet-unmodified libraries
         try
         {
-            if ( mxStorage->hasByName( maLibrariesDir ) )
+            if ( mxStorage->hasByName( maLibrariesDir ) || bInplaceStorage )
                 xSourceLibrariesStor = mxStorage->openStorageElement( maLibrariesDir, bInplaceStorage ? embed::ElementModes::READWRITE : embed::ElementModes::READ );
-            else if ( bInplaceStorage )
-                xSourceLibrariesStor = mxStorage->openStorageElement( maLibrariesDir, embed::ElementModes::READWRITE );
         }
         catch( const uno::Exception& )
         {