[Libreoffice-commits] .: 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 03e9161e2eca9d389d7ce419495538c31f6aed31
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 ef1386b..b4f4470 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 e00c67ba62b1f88399090352008d4840d52ca7e9
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 a27c36d..cf2e0b6 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1849,10 +1849,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& )
         {