comphelper/source/container/embeddedobjectcontainer.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
New commits: commit 28098d9d63359a695e28bc559b12ecc464212caf Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Thu Sep 18 10:33:29 2025 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Sep 18 15:20:41 2025 +0200 use more unique_ptr in EmbeddedObjectContainer Change-Id: I3794e081bc2bf0b6dfe2088dbb8402c490af5a57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191113 Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> Tested-by: Jenkins diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx index 01470a0fdb2a..c340a58afff4 100644 --- a/comphelper/source/container/embeddedobjectcontainer.cxx +++ b/comphelper/source/container/embeddedobjectcontainer.cxx @@ -66,7 +66,7 @@ struct EmbedImpl // to speed up lookup by Reference std::unordered_map<uno::Reference<embed::XEmbeddedObject>, OUString> maObjectToNameMap; uno::Reference < embed::XStorage > mxStorage; - EmbeddedObjectContainer* mpTempObjectContainer; + std::unique_ptr<EmbeddedObjectContainer> mpTempObjectContainer; uno::Reference < embed::XStorage > mxImageStorage; uno::WeakReference < uno::XInterface > m_xModel; @@ -193,8 +193,6 @@ EmbeddedObjectContainer::~EmbeddedObjectContainer() if ( pImpl->mbOwnsStorage ) pImpl->mxStorage->dispose(); - - delete pImpl->mpTempObjectContainer; } void EmbeddedObjectContainer::CloseEmbeddedObjects() @@ -918,7 +916,7 @@ bool EmbeddedObjectContainer::RemoveEmbeddedObject( if ( !pImpl->mpTempObjectContainer ) { - pImpl->mpTempObjectContainer = new EmbeddedObjectContainer(); + pImpl->mpTempObjectContainer = std::make_unique<EmbeddedObjectContainer>(); try { // TODO/LATER: in future probably the temporary container will have two storages ( of two formats )