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

[Lionel Elie Mamane]

 basic/source/uno/namecont.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 73318369c824326702b44ab4af13a78719720f77
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Jul 24 17:19:09 2014 +0200

    fdo#52076 remove empty library instead of writing it out empty
    
    Change-Id: Id4fd8c4f34e8ed07044eb428049731c4b9b694ca
    Reviewed-on: https://gerrit.libreoffice.org/10508
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 854f437..69ba278 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1815,8 +1815,12 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto
             Any aLibAny = maNameContainer.getByName( aNames[0] );
             Reference< XNameAccess > xNameAccess;
             aLibAny >>= xNameAccess;
-            if ( ! ( xNameAccess->hasElements() || ( bInplaceStorage && isModified() ) ) )
+            if ( ! xNameAccess->hasElements() )
             {
+                if ( bInplaceStorage && mxStorage->hasByName(maLibrariesDir) )
+                {
+                    mxStorage->removeElement(maLibrariesDir);
+                }
                 return;
             }
         }