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

[Michael Stahl]

 basic/source/uno/namecont.cxx |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit adfd7805bc61ff4ec56f6570fc516ff3aad74a28
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed May 21 19:43:46 2014 +0200

    Revert "fdo#67685 open xSourceLibrariesStor only when needed"
    
    This reverts commit fc9080a0c60f263d00eb71111fcda72b3c0a2ebb.
    
    This bug was apparently introduced by
    af34774d260a68fc02cd78ba90dd8d4afaf1a2a4, which will be reverted
    in the next commit.
    
    Change-Id: I81ccb5bf9cc7e29fbf1e66d02f38268ee1fd1d0c
    (cherry picked from commit 5ca4b9d51046b9b6a36b91c9abd0cc1e7c04b480)
    Reviewed-on: https://gerrit.libreoffice.org/9436
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 357f2e0..20e2bb3 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1871,6 +1871,21 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
             DBG_UNHANDLED_EXCEPTION();
             return;
         }
+
+        // open the source storage which might be used to copy yet-unmodified libraries
+        try
+        {
+            if ( mxStorage->hasByName( maLibrariesDir ) || bInplaceStorage )
+            {
+                xSourceLibrariesStor = mxStorage->openStorageElement( maLibrariesDir,
+                                                   bInplaceStorage ? embed::ElementModes::READWRITE : embed::ElementModes::READ );
+            }
+        }
+        catch( const uno::Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+            return;
+        }
     }
 
     int iArray = 0;
@@ -1999,21 +2014,6 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
     // then we need to clean up the temporary storage we used for this
     if ( bInplaceStorage && !sTempTargetStorName.isEmpty() )
     {
-        // open the source storage which might be used to copy yet-unmodified libraries
-        try
-        {
-            if ( mxStorage->hasByName( maLibrariesDir ) || bInplaceStorage )
-            {
-                xSourceLibrariesStor = mxStorage->openStorageElement( maLibrariesDir,
-                                                   bInplaceStorage ? embed::ElementModes::READWRITE : embed::ElementModes::READ );
-            }
-        }
-        catch( const uno::Exception& )
-        {
-            DBG_UNHANDLED_EXCEPTION();
-            return;
-        }
-
         SAL_WARN_IF(
             !xSourceLibrariesStor.is(), "basic",
             ("SfxLibrariesContainer::storeLibraries_impl: unexpected: we should"