[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - package/source

[Szymon Kłos]

 package/source/xstor/xstorage.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 5ffa11a77369637f4f8698bbe0402fe1395e46b7
Author: Szymon Kłos <szymon.klos at collabora.com>
Date:   Wed Sep 6 10:54:50 2017 +0200

    tdf#108572 let remove storage element
    
    void OStorage_Impl::RemoveElement( SotElement_Impl* pElement )
    expects that m_pAntiImpl will be nullptr, if not throws an exception.
    This caused that in case of deleting embedded database used for
    mail merge it wasn't fully removed and it was impossible to import
    the same datasource second time.
    
    Change-Id: I0310fde2ad819c96474a857f37ee42d052fad266
    Reviewed-on: https://gerrit.libreoffice.org/42028
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/42043
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 68f47a89db85..d0c470e55ebf 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -3046,6 +3046,8 @@ void SAL_CALL OStorage::removeElement( const OUString& aElementName )
         if ( !pElement )
             throw container::NoSuchElementException( THROW_WHERE ); //???
 
+        if ( pElement->m_pStorage )
+            pElement->m_pStorage->m_pAntiImpl = nullptr;
         m_pImpl->RemoveElement( pElement );
 
         m_pImpl->m_bIsModified = true;