[Libreoffice-commits] core.git: dbaccess/source

[Julien Nabet (via logerrit)]

 dbaccess/source/core/dataaccess/ModelImpl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5e80706dca6395dfac006cfc7009a2dfe388a46e
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Wed Jan 26 20:32:54 2022 +0100
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Thu Jan 27 08:36:54 2022 +0100

    Avoid 
warn:dbaccess:828616:828616:dbaccess/source/core/dataaccess/ModelImpl.cxx
    
    Just open an odb with embedded Firebird, browse tables panel and close LO
    Full message:
    
warn:dbaccess:828616:828616:dbaccess/source/core/dataaccess/ModelImpl.cxx:923:
    com.sun.star.container.NoSuchElementException message: 
"/home/julien/lo/libreoffice/package/source/xstor/xstorage.cxx:2974:
    at /home/julien/lo/libreoffice/package/source/xstor/xstorage.cxx:2974"
    
    Change-Id: Ibcea49b5ae28fd42cc1008c74f8cd5a9b7434068
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129009
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx 
b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 49a74717e559..0a1ef938d53b 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -887,7 +887,7 @@ bool 
ODatabaseModelImpl::commitStorageIfWriteable_ignoreErrors( const Reference<
 
                 uno::Reference<embed::XStorage> xTargetMetaInf
                     = _rxStorage->openStorageElement("META-INF", 
embed::ElementModes::READWRITE);
-                if (xMetaInf.is() && xTargetMetaInf.is())
+                if (xMetaInf.is() && xTargetMetaInf.is() && 
xMetaInf->hasByName(aScriptSignName))
                 {
                     xMetaInf->copyElementTo(aScriptSignName, xTargetMetaInf, 
aScriptSignName);