path: root/package
diff options
authorCaolán McNamara <>2018-04-07 20:24:40 +0100
committerCaolán McNamara <>2018-04-09 11:03:37 +0200
commit91bb474cc5342b32dab6c701a1bea6c49b87f498 (patch)
tree959797bef23b50b4f653d3579909ff20162a89ed /package
parent06d8e6264487e3084b583e5158d9b89f8480b3eb (diff)
forcepoint#37 revert tdf#108572 let remove storage element
reverts commit 26957fc325c27cf61e8ef5555b380d627def4931 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: Tested-by: Jenkins <> Reviewed-by: Caolán McNamara <> Tested-by: Caolán McNamara <>
Diffstat (limited to 'package')
1 files changed, 0 insertions, 2 deletions
diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx
index 67c2afa61fd2..0a43a07869f9 100644
--- a/package/source/xstor/xstorage.cxx
+++ b/package/source/xstor/xstorage.cxx
@@ -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;