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

Miklos Vajna vmiklos at suse.cz
Mon Jun 3 09:15:36 PDT 2013


 basic/source/uno/namecont.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8c63280ccd53d047a710f21e749214d0064a3d1a
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Mon Jun 3 17:54:57 2013 +0200

    SfxLibraryContainer::storeLibraries_Impl: make saving basic macros work again
    
    Regression from cbd1a89676f39135ed2e9c47d20475b2053289b9, that commit
    accidentally not only removed the #if 0 block, but also two other
    braces -- because of this, in case bStorage was false, nothing was
    saved. The effect of this was that if the user edited some macro in the
    basic IDE, then saved the macro, it was shown as saved, but in fact that
    didn't happen.
    
    Change-Id: I20f8358dddfb226976be72f95dcad64de88d83c3
    (cherry picked from commit 06138c2a5575b45109dc609453300aa74df22800)

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 69e8fbf..4dcf9c4 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1926,6 +1926,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
 
         if( pImplLib->implIsModified() || bComplete )
         {
+            {
             uno::Reference< embed::XStorage > xLibraryStor;
             if( bStorage )
             {
@@ -1947,6 +1948,7 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
                     #endif
                     return;
                 }
+            }
 
                 // Maybe lib is not loaded?!
                 if( bComplete )


More information about the Libreoffice-commits mailing list