Kaydet (Commit) 91bb474c authored tarafından Caolán McNamara's avatar Caolán McNamara

forcepoint#37 revert tdf#108572 let remove storage element

reverts

commit 26957fc3
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

The problem is that by allowing the removal of the element, existing readonly
accessors are left pointing to the deleted element which causes quite some problems
as seen in this sample document

Change-Id: Ie6ac36e6dea771b02637d77b78eb8026e3bb7ae8
Reviewed-on: https://gerrit.libreoffice.org/52563Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 06d8e626
......@@ -2822,8 +2822,6 @@ void SAL_CALL OStorage::removeElement( const OUString& aElementName )
if ( !pElement )
throw container::NoSuchElementException( THROW_WHERE ); //???
if ( pElement->m_xStorage )
pElement->m_xStorage->m_pAntiImpl = nullptr;
m_pImpl->RemoveElement( pElement );
m_pImpl->m_bIsModified = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment